From 36c2f12ffccce4fe63a6339c279ebfa795a6deaa Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Sat, 30 Mar 2024 18:54:54 -0700
Subject: [PATCH 1/6] feat: Use specified branch of arrow-rs with workaround to
 invalid offset buffers from Java Arrow

---
 .../scala/org/apache/comet/CometConf.scala    |  16 +-
 core/Cargo.lock                               | 699 +++++++++---------
 core/Cargo.toml                               |  19 +-
 .../execution/datafusion/expressions/avg.rs   |   2 +-
 .../datafusion/expressions/avg_decimal.rs     |   2 +-
 .../expressions/bloom_filter_might_contain.rs |   2 +-
 .../datafusion/expressions/scalar_funcs.rs    | 155 +++-
 .../datafusion/expressions/subquery.rs        |   2 +-
 .../datafusion/expressions/temporal.rs        |   8 +-
 .../execution/datafusion/operators/expand.rs  |  26 +-
 core/src/execution/datafusion/planner.rs      | 122 ++-
 .../execution/datafusion/shuffle_writer.rs    |  26 +-
 core/src/execution/operators/copy.rs          |  26 +-
 core/src/execution/operators/scan.rs          |  84 ++-
 core/src/parquet/util/jni.rs                  |   1 +
 15 files changed, 662 insertions(+), 528 deletions(-)

diff --git a/common/src/main/scala/org/apache/comet/CometConf.scala b/common/src/main/scala/org/apache/comet/CometConf.scala
index de49fdfb0b..eb42457533 100644
--- a/common/src/main/scala/org/apache/comet/CometConf.scala
+++ b/common/src/main/scala/org/apache/comet/CometConf.scala
@@ -130,14 +130,14 @@ object CometConf {
       .booleanConf
       .createWithDefault(false)
 
-  val COMET_COLUMNAR_SHUFFLE_ENABLED: ConfigEntry[Boolean] = conf(
-    "spark.comet.columnar.shuffle.enabled")
-    .doc(
-      "Force Comet to only use columnar shuffle for CometScan and Spark regular operators. " +
-        "If this is enabled, Comet native shuffle will not be enabled but only Arrow shuffle. " +
-        "By default, this config is false.")
-    .booleanConf
-    .createWithDefault(false)
+  val COMET_COLUMNAR_SHUFFLE_ENABLED: ConfigEntry[Boolean] =
+    conf("spark.comet.columnar.shuffle.enabled")
+      .doc(
+        "Whether to enable Arrow-based columnar shuffle for Comet and Spark regular operators. " +
+          "If this is enabled, Comet prefers columnar shuffle than native shuffle. " +
+          "By default, this config is true.")
+      .booleanConf
+      .createWithDefault(true)
 
   val COMET_EXEC_BROADCAST_ENABLED: ConfigEntry[Boolean] =
     conf(s"$COMET_EXEC_CONFIG_PREFIX.broadcast.enabled")
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 456d969665..7ec96b32eb 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "const-random",
@@ -33,9 +33,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -84,21 +84,21 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arrayref"
@@ -114,9 +114,8 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "arrow"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa285343fba4d829d49985bdc541e3789cf6000ed0e84be7c039438df4a4e78c"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -135,9 +134,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-arith"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "753abd0a5290c1bcade7c6623a556f7d1659c5f4148b140b5b63ce7bd1a45705"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -150,9 +148,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-array"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "ahash",
  "arrow-buffer",
@@ -161,15 +158,14 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "half 2.1.0",
- "hashbrown 0.14.3",
+ "hashbrown",
  "num",
 ]
 
 [[package]]
 name = "arrow-buffer"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "bytes",
  "half 2.1.0",
@@ -178,28 +174,28 @@ dependencies = [
 
 [[package]]
 name = "arrow-cast"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e448e5dd2f4113bf5b74a1f26531708f5edcacc77335b7066f9398f4bcf4cdef"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
  "arrow-data",
  "arrow-schema",
  "arrow-select",
+ "atoi",
  "base64",
  "chrono",
  "comfy-table",
  "half 2.1.0",
  "lexical-core",
  "num",
+ "ryu",
 ]
 
 [[package]]
 name = "arrow-csv"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46af72211f0712612f5b18325530b9ad1bfbdc87290d5fbfd32a7da128983781"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -216,9 +212,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-data"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-buffer",
  "arrow-schema",
@@ -228,9 +223,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-ipc"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03dea5e79b48de6c2e04f03f62b0afea7105be7b77d134f6c5414868feefb80d"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -243,9 +237,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-json"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8950719280397a47d37ac01492e3506a8a724b3fb81001900b866637a829ee0f"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -254,7 +247,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half 2.1.0",
- "indexmap 2.1.0",
+ "indexmap",
  "lexical-core",
  "num",
  "serde",
@@ -263,9 +256,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-ord"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ed9630979034077982d8e74a942b7ac228f33dd93a93b615b4d02ad60c260be"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -278,9 +270,8 @@ dependencies = [
 
 [[package]]
 name = "arrow-row"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -288,23 +279,21 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "half 2.1.0",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
 [[package]]
 name = "arrow-schema"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "arrow-select"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -316,15 +305,15 @@ dependencies = [
 
 [[package]]
 name = "arrow-string"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f3b37f2aeece31a2636d1b037dabb69ef590e03bdc7eb68519b51ec86932a7"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
  "arrow-data",
  "arrow-schema",
  "arrow-select",
+ "memchr",
  "num",
  "regex",
  "regex-syntax",
@@ -338,26 +327,35 @@ checksum = "0c24e9d990669fbd16806bff449e4ac644fd9b1fca014760087732fe4102f131"
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
+]
+
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -370,9 +368,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
 
 [[package]]
 name = "bitflags"
@@ -382,9 +380,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "blake2"
@@ -397,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -419,9 +417,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -440,15 +438,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
 
 [[package]]
 name = "byteorder"
@@ -458,9 +456,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cast"
@@ -470,9 +468,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 dependencies = [
  "jobserver",
  "libc",
@@ -492,23 +490,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.34"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
- "js-sys",
  "num-traits",
- "wasm-bindgen",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7"
+checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -539,9 +535,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
@@ -550,23 +546,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 dependencies = [
  "ciborium-io",
- "half 1.8.2",
+ "half 1.8.3",
 ]
 
 [[package]]
 name = "clap"
-version = "4.4.13"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.12"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -574,9 +570,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "combine"
@@ -609,11 +605,12 @@ dependencies = [
  "criterion",
  "datafusion",
  "datafusion-common",
+ "datafusion-functions",
  "datafusion-physical-expr",
  "flate2",
  "futures",
  "half 2.1.0",
- "hashbrown 0.14.3",
+ "hashbrown",
  "itertools 0.11.0",
  "jni",
  "lazy_static",
@@ -657,9 +654,9 @@ dependencies = [
 
 [[package]]
 name = "const-random"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
  "const-random-macro",
 ]
@@ -707,9 +704,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -752,34 +749,28 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.17"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.18"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crunchy"
@@ -825,7 +816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.14.3",
+ "hashbrown",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -834,8 +825,7 @@ dependencies = [
 [[package]]
 name = "datafusion"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b360b692bf6c6d6e6b6dbaf41a3be0020daeceac0f406aed54c75331e50dbb"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "ahash",
  "arrow",
@@ -847,6 +837,7 @@ dependencies = [
  "chrono",
  "dashmap",
  "datafusion-common",
+ "datafusion-common-runtime",
  "datafusion-execution",
  "datafusion-expr",
  "datafusion-functions",
@@ -857,9 +848,9 @@ dependencies = [
  "futures",
  "glob",
  "half 2.1.0",
- "hashbrown 0.14.3",
- "indexmap 2.1.0",
- "itertools 0.12.0",
+ "hashbrown",
+ "indexmap",
+ "itertools 0.12.1",
  "log",
  "num_cpus",
  "object_store",
@@ -876,8 +867,7 @@ dependencies = [
 [[package]]
 name = "datafusion-common"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37f343ccc298f440e25aa38ff82678291a7acc24061c7370ba6c0ff5cc811412"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "ahash",
  "arrow",
@@ -886,17 +876,25 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half 2.1.0",
+ "instant",
  "libc",
  "num_cpus",
  "object_store",
  "sqlparser",
 ]
 
+[[package]]
+name = "datafusion-common-runtime"
+version = "36.0.0"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+dependencies = [
+ "tokio",
+]
+
 [[package]]
 name = "datafusion-execution"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9c93043081487e335399a21ebf8295626367a647ac5cb87d41d18afad7d0f7"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "arrow",
  "chrono",
@@ -904,7 +902,7 @@ dependencies = [
  "datafusion-common",
  "datafusion-expr",
  "futures",
- "hashbrown 0.14.3",
+ "hashbrown",
  "log",
  "object_store",
  "parking_lot",
@@ -916,39 +914,47 @@ dependencies = [
 [[package]]
 name = "datafusion-expr"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e204d89909e678846b6a95f156aafc1ee5b36cb6c9e37ec2e1449b078a38c818"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "ahash",
  "arrow",
  "arrow-array",
+ "chrono",
  "datafusion-common",
  "paste",
  "sqlparser",
- "strum 0.26.1",
- "strum_macros 0.26.1",
+ "strum 0.26.2",
+ "strum_macros 0.26.2",
 ]
 
 [[package]]
 name = "datafusion-functions"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f1c73f7801b2b8ba2297b3ad78ffcf6c1fc6b8171f502987eb9ad5cb244ee7"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "arrow",
  "base64",
+ "blake2",
+ "blake3",
+ "chrono",
  "datafusion-common",
  "datafusion-execution",
  "datafusion-expr",
+ "datafusion-physical-expr",
  "hex",
+ "itertools 0.12.1",
  "log",
+ "md-5",
+ "regex",
+ "sha2",
+ "unicode-segmentation",
+ "uuid",
 ]
 
 [[package]]
 name = "datafusion-optimizer"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ae27e07bf1f04d327be5c2a293470879801ab5535204dc3b16b062fda195496"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "arrow",
  "async-trait",
@@ -956,8 +962,8 @@ dependencies = [
  "datafusion-common",
  "datafusion-expr",
  "datafusion-physical-expr",
- "hashbrown 0.14.3",
- "itertools 0.12.0",
+ "hashbrown",
+ "itertools 0.12.1",
  "log",
  "regex-syntax",
 ]
@@ -965,8 +971,7 @@ dependencies = [
 [[package]]
 name = "datafusion-physical-expr"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde620cd9ef76a3bca9c754fb68854bd2349c49f55baf97e08001f9e967f6d6b"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "ahash",
  "arrow",
@@ -983,10 +988,10 @@ dependencies = [
  "datafusion-execution",
  "datafusion-expr",
  "half 2.1.0",
- "hashbrown 0.14.3",
+ "hashbrown",
  "hex",
- "indexmap 2.1.0",
- "itertools 0.12.0",
+ "indexmap",
+ "itertools 0.12.1",
  "log",
  "md-5",
  "paste",
@@ -995,14 +1000,12 @@ dependencies = [
  "regex",
  "sha2",
  "unicode-segmentation",
- "uuid",
 ]
 
 [[package]]
 name = "datafusion-physical-plan"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a4c75fba9ea99d64b2246cbd2fcae2e6fc973e6616b1015237a616036506dd4"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "ahash",
  "arrow",
@@ -1012,35 +1015,36 @@ dependencies = [
  "async-trait",
  "chrono",
  "datafusion-common",
+ "datafusion-common-runtime",
  "datafusion-execution",
  "datafusion-expr",
  "datafusion-physical-expr",
  "futures",
  "half 2.1.0",
- "hashbrown 0.14.3",
- "indexmap 2.1.0",
- "itertools 0.12.0",
+ "hashbrown",
+ "indexmap",
+ "itertools 0.12.1",
  "log",
  "once_cell",
  "parking_lot",
  "pin-project-lite",
  "rand",
  "tokio",
- "uuid",
 ]
 
 [[package]]
 name = "datafusion-sql"
 version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21474a95c3a62d113599d21b439fa15091b538bac06bd20be0bb2e7d22903c09"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
 dependencies = [
  "arrow",
+ "arrow-array",
  "arrow-schema",
  "datafusion-common",
  "datafusion-expr",
  "log",
  "sqlparser",
+ "strum 0.26.2",
 ]
 
 [[package]]
@@ -1088,9 +1092,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "equivalent"
@@ -1110,9 +1114,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
 
 [[package]]
 name = "findshlibs"
@@ -1223,7 +1227,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1268,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1291,9 +1295,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
 
 [[package]]
 name = "half"
@@ -1305,12 +1309,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.3"
@@ -1338,9 +1336,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1365,9 +1363,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1398,22 +1396,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.1.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1423,7 +1411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9"
 dependencies = [
  "ahash",
- "indexmap 2.1.0",
+ "indexmap",
  "is-terminal",
  "itoa",
  "log",
@@ -1434,6 +1422,18 @@ dependencies = [
  "str_stack",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "integer-encoding"
 version = "1.1.7"
@@ -1448,12 +1448,12 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
- "rustix",
+ "libc",
  "windows-sys 0.52.0",
 ]
 
@@ -1477,18 +1477,18 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "java-locator"
@@ -1526,18 +1526,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1614,9 +1614,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
@@ -1644,17 +1644,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
@@ -1668,9 +1662,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
  "serde",
 ]
@@ -1683,9 +1677,9 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7"
 
 [[package]]
 name = "log4rs"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd"
+checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1696,7 +1690,9 @@ dependencies = [
  "libc",
  "log",
  "log-mdc",
+ "once_cell",
  "parking_lot",
+ "rand",
  "serde",
  "serde-value",
  "serde_json",
@@ -1729,9 +1725,9 @@ dependencies = [
 
 [[package]]
 name = "lz4_flex"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15"
+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
 dependencies = [
  "twox-hash",
 ]
@@ -1748,15 +1744,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memmap2"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 dependencies = [
  "libc",
 ]
@@ -1772,9 +1768,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -1823,9 +1819,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
@@ -1842,19 +1838,18 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -1875,9 +1870,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
  "libm",
@@ -1904,16 +1899,16 @@ dependencies = [
 
 [[package]]
 name = "object_store"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d139f545f64630e2e3688fd9f81c470888ab01edeb72d13b4e86c566f1130000"
+checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3"
 dependencies = [
  "async-trait",
  "bytes",
  "chrono",
  "futures",
  "humantime",
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "parking_lot",
  "percent-encoding",
  "snafu",
@@ -1978,15 +1973,14 @@ dependencies = [
 
 [[package]]
 name = "parquet"
-version = "50.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750"
+version = "51.0.0"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
 dependencies = [
  "ahash",
  "bytes",
  "chrono",
  "half 2.1.0",
- "hashbrown 0.14.3",
+ "hashbrown",
  "num",
  "num-bigint",
  "paste",
@@ -2032,7 +2026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.1.0",
+ "indexmap",
 ]
 
 [[package]]
@@ -2075,9 +2069,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -2087,9 +2081,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plotters"
@@ -2148,9 +2142,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2218,7 +2212,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -2281,9 +2275,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -2291,9 +2285,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2310,9 +2304,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2322,9 +2316,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2333,9 +2327,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rgb"
@@ -2363,11 +2357,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2382,9 +2376,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "same-file"
@@ -2403,9 +2397,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "semver"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "seq-macro"
@@ -2415,9 +2409,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.194"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -2434,20 +2428,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.194"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.111"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "itoa",
  "ryu",
@@ -2456,14 +2450,15 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.26"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 1.9.3",
+ "indexmap",
+ "itoa",
  "ryu",
  "serde",
- "yaml-rust",
+ "unsafe-libyaml",
 ]
 
 [[package]]
@@ -2500,9 +2495,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "snafu"
@@ -2534,9 +2529,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
 [[package]]
 name = "sqlparser"
-version = "0.43.1"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4"
+checksum = "aaf9c7ff146298ffda83a200f8d5084f08dcee1edfc135fcc1d646a45d50ffd6"
 dependencies = [
  "log",
  "sqlparser_derive",
@@ -2550,7 +2545,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -2579,11 +2574,11 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
 [[package]]
 name = "strum"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros 0.26.1",
+ "strum_macros 0.26.2",
 ]
 
 [[package]]
@@ -2596,20 +2591,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -2654,9 +2649,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2665,35 +2660,34 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
  "rustix",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -2777,9 +2771,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2796,14 +2790,14 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2829,7 +2823,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -2868,9 +2862,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
@@ -2880,18 +2874,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
@@ -2908,6 +2902,12 @@ dependencies = [
  "destructure_traitobject",
 ]
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "url"
 version = "2.5.0"
@@ -2921,9 +2921,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom",
 ]
@@ -2936,9 +2936,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -2952,9 +2952,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -2962,24 +2962,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2987,28 +2987,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3063,7 +3063,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3081,7 +3081,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3116,17 +3116,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -3143,9 +3143,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3161,9 +3161,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3179,9 +3179,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3197,9 +3197,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3215,9 +3215,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3233,9 +3233,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3251,18 +3251,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "zerocopy"
@@ -3281,7 +3272,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -3305,9 +3296,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
+version = "2.0.10+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4dc5afe6fc..87f8eb542b 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -29,12 +29,12 @@ include = [
 
 [dependencies]
 parquet-format = "4.0.0" # This must be kept in sync with that from parquet crate
-arrow = { version = "~50.0.0", features = ["prettyprint", "ffi", "chrono-tz"] }
-arrow-array = { version = "~50.0.0" }
-arrow-data = { version = "~50.0.0" }
-arrow-schema = { version = "~50.0.0" }
-arrow-string = { version = "~50.0.0" }
-parquet = { version = "~50.0.0", default-features = false, features = ["experimental"] }
+arrow = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df", features = ["prettyprint", "ffi", "chrono-tz"] }
+arrow-array = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
+arrow-data = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
+arrow-schema = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
+arrow-string = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
+parquet = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df", default-features = false, features = ["experimental"] }
 half = { version = "~2.1", default-features = false }
 futures = "0.3.28"
 mimalloc = { version = "*", default-features = false, optional = true }
@@ -66,9 +66,10 @@ itertools = "0.11.0"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 chrono-tz = { version = "0.8" }
 paste = "1.0.14"
-datafusion-common = { version = "36.0.0" }
-datafusion = { default-features = false, version = "36.0.0", features = ["unicode_expressions"] }
-datafusion-physical-expr = { version = "36.0.0", default-features = false , features = ["unicode_expressions"] }
+datafusion-common = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052" }
+datafusion = { default-features = false, git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052", features = ["unicode_expressions"] }
+datafusion-functions = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052" }
+datafusion-physical-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052", default-features = false, features = ["unicode_expressions"] }
 unicode-segmentation = "^1.10.1"
 once_cell = "1.18.0"
 regex = "1.9.6"
diff --git a/core/src/execution/datafusion/expressions/avg.rs b/core/src/execution/datafusion/expressions/avg.rs
index 1e04ab0e97..e35ff6120e 100644
--- a/core/src/execution/datafusion/expressions/avg.rs
+++ b/core/src/execution/datafusion/expressions/avg.rs
@@ -27,7 +27,7 @@ use arrow_schema::{DataType, Field};
 use datafusion::logical_expr::{
     type_coercion::aggregates::avg_return_type, Accumulator, EmitTo, GroupsAccumulator,
 };
-use datafusion_common::{not_impl_err, DataFusionError, Result, ScalarValue};
+use datafusion_common::{not_impl_err, Result, ScalarValue};
 use datafusion_physical_expr::{expressions::format_state_name, AggregateExpr, PhysicalExpr};
 use std::{any::Any, sync::Arc};
 
diff --git a/core/src/execution/datafusion/expressions/avg_decimal.rs b/core/src/execution/datafusion/expressions/avg_decimal.rs
index d99ed041c7..870e6d1a6f 100644
--- a/core/src/execution/datafusion/expressions/avg_decimal.rs
+++ b/core/src/execution/datafusion/expressions/avg_decimal.rs
@@ -25,7 +25,7 @@ use arrow_array::{
 };
 use arrow_schema::{DataType, Field};
 use datafusion::logical_expr::{Accumulator, EmitTo, GroupsAccumulator};
-use datafusion_common::{not_impl_err, DataFusionError, Result, ScalarValue};
+use datafusion_common::{not_impl_err, Result, ScalarValue};
 use datafusion_physical_expr::{expressions::format_state_name, AggregateExpr, PhysicalExpr};
 use std::{any::Any, sync::Arc};
 
diff --git a/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs b/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
index dd90cd8e9d..6a4d07b892 100644
--- a/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
+++ b/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
@@ -22,7 +22,7 @@ use arrow::record_batch::RecordBatch;
 use arrow_array::cast::as_primitive_array;
 use arrow_schema::{DataType, Schema};
 use datafusion::physical_plan::ColumnarValue;
-use datafusion_common::{internal_err, DataFusionError, Result, ScalarValue};
+use datafusion_common::{internal_err, Result, ScalarValue};
 use datafusion_physical_expr::{aggregate::utils::down_cast_any_ref, PhysicalExpr};
 use std::{
     any::Any,
diff --git a/core/src/execution/datafusion/expressions/scalar_funcs.rs b/core/src/execution/datafusion/expressions/scalar_funcs.rs
index 4fca7237b8..ca440d3298 100644
--- a/core/src/execution/datafusion/expressions/scalar_funcs.rs
+++ b/core/src/execution/datafusion/expressions/scalar_funcs.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::{cmp::min, str::FromStr, sync::Arc};
+use std::{any::Any, cmp::min, fmt::Debug, str::FromStr, sync::Arc};
 
 use arrow::{
     array::{
@@ -27,16 +27,17 @@ use arrow::{
 use arrow_array::{Array, ArrowNativeTypeOp, Decimal128Array};
 use arrow_schema::DataType;
 use datafusion::{
-    logical_expr::{BuiltinScalarFunction, ScalarFunctionImplementation},
+    logical_expr::{
+        BuiltinScalarFunction, ScalarFunctionDefinition, ScalarFunctionImplementation,
+        ScalarUDFImpl, Signature, Volatility,
+    },
     physical_plan::ColumnarValue,
 };
 use datafusion_common::{
     cast::as_generic_string_array, exec_err, internal_err, DataFusionError,
     Result as DataFusionResult, ScalarValue,
 };
-use datafusion_physical_expr::{
-    execution_props::ExecutionProps, functions::create_physical_fun, math_expressions,
-};
+use datafusion_physical_expr::{math_expressions, udf::ScalarUDF};
 use num::{
     integer::{div_ceil, div_floor},
     BigInt, Signed, ToPrimitive,
@@ -46,20 +47,89 @@ use unicode_segmentation::UnicodeSegmentation;
 /// Create a physical scalar function.
 pub fn create_comet_physical_fun(
     fun_name: &str,
-    execution_props: &ExecutionProps,
     data_type: DataType,
-) -> Result<ScalarFunctionImplementation, DataFusionError> {
+) -> Result<ScalarFunctionDefinition, DataFusionError> {
     match fun_name {
-        "ceil" => Ok(Arc::new(move |x| spark_ceil(x, &data_type))),
-        "floor" => Ok(Arc::new(move |x| spark_floor(x, &data_type))),
-        "rpad" => Ok(Arc::new(spark_rpad)),
-        "round" => Ok(Arc::new(move |x| spark_round(x, &data_type))),
-        "unscaled_value" => Ok(Arc::new(spark_unscaled_value)),
-        "make_decimal" => Ok(Arc::new(move |x| spark_make_decimal(x, &data_type))),
-        "decimal_div" => Ok(Arc::new(move |x| spark_decimal_div(x, &data_type))),
+        "ceil" => {
+            let scalar_func = CometScalarFunction::new(
+                "ceil".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(move |args| spark_ceil(args, &data_type)),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
+        "floor" => {
+            let scalar_func = CometScalarFunction::new(
+                "floor".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(move |args| spark_floor(args, &data_type)),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
+        "rpad" => {
+            let scalar_func = CometScalarFunction::new(
+                "rpad".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(spark_rpad),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
+        "round" => {
+            let scalar_func = CometScalarFunction::new(
+                "round".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(move |args| spark_round(args, &data_type)),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
+        "unscaled_value" => {
+            let scalar_func = CometScalarFunction::new(
+                "unscaled_value".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(spark_unscaled_value),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
+        "make_decimal" => {
+            let scalar_func = CometScalarFunction::new(
+                "make_decimal".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(move |args| spark_make_decimal(args, &data_type)),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
+        "decimal_div" => {
+            let scalar_func = CometScalarFunction::new(
+                "decimal_div".to_string(),
+                Signature::variadic_any(Volatility::Immutable),
+                data_type.clone(),
+                Arc::new(move |args| spark_decimal_div(args, &data_type)),
+            );
+            Ok(ScalarFunctionDefinition::UDF(Arc::new(
+                ScalarUDF::new_from_impl(scalar_func),
+            )))
+        }
         _ => {
             let fun = &BuiltinScalarFunction::from_str(fun_name)?;
-            create_physical_fun(fun, execution_props)
+            Ok(ScalarFunctionDefinition::BuiltIn(*fun))
         }
     }
 }
@@ -89,6 +159,61 @@ macro_rules! downcast_compute_op {
     }};
 }
 
+struct CometScalarFunction {
+    name: String,
+    signature: Signature,
+    data_type: DataType,
+    func: ScalarFunctionImplementation,
+}
+
+impl Debug for CometScalarFunction {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("CometScalarFunction")
+            .field("name", &self.name)
+            .field("signature", &self.signature)
+            .field("data_type", &self.data_type)
+            .finish()
+    }
+}
+
+impl CometScalarFunction {
+    fn new(
+        name: String,
+        signature: Signature,
+        data_type: DataType,
+        func: ScalarFunctionImplementation,
+    ) -> Self {
+        Self {
+            name,
+            signature,
+            data_type,
+            func,
+        }
+    }
+}
+
+impl ScalarUDFImpl for CometScalarFunction {
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn name(&self) -> &str {
+        self.name.as_str()
+    }
+
+    fn signature(&self) -> &Signature {
+        &self.signature
+    }
+
+    fn return_type(&self, _: &[DataType]) -> DataFusionResult<DataType> {
+        Ok(self.data_type.clone())
+    }
+
+    fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
+        (self.func)(args)
+    }
+}
+
 /// `ceil` function that simulates Spark `ceil` expression
 pub fn spark_ceil(
     args: &[ColumnarValue],
diff --git a/core/src/execution/datafusion/expressions/subquery.rs b/core/src/execution/datafusion/expressions/subquery.rs
index 7cae12963b..bf37cb8951 100644
--- a/core/src/execution/datafusion/expressions/subquery.rs
+++ b/core/src/execution/datafusion/expressions/subquery.rs
@@ -18,7 +18,7 @@
 use arrow_array::RecordBatch;
 use arrow_schema::{DataType, Schema, TimeUnit};
 use datafusion::logical_expr::ColumnarValue;
-use datafusion_common::{internal_err, DataFusionError, ScalarValue};
+use datafusion_common::{internal_err, ScalarValue};
 use datafusion_physical_expr::PhysicalExpr;
 use jni::{
     objects::JByteArray,
diff --git a/core/src/execution/datafusion/expressions/temporal.rs b/core/src/execution/datafusion/expressions/temporal.rs
index 5bdb533d06..4ae3c2605c 100644
--- a/core/src/execution/datafusion/expressions/temporal.rs
+++ b/core/src/execution/datafusion/expressions/temporal.rs
@@ -23,7 +23,7 @@ use std::{
 };
 
 use arrow::{
-    compute::{hour_dyn, minute_dyn, second_dyn},
+    compute::{date_part, DatePart},
     record_batch::RecordBatch,
 };
 use arrow_schema::{DataType, Schema, TimeUnit::Microsecond};
@@ -101,7 +101,7 @@ impl PhysicalExpr for HourExec {
                         Some(self.timezone.clone().into()),
                     )),
                 );
-                let result = hour_dyn(&array)?;
+                let result = date_part(&array, DatePart::Hour)?;
 
                 Ok(ColumnarValue::Array(result))
             }
@@ -195,7 +195,7 @@ impl PhysicalExpr for MinuteExec {
                         Some(self.timezone.clone().into()),
                     )),
                 );
-                let result = minute_dyn(&array)?;
+                let result = date_part(&array, DatePart::Minute)?;
 
                 Ok(ColumnarValue::Array(result))
             }
@@ -289,7 +289,7 @@ impl PhysicalExpr for SecondExec {
                         Some(self.timezone.clone().into()),
                     )),
                 );
-                let result = second_dyn(&array)?;
+                let result = date_part(&array, DatePart::Second)?;
 
                 Ok(ColumnarValue::Array(result))
             }
diff --git a/core/src/execution/datafusion/operators/expand.rs b/core/src/execution/datafusion/operators/expand.rs
index e3f681b77b..5cf444b3b9 100644
--- a/core/src/execution/datafusion/operators/expand.rs
+++ b/core/src/execution/datafusion/operators/expand.rs
@@ -20,12 +20,12 @@ use arrow_schema::SchemaRef;
 use datafusion::{
     execution::TaskContext,
     physical_plan::{
-        DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning, RecordBatchStream,
-        SendableRecordBatchStream,
+        DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan, Partitioning, PlanProperties,
+        RecordBatchStream, SendableRecordBatchStream,
     },
 };
 use datafusion_common::DataFusionError;
-use datafusion_physical_expr::{PhysicalExpr, PhysicalSortExpr};
+use datafusion_physical_expr::{EquivalenceProperties, PhysicalExpr};
 use futures::{Stream, StreamExt};
 use std::{
     any::Any,
@@ -41,6 +41,7 @@ pub struct CometExpandExec {
     projections: Vec<Vec<Arc<dyn PhysicalExpr>>>,
     child: Arc<dyn ExecutionPlan>,
     schema: SchemaRef,
+    cache: PlanProperties,
 }
 
 impl CometExpandExec {
@@ -50,10 +51,17 @@ impl CometExpandExec {
         child: Arc<dyn ExecutionPlan>,
         schema: SchemaRef,
     ) -> Self {
+        let cache = PlanProperties::new(
+            EquivalenceProperties::new(schema.clone()),
+            Partitioning::UnknownPartitioning(1),
+            ExecutionMode::Bounded,
+        );
+
         Self {
             projections,
             child,
             schema,
+            cache,
         }
     }
 }
@@ -88,14 +96,6 @@ impl ExecutionPlan for CometExpandExec {
         self.schema.clone()
     }
 
-    fn output_partitioning(&self) -> Partitioning {
-        Partitioning::UnknownPartitioning(1)
-    }
-
-    fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
-        None
-    }
-
     fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> {
         vec![self.child.clone()]
     }
@@ -122,6 +122,10 @@ impl ExecutionPlan for CometExpandExec {
             ExpandStream::new(self.projections.clone(), child_stream, self.schema.clone());
         Ok(Box::pin(expand_stream))
     }
+
+    fn properties(&self) -> &PlanProperties {
+        &self.cache
+    }
 }
 
 pub struct ExpandStream {
diff --git a/core/src/execution/datafusion/planner.rs b/core/src/execution/datafusion/planner.rs
index c8869c5f3e..1b0a2d0d8d 100644
--- a/core/src/execution/datafusion/planner.rs
+++ b/core/src/execution/datafusion/planner.rs
@@ -23,7 +23,10 @@ use arrow_schema::{DataType, Field, Schema, TimeUnit};
 use datafusion::{
     arrow::{compute::SortOptions, datatypes::SchemaRef},
     common::DataFusionError,
-    logical_expr::{BuiltinScalarFunction, Operator as DataFusionOperator},
+    functions::math,
+    logical_expr::{
+        BuiltinScalarFunction, Operator as DataFusionOperator, ScalarFunctionDefinition,
+    },
     physical_expr::{
         execution_props::ExecutionProps,
         expressions::{
@@ -31,7 +34,6 @@ use datafusion::{
             FirstValue, InListExpr, IsNotNullExpr, IsNullExpr, LastValue,
             Literal as DataFusionLiteral, Max, Min, NegativeExpr, NotExpr, Sum, UnKnownColumn,
         },
-        functions::create_physical_expr,
         AggregateExpr, PhysicalExpr, PhysicalSortExpr, ScalarFunctionExpr,
     },
     physical_plan::{
@@ -45,7 +47,7 @@ use datafusion::{
     },
 };
 use datafusion_common::{
-    tree_node::{TreeNode, TreeNodeRewriter, VisitRecursion},
+    tree_node::{Transformed, TransformedResult, TreeNode, TreeNodeRecursion, TreeNodeRewriter},
     JoinType as DFJoinType, ScalarValue,
 };
 use itertools::Itertools;
@@ -464,14 +466,13 @@ impl PhysicalPlanner {
             }
             ExprStruct::Abs(expr) => {
                 let child = self.create_expr(expr.child.as_ref().unwrap(), input_schema.clone())?;
+                let return_type = child.data_type(&input_schema)?;
                 let args = vec![child];
-                let expr = create_physical_expr(
-                    &BuiltinScalarFunction::Abs,
-                    &args,
-                    &input_schema,
-                    &self.execution_props,
-                )?;
-                Ok(expr)
+                let scalar_def = ScalarFunctionDefinition::UDF(math::abs());
+
+                let expr =
+                    ScalarFunctionExpr::new("abs", scalar_def, args, return_type, None, false);
+                Ok(Arc::new(expr))
             }
             ExprStruct::CaseWhen(case_when) => {
                 let when_then_pairs = case_when
@@ -635,11 +636,7 @@ impl PhysicalPlanner {
                 Ok(DataType::Decimal128(_p2, _s2)),
             ) => {
                 let data_type = return_type.map(to_arrow_datatype).unwrap();
-                let fun_expr = create_comet_physical_fun(
-                    "decimal_div",
-                    &self.execution_props,
-                    data_type.clone(),
-                )?;
+                let fun_expr = create_comet_physical_fun("decimal_div", data_type.clone())?;
                 Ok(Arc::new(ScalarFunctionExpr::new(
                     "decimal_div",
                     fun_expr,
@@ -933,6 +930,7 @@ impl PhysicalPlanner {
                     join_params.join_on,
                     join_params.join_filter,
                     &join_params.join_type,
+                    None,
                     PartitionMode::Partitioned,
                     // null doesn't equal to null in Spark join key. If the join key is
                     // `EqualNullSafe`, Spark will rewrite it during planning.
@@ -1219,8 +1217,7 @@ impl PhysicalPlanner {
                 fun.return_type(&input_expr_types)?
             }
         };
-        let fun_expr =
-            create_comet_physical_fun(fun_name, &self.execution_props, data_type.clone())?;
+        let fun_expr = create_comet_physical_fun(fun_name, data_type.clone())?;
 
         let scalar_expr: Arc<dyn PhysicalExpr> = Arc::new(ScalarFunctionExpr::new(
             fun_name,
@@ -1287,7 +1284,7 @@ fn expr_to_columns(
                     right_field_indices.push(column.index() - left_field_len);
                 }
             }
-            VisitRecursion::Continue
+            TreeNodeRecursion::Continue
         })
     })?;
 
@@ -1323,50 +1320,51 @@ impl JoinFilterRewriter<'_> {
 }
 
 impl TreeNodeRewriter for JoinFilterRewriter<'_> {
-    type N = Arc<dyn PhysicalExpr>;
-
-    fn mutate(&mut self, node: Self::N) -> datafusion_common::Result<Self::N> {
-        let new_expr: Arc<dyn PhysicalExpr> =
-            if let Some(column) = node.as_any().downcast_ref::<Column>() {
-                if column.index() < self.left_field_len {
-                    // left side
-                    let new_index = self
-                        .left_field_indices
-                        .iter()
-                        .position(|&x| x == column.index())
-                        .ok_or_else(|| {
-                            DataFusionError::Internal(format!(
-                                "Column index {} not found in left field indices",
-                                column.index()
-                            ))
-                        })?;
-                    Arc::new(Column::new(column.name(), new_index))
-                } else if column.index() < self.left_field_len + self.right_field_len {
-                    // right side
-                    let new_index = self
-                        .right_field_indices
-                        .iter()
-                        .position(|&x| x + self.left_field_len == column.index())
-                        .ok_or_else(|| {
-                            DataFusionError::Internal(format!(
-                                "Column index {} not found in right field indices",
-                                column.index()
-                            ))
-                        })?;
-                    Arc::new(Column::new(
-                        column.name(),
-                        new_index + self.left_field_indices.len(),
-                    ))
-                } else {
-                    return Err(DataFusionError::Internal(format!(
-                        "Column index {} out of range",
-                        column.index()
-                    )));
-                }
+    type Node = Arc<dyn PhysicalExpr>;
+
+    fn f_down(&mut self, node: Self::Node) -> datafusion_common::Result<Transformed<Self::Node>> {
+        if let Some(column) = node.as_any().downcast_ref::<Column>() {
+            if column.index() < self.left_field_len {
+                // left side
+                let new_index = self
+                    .left_field_indices
+                    .iter()
+                    .position(|&x| x == column.index())
+                    .ok_or_else(|| {
+                        DataFusionError::Internal(format!(
+                            "Column index {} not found in left field indices",
+                            column.index()
+                        ))
+                    })?;
+                Ok(Transformed::yes(Arc::new(Column::new(
+                    column.name(),
+                    new_index,
+                ))))
+            } else if column.index() < self.left_field_len + self.right_field_len {
+                // right side
+                let new_index = self
+                    .right_field_indices
+                    .iter()
+                    .position(|&x| x + self.left_field_len == column.index())
+                    .ok_or_else(|| {
+                        DataFusionError::Internal(format!(
+                            "Column index {} not found in right field indices",
+                            column.index()
+                        ))
+                    })?;
+                Ok(Transformed::yes(Arc::new(Column::new(
+                    column.name(),
+                    new_index + self.left_field_indices.len(),
+                ))))
             } else {
-                node.clone()
-            };
-        Ok(new_expr)
+                return Err(DataFusionError::Internal(format!(
+                    "Column index {} out of range",
+                    column.index()
+                )));
+            }
+        } else {
+            Ok(Transformed::no(node))
+        }
     }
 }
 
@@ -1387,7 +1385,7 @@ fn rewrite_physical_expr(
         right_field_indices,
     );
 
-    Ok(expr.rewrite(&mut rewriter)?)
+    Ok(expr.rewrite(&mut rewriter).data()?)
 }
 
 #[cfg(test)]
diff --git a/core/src/execution/datafusion/shuffle_writer.rs b/core/src/execution/datafusion/shuffle_writer.rs
index f836e3a409..3b92abbde4 100644
--- a/core/src/execution/datafusion/shuffle_writer.rs
+++ b/core/src/execution/datafusion/shuffle_writer.rs
@@ -47,13 +47,13 @@ use datafusion::{
         runtime_env::RuntimeEnv,
     },
     physical_plan::{
-        expressions::PhysicalSortExpr,
         metrics::{BaselineMetrics, Count, ExecutionPlanMetricsSet, MetricBuilder, MetricsSet},
         stream::RecordBatchStreamAdapter,
-        DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning, RecordBatchStream,
-        SendableRecordBatchStream, Statistics,
+        DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan, Partitioning, PlanProperties,
+        RecordBatchStream, SendableRecordBatchStream, Statistics,
     },
 };
+use datafusion_physical_expr::EquivalenceProperties;
 use futures::{lock::Mutex, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use itertools::Itertools;
 use simd_adler32::Adler32;
@@ -79,6 +79,7 @@ pub struct ShuffleWriterExec {
     output_index_file: String,
     /// Metrics
     metrics: ExecutionPlanMetricsSet,
+    cache: PlanProperties,
 }
 
 impl DisplayAs for ShuffleWriterExec {
@@ -103,14 +104,6 @@ impl ExecutionPlan for ShuffleWriterExec {
         self.input.schema()
     }
 
-    fn output_partitioning(&self) -> Partitioning {
-        self.partitioning.clone()
-    }
-
-    fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
-        None
-    }
-
     fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> {
         vec![self.input.clone()]
     }
@@ -163,6 +156,10 @@ impl ExecutionPlan for ShuffleWriterExec {
     fn statistics(&self) -> Result<Statistics> {
         self.input.statistics()
     }
+
+    fn properties(&self) -> &PlanProperties {
+        &self.cache
+    }
 }
 
 impl ShuffleWriterExec {
@@ -173,12 +170,19 @@ impl ShuffleWriterExec {
         output_data_file: String,
         output_index_file: String,
     ) -> Result<Self> {
+        let cache = PlanProperties::new(
+            EquivalenceProperties::new(input.schema().clone()),
+            partitioning.clone(),
+            ExecutionMode::Bounded,
+        );
+
         Ok(ShuffleWriterExec {
             input,
             partitioning,
             metrics: ExecutionPlanMetricsSet::new(),
             output_data_file,
             output_index_file,
+            cache,
         })
     }
 }
diff --git a/core/src/execution/operators/copy.rs b/core/src/execution/operators/copy.rs
index 699ccf7ae7..292271f9e9 100644
--- a/core/src/execution/operators/copy.rs
+++ b/core/src/execution/operators/copy.rs
@@ -41,6 +41,7 @@ use super::copy_or_cast_array;
 pub struct CopyExec {
     input: Arc<dyn ExecutionPlan>,
     schema: SchemaRef,
+    cache: PlanProperties,
 }
 
 impl CopyExec {
@@ -59,7 +60,17 @@ impl CopyExec {
 
         let schema = Arc::new(Schema::new(fields));
 
-        Self { input, schema }
+        let cache = PlanProperties::new(
+            EquivalenceProperties::new(schema.clone()),
+            Partitioning::UnknownPartitioning(1),
+            ExecutionMode::Bounded,
+        );
+
+        Self {
+            input,
+            schema,
+            cache,
+        }
     }
 }
 
@@ -82,14 +93,6 @@ impl ExecutionPlan for CopyExec {
         self.schema.clone()
     }
 
-    fn output_partitioning(&self) -> Partitioning {
-        self.input.output_partitioning()
-    }
-
-    fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
-        self.input.output_ordering()
-    }
-
     fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> {
         vec![self.input.clone()]
     }
@@ -103,6 +106,7 @@ impl ExecutionPlan for CopyExec {
         Ok(Arc::new(CopyExec {
             input: new_input,
             schema: self.schema.clone(),
+            cache: self.cache.clone(),
         }))
     }
 
@@ -118,6 +122,10 @@ impl ExecutionPlan for CopyExec {
     fn statistics(&self) -> DataFusionResult<Statistics> {
         self.input.statistics()
     }
+
+    fn properties(&self) -> &PlanProperties {
+        &self.cache
+    }
 }
 
 struct CopyStream {
diff --git a/core/src/execution/operators/scan.rs b/core/src/execution/operators/scan.rs
index e31230c583..99c7c8391e 100644
--- a/core/src/execution/operators/scan.rs
+++ b/core/src/execution/operators/scan.rs
@@ -61,6 +61,7 @@ pub struct ScanExec {
     /// The input batch of input data. Used to determine the schema of the input data.
     /// It is also used in unit test to mock the input data from JVM.
     pub batch: Arc<Mutex<Option<InputBatch>>>,
+    cache: PlanProperties,
 }
 
 impl ScanExec {
@@ -76,11 +77,20 @@ impl ScanExec {
             InputBatch::EOF
         };
 
+        let schema = scan_schema(&first_batch, &data_types);
+
+        let cache = PlanProperties::new(
+            EquivalenceProperties::new(schema),
+            Partitioning::UnknownPartitioning(1),
+            ExecutionMode::Bounded,
+        );
+
         Ok(Self {
             exec_context_id,
             input_source,
             data_types,
             batch: Arc::new(Mutex::new(Some(first_batch))),
+            cache,
         })
     }
 
@@ -197,6 +207,34 @@ impl ScanExec {
     }
 }
 
+fn scan_schema(input_batch: &InputBatch, data_types: &[DataType]) -> SchemaRef {
+    let fields = match input_batch {
+        // Note that if `columns` is empty, we'll get an empty schema
+        InputBatch::Batch(columns, _) => {
+            columns
+                .iter()
+                .enumerate()
+                .map(|(idx, c)| {
+                    let datatype = ScanExec::unpack_dictionary_type(c.data_type());
+                    // We don't use the field name. Put a placeholder.
+                    if matches!(datatype, DataType::Dictionary(_, _)) {
+                        Field::new_dict(format!("col_{}", idx), datatype, true, idx as i64, false)
+                    } else {
+                        Field::new(format!("col_{}", idx), datatype, true)
+                    }
+                })
+                .collect::<Vec<Field>>()
+        }
+        _ => data_types
+            .iter()
+            .enumerate()
+            .map(|(idx, dt)| Field::new(format!("col_{}", idx), dt.clone(), true))
+            .collect(),
+    };
+
+    Arc::new(Schema::new(fields))
+}
+
 impl ExecutionPlan for ScanExec {
     fn as_any(&self) -> &dyn Any {
         self
@@ -207,47 +245,7 @@ impl ExecutionPlan for ScanExec {
         // Spark plan to DataFusion plan. At the moment, `batch` is not EOF.
         let binding = self.batch.try_lock().unwrap();
         let input_batch = binding.as_ref().unwrap();
-
-        let fields = match input_batch {
-            // Note that if `columns` is empty, we'll get an empty schema
-            InputBatch::Batch(columns, _) => {
-                columns
-                    .iter()
-                    .enumerate()
-                    .map(|(idx, c)| {
-                        let datatype = Self::unpack_dictionary_type(c.data_type());
-                        // We don't use the field name. Put a placeholder.
-                        if matches!(datatype, DataType::Dictionary(_, _)) {
-                            Field::new_dict(
-                                format!("col_{}", idx),
-                                datatype,
-                                true,
-                                idx as i64,
-                                false,
-                            )
-                        } else {
-                            Field::new(format!("col_{}", idx), datatype, true)
-                        }
-                    })
-                    .collect::<Vec<Field>>()
-            }
-            _ => self
-                .data_types
-                .iter()
-                .enumerate()
-                .map(|(idx, dt)| Field::new(format!("col_{}", idx), dt.clone(), true))
-                .collect(),
-        };
-
-        Arc::new(Schema::new(fields))
-    }
-
-    fn output_partitioning(&self) -> Partitioning {
-        Partitioning::UnknownPartitioning(1)
-    }
-
-    fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
-        None
+        scan_schema(input_batch, &self.data_types)
     }
 
     fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> {
@@ -268,6 +266,10 @@ impl ExecutionPlan for ScanExec {
     ) -> datafusion::common::Result<SendableRecordBatchStream> {
         Ok(Box::pin(ScanStream::new(self.clone(), self.schema())))
     }
+
+    fn properties(&self) -> &PlanProperties {
+        &self.cache
+    }
 }
 
 impl DisplayAs for ScanExec {
diff --git a/core/src/parquet/util/jni.rs b/core/src/parquet/util/jni.rs
index 225abfc030..62787213fd 100644
--- a/core/src/parquet/util/jni.rs
+++ b/core/src/parquet/util/jni.rs
@@ -82,6 +82,7 @@ pub fn convert_encoding(ordinal: jint) -> Encoding {
     match ordinal {
         0 => Encoding::PLAIN,
         1 => Encoding::RLE,
+        #[allow(deprecated)]
         3 => Encoding::BIT_PACKED,
         4 => Encoding::PLAIN_DICTIONARY,
         5 => Encoding::DELTA_BINARY_PACKED,

From bd29d48df9707f9cd9117753e37eb609bab73fd9 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Sun, 31 Mar 2024 14:23:39 -0700
Subject: [PATCH 2/6] Use FunctionRegistry

---
 .../datafusion/expressions/scalar_funcs.rs    | 10 ++++--
 core/src/execution/datafusion/planner.rs      | 33 ++++++++++++-------
 core/src/execution/jni_api.rs                 |  3 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/core/src/execution/datafusion/expressions/scalar_funcs.rs b/core/src/execution/datafusion/expressions/scalar_funcs.rs
index ca440d3298..e6f8de16bd 100644
--- a/core/src/execution/datafusion/expressions/scalar_funcs.rs
+++ b/core/src/execution/datafusion/expressions/scalar_funcs.rs
@@ -27,6 +27,7 @@ use arrow::{
 use arrow_array::{Array, ArrowNativeTypeOp, Decimal128Array};
 use arrow_schema::DataType;
 use datafusion::{
+    execution::FunctionRegistry,
     logical_expr::{
         BuiltinScalarFunction, ScalarFunctionDefinition, ScalarFunctionImplementation,
         ScalarUDFImpl, Signature, Volatility,
@@ -48,6 +49,7 @@ use unicode_segmentation::UnicodeSegmentation;
 pub fn create_comet_physical_fun(
     fun_name: &str,
     data_type: DataType,
+    registry: &dyn FunctionRegistry,
 ) -> Result<ScalarFunctionDefinition, DataFusionError> {
     match fun_name {
         "ceil" => {
@@ -128,8 +130,12 @@ pub fn create_comet_physical_fun(
             )))
         }
         _ => {
-            let fun = &BuiltinScalarFunction::from_str(fun_name)?;
-            Ok(ScalarFunctionDefinition::BuiltIn(*fun))
+            let fun = BuiltinScalarFunction::from_str(fun_name);
+            if fun.is_err() {
+                Ok(ScalarFunctionDefinition::UDF(registry.udf(fun_name)?))
+            } else {
+                Ok(ScalarFunctionDefinition::BuiltIn(fun?))
+            }
         }
     }
 }
diff --git a/core/src/execution/datafusion/planner.rs b/core/src/execution/datafusion/planner.rs
index 1b0a2d0d8d..adb143acac 100644
--- a/core/src/execution/datafusion/planner.rs
+++ b/core/src/execution/datafusion/planner.rs
@@ -23,6 +23,7 @@ use arrow_schema::{DataType, Field, Schema, TimeUnit};
 use datafusion::{
     arrow::{compute::SortOptions, datatypes::SchemaRef},
     common::DataFusionError,
+    execution::FunctionRegistry,
     functions::math,
     logical_expr::{
         BuiltinScalarFunction, Operator as DataFusionOperator, ScalarFunctionDefinition,
@@ -45,6 +46,7 @@ use datafusion::{
         sorts::sort::SortExec,
         ExecutionPlan, Partitioning,
     },
+    prelude::SessionContext,
 };
 use datafusion_common::{
     tree_node::{Transformed, TransformedResult, TreeNode, TreeNodeRecursion, TreeNodeRewriter},
@@ -109,20 +111,16 @@ pub struct PhysicalPlanner {
     // The execution context id of this planner.
     exec_context_id: i64,
     execution_props: ExecutionProps,
-}
-
-impl Default for PhysicalPlanner {
-    fn default() -> Self {
-        Self::new()
-    }
+    session_ctx: Arc<SessionContext>,
 }
 
 impl PhysicalPlanner {
-    pub fn new() -> Self {
+    pub fn new(session_ctx: Arc<SessionContext>) -> Self {
         let execution_props = ExecutionProps::new();
         Self {
             exec_context_id: TEST_EXEC_CONTEXT_ID,
             execution_props,
+            session_ctx,
         }
     }
 
@@ -130,6 +128,7 @@ impl PhysicalPlanner {
         Self {
             exec_context_id,
             execution_props: self.execution_props,
+            session_ctx: self.session_ctx.clone(),
         }
     }
 
@@ -636,7 +635,11 @@ impl PhysicalPlanner {
                 Ok(DataType::Decimal128(_p2, _s2)),
             ) => {
                 let data_type = return_type.map(to_arrow_datatype).unwrap();
-                let fun_expr = create_comet_physical_fun("decimal_div", data_type.clone())?;
+                let fun_expr = create_comet_physical_fun(
+                    "decimal_div",
+                    data_type.clone(),
+                    &self.session_ctx.state(),
+                )?;
                 Ok(Arc::new(ScalarFunctionExpr::new(
                     "decimal_div",
                     fun_expr,
@@ -1213,11 +1216,19 @@ impl PhysicalPlanner {
                 // scalar function
                 // Note this assumes the `fun_name` is a defined function in DF. Otherwise, it'll
                 // throw error.
-                let fun = &BuiltinScalarFunction::from_str(fun_name)?;
-                fun.return_type(&input_expr_types)?
+                let fun = BuiltinScalarFunction::from_str(fun_name);
+                if fun.is_err() {
+                    self.session_ctx
+                        .udf(fun_name)?
+                        .inner()
+                        .return_type(&input_expr_types)?
+                } else {
+                    fun?.return_type(&input_expr_types)?
+                }
             }
         };
-        let fun_expr = create_comet_physical_fun(fun_name, data_type.clone())?;
+        let fun_expr =
+            create_comet_physical_fun(fun_name, data_type.clone(), &self.session_ctx.state())?;
 
         let scalar_expr: Arc<dyn PhysicalExpr> = Arc::new(ScalarFunctionExpr::new(
             fun_name,
diff --git a/core/src/execution/jni_api.rs b/core/src/execution/jni_api.rs
index 20f98a3a4d..8249097a18 100644
--- a/core/src/execution/jni_api.rs
+++ b/core/src/execution/jni_api.rs
@@ -321,7 +321,8 @@ pub unsafe extern "system" fn Java_org_apache_comet_Native_executePlan(
         // Because we don't know if input arrays are dictionary-encoded when we create
         // query plan, we need to defer stream initialization to first time execution.
         if exec_context.root_op.is_none() {
-            let planner = PhysicalPlanner::new().with_exec_id(exec_context_id);
+            let planner = PhysicalPlanner::new(exec_context.session_ctx.clone())
+                .with_exec_id(exec_context_id);
             let (scans, root_op) = planner.create_plan(
                 &exec_context.spark_plan,
                 &mut exec_context.input_sources.clone(),

From 3c1492e7b8e8283bd454decb266c11c594e4e8f4 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Sun, 31 Mar 2024 15:09:49 -0700
Subject: [PATCH 3/6] Fix

---
 core/src/execution/datafusion/planner.rs      |   18 +-
 .../approved-plans-v1_4/q1/explain.txt        |  298 +++--
 .../approved-plans-v1_4/q1/simplified.txt     |   72 +-
 .../approved-plans-v1_4/q10/explain.txt       |  140 +-
 .../approved-plans-v1_4/q10/simplified.txt    |  134 +-
 .../approved-plans-v1_4/q11/explain.txt       |  582 ++++----
 .../approved-plans-v1_4/q11/simplified.txt    |  180 +--
 .../approved-plans-v1_4/q12/explain.txt       |  114 +-
 .../approved-plans-v1_4/q12/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q13/explain.txt       |  112 +-
 .../approved-plans-v1_4/q13/simplified.txt    |  100 +-
 .../approved-plans-v1_4/q14a/explain.txt      |  781 +++++------
 .../approved-plans-v1_4/q14a/simplified.txt   |  250 ++--
 .../approved-plans-v1_4/q14b/explain.txt      |  678 +++++-----
 .../approved-plans-v1_4/q14b/simplified.txt   |  370 +++---
 .../approved-plans-v1_4/q15/explain.txt       |   94 +-
 .../approved-plans-v1_4/q15/simplified.txt    |   76 +-
 .../approved-plans-v1_4/q16/explain.txt       |  118 +-
 .../approved-plans-v1_4/q16/simplified.txt    |  122 +-
 .../approved-plans-v1_4/q17/explain.txt       |  138 +-
 .../approved-plans-v1_4/q17/simplified.txt    |  126 +-
 .../approved-plans-v1_4/q18/explain.txt       |  136 +-
 .../approved-plans-v1_4/q18/simplified.txt    |  122 +-
 .../approved-plans-v1_4/q19/explain.txt       |  100 +-
 .../approved-plans-v1_4/q19/simplified.txt    |   94 +-
 .../approved-plans-v1_4/q2/explain.txt        |  202 +--
 .../approved-plans-v1_4/q2/simplified.txt     |  105 +-
 .../approved-plans-v1_4/q20/explain.txt       |  114 +-
 .../approved-plans-v1_4/q20/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q21/explain.txt       |   92 +-
 .../approved-plans-v1_4/q21/simplified.txt    |   78 +-
 .../approved-plans-v1_4/q22/explain.txt       |   96 +-
 .../approved-plans-v1_4/q22/simplified.txt    |   78 +-
 .../approved-plans-v1_4/q23a/explain.txt      |  706 +++++-----
 .../approved-plans-v1_4/q23a/simplified.txt   |  295 ++---
 .../approved-plans-v1_4/q23b/explain.txt      |  881 ++++++------
 .../approved-plans-v1_4/q23b/simplified.txt   |  349 +++--
 .../approved-plans-v1_4/q24a/explain.txt      |  294 ++--
 .../approved-plans-v1_4/q24a/simplified.txt   |  100 +-
 .../approved-plans-v1_4/q24b/explain.txt      |  294 ++--
 .../approved-plans-v1_4/q24b/simplified.txt   |  100 +-
 .../approved-plans-v1_4/q25/explain.txt       |  160 +--
 .../approved-plans-v1_4/q25/simplified.txt    |  132 +-
 .../approved-plans-v1_4/q26/explain.txt       |  110 +-
 .../approved-plans-v1_4/q26/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q27/explain.txt       |  110 +-
 .../approved-plans-v1_4/q27/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q28/explain.txt       |  340 ++---
 .../approved-plans-v1_4/q28/simplified.txt    |  140 +-
 .../approved-plans-v1_4/q29/explain.txt       |  186 +--
 .../approved-plans-v1_4/q29/simplified.txt    |  140 +-
 .../approved-plans-v1_4/q3/explain.txt        |   64 +-
 .../approved-plans-v1_4/q3/simplified.txt     |   58 +-
 .../approved-plans-v1_4/q30/explain.txt       |  322 ++---
 .../approved-plans-v1_4/q30/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q31/explain.txt       |  808 +++++------
 .../approved-plans-v1_4/q31/simplified.txt    |  300 +++--
 .../approved-plans-v1_4/q32/explain.txt       |  164 +--
 .../approved-plans-v1_4/q32/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q33/explain.txt       |  395 +++---
 .../approved-plans-v1_4/q33/simplified.txt    |  190 ++-
 .../approved-plans-v1_4/q34/explain.txt       |  160 ++-
 .../approved-plans-v1_4/q34/simplified.txt    |  108 +-
 .../approved-plans-v1_4/q35/explain.txt       |  138 +-
 .../approved-plans-v1_4/q35/simplified.txt    |  132 +-
 .../approved-plans-v1_4/q36/explain.txt       |  130 +-
 .../approved-plans-v1_4/q36/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q37/explain.txt       |   90 +-
 .../approved-plans-v1_4/q37/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q38/explain.txt       |  238 ++--
 .../approved-plans-v1_4/q38/simplified.txt    |  160 +--
 .../approved-plans-v1_4/q39a/explain.txt      |  208 +--
 .../approved-plans-v1_4/q39a/simplified.txt   |  152 ++-
 .../approved-plans-v1_4/q39b/explain.txt      |  208 +--
 .../approved-plans-v1_4/q39b/simplified.txt   |  152 ++-
 .../approved-plans-v1_4/q4/explain.txt        |  898 +++++++------
 .../approved-plans-v1_4/q4/simplified.txt     |  272 ++--
 .../approved-plans-v1_4/q40/explain.txt       |  110 +-
 .../approved-plans-v1_4/q40/simplified.txt    |   94 +-
 .../approved-plans-v1_4/q41/explain.txt       |   64 +-
 .../approved-plans-v1_4/q41/simplified.txt    |   56 +-
 .../approved-plans-v1_4/q42/explain.txt       |   64 +-
 .../approved-plans-v1_4/q42/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q43/explain.txt       |   64 +-
 .../approved-plans-v1_4/q43/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q44/explain.txt       |   18 +-
 .../approved-plans-v1_4/q44/simplified.txt    |    6 +-
 .../approved-plans-v1_4/q45/explain.txt       |  122 +-
 .../approved-plans-v1_4/q45/simplified.txt    |  108 +-
 .../approved-plans-v1_4/q46/explain.txt       |  172 +--
 .../approved-plans-v1_4/q46/simplified.txt    |   86 +-
 .../approved-plans-v1_4/q47/explain.txt       |  283 ++--
 .../approved-plans-v1_4/q47/simplified.txt    |   42 +-
 .../approved-plans-v1_4/q48/explain.txt       |  100 +-
 .../approved-plans-v1_4/q48/simplified.txt    |   84 +-
 .../approved-plans-v1_4/q49/explain.txt       |  602 +++++----
 .../approved-plans-v1_4/q49/simplified.txt    |  262 ++--
 .../approved-plans-v1_4/q5/explain.txt        |  320 +++--
 .../approved-plans-v1_4/q5/simplified.txt     |  236 ++--
 .../approved-plans-v1_4/q50/explain.txt       |  106 +-
 .../approved-plans-v1_4/q50/simplified.txt    |   84 +-
 .../approved-plans-v1_4/q51/explain.txt       |  335 ++---
 .../approved-plans-v1_4/q51/simplified.txt    |  136 +-
 .../approved-plans-v1_4/q52/explain.txt       |   64 +-
 .../approved-plans-v1_4/q52/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q53/explain.txt       |  136 +-
 .../approved-plans-v1_4/q53/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q54/explain.txt       |  368 ++---
 .../approved-plans-v1_4/q54/simplified.txt    |  112 +-
 .../approved-plans-v1_4/q55/explain.txt       |   64 +-
 .../approved-plans-v1_4/q55/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q56/explain.txt       |  395 +++---
 .../approved-plans-v1_4/q56/simplified.txt    |  190 ++-
 .../approved-plans-v1_4/q57/explain.txt       |  283 ++--
 .../approved-plans-v1_4/q57/simplified.txt    |   42 +-
 .../approved-plans-v1_4/q58/explain.txt       |  458 ++++---
 .../approved-plans-v1_4/q58/simplified.txt    |  166 +--
 .../approved-plans-v1_4/q59/explain.txt       |  256 ++--
 .../approved-plans-v1_4/q59/simplified.txt    |   41 +-
 .../approved-plans-v1_4/q6/explain.txt        |  190 +--
 .../approved-plans-v1_4/q6/simplified.txt     |  138 +-
 .../approved-plans-v1_4/q60/explain.txt       |  395 +++---
 .../approved-plans-v1_4/q60/simplified.txt    |  190 ++-
 .../approved-plans-v1_4/q61/explain.txt       |  318 ++---
 .../approved-plans-v1_4/q61/simplified.txt    |  170 +--
 .../approved-plans-v1_4/q62/explain.txt       |   86 +-
 .../approved-plans-v1_4/q62/simplified.txt    |   80 +-
 .../approved-plans-v1_4/q63/explain.txt       |  136 +-
 .../approved-plans-v1_4/q63/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q64/explain.txt       |  800 +++++------
 .../approved-plans-v1_4/q64/simplified.txt    |  452 ++++---
 .../approved-plans-v1_4/q65/explain.txt       |  300 +++--
 .../approved-plans-v1_4/q65/simplified.txt    |   68 +-
 .../approved-plans-v1_4/q66/explain.txt       |  300 +++--
 .../approved-plans-v1_4/q66/simplified.txt    |  153 ++-
 .../approved-plans-v1_4/q67/explain.txt       |  128 +-
 .../approved-plans-v1_4/q67/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q68/explain.txt       |  172 +--
 .../approved-plans-v1_4/q68/simplified.txt    |   86 +-
 .../approved-plans-v1_4/q69/explain.txt       |  138 +-
 .../approved-plans-v1_4/q69/simplified.txt    |  130 +-
 .../approved-plans-v1_4/q7/explain.txt        |  110 +-
 .../approved-plans-v1_4/q7/simplified.txt     |   96 +-
 .../approved-plans-v1_4/q70/explain.txt       |  228 ++--
 .../approved-plans-v1_4/q70/simplified.txt    |   64 +-
 .../approved-plans-v1_4/q71/explain.txt       |  136 +-
 .../approved-plans-v1_4/q71/simplified.txt    |   14 +-
 .../approved-plans-v1_4/q72/explain.txt       |  231 ++--
 .../approved-plans-v1_4/q72/simplified.txt    |  182 ++-
 .../approved-plans-v1_4/q73/explain.txt       |  160 ++-
 .../approved-plans-v1_4/q73/simplified.txt    |  108 +-
 .../approved-plans-v1_4/q74/explain.txt       |  574 ++++----
 .../approved-plans-v1_4/q74/simplified.txt    |  180 +--
 .../approved-plans-v1_4/q75/explain.txt       |  850 ++++++------
 .../approved-plans-v1_4/q75/simplified.txt    |  372 +++---
 .../approved-plans-v1_4/q76/explain.txt       |   98 +-
 .../approved-plans-v1_4/q76/simplified.txt    |  106 +-
 .../approved-plans-v1_4/q77/explain.txt       |  714 +++++-----
 .../approved-plans-v1_4/q77/simplified.txt    |  290 ++--
 .../approved-plans-v1_4/q78/explain.txt       |  508 +++----
 .../approved-plans-v1_4/q78/simplified.txt    |  144 +-
 .../approved-plans-v1_4/q79/explain.txt       |  136 +-
 .../approved-plans-v1_4/q79/simplified.txt    |   74 +-
 .../approved-plans-v1_4/q8/explain.txt        |  206 +--
 .../approved-plans-v1_4/q8/simplified.txt     |  142 +-
 .../approved-plans-v1_4/q80/explain.txt       |  426 +++---
 .../approved-plans-v1_4/q80/simplified.txt    |  294 ++--
 .../approved-plans-v1_4/q81/explain.txt       |  314 ++---
 .../approved-plans-v1_4/q81/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q82/explain.txt       |   90 +-
 .../approved-plans-v1_4/q82/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q83/explain.txt       |  430 +++---
 .../approved-plans-v1_4/q83/simplified.txt    |  158 +--
 .../approved-plans-v1_4/q85/explain.txt       |  146 +-
 .../approved-plans-v1_4/q85/simplified.txt    |  128 +-
 .../approved-plans-v1_4/q86/explain.txt       |  116 +-
 .../approved-plans-v1_4/q86/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q87/explain.txt       |  238 ++--
 .../approved-plans-v1_4/q87/simplified.txt    |  160 +--
 .../approved-plans-v1_4/q88/explain.txt       | 1178 +++++++++--------
 .../approved-plans-v1_4/q88/simplified.txt    |  288 ++--
 .../approved-plans-v1_4/q89/explain.txt       |  134 +-
 .../approved-plans-v1_4/q89/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q9/explain.txt        |   30 +-
 .../approved-plans-v1_4/q9/simplified.txt     |   10 +-
 .../approved-plans-v1_4/q90/explain.txt       |  238 ++--
 .../approved-plans-v1_4/q90/simplified.txt    |  120 +-
 .../approved-plans-v1_4/q91/explain.txt       |  142 +-
 .../approved-plans-v1_4/q91/simplified.txt    |   14 +-
 .../approved-plans-v1_4/q92/explain.txt       |  164 +--
 .../approved-plans-v1_4/q92/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q93/explain.txt       |   76 +-
 .../approved-plans-v1_4/q93/simplified.txt    |   62 +-
 .../approved-plans-v1_4/q94/explain.txt       |  118 +-
 .../approved-plans-v1_4/q94/simplified.txt    |  122 +-
 .../approved-plans-v1_4/q95/explain.txt       |  150 ++-
 .../approved-plans-v1_4/q95/simplified.txt    |  178 +--
 .../approved-plans-v1_4/q96/explain.txt       |   72 +-
 .../approved-plans-v1_4/q96/simplified.txt    |   68 +-
 .../approved-plans-v1_4/q97/explain.txt       |  151 +--
 .../approved-plans-v1_4/q97/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q98/explain.txt       |  138 +-
 .../approved-plans-v1_4/q98/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q99/explain.txt       |   86 +-
 .../approved-plans-v1_4/q99/simplified.txt    |   80 +-
 .../approved-plans-v2_7/q10a/explain.txt      |  136 +-
 .../approved-plans-v2_7/q10a/simplified.txt   |  136 +-
 .../approved-plans-v2_7/q11/explain.txt       |  574 ++++----
 .../approved-plans-v2_7/q11/simplified.txt    |  180 +--
 .../approved-plans-v2_7/q12/explain.txt       |  114 +-
 .../approved-plans-v2_7/q12/simplified.txt    |   16 +-
 .../approved-plans-v2_7/q14/explain.txt       |  678 +++++-----
 .../approved-plans-v2_7/q14/simplified.txt    |  370 +++---
 .../approved-plans-v2_7/q14a/explain.txt      | 1048 ++++++++-------
 .../approved-plans-v2_7/q14a/simplified.txt   |  476 ++++---
 .../approved-plans-v2_7/q18a/explain.txt      |  647 ++++-----
 .../approved-plans-v2_7/q18a/simplified.txt   |  402 +++---
 .../approved-plans-v2_7/q20/explain.txt       |  114 +-
 .../approved-plans-v2_7/q20/simplified.txt    |   16 +-
 .../approved-plans-v2_7/q22/explain.txt       |   94 +-
 .../approved-plans-v2_7/q22/simplified.txt    |   76 +-
 .../approved-plans-v2_7/q22a/explain.txt      |  275 ++--
 .../approved-plans-v2_7/q22a/simplified.txt   |  138 +-
 .../approved-plans-v2_7/q24/explain.txt       |  310 ++---
 .../approved-plans-v2_7/q24/simplified.txt    |  128 +-
 .../approved-plans-v2_7/q27a/explain.txt      |  319 ++---
 .../approved-plans-v2_7/q27a/simplified.txt   |  212 +--
 .../approved-plans-v2_7/q34/explain.txt       |  160 ++-
 .../approved-plans-v2_7/q34/simplified.txt    |  108 +-
 .../approved-plans-v2_7/q35/explain.txt       |  138 +-
 .../approved-plans-v2_7/q35/simplified.txt    |  132 +-
 .../approved-plans-v2_7/q35a/explain.txt      |  134 +-
 .../approved-plans-v2_7/q35a/simplified.txt   |  134 +-
 .../approved-plans-v2_7/q36a/explain.txt      |  247 ++--
 .../approved-plans-v2_7/q36a/simplified.txt   |  126 +-
 .../approved-plans-v2_7/q47/explain.txt       |  283 ++--
 .../approved-plans-v2_7/q47/simplified.txt    |   42 +-
 .../approved-plans-v2_7/q49/explain.txt       |  602 +++++----
 .../approved-plans-v2_7/q49/simplified.txt    |  262 ++--
 .../approved-plans-v2_7/q51a/explain.txt      |  653 ++++-----
 .../approved-plans-v2_7/q51a/simplified.txt   |  201 ++-
 .../approved-plans-v2_7/q57/explain.txt       |  283 ++--
 .../approved-plans-v2_7/q57/simplified.txt    |   42 +-
 .../approved-plans-v2_7/q5a/explain.txt       |  427 +++---
 .../approved-plans-v2_7/q5a/simplified.txt    |   90 +-
 .../approved-plans-v2_7/q6/explain.txt        |  190 +--
 .../approved-plans-v2_7/q6/simplified.txt     |  138 +-
 .../approved-plans-v2_7/q64/explain.txt       |  800 +++++------
 .../approved-plans-v2_7/q64/simplified.txt    |  452 ++++---
 .../approved-plans-v2_7/q67a/explain.txt      |  487 ++++---
 .../approved-plans-v2_7/q67a/simplified.txt   |  130 +-
 .../approved-plans-v2_7/q70a/explain.txt      |  335 +++--
 .../approved-plans-v2_7/q70a/simplified.txt   |  170 ++-
 .../approved-plans-v2_7/q72/explain.txt       |  231 ++--
 .../approved-plans-v2_7/q72/simplified.txt    |  182 ++-
 .../approved-plans-v2_7/q74/explain.txt       |  574 ++++----
 .../approved-plans-v2_7/q74/simplified.txt    |  180 +--
 .../approved-plans-v2_7/q75/explain.txt       |  850 ++++++------
 .../approved-plans-v2_7/q75/simplified.txt    |  372 +++---
 .../approved-plans-v2_7/q77a/explain.txt      |  861 ++++++------
 .../approved-plans-v2_7/q77a/simplified.txt   |  144 +-
 .../approved-plans-v2_7/q78/explain.txt       |  508 +++----
 .../approved-plans-v2_7/q78/simplified.txt    |  144 +-
 .../approved-plans-v2_7/q80a/explain.txt      |  533 ++++----
 .../approved-plans-v2_7/q80a/simplified.txt   |  102 +-
 .../approved-plans-v2_7/q86a/explain.txt      |  233 ++--
 .../approved-plans-v2_7/q86a/simplified.txt   |  108 +-
 .../approved-plans-v2_7/q98/explain.txt       |  130 +-
 .../approved-plans-v2_7/q98/simplified.txt    |   84 +-
 269 files changed, 29502 insertions(+), 28036 deletions(-)

diff --git a/core/src/execution/datafusion/planner.rs b/core/src/execution/datafusion/planner.rs
index adb143acac..ab83872c38 100644
--- a/core/src/execution/datafusion/planner.rs
+++ b/core/src/execution/datafusion/planner.rs
@@ -114,6 +114,18 @@ pub struct PhysicalPlanner {
     session_ctx: Arc<SessionContext>,
 }
 
+impl Default for PhysicalPlanner {
+    fn default() -> Self {
+        let session_ctx = Arc::new(SessionContext::new());
+        let execution_props = ExecutionProps::new();
+        Self {
+            exec_context_id: TEST_EXEC_CONTEXT_ID,
+            execution_props,
+            session_ctx,
+        }
+    }
+}
+
 impl PhysicalPlanner {
     pub fn new(session_ctx: Arc<SessionContext>) -> Self {
         let execution_props = ExecutionProps::new();
@@ -1433,7 +1445,7 @@ mod tests {
         };
 
         let op = create_filter(op_scan, 3);
-        let planner = PhysicalPlanner::new();
+        let planner = PhysicalPlanner::default();
         let row_count = 100;
 
         // Create a dictionary array with 100 values, and use it as input to the execution.
@@ -1513,7 +1525,7 @@ mod tests {
         };
 
         let op = create_filter_literal(op_scan, STRING_TYPE_ID, lit);
-        let planner = PhysicalPlanner::new();
+        let planner = PhysicalPlanner::default();
 
         let row_count = 100;
 
@@ -1591,7 +1603,7 @@ mod tests {
         };
 
         let op = create_filter(op_scan, 0);
-        let planner = PhysicalPlanner::new();
+        let planner = PhysicalPlanner::default();
 
         let (mut scans, datafusion_plan) = planner.create_plan(&op, &mut vec![]).unwrap();
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt
index b0ea6bed8b..acab82fdec 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt
@@ -1,44 +1,48 @@
 == Physical Plan ==
-TakeOrderedAndProject (40)
-+- * Project (39)
-   +- * BroadcastHashJoin Inner BuildRight (38)
-      :- * Project (33)
-      :  +- * BroadcastHashJoin Inner BuildRight (32)
-      :     :- * Project (26)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-      :     :     :- * Filter (10)
-      :     :     :  +- * HashAggregate (9)
-      :     :     :     +- Exchange (8)
-      :     :     :        +- * HashAggregate (7)
-      :     :     :           +- * Project (6)
-      :     :     :              +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :     :                 :- * ColumnarToRow (3)
-      :     :     :                 :  +- CometFilter (2)
-      :     :     :                 :     +- CometScan parquet spark_catalog.default.store_returns (1)
-      :     :     :                 +- ReusedExchange (4)
-      :     :     +- BroadcastExchange (24)
-      :     :        +- * Filter (23)
-      :     :           +- * HashAggregate (22)
-      :     :              +- Exchange (21)
-      :     :                 +- * HashAggregate (20)
-      :     :                    +- * HashAggregate (19)
-      :     :                       +- Exchange (18)
-      :     :                          +- * HashAggregate (17)
-      :     :                             +- * Project (16)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (15)
-      :     :                                   :- * ColumnarToRow (13)
-      :     :                                   :  +- CometFilter (12)
-      :     :                                   :     +- CometScan parquet spark_catalog.default.store_returns (11)
-      :     :                                   +- ReusedExchange (14)
-      :     +- BroadcastExchange (31)
-      :        +- * ColumnarToRow (30)
-      :           +- CometProject (29)
-      :              +- CometFilter (28)
-      :                 +- CometScan parquet spark_catalog.default.store (27)
-      +- BroadcastExchange (37)
-         +- * ColumnarToRow (36)
-            +- CometFilter (35)
-               +- CometScan parquet spark_catalog.default.customer (34)
+TakeOrderedAndProject (44)
++- * Project (43)
+   +- * BroadcastHashJoin Inner BuildRight (42)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * Project (30)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :     :- * ColumnarToRow (12)
+      :     :     :  +- CometFilter (11)
+      :     :     :     +- CometHashAggregate (10)
+      :     :     :        +- CometColumnarExchange (9)
+      :     :     :           +- RowToColumnar (8)
+      :     :     :              +- * HashAggregate (7)
+      :     :     :                 +- * Project (6)
+      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :     :                       :- * ColumnarToRow (3)
+      :     :     :                       :  +- CometFilter (2)
+      :     :     :                       :     +- CometScan parquet spark_catalog.default.store_returns (1)
+      :     :     :                       +- ReusedExchange (4)
+      :     :     +- BroadcastExchange (28)
+      :     :        +- * ColumnarToRow (27)
+      :     :           +- CometFilter (26)
+      :     :              +- CometHashAggregate (25)
+      :     :                 +- CometColumnarExchange (24)
+      :     :                    +- CometHashAggregate (23)
+      :     :                       +- CometHashAggregate (22)
+      :     :                          +- CometColumnarExchange (21)
+      :     :                             +- RowToColumnar (20)
+      :     :                                +- * HashAggregate (19)
+      :     :                                   +- * Project (18)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                         :- * ColumnarToRow (15)
+      :     :                                         :  +- CometFilter (14)
+      :     :                                         :     +- CometScan parquet spark_catalog.default.store_returns (13)
+      :     :                                         +- ReusedExchange (16)
+      :     +- BroadcastExchange (35)
+      :        +- * ColumnarToRow (34)
+      :           +- CometProject (33)
+      :              +- CometFilter (32)
+      :                 +- CometScan parquet spark_catalog.default.store (31)
+      +- BroadcastExchange (41)
+         +- * ColumnarToRow (40)
+            +- CometFilter (39)
+               +- CometScan parquet spark_catalog.default.customer (38)
 
 
 (unknown) Scan parquet spark_catalog.default.store_returns
@@ -56,7 +60,7 @@ Condition : (isnotnull(sr_store_sk#2) AND isnotnull(sr_customer_sk#1))
 (3) ColumnarToRow [codegen id : 2]
 Input [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 45]
+(4) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 2]
@@ -76,199 +80,203 @@ Functions [1]: [partial_sum(UnscaledValue(sr_return_amt#3))]
 Aggregate Attributes [1]: [sum#7]
 Results [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
 
-(8) Exchange
+(8) RowToColumnar
 Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
-Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(9) HashAggregate [codegen id : 9]
+(9) CometColumnarExchange
+Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
+Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+
+(10) CometHashAggregate
 Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
 Keys [2]: [sr_customer_sk#1, sr_store_sk#2]
 Functions [1]: [sum(UnscaledValue(sr_return_amt#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(sr_return_amt#3))#9]
-Results [3]: [sr_customer_sk#1 AS ctr_customer_sk#10, sr_store_sk#2 AS ctr_store_sk#11, MakeDecimal(sum(UnscaledValue(sr_return_amt#3))#9,17,2) AS ctr_total_return#12]
 
-(10) Filter [codegen id : 9]
-Input [3]: [ctr_customer_sk#10, ctr_store_sk#11, ctr_total_return#12]
-Condition : isnotnull(ctr_total_return#12)
+(11) CometFilter
+Input [3]: [ctr_customer_sk#9, ctr_store_sk#10, ctr_total_return#11]
+Condition : isnotnull(ctr_total_return#11)
+
+(12) ColumnarToRow [codegen id : 8]
+Input [3]: [ctr_customer_sk#9, ctr_store_sk#10, ctr_total_return#11]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
 Output [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(sr_returned_date_sk#4), dynamicpruningexpression(sr_returned_date_sk#4 IN dynamicpruning#13)]
+PartitionFilters: [isnotnull(sr_returned_date_sk#4), dynamicpruningexpression(sr_returned_date_sk#4 IN dynamicpruning#12)]
 PushedFilters: [IsNotNull(sr_store_sk)]
 ReadSchema: struct<sr_customer_sk:int,sr_store_sk:int,sr_return_amt:decimal(7,2)>
 
-(12) CometFilter
+(14) CometFilter
 Input [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 Condition : isnotnull(sr_store_sk#2)
 
-(13) ColumnarToRow [codegen id : 4]
+(15) ColumnarToRow [codegen id : 4]
 Input [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 
-(14) ReusedExchange [Reuses operator id: 45]
+(16) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#6]
 
-(15) BroadcastHashJoin [codegen id : 4]
+(17) BroadcastHashJoin [codegen id : 4]
 Left keys [1]: [sr_returned_date_sk#4]
 Right keys [1]: [d_date_sk#6]
 Join type: Inner
 Join condition: None
 
-(16) Project [codegen id : 4]
+(18) Project [codegen id : 4]
 Output [3]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3]
 Input [5]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4, d_date_sk#6]
 
-(17) HashAggregate [codegen id : 4]
+(19) HashAggregate [codegen id : 4]
 Input [3]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3]
 Keys [2]: [sr_customer_sk#1, sr_store_sk#2]
 Functions [1]: [partial_sum(UnscaledValue(sr_return_amt#3))]
-Aggregate Attributes [1]: [sum#14]
-Results [3]: [sr_customer_sk#1, sr_store_sk#2, sum#15]
+Aggregate Attributes [1]: [sum#13]
+Results [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
 
-(18) Exchange
-Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#15]
-Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=2]
+(20) RowToColumnar
+Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
 
-(19) HashAggregate [codegen id : 5]
-Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#15]
+(21) CometColumnarExchange
+Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
+Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(22) CometHashAggregate
+Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
 Keys [2]: [sr_customer_sk#1, sr_store_sk#2]
 Functions [1]: [sum(UnscaledValue(sr_return_amt#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(sr_return_amt#3))#9]
-Results [2]: [sr_store_sk#2 AS ctr_store_sk#11, MakeDecimal(sum(UnscaledValue(sr_return_amt#3))#9,17,2) AS ctr_total_return#12]
-
-(20) HashAggregate [codegen id : 5]
-Input [2]: [ctr_store_sk#11, ctr_total_return#12]
-Keys [1]: [ctr_store_sk#11]
-Functions [1]: [partial_avg(ctr_total_return#12)]
-Aggregate Attributes [2]: [sum#16, count#17]
-Results [3]: [ctr_store_sk#11, sum#18, count#19]
-
-(21) Exchange
-Input [3]: [ctr_store_sk#11, sum#18, count#19]
-Arguments: hashpartitioning(ctr_store_sk#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
-
-(22) HashAggregate [codegen id : 6]
-Input [3]: [ctr_store_sk#11, sum#18, count#19]
-Keys [1]: [ctr_store_sk#11]
-Functions [1]: [avg(ctr_total_return#12)]
-Aggregate Attributes [1]: [avg(ctr_total_return#12)#20]
-Results [2]: [(avg(ctr_total_return#12)#20 * 1.2) AS (avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11 AS ctr_store_sk#11#22]
-
-(23) Filter [codegen id : 6]
-Input [2]: [(avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11#22]
-Condition : isnotnull((avg(ctr_total_return) * 1.2)#21)
-
-(24) BroadcastExchange
-Input [2]: [(avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11#22]
+
+(23) CometHashAggregate
+Input [2]: [ctr_store_sk#10, ctr_total_return#11]
+Keys [1]: [ctr_store_sk#10]
+Functions [1]: [partial_avg(ctr_total_return#11)]
+
+(24) CometColumnarExchange
+Input [3]: [ctr_store_sk#10, sum#15, count#16]
+Arguments: hashpartitioning(ctr_store_sk#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(25) CometHashAggregate
+Input [3]: [ctr_store_sk#10, sum#15, count#16]
+Keys [1]: [ctr_store_sk#10]
+Functions [1]: [avg(ctr_total_return#11)]
+
+(26) CometFilter
+Input [2]: [(avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
+Condition : isnotnull((avg(ctr_total_return) * 1.2)#17)
+
+(27) ColumnarToRow [codegen id : 5]
+Input [2]: [(avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
+
+(28) BroadcastExchange
+Input [2]: [(avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint)),false), [plan_id=4]
 
-(25) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [ctr_store_sk#11]
-Right keys [1]: [ctr_store_sk#11#22]
+(29) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ctr_store_sk#10]
+Right keys [1]: [ctr_store_sk#10#18]
 Join type: Inner
-Join condition: (cast(ctr_total_return#12 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#21)
+Join condition: (cast(ctr_total_return#11 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#17)
 
-(26) Project [codegen id : 9]
-Output [2]: [ctr_customer_sk#10, ctr_store_sk#11]
-Input [5]: [ctr_customer_sk#10, ctr_store_sk#11, ctr_total_return#12, (avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11#22]
+(30) Project [codegen id : 8]
+Output [2]: [ctr_customer_sk#9, ctr_store_sk#10]
+Input [5]: [ctr_customer_sk#9, ctr_store_sk#10, ctr_total_return#11, (avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
 
 (unknown) Scan parquet spark_catalog.default.store
-Output [2]: [s_store_sk#23, s_state#24]
+Output [2]: [s_store_sk#19, s_state#20]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_state), EqualTo(s_state,TN), IsNotNull(s_store_sk)]
 ReadSchema: struct<s_store_sk:int,s_state:string>
 
-(28) CometFilter
-Input [2]: [s_store_sk#23, s_state#24]
-Condition : ((isnotnull(s_state#24) AND (s_state#24 = TN)) AND isnotnull(s_store_sk#23))
+(32) CometFilter
+Input [2]: [s_store_sk#19, s_state#20]
+Condition : ((isnotnull(s_state#20) AND (s_state#20 = TN)) AND isnotnull(s_store_sk#19))
 
-(29) CometProject
-Input [2]: [s_store_sk#23, s_state#24]
-Arguments: [s_store_sk#23], [s_store_sk#23]
+(33) CometProject
+Input [2]: [s_store_sk#19, s_state#20]
+Arguments: [s_store_sk#19], [s_store_sk#19]
 
-(30) ColumnarToRow [codegen id : 7]
-Input [1]: [s_store_sk#23]
+(34) ColumnarToRow [codegen id : 6]
+Input [1]: [s_store_sk#19]
 
-(31) BroadcastExchange
-Input [1]: [s_store_sk#23]
+(35) BroadcastExchange
+Input [1]: [s_store_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(32) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [ctr_store_sk#11]
-Right keys [1]: [s_store_sk#23]
+(36) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ctr_store_sk#10]
+Right keys [1]: [s_store_sk#19]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 9]
-Output [1]: [ctr_customer_sk#10]
-Input [3]: [ctr_customer_sk#10, ctr_store_sk#11, s_store_sk#23]
+(37) Project [codegen id : 8]
+Output [1]: [ctr_customer_sk#9]
+Input [3]: [ctr_customer_sk#9, ctr_store_sk#10, s_store_sk#19]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [2]: [c_customer_sk#25, c_customer_id#26]
+Output [2]: [c_customer_sk#21, c_customer_id#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string>
 
-(35) CometFilter
-Input [2]: [c_customer_sk#25, c_customer_id#26]
-Condition : isnotnull(c_customer_sk#25)
+(39) CometFilter
+Input [2]: [c_customer_sk#21, c_customer_id#22]
+Condition : isnotnull(c_customer_sk#21)
 
-(36) ColumnarToRow [codegen id : 8]
-Input [2]: [c_customer_sk#25, c_customer_id#26]
+(40) ColumnarToRow [codegen id : 7]
+Input [2]: [c_customer_sk#21, c_customer_id#22]
 
-(37) BroadcastExchange
-Input [2]: [c_customer_sk#25, c_customer_id#26]
+(41) BroadcastExchange
+Input [2]: [c_customer_sk#21, c_customer_id#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(38) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [ctr_customer_sk#10]
-Right keys [1]: [c_customer_sk#25]
+(42) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ctr_customer_sk#9]
+Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 9]
-Output [1]: [c_customer_id#26]
-Input [3]: [ctr_customer_sk#10, c_customer_sk#25, c_customer_id#26]
+(43) Project [codegen id : 8]
+Output [1]: [c_customer_id#22]
+Input [3]: [ctr_customer_sk#9, c_customer_sk#21, c_customer_id#22]
 
-(40) TakeOrderedAndProject
-Input [1]: [c_customer_id#26]
-Arguments: 100, [c_customer_id#26 ASC NULLS FIRST], [c_customer_id#26]
+(44) TakeOrderedAndProject
+Input [1]: [c_customer_id#22]
+Arguments: 100, [c_customer_id#22 ASC NULLS FIRST], [c_customer_id#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = sr_returned_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (45)
-+- * ColumnarToRow (44)
-   +- CometProject (43)
-      +- CometFilter (42)
-         +- CometScan parquet spark_catalog.default.date_dim (41)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_year#27]
+Output [2]: [d_date_sk#6, d_year#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(42) CometFilter
-Input [2]: [d_date_sk#6, d_year#27]
-Condition : ((isnotnull(d_year#27) AND (d_year#27 = 2000)) AND isnotnull(d_date_sk#6))
+(46) CometFilter
+Input [2]: [d_date_sk#6, d_year#23]
+Condition : ((isnotnull(d_year#23) AND (d_year#23 = 2000)) AND isnotnull(d_date_sk#6))
 
-(43) CometProject
-Input [2]: [d_date_sk#6, d_year#27]
+(47) CometProject
+Input [2]: [d_date_sk#6, d_year#23]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(44) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(45) BroadcastExchange
+(49) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 11 Hosting Expression = sr_returned_date_sk#4 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 13 Hosting Expression = sr_returned_date_sk#4 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt
index 6d4c0fca7a..c8f2ec9eb9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt
@@ -1,45 +1,47 @@
 TakeOrderedAndProject [c_customer_id]
-  WholeStageCodegen (9)
+  WholeStageCodegen (8)
     Project [c_customer_id]
       BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
         Project [ctr_customer_sk]
           BroadcastHashJoin [ctr_store_sk,s_store_sk]
             Project [ctr_customer_sk,ctr_store_sk]
               BroadcastHashJoin [ctr_store_sk,ctr_store_sk,ctr_total_return,(avg(ctr_total_return) * 1.2)]
-                Filter [ctr_total_return]
-                  HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_customer_sk,ctr_store_sk,ctr_total_return,sum]
-                    InputAdapter
-                      Exchange [sr_customer_sk,sr_store_sk] #1
-                        WholeStageCodegen (2)
-                          HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
-                            Project [sr_customer_sk,sr_store_sk,sr_return_amt]
-                              BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [sr_store_sk,sr_customer_sk]
-                                      CometScan parquet spark_catalog.default.store_returns [sr_customer_sk,sr_store_sk,sr_return_amt,sr_returned_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_year,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                ColumnarToRow
+                  InputAdapter
+                    CometFilter [ctr_total_return]
+                      CometHashAggregate [sr_customer_sk,sr_store_sk,sum]
+                        CometColumnarExchange [sr_customer_sk,sr_store_sk] #1
+                          RowToColumnar
+                            WholeStageCodegen (2)
+                              HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
+                                Project [sr_customer_sk,sr_store_sk,sr_return_amt]
+                                  BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [sr_store_sk,sr_customer_sk]
+                                          CometScan parquet spark_catalog.default.store_returns [sr_customer_sk,sr_store_sk,sr_return_amt,sr_returned_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #2
                 InputAdapter
                   BroadcastExchange #3
-                    WholeStageCodegen (6)
-                      Filter [(avg(ctr_total_return) * 1.2)]
-                        HashAggregate [ctr_store_sk,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),ctr_store_sk,sum,count]
-                          InputAdapter
-                            Exchange [ctr_store_sk] #4
-                              WholeStageCodegen (5)
-                                HashAggregate [ctr_store_sk,ctr_total_return] [sum,count,sum,count]
-                                  HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_store_sk,ctr_total_return,sum]
-                                    InputAdapter
-                                      Exchange [sr_customer_sk,sr_store_sk] #5
+                    WholeStageCodegen (5)
+                      ColumnarToRow
+                        InputAdapter
+                          CometFilter [(avg(ctr_total_return) * 1.2)]
+                            CometHashAggregate [ctr_store_sk,sum,count]
+                              CometColumnarExchange [ctr_store_sk] #4
+                                CometHashAggregate [ctr_store_sk,ctr_total_return]
+                                  CometHashAggregate [sr_customer_sk,sr_store_sk,sum]
+                                    CometColumnarExchange [sr_customer_sk,sr_store_sk] #5
+                                      RowToColumnar
                                         WholeStageCodegen (4)
                                           HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
                                             Project [sr_customer_sk,sr_store_sk,sr_return_amt]
@@ -53,7 +55,7 @@ TakeOrderedAndProject [c_customer_id]
                                                   ReusedExchange [d_date_sk] #2
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (7)
+                WholeStageCodegen (6)
                   ColumnarToRow
                     InputAdapter
                       CometProject [s_store_sk]
@@ -61,7 +63,7 @@ TakeOrderedAndProject [c_customer_id]
                           CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
         InputAdapter
           BroadcastExchange #7
-            WholeStageCodegen (8)
+            WholeStageCodegen (7)
               ColumnarToRow
                 InputAdapter
                   CometFilter [c_customer_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt
index 1ea234408b..a99a75e9a6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt
@@ -1,47 +1,49 @@
 == Physical Plan ==
-TakeOrderedAndProject (43)
-+- * HashAggregate (42)
-   +- Exchange (41)
-      +- * HashAggregate (40)
-         +- * Project (39)
-            +- * BroadcastHashJoin Inner BuildRight (38)
-               :- * Project (33)
-               :  +- * BroadcastHashJoin Inner BuildRight (32)
-               :     :- * Project (26)
-               :     :  +- * Filter (25)
-               :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
-               :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
-               :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-               :     :        :  :  :- * ColumnarToRow (3)
-               :     :        :  :  :  +- CometFilter (2)
-               :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-               :     :        :  :  +- BroadcastExchange (9)
-               :     :        :  :     +- * Project (8)
-               :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :        :  :           :- * ColumnarToRow (5)
-               :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-               :     :        :  :           +- ReusedExchange (6)
-               :     :        :  +- BroadcastExchange (16)
-               :     :        :     +- * Project (15)
-               :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :        :           :- * ColumnarToRow (12)
-               :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-               :     :        :           +- ReusedExchange (13)
-               :     :        +- BroadcastExchange (23)
-               :     :           +- * Project (22)
-               :     :              +- * BroadcastHashJoin Inner BuildRight (21)
-               :     :                 :- * ColumnarToRow (19)
-               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-               :     :                 +- ReusedExchange (20)
-               :     +- BroadcastExchange (31)
-               :        +- * ColumnarToRow (30)
-               :           +- CometProject (29)
-               :              +- CometFilter (28)
-               :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-               +- BroadcastExchange (37)
-                  +- * ColumnarToRow (36)
-                     +- CometFilter (35)
-                        +- CometScan parquet spark_catalog.default.customer_demographics (34)
+* ColumnarToRow (45)
++- CometTakeOrderedAndProject (44)
+   +- CometHashAggregate (43)
+      +- CometColumnarExchange (42)
+         +- RowToColumnar (41)
+            +- * HashAggregate (40)
+               +- * Project (39)
+                  +- * BroadcastHashJoin Inner BuildRight (38)
+                     :- * Project (33)
+                     :  +- * BroadcastHashJoin Inner BuildRight (32)
+                     :     :- * Project (26)
+                     :     :  +- * Filter (25)
+                     :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
+                     :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
+                     :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+                     :     :        :  :  :- * ColumnarToRow (3)
+                     :     :        :  :  :  +- CometFilter (2)
+                     :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+                     :     :        :  :  +- BroadcastExchange (9)
+                     :     :        :  :     +- * Project (8)
+                     :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+                     :     :        :  :           :- * ColumnarToRow (5)
+                     :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+                     :     :        :  :           +- ReusedExchange (6)
+                     :     :        :  +- BroadcastExchange (16)
+                     :     :        :     +- * Project (15)
+                     :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :        :           :- * ColumnarToRow (12)
+                     :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+                     :     :        :           +- ReusedExchange (13)
+                     :     :        +- BroadcastExchange (23)
+                     :     :           +- * Project (22)
+                     :     :              +- * BroadcastHashJoin Inner BuildRight (21)
+                     :     :                 :- * ColumnarToRow (19)
+                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+                     :     :                 +- ReusedExchange (20)
+                     :     +- BroadcastExchange (31)
+                     :        +- * ColumnarToRow (30)
+                     :           +- CometProject (29)
+                     :              +- CometFilter (28)
+                     :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+                     +- BroadcastExchange (37)
+                        +- * ColumnarToRow (36)
+                           +- CometFilter (35)
+                              +- CometScan parquet spark_catalog.default.customer_demographics (34)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -68,7 +70,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#6, ss_sold_date_sk#7]
 
-(6) ReusedExchange [Reuses operator id: 48]
+(6) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#9]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -101,7 +103,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#10, ws_sold_date_sk#11]
 
-(13) ReusedExchange [Reuses operator id: 48]
+(13) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#13]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -134,7 +136,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#14, cs_sold_date_sk#15]
 
-(20) ReusedExchange [Reuses operator id: 48]
+(20) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#17]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -232,50 +234,54 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#29]
 Results [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 
-(41) Exchange
+(41) RowToColumnar
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
-Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(42) HashAggregate [codegen id : 10]
+(42) CometColumnarExchange
+Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
+Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(43) CometHashAggregate
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 Keys [8]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#31]
-Results [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, count(1)#31 AS cnt1#32, cd_purchase_estimate#24, count(1)#31 AS cnt2#33, cd_credit_rating#25, count(1)#31 AS cnt3#34, cd_dep_count#26, count(1)#31 AS cnt4#35, cd_dep_employed_count#27, count(1)#31 AS cnt5#36, cd_dep_college_count#28, count(1)#31 AS cnt6#37]
 
-(43) TakeOrderedAndProject
-Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
-Arguments: 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
+(44) CometTakeOrderedAndProject
+Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_education_status#23 ASC NULLS FIRST,cd_purchase_estimate#24 ASC NULLS FIRST,cd_credit_rating#25 ASC NULLS FIRST,cd_dep_count#26 ASC NULLS FIRST,cd_dep_employed_count#27 ASC NULLS FIRST,cd_dep_college_count#28 ASC NULLS FIRST], output=[cd_gender#21,cd_marital_status#22,cd_education_status#23,cnt1#31,cd_purchase_estimate#24,cnt2#32,cd_credit_rating#25,cnt3#33,cd_dep_count#26,cnt4#34,cd_dep_employed_count#27,cnt5#35,cd_dep_college_count#28,cnt6#36]), 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
+
+(45) ColumnarToRow [codegen id : 10]
+Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#9, d_year#38, d_moy#39]
+Output [3]: [d_date_sk#9, d_year#37, d_moy#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2002), GreaterThanOrEqual(d_moy,1), LessThanOrEqual(d_moy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(45) CometFilter
-Input [3]: [d_date_sk#9, d_year#38, d_moy#39]
-Condition : (((((isnotnull(d_year#38) AND isnotnull(d_moy#39)) AND (d_year#38 = 2002)) AND (d_moy#39 >= 1)) AND (d_moy#39 <= 4)) AND isnotnull(d_date_sk#9))
+(47) CometFilter
+Input [3]: [d_date_sk#9, d_year#37, d_moy#38]
+Condition : (((((isnotnull(d_year#37) AND isnotnull(d_moy#38)) AND (d_year#37 = 2002)) AND (d_moy#38 >= 1)) AND (d_moy#38 <= 4)) AND isnotnull(d_date_sk#9))
 
-(46) CometProject
-Input [3]: [d_date_sk#9, d_year#38, d_moy#39]
+(48) CometProject
+Input [3]: [d_date_sk#9, d_year#37, d_moy#38]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(47) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(48) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt
index 89893c831e..8923131021 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt
@@ -1,75 +1,77 @@
-TakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
-  WholeStageCodegen (10)
-    HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count] [count(1),cnt1,cnt2,cnt3,cnt4,cnt5,cnt6,count]
-      InputAdapter
-        Exchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-          WholeStageCodegen (9)
-            HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
-              Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                  Project [c_current_cdemo_sk]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [c_current_cdemo_sk,c_current_addr_sk]
-                        Filter [exists,exists]
-                          BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                            BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                ColumnarToRow
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
+        CometHashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count]
+          CometColumnarExchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+            RowToColumnar
+              WholeStageCodegen (9)
+                HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
+                  Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                      Project [c_current_cdemo_sk]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [c_current_cdemo_sk,c_current_addr_sk]
+                            Filter [exists,exists]
+                              BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                                BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                    InputAdapter
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (2)
+                                          Project [ss_customer_sk]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (4)
+                                        Project [ws_bill_customer_sk]
+                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk] #3
                                 InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (2)
-                                      Project [ss_customer_sk]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (6)
+                                      Project [cs_ship_customer_sk]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                           InputAdapter
                                             ReusedExchange [d_date_sk] #3
-                              InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (4)
-                                    Project [ws_bill_customer_sk]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                            InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (6)
-                                  Project [cs_ship_customer_sk]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                          InputAdapter
+                            BroadcastExchange #6
+                              WholeStageCodegen (7)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ca_address_sk]
+                                      CometFilter [ca_county,ca_address_sk]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (7)
+                        BroadcastExchange #7
+                          WholeStageCodegen (8)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [ca_address_sk]
-                                  CometFilter [ca_county,ca_address_sk]
-                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
-                  InputAdapter
-                    BroadcastExchange #7
-                      WholeStageCodegen (8)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cd_demo_sk]
-                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [cd_demo_sk]
+                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt
index 64f486f71e..a24e545fbc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt
@@ -1,76 +1,84 @@
 == Physical Plan ==
-TakeOrderedAndProject (72)
-+- * Project (71)
-   +- * BroadcastHashJoin Inner BuildRight (70)
-      :- * Project (53)
-      :  +- * BroadcastHashJoin Inner BuildRight (52)
-      :     :- * Project (34)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (33)
-      :     :     :- * Filter (16)
-      :     :     :  +- * HashAggregate (15)
-      :     :     :     +- Exchange (14)
-      :     :     :        +- * HashAggregate (13)
-      :     :     :           +- * Project (12)
-      :     :     :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :                 :- * Project (9)
-      :     :     :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :     :                 :     :- * ColumnarToRow (3)
-      :     :     :                 :     :  +- CometFilter (2)
-      :     :     :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :     :                 :     +- BroadcastExchange (7)
-      :     :     :                 :        +- * ColumnarToRow (6)
-      :     :     :                 :           +- CometFilter (5)
-      :     :     :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :     :                 +- ReusedExchange (10)
-      :     :     +- BroadcastExchange (32)
-      :     :        +- * HashAggregate (31)
-      :     :           +- Exchange (30)
-      :     :              +- * HashAggregate (29)
-      :     :                 +- * Project (28)
-      :     :                    +- * BroadcastHashJoin Inner BuildRight (27)
-      :     :                       :- * Project (25)
-      :     :                       :  +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :                       :     :- * ColumnarToRow (19)
-      :     :                       :     :  +- CometFilter (18)
-      :     :                       :     :     +- CometScan parquet spark_catalog.default.customer (17)
-      :     :                       :     +- BroadcastExchange (23)
-      :     :                       :        +- * ColumnarToRow (22)
-      :     :                       :           +- CometFilter (21)
-      :     :                       :              +- CometScan parquet spark_catalog.default.store_sales (20)
-      :     :                       +- ReusedExchange (26)
-      :     +- BroadcastExchange (51)
-      :        +- * Filter (50)
-      :           +- * HashAggregate (49)
-      :              +- Exchange (48)
-      :                 +- * HashAggregate (47)
-      :                    +- * Project (46)
-      :                       +- * BroadcastHashJoin Inner BuildRight (45)
-      :                          :- * Project (43)
-      :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
-      :                          :     :- * ColumnarToRow (37)
-      :                          :     :  +- CometFilter (36)
-      :                          :     :     +- CometScan parquet spark_catalog.default.customer (35)
-      :                          :     +- BroadcastExchange (41)
-      :                          :        +- * ColumnarToRow (40)
-      :                          :           +- CometFilter (39)
-      :                          :              +- CometScan parquet spark_catalog.default.web_sales (38)
-      :                          +- ReusedExchange (44)
-      +- BroadcastExchange (69)
-         +- * HashAggregate (68)
-            +- Exchange (67)
-               +- * HashAggregate (66)
-                  +- * Project (65)
-                     +- * BroadcastHashJoin Inner BuildRight (64)
-                        :- * Project (62)
-                        :  +- * BroadcastHashJoin Inner BuildRight (61)
-                        :     :- * ColumnarToRow (56)
-                        :     :  +- CometFilter (55)
-                        :     :     +- CometScan parquet spark_catalog.default.customer (54)
-                        :     +- BroadcastExchange (60)
-                        :        +- * ColumnarToRow (59)
-                        :           +- CometFilter (58)
-                        :              +- CometScan parquet spark_catalog.default.web_sales (57)
-                        +- ReusedExchange (63)
+TakeOrderedAndProject (80)
++- * Project (79)
+   +- * BroadcastHashJoin Inner BuildRight (78)
+      :- * Project (59)
+      :  +- * BroadcastHashJoin Inner BuildRight (58)
+      :     :- * Project (38)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+      :     :     :- * ColumnarToRow (18)
+      :     :     :  +- CometFilter (17)
+      :     :     :     +- CometHashAggregate (16)
+      :     :     :        +- CometColumnarExchange (15)
+      :     :     :           +- RowToColumnar (14)
+      :     :     :              +- * HashAggregate (13)
+      :     :     :                 +- * Project (12)
+      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :                       :- * Project (9)
+      :     :     :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :     :                       :     :- * ColumnarToRow (3)
+      :     :     :                       :     :  +- CometFilter (2)
+      :     :     :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :     :                       :     +- BroadcastExchange (7)
+      :     :     :                       :        +- * ColumnarToRow (6)
+      :     :     :                       :           +- CometFilter (5)
+      :     :     :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :     :                       +- ReusedExchange (10)
+      :     :     +- BroadcastExchange (36)
+      :     :        +- * ColumnarToRow (35)
+      :     :           +- CometHashAggregate (34)
+      :     :              +- CometColumnarExchange (33)
+      :     :                 +- RowToColumnar (32)
+      :     :                    +- * HashAggregate (31)
+      :     :                       +- * Project (30)
+      :     :                          +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :                             :- * Project (27)
+      :     :                             :  +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :                             :     :- * ColumnarToRow (21)
+      :     :                             :     :  +- CometFilter (20)
+      :     :                             :     :     +- CometScan parquet spark_catalog.default.customer (19)
+      :     :                             :     +- BroadcastExchange (25)
+      :     :                             :        +- * ColumnarToRow (24)
+      :     :                             :           +- CometFilter (23)
+      :     :                             :              +- CometScan parquet spark_catalog.default.store_sales (22)
+      :     :                             +- ReusedExchange (28)
+      :     +- BroadcastExchange (57)
+      :        +- * ColumnarToRow (56)
+      :           +- CometFilter (55)
+      :              +- CometHashAggregate (54)
+      :                 +- CometColumnarExchange (53)
+      :                    +- RowToColumnar (52)
+      :                       +- * HashAggregate (51)
+      :                          +- * Project (50)
+      :                             +- * BroadcastHashJoin Inner BuildRight (49)
+      :                                :- * Project (47)
+      :                                :  +- * BroadcastHashJoin Inner BuildRight (46)
+      :                                :     :- * ColumnarToRow (41)
+      :                                :     :  +- CometFilter (40)
+      :                                :     :     +- CometScan parquet spark_catalog.default.customer (39)
+      :                                :     +- BroadcastExchange (45)
+      :                                :        +- * ColumnarToRow (44)
+      :                                :           +- CometFilter (43)
+      :                                :              +- CometScan parquet spark_catalog.default.web_sales (42)
+      :                                +- ReusedExchange (48)
+      +- BroadcastExchange (77)
+         +- * ColumnarToRow (76)
+            +- CometHashAggregate (75)
+               +- CometColumnarExchange (74)
+                  +- RowToColumnar (73)
+                     +- * HashAggregate (72)
+                        +- * Project (71)
+                           +- * BroadcastHashJoin Inner BuildRight (70)
+                              :- * Project (68)
+                              :  +- * BroadcastHashJoin Inner BuildRight (67)
+                              :     :- * ColumnarToRow (62)
+                              :     :  +- CometFilter (61)
+                              :     :     +- CometScan parquet spark_catalog.default.customer (60)
+                              :     +- BroadcastExchange (66)
+                              :        +- * ColumnarToRow (65)
+                              :           +- CometFilter (64)
+                              :              +- CometScan parquet spark_catalog.default.web_sales (63)
+                              +- ReusedExchange (69)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -116,7 +124,7 @@ Join condition: None
 Output [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 Input [12]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_customer_sk#9, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 
-(10) ReusedExchange [Reuses operator id: 76]
+(10) ReusedExchange [Reuses operator id: 84]
 Output [2]: [d_date_sk#14, d_year#15]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -136,300 +144,316 @@ Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discoun
 Aggregate Attributes [1]: [sum#16]
 Results [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 
-(14) Exchange
+(14) RowToColumnar
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 16]
+(15) CometColumnarExchange
+Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 Keys [8]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8]
 Functions [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18]
-Results [2]: [c_customer_id#2 AS customer_id#19, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18,18,2) AS year_total#20]
 
-(16) Filter [codegen id : 16]
-Input [2]: [customer_id#19, year_total#20]
-Condition : (isnotnull(year_total#20) AND (year_total#20 > 0.00))
+(17) CometFilter
+Input [2]: [customer_id#18, year_total#19]
+Condition : (isnotnull(year_total#19) AND (year_total#19 > 0.00))
+
+(18) ColumnarToRow [codegen id : 16]
+Input [2]: [customer_id#18, year_total#19]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Output [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(18) CometFilter
-Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
-Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_customer_id#22))
+(20) CometFilter
+Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Condition : (isnotnull(c_customer_sk#20) AND isnotnull(c_customer_id#21))
 
-(19) ColumnarToRow [codegen id : 6]
-Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+(21) ColumnarToRow [codegen id : 6]
+Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+Output [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#32), dynamicpruningexpression(ss_sold_date_sk#32 IN dynamicpruning#33)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#31), dynamicpruningexpression(ss_sold_date_sk#31 IN dynamicpruning#32)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_discount_amt:decimal(7,2),ss_ext_list_price:decimal(7,2)>
 
-(21) CometFilter
-Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
-Condition : isnotnull(ss_customer_sk#29)
+(23) CometFilter
+Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+Condition : isnotnull(ss_customer_sk#28)
 
-(22) ColumnarToRow [codegen id : 4]
-Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+(24) ColumnarToRow [codegen id : 4]
+Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 
-(23) BroadcastExchange
-Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+(25) BroadcastExchange
+Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#21]
-Right keys [1]: [ss_customer_sk#29]
+(26) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#20]
+Right keys [1]: [ss_customer_sk#28]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
-Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
-Input [12]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+(27) Project [codegen id : 6]
+Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+Input [12]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 
-(26) ReusedExchange [Reuses operator id: 80]
-Output [2]: [d_date_sk#34, d_year#35]
+(28) ReusedExchange [Reuses operator id: 88]
+Output [2]: [d_date_sk#33, d_year#34]
 
-(27) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#32]
-Right keys [1]: [d_date_sk#34]
+(29) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#31]
+Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
-Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
-Input [12]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32, d_date_sk#34, d_year#35]
-
-(29) HashAggregate [codegen id : 6]
-Input [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
-Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
-Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
-Aggregate Attributes [1]: [sum#36]
-Results [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
-
-(30) Exchange
-Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
-Arguments: hashpartitioning(c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 7]
-Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
-Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
-Functions [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18]
-Results [3]: [c_customer_id#22 AS customer_id#38, c_preferred_cust_flag#25 AS customer_preferred_cust_flag#39, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18,18,2) AS year_total#40]
-
-(32) BroadcastExchange
-Input [3]: [customer_id#38, customer_preferred_cust_flag#39, year_total#40]
+(30) Project [codegen id : 6]
+Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
+Input [12]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31, d_date_sk#33, d_year#34]
+
+(31) HashAggregate [codegen id : 6]
+Input [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
+Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
+Aggregate Attributes [1]: [sum#35]
+Results [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+
+(32) RowToColumnar
+Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+
+(33) CometColumnarExchange
+Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+Arguments: hashpartitioning(c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Functions [1]: [sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
+
+(35) ColumnarToRow [codegen id : 7]
+Input [3]: [customer_id#37, customer_preferred_cust_flag#38, year_total#39]
+
+(36) BroadcastExchange
+Input [3]: [customer_id#37, customer_preferred_cust_flag#38, year_total#39]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#19]
-Right keys [1]: [customer_id#38]
+(37) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#18]
+Right keys [1]: [customer_id#37]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 16]
-Output [4]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40]
-Input [5]: [customer_id#19, year_total#20, customer_id#38, customer_preferred_cust_flag#39, year_total#40]
+(38) Project [codegen id : 16]
+Output [4]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39]
+Input [5]: [customer_id#18, year_total#19, customer_id#37, customer_preferred_cust_flag#38, year_total#39]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48]
+Output [8]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(36) CometFilter
-Input [8]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48]
-Condition : (isnotnull(c_customer_sk#41) AND isnotnull(c_customer_id#42))
+(40) CometFilter
+Input [8]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47]
+Condition : (isnotnull(c_customer_sk#40) AND isnotnull(c_customer_id#41))
 
-(37) ColumnarToRow [codegen id : 10]
-Input [8]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48]
+(41) ColumnarToRow [codegen id : 10]
+Input [8]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
+Output [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#52), dynamicpruningexpression(ws_sold_date_sk#52 IN dynamicpruning#53)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(39) CometFilter
-Input [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
-Condition : isnotnull(ws_bill_customer_sk#49)
+(43) CometFilter
+Input [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
+Condition : isnotnull(ws_bill_customer_sk#48)
 
-(40) ColumnarToRow [codegen id : 8]
-Input [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
+(44) ColumnarToRow [codegen id : 8]
+Input [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
 
-(41) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
+(45) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(42) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#41]
-Right keys [1]: [ws_bill_customer_sk#49]
+(46) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#40]
+Right keys [1]: [ws_bill_customer_sk#48]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 10]
-Output [10]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
-Input [12]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
+(47) Project [codegen id : 10]
+Output [10]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
+Input [12]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
 
-(44) ReusedExchange [Reuses operator id: 76]
-Output [2]: [d_date_sk#54, d_year#55]
+(48) ReusedExchange [Reuses operator id: 84]
+Output [2]: [d_date_sk#53, d_year#54]
 
-(45) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#52]
-Right keys [1]: [d_date_sk#54]
+(49) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#51]
+Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 10]
-Output [10]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, d_year#55]
-Input [12]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52, d_date_sk#54, d_year#55]
-
-(47) HashAggregate [codegen id : 10]
-Input [10]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, d_year#55]
-Keys [8]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))]
-Aggregate Attributes [1]: [sum#56]
-Results [9]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, sum#57]
-
-(48) Exchange
-Input [9]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, sum#57]
-Arguments: hashpartitioning(c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(49) HashAggregate [codegen id : 11]
-Input [9]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, sum#57]
-Keys [8]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))#58]
-Results [2]: [c_customer_id#42 AS customer_id#59, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))#58,18,2) AS year_total#60]
-
-(50) Filter [codegen id : 11]
-Input [2]: [customer_id#59, year_total#60]
-Condition : (isnotnull(year_total#60) AND (year_total#60 > 0.00))
-
-(51) BroadcastExchange
-Input [2]: [customer_id#59, year_total#60]
+(50) Project [codegen id : 10]
+Output [10]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, d_year#54]
+Input [12]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54]
+
+(51) HashAggregate [codegen id : 10]
+Input [10]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, d_year#54]
+Keys [8]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#50 - ws_ext_discount_amt#49)))]
+Aggregate Attributes [1]: [sum#55]
+Results [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
+
+(52) RowToColumnar
+Input [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
+
+(53) CometColumnarExchange
+Input [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
+Arguments: hashpartitioning(c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(54) CometHashAggregate
+Input [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
+Keys [8]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#50 - ws_ext_discount_amt#49)))]
+
+(55) CometFilter
+Input [2]: [customer_id#57, year_total#58]
+Condition : (isnotnull(year_total#58) AND (year_total#58 > 0.00))
+
+(56) ColumnarToRow [codegen id : 11]
+Input [2]: [customer_id#57, year_total#58]
+
+(57) BroadcastExchange
+Input [2]: [customer_id#57, year_total#58]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(52) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#19]
-Right keys [1]: [customer_id#59]
+(58) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#18]
+Right keys [1]: [customer_id#57]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 16]
-Output [5]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40, year_total#60]
-Input [6]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40, customer_id#59, year_total#60]
+(59) Project [codegen id : 16]
+Output [5]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39, year_total#58]
+Input [6]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39, customer_id#57, year_total#58]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
+Output [8]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(55) CometFilter
-Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
-Condition : (isnotnull(c_customer_sk#61) AND isnotnull(c_customer_id#62))
+(61) CometFilter
+Input [8]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66]
+Condition : (isnotnull(c_customer_sk#59) AND isnotnull(c_customer_id#60))
 
-(56) ColumnarToRow [codegen id : 14]
-Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
+(62) ColumnarToRow [codegen id : 14]
+Input [8]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+Output [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#72), dynamicpruningexpression(ws_sold_date_sk#72 IN dynamicpruning#73)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#70), dynamicpruningexpression(ws_sold_date_sk#70 IN dynamicpruning#71)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(58) CometFilter
-Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
-Condition : isnotnull(ws_bill_customer_sk#69)
+(64) CometFilter
+Input [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
+Condition : isnotnull(ws_bill_customer_sk#67)
 
-(59) ColumnarToRow [codegen id : 12]
-Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+(65) ColumnarToRow [codegen id : 12]
+Input [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
 
-(60) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+(66) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(61) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#61]
-Right keys [1]: [ws_bill_customer_sk#69]
+(67) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#59]
+Right keys [1]: [ws_bill_customer_sk#67]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 14]
-Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
-Input [12]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+(68) Project [codegen id : 14]
+Output [10]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
+Input [12]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
 
-(63) ReusedExchange [Reuses operator id: 80]
-Output [2]: [d_date_sk#74, d_year#75]
+(69) ReusedExchange [Reuses operator id: 88]
+Output [2]: [d_date_sk#72, d_year#73]
 
-(64) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#72]
-Right keys [1]: [d_date_sk#74]
+(70) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#70]
+Right keys [1]: [d_date_sk#72]
 Join type: Inner
 Join condition: None
 
-(65) Project [codegen id : 14]
-Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
-Input [12]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72, d_date_sk#74, d_year#75]
-
-(66) HashAggregate [codegen id : 14]
-Input [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
-Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
-Aggregate Attributes [1]: [sum#76]
-Results [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-
-(67) Exchange
-Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-Arguments: hashpartitioning(c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(68) HashAggregate [codegen id : 15]
-Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))#58]
-Results [2]: [c_customer_id#62 AS customer_id#78, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))#58,18,2) AS year_total#79]
-
-(69) BroadcastExchange
-Input [2]: [customer_id#78, year_total#79]
+(71) Project [codegen id : 14]
+Output [10]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, d_year#73]
+Input [12]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70, d_date_sk#72, d_year#73]
+
+(72) HashAggregate [codegen id : 14]
+Input [10]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, d_year#73]
+Keys [8]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#69 - ws_ext_discount_amt#68)))]
+Aggregate Attributes [1]: [sum#74]
+Results [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
+
+(73) RowToColumnar
+Input [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
+
+(74) CometColumnarExchange
+Input [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
+Arguments: hashpartitioning(c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(75) CometHashAggregate
+Input [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
+Keys [8]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#69 - ws_ext_discount_amt#68)))]
+
+(76) ColumnarToRow [codegen id : 15]
+Input [2]: [customer_id#76, year_total#77]
+
+(77) BroadcastExchange
+Input [2]: [customer_id#76, year_total#77]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(70) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#19]
-Right keys [1]: [customer_id#78]
+(78) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#18]
+Right keys [1]: [customer_id#76]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#60 > 0.00) THEN (year_total#79 / year_total#60) END > CASE WHEN (year_total#20 > 0.00) THEN (year_total#40 / year_total#20) END)
+Join condition: (CASE WHEN (year_total#58 > 0.00) THEN (year_total#77 / year_total#58) END > CASE WHEN (year_total#19 > 0.00) THEN (year_total#39 / year_total#19) END)
 
-(71) Project [codegen id : 16]
-Output [1]: [customer_preferred_cust_flag#39]
-Input [7]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40, year_total#60, customer_id#78, year_total#79]
+(79) Project [codegen id : 16]
+Output [1]: [customer_preferred_cust_flag#38]
+Input [7]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39, year_total#58, customer_id#76, year_total#77]
 
-(72) TakeOrderedAndProject
-Input [1]: [customer_preferred_cust_flag#39]
-Arguments: 100, [customer_preferred_cust_flag#39 ASC NULLS FIRST], [customer_preferred_cust_flag#39]
+(80) TakeOrderedAndProject
+Input [1]: [customer_preferred_cust_flag#38]
+Arguments: 100, [customer_preferred_cust_flag#38 ASC NULLS FIRST], [customer_preferred_cust_flag#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (76)
-+- * ColumnarToRow (75)
-   +- CometFilter (74)
-      +- CometScan parquet spark_catalog.default.date_dim (73)
+BroadcastExchange (84)
++- * ColumnarToRow (83)
+   +- CometFilter (82)
+      +- CometScan parquet spark_catalog.default.date_dim (81)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -439,44 +463,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(74) CometFilter
+(82) CometFilter
 Input [2]: [d_date_sk#14, d_year#15]
 Condition : ((isnotnull(d_year#15) AND (d_year#15 = 2001)) AND isnotnull(d_date_sk#14))
 
-(75) ColumnarToRow [codegen id : 1]
+(83) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#14, d_year#15]
 
-(76) BroadcastExchange
+(84) BroadcastExchange
 Input [2]: [d_date_sk#14, d_year#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#32 IN dynamicpruning#33
-BroadcastExchange (80)
-+- * ColumnarToRow (79)
-   +- CometFilter (78)
-      +- CometScan parquet spark_catalog.default.date_dim (77)
+Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#31 IN dynamicpruning#32
+BroadcastExchange (88)
++- * ColumnarToRow (87)
+   +- CometFilter (86)
+      +- CometScan parquet spark_catalog.default.date_dim (85)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#34, d_year#35]
+Output [2]: [d_date_sk#33, d_year#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(78) CometFilter
-Input [2]: [d_date_sk#34, d_year#35]
-Condition : ((isnotnull(d_year#35) AND (d_year#35 = 2002)) AND isnotnull(d_date_sk#34))
+(86) CometFilter
+Input [2]: [d_date_sk#33, d_year#34]
+Condition : ((isnotnull(d_year#34) AND (d_year#34 = 2002)) AND isnotnull(d_date_sk#33))
 
-(79) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#34, d_year#35]
+(87) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#33, d_year#34]
 
-(80) BroadcastExchange
-Input [2]: [d_date_sk#34, d_year#35]
+(88) BroadcastExchange
+Input [2]: [d_date_sk#33, d_year#34]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#52 IN dynamicpruning#13
+Subquery:3 Hosting operator id = 42 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#13
 
-Subquery:4 Hosting operator id = 57 Hosting Expression = ws_sold_date_sk#72 IN dynamicpruning#33
+Subquery:4 Hosting operator id = 63 Hosting Expression = ws_sold_date_sk#70 IN dynamicpruning#32
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt
index 562b5fdf29..2810bbd068 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt
@@ -6,43 +6,13 @@ TakeOrderedAndProject [customer_preferred_cust_flag]
           BroadcastHashJoin [customer_id,customer_id]
             Project [customer_id,year_total,customer_preferred_cust_flag,year_total]
               BroadcastHashJoin [customer_id,customer_id]
-                Filter [year_total]
-                  HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,year_total,sum]
-                    InputAdapter
-                      Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
-                        WholeStageCodegen (3)
-                          HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_customer_id]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                    InputAdapter
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_customer_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #3
-                InputAdapter
-                  BroadcastExchange #4
-                    WholeStageCodegen (7)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,customer_preferred_cust_flag,year_total,sum]
-                        InputAdapter
-                          Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
-                            WholeStageCodegen (6)
+                ColumnarToRow
+                  InputAdapter
+                    CometFilter [year_total]
+                      CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
+                        CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
+                          RowToColumnar
+                            WholeStageCodegen (3)
                               HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
                                 Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
                                   BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -53,71 +23,109 @@ TakeOrderedAndProject [customer_preferred_cust_flag]
                                             CometFilter [c_customer_sk,c_customer_id]
                                               CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                         InputAdapter
-                                          BroadcastExchange #6
-                                            WholeStageCodegen (4)
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
                                               ColumnarToRow
                                                 InputAdapter
                                                   CometFilter [ss_customer_sk]
                                                     CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #2
-                                                        BroadcastExchange #7
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
                                                           WholeStageCodegen (1)
                                                             ColumnarToRow
                                                               InputAdapter
                                                                 CometFilter [d_year,d_date_sk]
                                                                   CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                     InputAdapter
-                                      ReusedExchange [d_date_sk,d_year] #7
+                                      ReusedExchange [d_date_sk,d_year] #3
+                InputAdapter
+                  BroadcastExchange #4
+                    WholeStageCodegen (7)
+                      ColumnarToRow
+                        InputAdapter
+                          CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
+                            CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
+                              RowToColumnar
+                                WholeStageCodegen (6)
+                                  HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
+                                    Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [c_customer_sk,c_customer_id]
+                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                            InputAdapter
+                                              BroadcastExchange #6
+                                                WholeStageCodegen (4)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [ss_customer_sk]
+                                                        CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                                          SubqueryBroadcast [d_date_sk] #2
+                                                            BroadcastExchange #7
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [d_year,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  Filter [year_total]
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
-                          WholeStageCodegen (10)
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk,c_customer_id]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [year_total]
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
+                            RowToColumnar
+                              WholeStageCodegen (10)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                          InputAdapter
+                                            BroadcastExchange #10
+                                              WholeStageCodegen (8)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (8)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
+                                        ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
+              ColumnarToRow
                 InputAdapter
-                  Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
-                    WholeStageCodegen (14)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_customer_sk,c_customer_id]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
+                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
+                      RowToColumnar
+                        WholeStageCodegen (14)
+                          HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_customer_id]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                    InputAdapter
+                                      BroadcastExchange #13
+                                        WholeStageCodegen (12)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #13
-                                    WholeStageCodegen (12)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_customer_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #2
-                            InputAdapter
-                              ReusedExchange [d_date_sk,d_year] #7
+                                  ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt
index 23ff8f948b..b59f6739bb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt
@@ -1,24 +1,26 @@
 == Physical Plan ==
-TakeOrderedAndProject (20)
-+- * Project (19)
-   +- Window (18)
-      +- * Sort (17)
-         +- Exchange (16)
-            +- * HashAggregate (15)
-               +- Exchange (14)
-                  +- * HashAggregate (13)
-                     +- * Project (12)
-                        +- * BroadcastHashJoin Inner BuildRight (11)
-                           :- * Project (9)
-                           :  +- * BroadcastHashJoin Inner BuildRight (8)
-                           :     :- * ColumnarToRow (3)
-                           :     :  +- CometFilter (2)
-                           :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                           :     +- BroadcastExchange (7)
-                           :        +- * ColumnarToRow (6)
-                           :           +- CometFilter (5)
-                           :              +- CometScan parquet spark_catalog.default.item (4)
-                           +- ReusedExchange (10)
+TakeOrderedAndProject (22)
++- * Project (21)
+   +- Window (20)
+      +- * ColumnarToRow (19)
+         +- CometSort (18)
+            +- CometColumnarExchange (17)
+               +- CometHashAggregate (16)
+                  +- CometColumnarExchange (15)
+                     +- RowToColumnar (14)
+                        +- * HashAggregate (13)
+                           +- * Project (12)
+                              +- * BroadcastHashJoin Inner BuildRight (11)
+                                 :- * Project (9)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                 :     :- * ColumnarToRow (3)
+                                 :     :  +- CometFilter (2)
+                                 :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                                 :     +- BroadcastExchange (7)
+                                 :        +- * ColumnarToRow (6)
+                                 :           +- CometFilter (5)
+                                 :              +- CometScan parquet spark_catalog.default.item (4)
+                                 +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -64,7 +66,7 @@ Join condition: None
 Output [7]: [ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ws_item_sk#1, ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 25]
+(10) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -84,66 +86,70 @@ Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) Exchange
+(14) RowToColumnar
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#2))#14]
-Results [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS _w0#16, i_item_id#6]
 
-(16) Exchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(17) CometColumnarExchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(18) CometSort
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6], [i_class#9 ASC NULLS FIRST]
 
-(17) Sort [codegen id : 5]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: [i_class#9 ASC NULLS FIRST], false, 0
+(19) ColumnarToRow [codegen id : 4]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
 
-(18) Window
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
+(20) Window
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
 
-(19) Project [codegen id : 6]
-Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18, i_item_id#6]
-Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6, _we0#17]
+(21) Project [codegen id : 5]
+Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
+Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
 
-(20) TakeOrderedAndProject
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+(22) TakeOrderedAndProject
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (25)
-+- * ColumnarToRow (24)
-   +- CometProject (23)
-      +- CometFilter (22)
-         +- CometScan parquet spark_catalog.default.date_dim (21)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#19]
+Output [2]: [d_date_sk#11, d_date#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(22) CometFilter
-Input [2]: [d_date_sk#11, d_date#19]
-Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(24) CometFilter
+Input [2]: [d_date_sk#11, d_date#18]
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(23) CometProject
-Input [2]: [d_date_sk#11, d_date#19]
+(25) CometProject
+Input [2]: [d_date_sk#11, d_date#18]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(24) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(25) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt
index fae1c6dba1..985a824e6e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (6)
+  WholeStageCodegen (5)
     Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (5)
-            Sort [i_class]
+          WholeStageCodegen (4)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_class] #1
-                  WholeStageCodegen (4)
-                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ws_ext_sales_price)),itemrevenue,_w0,sum]
-                      InputAdapter
-                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                CometSort [i_class]
+                  CometColumnarExchange [i_class] #1
+                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
+                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                        RowToColumnar
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ws_ext_sales_price] [sum,sum]
                               Project [ws_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt
index 759871556e..a6d0b9b416 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt
@@ -1,38 +1,40 @@
 == Physical Plan ==
-* HashAggregate (34)
-+- Exchange (33)
-   +- * HashAggregate (32)
-      +- * Project (31)
-         +- * BroadcastHashJoin Inner BuildRight (30)
-            :- * Project (25)
-            :  +- * BroadcastHashJoin Inner BuildRight (24)
-            :     :- * Project (19)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (18)
-            :     :     :- * Project (16)
-            :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
-            :     :     :     :- * Project (9)
-            :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-            :     :     :     :     :- * ColumnarToRow (3)
-            :     :     :     :     :  +- CometFilter (2)
-            :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :     :     :     :     +- BroadcastExchange (7)
-            :     :     :     :        +- * ColumnarToRow (6)
-            :     :     :     :           +- CometFilter (5)
-            :     :     :     :              +- CometScan parquet spark_catalog.default.store (4)
-            :     :     :     +- BroadcastExchange (14)
-            :     :     :        +- * ColumnarToRow (13)
-            :     :     :           +- CometProject (12)
-            :     :     :              +- CometFilter (11)
-            :     :     :                 +- CometScan parquet spark_catalog.default.customer_address (10)
-            :     :     +- ReusedExchange (17)
-            :     +- BroadcastExchange (23)
-            :        +- * ColumnarToRow (22)
-            :           +- CometFilter (21)
-            :              +- CometScan parquet spark_catalog.default.customer_demographics (20)
-            +- BroadcastExchange (29)
-               +- * ColumnarToRow (28)
-                  +- CometFilter (27)
-                     +- CometScan parquet spark_catalog.default.household_demographics (26)
+* ColumnarToRow (36)
++- CometHashAggregate (35)
+   +- CometColumnarExchange (34)
+      +- RowToColumnar (33)
+         +- * HashAggregate (32)
+            +- * Project (31)
+               +- * BroadcastHashJoin Inner BuildRight (30)
+                  :- * Project (25)
+                  :  +- * BroadcastHashJoin Inner BuildRight (24)
+                  :     :- * Project (19)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (18)
+                  :     :     :- * Project (16)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
+                  :     :     :     :- * Project (9)
+                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :     :     :     :     +- BroadcastExchange (7)
+                  :     :     :     :        +- * ColumnarToRow (6)
+                  :     :     :     :           +- CometFilter (5)
+                  :     :     :     :              +- CometScan parquet spark_catalog.default.store (4)
+                  :     :     :     +- BroadcastExchange (14)
+                  :     :     :        +- * ColumnarToRow (13)
+                  :     :     :           +- CometProject (12)
+                  :     :     :              +- CometFilter (11)
+                  :     :     :                 +- CometScan parquet spark_catalog.default.customer_address (10)
+                  :     :     +- ReusedExchange (17)
+                  :     +- BroadcastExchange (23)
+                  :        +- * ColumnarToRow (22)
+                  :           +- CometFilter (21)
+                  :              +- CometScan parquet spark_catalog.default.customer_demographics (20)
+                  +- BroadcastExchange (29)
+                     +- * ColumnarToRow (28)
+                        +- CometFilter (27)
+                           +- CometScan parquet spark_catalog.default.household_demographics (26)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -110,7 +112,7 @@ Join condition: ((((ca_state#14 IN (TX,OH) AND (ss_net_profit#9 >= 100.00)) AND
 Output [7]: [ss_cdemo_sk#1, ss_hdemo_sk#2, ss_quantity#5, ss_sales_price#6, ss_ext_sales_price#7, ss_ext_wholesale_cost#8, ss_sold_date_sk#10]
 Input [11]: [ss_cdemo_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_quantity#5, ss_sales_price#6, ss_ext_sales_price#7, ss_ext_wholesale_cost#8, ss_net_profit#9, ss_sold_date_sk#10, ca_address_sk#13, ca_state#14]
 
-(17) ReusedExchange [Reuses operator id: 39]
+(17) ReusedExchange [Reuses operator id: 41]
 Output [1]: [d_date_sk#16]
 
 (18) BroadcastHashJoin [codegen id : 6]
@@ -186,46 +188,50 @@ Functions [4]: [partial_avg(ss_quantity#5), partial_avg(UnscaledValue(ss_ext_sal
 Aggregate Attributes [7]: [sum#22, count#23, sum#24, count#25, sum#26, count#27, sum#28]
 Results [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
 
-(33) Exchange
+(33) RowToColumnar
 Input [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=5]
 
-(34) HashAggregate [codegen id : 7]
+(34) CometColumnarExchange
+Input [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(35) CometHashAggregate
 Input [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
 Keys: []
 Functions [4]: [avg(ss_quantity#5), avg(UnscaledValue(ss_ext_sales_price#7)), avg(UnscaledValue(ss_ext_wholesale_cost#8)), sum(UnscaledValue(ss_ext_wholesale_cost#8))]
-Aggregate Attributes [4]: [avg(ss_quantity#5)#36, avg(UnscaledValue(ss_ext_sales_price#7))#37, avg(UnscaledValue(ss_ext_wholesale_cost#8))#38, sum(UnscaledValue(ss_ext_wholesale_cost#8))#39]
-Results [4]: [avg(ss_quantity#5)#36 AS avg(ss_quantity)#40, cast((avg(UnscaledValue(ss_ext_sales_price#7))#37 / 100.0) as decimal(11,6)) AS avg(ss_ext_sales_price)#41, cast((avg(UnscaledValue(ss_ext_wholesale_cost#8))#38 / 100.0) as decimal(11,6)) AS avg(ss_ext_wholesale_cost)#42, MakeDecimal(sum(UnscaledValue(ss_ext_wholesale_cost#8))#39,17,2) AS sum(ss_ext_wholesale_cost)#43]
+
+(36) ColumnarToRow [codegen id : 7]
+Input [4]: [avg(ss_quantity)#36, avg(ss_ext_sales_price)#37, avg(ss_ext_wholesale_cost)#38, sum(ss_ext_wholesale_cost)#39]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#10 IN dynamicpruning#11
-BroadcastExchange (39)
-+- * ColumnarToRow (38)
-   +- CometProject (37)
-      +- CometFilter (36)
-         +- CometScan parquet spark_catalog.default.date_dim (35)
+BroadcastExchange (41)
++- * ColumnarToRow (40)
+   +- CometProject (39)
+      +- CometFilter (38)
+         +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#16, d_year#44]
+Output [2]: [d_date_sk#16, d_year#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(36) CometFilter
-Input [2]: [d_date_sk#16, d_year#44]
-Condition : ((isnotnull(d_year#44) AND (d_year#44 = 2001)) AND isnotnull(d_date_sk#16))
+(38) CometFilter
+Input [2]: [d_date_sk#16, d_year#40]
+Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2001)) AND isnotnull(d_date_sk#16))
 
-(37) CometProject
-Input [2]: [d_date_sk#16, d_year#44]
+(39) CometProject
+Input [2]: [d_date_sk#16, d_year#40]
 Arguments: [d_date_sk#16], [d_date_sk#16]
 
-(38) ColumnarToRow [codegen id : 1]
+(40) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#16]
 
-(39) BroadcastExchange
+(41) BroadcastExchange
 Input [1]: [d_date_sk#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt
index 5e5fc41f83..87b7bf67e8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt
@@ -1,59 +1,61 @@
 WholeStageCodegen (7)
-  HashAggregate [sum,count,sum,count,sum,count,sum] [avg(ss_quantity),avg(UnscaledValue(ss_ext_sales_price)),avg(UnscaledValue(ss_ext_wholesale_cost)),sum(UnscaledValue(ss_ext_wholesale_cost)),avg(ss_quantity),avg(ss_ext_sales_price),avg(ss_ext_wholesale_cost),sum(ss_ext_wholesale_cost),sum,count,sum,count,sum,count,sum]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (6)
-          HashAggregate [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost] [sum,count,sum,count,sum,count,sum,sum,count,sum,count,sum,count,sum]
-            Project [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost]
-              BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price,hd_dep_count]
-                Project [ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,cd_marital_status,cd_education_status]
-                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
-                    Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost]
-                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                        Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_sold_date_sk]
-                          BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
-                            Project [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_store_sk,ss_addr_sk,ss_cdemo_sk,ss_hdemo_sk,ss_net_profit,ss_sales_price]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_year,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+      CometHashAggregate [sum,count,sum,count,sum,count,sum]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (6)
+              HashAggregate [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost] [sum,count,sum,count,sum,count,sum,sum,count,sum,count,sum,count,sum]
+                Project [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost]
+                  BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price,hd_dep_count]
+                    Project [ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,cd_marital_status,cd_education_status]
+                      BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
+                        Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
+                                Project [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
+                                  BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_store_sk,ss_addr_sk,ss_cdemo_sk,ss_hdemo_sk,ss_net_profit,ss_sales_price]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
+                                  BroadcastExchange #4
+                                    WholeStageCodegen (2)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [s_store_sk]
-                                            CometScan parquet spark_catalog.default.store [s_store_sk]
+                                          CometProject [ca_address_sk,ca_state]
+                                            CometFilter [ca_country,ca_address_sk,ca_state]
+                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                             InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (2)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [ca_address_sk,ca_state]
-                                        CometFilter [ca_country,ca_address_sk,ca_state]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
+                          BroadcastExchange #5
+                            WholeStageCodegen (4)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
+                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                     InputAdapter
-                      BroadcastExchange #5
-                        WholeStageCodegen (4)
+                      BroadcastExchange #6
+                        WholeStageCodegen (5)
                           ColumnarToRow
                             InputAdapter
-                              CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
-                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
-                InputAdapter
-                  BroadcastExchange #6
-                    WholeStageCodegen (5)
-                      ColumnarToRow
-                        InputAdapter
-                          CometFilter [hd_demo_sk,hd_dep_count]
-                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
+                              CometFilter [hd_demo_sk,hd_dep_count]
+                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt
index 1323cb8df5..bfb15cc6a7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt
@@ -1,109 +1,115 @@
 == Physical Plan ==
-TakeOrderedAndProject (105)
-+- * HashAggregate (104)
-   +- Exchange (103)
-      +- * HashAggregate (102)
-         +- * Expand (101)
-            +- Union (100)
-               :- * Project (67)
-               :  +- * Filter (66)
-               :     +- * HashAggregate (65)
-               :        +- Exchange (64)
-               :           +- * HashAggregate (63)
-               :              +- * Project (62)
-               :                 +- * BroadcastHashJoin Inner BuildRight (61)
-               :                    :- * Project (59)
-               :                    :  +- * BroadcastHashJoin Inner BuildRight (58)
-               :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
-               :                    :     :  :- * ColumnarToRow (3)
-               :                    :     :  :  +- CometFilter (2)
-               :                    :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                    :     :  +- BroadcastExchange (50)
-               :                    :     :     +- * Project (49)
-               :                    :     :        +- * BroadcastHashJoin Inner BuildRight (48)
-               :                    :     :           :- * ColumnarToRow (6)
-               :                    :     :           :  +- CometFilter (5)
-               :                    :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-               :                    :     :           +- BroadcastExchange (47)
-               :                    :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
-               :                    :     :                 :- * HashAggregate (35)
-               :                    :     :                 :  +- Exchange (34)
-               :                    :     :                 :     +- * HashAggregate (33)
-               :                    :     :                 :        +- * Project (32)
-               :                    :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
-               :                    :     :                 :              :- * Project (29)
-               :                    :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
-               :                    :     :                 :              :     :- * ColumnarToRow (9)
-               :                    :     :                 :              :     :  +- CometFilter (8)
-               :                    :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-               :                    :     :                 :              :     +- BroadcastExchange (27)
-               :                    :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-               :                    :     :                 :              :           :- * ColumnarToRow (12)
-               :                    :     :                 :              :           :  +- CometFilter (11)
-               :                    :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
-               :                    :     :                 :              :           +- BroadcastExchange (25)
-               :                    :     :                 :              :              +- * Project (24)
-               :                    :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
-               :                    :     :                 :              :                    :- * Project (21)
-               :                    :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :                    :     :                 :              :                    :     :- * ColumnarToRow (15)
-               :                    :     :                 :              :                    :     :  +- CometFilter (14)
-               :                    :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-               :                    :     :                 :              :                    :     +- BroadcastExchange (19)
-               :                    :     :                 :              :                    :        +- * ColumnarToRow (18)
-               :                    :     :                 :              :                    :           +- CometFilter (17)
-               :                    :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
-               :                    :     :                 :              :                    +- ReusedExchange (22)
-               :                    :     :                 :              +- ReusedExchange (30)
-               :                    :     :                 +- BroadcastExchange (45)
-               :                    :     :                    +- * Project (44)
-               :                    :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
-               :                    :     :                          :- * Project (41)
-               :                    :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
-               :                    :     :                          :     :- * ColumnarToRow (38)
-               :                    :     :                          :     :  +- CometFilter (37)
-               :                    :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
-               :                    :     :                          :     +- ReusedExchange (39)
-               :                    :     :                          +- ReusedExchange (42)
-               :                    :     +- BroadcastExchange (57)
-               :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
-               :                    :           :- * ColumnarToRow (54)
-               :                    :           :  +- CometFilter (53)
-               :                    :           :     +- CometScan parquet spark_catalog.default.item (52)
-               :                    :           +- ReusedExchange (55)
-               :                    +- ReusedExchange (60)
-               :- * Project (83)
-               :  +- * Filter (82)
-               :     +- * HashAggregate (81)
-               :        +- Exchange (80)
-               :           +- * HashAggregate (79)
-               :              +- * Project (78)
-               :                 +- * BroadcastHashJoin Inner BuildRight (77)
-               :                    :- * Project (75)
-               :                    :  +- * BroadcastHashJoin Inner BuildRight (74)
-               :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (72)
-               :                    :     :  :- * ColumnarToRow (70)
-               :                    :     :  :  +- CometFilter (69)
-               :                    :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (68)
-               :                    :     :  +- ReusedExchange (71)
-               :                    :     +- ReusedExchange (73)
-               :                    +- ReusedExchange (76)
-               +- * Project (99)
-                  +- * Filter (98)
-                     +- * HashAggregate (97)
-                        +- Exchange (96)
-                           +- * HashAggregate (95)
-                              +- * Project (94)
-                                 +- * BroadcastHashJoin Inner BuildRight (93)
-                                    :- * Project (91)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (90)
-                                    :     :- * BroadcastHashJoin LeftSemi BuildRight (88)
-                                    :     :  :- * ColumnarToRow (86)
-                                    :     :  :  +- CometFilter (85)
-                                    :     :  :     +- CometScan parquet spark_catalog.default.web_sales (84)
-                                    :     :  +- ReusedExchange (87)
-                                    :     +- ReusedExchange (89)
-                                    +- ReusedExchange (92)
+* ColumnarToRow (111)
++- CometTakeOrderedAndProject (110)
+   +- CometHashAggregate (109)
+      +- CometColumnarExchange (108)
+         +- CometHashAggregate (107)
+            +- CometExpand (106)
+               +- CometUnion (105)
+                  :- CometProject (70)
+                  :  +- CometFilter (69)
+                  :     +- CometHashAggregate (68)
+                  :        +- CometColumnarExchange (67)
+                  :           +- RowToColumnar (66)
+                  :              +- * HashAggregate (65)
+                  :                 +- * Project (64)
+                  :                    +- * BroadcastHashJoin Inner BuildRight (63)
+                  :                       :- * Project (61)
+                  :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
+                  :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
+                  :                       :     :  :- * ColumnarToRow (3)
+                  :                       :     :  :  +- CometFilter (2)
+                  :                       :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :                       :     :  +- BroadcastExchange (52)
+                  :                       :     :     +- * Project (51)
+                  :                       :     :        +- * BroadcastHashJoin Inner BuildRight (50)
+                  :                       :     :           :- * ColumnarToRow (6)
+                  :                       :     :           :  +- CometFilter (5)
+                  :                       :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+                  :                       :     :           +- BroadcastExchange (49)
+                  :                       :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
+                  :                       :     :                 :- * ColumnarToRow (37)
+                  :                       :     :                 :  +- CometHashAggregate (36)
+                  :                       :     :                 :     +- CometColumnarExchange (35)
+                  :                       :     :                 :        +- RowToColumnar (34)
+                  :                       :     :                 :           +- * HashAggregate (33)
+                  :                       :     :                 :              +- * Project (32)
+                  :                       :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
+                  :                       :     :                 :                    :- * Project (29)
+                  :                       :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
+                  :                       :     :                 :                    :     :- * ColumnarToRow (9)
+                  :                       :     :                 :                    :     :  +- CometFilter (8)
+                  :                       :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+                  :                       :     :                 :                    :     +- BroadcastExchange (27)
+                  :                       :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+                  :                       :     :                 :                    :           :- * ColumnarToRow (12)
+                  :                       :     :                 :                    :           :  +- CometFilter (11)
+                  :                       :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
+                  :                       :     :                 :                    :           +- BroadcastExchange (25)
+                  :                       :     :                 :                    :              +- * Project (24)
+                  :                       :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
+                  :                       :     :                 :                    :                    :- * Project (21)
+                  :                       :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+                  :                       :     :                 :                    :                    :     :- * ColumnarToRow (15)
+                  :                       :     :                 :                    :                    :     :  +- CometFilter (14)
+                  :                       :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+                  :                       :     :                 :                    :                    :     +- BroadcastExchange (19)
+                  :                       :     :                 :                    :                    :        +- * ColumnarToRow (18)
+                  :                       :     :                 :                    :                    :           +- CometFilter (17)
+                  :                       :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
+                  :                       :     :                 :                    :                    +- ReusedExchange (22)
+                  :                       :     :                 :                    +- ReusedExchange (30)
+                  :                       :     :                 +- BroadcastExchange (47)
+                  :                       :     :                    +- * Project (46)
+                  :                       :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
+                  :                       :     :                          :- * Project (43)
+                  :                       :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
+                  :                       :     :                          :     :- * ColumnarToRow (40)
+                  :                       :     :                          :     :  +- CometFilter (39)
+                  :                       :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
+                  :                       :     :                          :     +- ReusedExchange (41)
+                  :                       :     :                          +- ReusedExchange (44)
+                  :                       :     +- BroadcastExchange (59)
+                  :                       :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
+                  :                       :           :- * ColumnarToRow (56)
+                  :                       :           :  +- CometFilter (55)
+                  :                       :           :     +- CometScan parquet spark_catalog.default.item (54)
+                  :                       :           +- ReusedExchange (57)
+                  :                       +- ReusedExchange (62)
+                  :- CometProject (87)
+                  :  +- CometFilter (86)
+                  :     +- CometHashAggregate (85)
+                  :        +- CometColumnarExchange (84)
+                  :           +- RowToColumnar (83)
+                  :              +- * HashAggregate (82)
+                  :                 +- * Project (81)
+                  :                    +- * BroadcastHashJoin Inner BuildRight (80)
+                  :                       :- * Project (78)
+                  :                       :  +- * BroadcastHashJoin Inner BuildRight (77)
+                  :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (75)
+                  :                       :     :  :- * ColumnarToRow (73)
+                  :                       :     :  :  +- CometFilter (72)
+                  :                       :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (71)
+                  :                       :     :  +- ReusedExchange (74)
+                  :                       :     +- ReusedExchange (76)
+                  :                       +- ReusedExchange (79)
+                  +- CometProject (104)
+                     +- CometFilter (103)
+                        +- CometHashAggregate (102)
+                           +- CometColumnarExchange (101)
+                              +- RowToColumnar (100)
+                                 +- * HashAggregate (99)
+                                    +- * Project (98)
+                                       +- * BroadcastHashJoin Inner BuildRight (97)
+                                          :- * Project (95)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (94)
+                                          :     :- * BroadcastHashJoin LeftSemi BuildRight (92)
+                                          :     :  :- * ColumnarToRow (90)
+                                          :     :  :  +- CometFilter (89)
+                                          :     :  :     +- CometScan parquet spark_catalog.default.web_sales (88)
+                                          :     :  +- ReusedExchange (91)
+                                          :     +- ReusedExchange (93)
+                                          +- ReusedExchange (96)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -207,7 +213,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 134]
+(22) ReusedExchange [Reuses operator id: 142]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -244,7 +250,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 134]
+(30) ReusedExchange [Reuses operator id: 142]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -264,16 +270,20 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) Exchange
+(34) RowToColumnar
 Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) HashAggregate [codegen id : 10]
+(35) CometColumnarExchange
+Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(36) CometHashAggregate
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [brand_id#26, class_id#27, category_id#28]
+
+(37) ColumnarToRow [codegen id : 10]
+Input [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -283,68 +293,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(37) CometFilter
+(39) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(38) ColumnarToRow [codegen id : 9]
+(40) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(39) ReusedExchange [Reuses operator id: 19]
+(41) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(40) BroadcastHashJoin [codegen id : 9]
+(42) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 9]
+(43) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) ReusedExchange [Reuses operator id: 134]
+(44) ReusedExchange [Reuses operator id: 142]
 Output [1]: [d_date_sk#36]
 
-(43) BroadcastHashJoin [codegen id : 9]
+(45) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 9]
+(46) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(46) BroadcastHashJoin [codegen id : 10]
+(48) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(48) BroadcastHashJoin [codegen id : 11]
+(50) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 11]
+(51) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(51) BroadcastHashJoin [codegen id : 25]
+(53) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -357,444 +367,455 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(53) CometFilter
+(55) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : isnotnull(i_item_sk#38)
 
-(54) ColumnarToRow [codegen id : 23]
+(56) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(55) ReusedExchange [Reuses operator id: 50]
+(57) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(56) BroadcastHashJoin [codegen id : 23]
+(58) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(57) BroadcastExchange
+(59) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(58) BroadcastHashJoin [codegen id : 25]
+(60) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 25]
+(61) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(60) ReusedExchange [Reuses operator id: 129]
+(62) ReusedExchange [Reuses operator id: 137]
 Output [1]: [d_date_sk#42]
 
-(61) BroadcastHashJoin [codegen id : 25]
+(63) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 25]
+(64) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(63) HashAggregate [codegen id : 25]
+(65) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(64) Exchange
+(66) RowToColumnar
+Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
+
+(67) CometColumnarExchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(65) HashAggregate [codegen id : 26]
+(68) CometHashAggregate
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
-Results [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#51, count(1)#50 AS number_sales#52]
 
-(66) Filter [codegen id : 26]
-Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#51, number_sales#52]
-Condition : (isnotnull(sales#51) AND (cast(sales#51 as decimal(32,6)) > cast(Subquery scalar-subquery#53, [id=#54] as decimal(32,6))))
+(69) CometFilter
+Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#49, number_sales#50]
+Condition : (isnotnull(sales#49) AND (cast(sales#49 as decimal(32,6)) > cast(Subquery scalar-subquery#51, [id=#52] as decimal(32,6))))
 
-(67) Project [codegen id : 26]
-Output [6]: [sales#51, number_sales#52, store AS channel#55, i_brand_id#39 AS i_brand_id#56, i_class_id#40 AS i_class_id#57, i_category_id#41 AS i_category_id#58]
-Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#51, number_sales#52]
+(70) CometProject
+Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#49, number_sales#50]
+Arguments: [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56], [sales#49, number_sales#50, store AS channel#53, i_brand_id#39 AS i_brand_id#54, i_class_id#40 AS i_class_id#55, i_category_id#41 AS i_category_id#56]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62]
+Output [4]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#62), dynamicpruningexpression(cs_sold_date_sk#62 IN dynamicpruning#63)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#60), dynamicpruningexpression(cs_sold_date_sk#60 IN dynamicpruning#61)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(69) CometFilter
-Input [4]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62]
-Condition : isnotnull(cs_item_sk#59)
+(72) CometFilter
+Input [4]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60]
+Condition : isnotnull(cs_item_sk#57)
 
-(70) ColumnarToRow [codegen id : 51]
-Input [4]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62]
+(73) ColumnarToRow [codegen id : 50]
+Input [4]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60]
 
-(71) ReusedExchange [Reuses operator id: 50]
+(74) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(72) BroadcastHashJoin [codegen id : 51]
-Left keys [1]: [cs_item_sk#59]
+(75) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [cs_item_sk#57]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(73) ReusedExchange [Reuses operator id: 57]
-Output [4]: [i_item_sk#64, i_brand_id#65, i_class_id#66, i_category_id#67]
+(76) ReusedExchange [Reuses operator id: 59]
+Output [4]: [i_item_sk#62, i_brand_id#63, i_class_id#64, i_category_id#65]
 
-(74) BroadcastHashJoin [codegen id : 51]
-Left keys [1]: [cs_item_sk#59]
-Right keys [1]: [i_item_sk#64]
+(77) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [cs_item_sk#57]
+Right keys [1]: [i_item_sk#62]
 Join type: Inner
 Join condition: None
 
-(75) Project [codegen id : 51]
-Output [6]: [cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62, i_brand_id#65, i_class_id#66, i_category_id#67]
-Input [8]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62, i_item_sk#64, i_brand_id#65, i_class_id#66, i_category_id#67]
+(78) Project [codegen id : 50]
+Output [6]: [cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60, i_brand_id#63, i_class_id#64, i_category_id#65]
+Input [8]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60, i_item_sk#62, i_brand_id#63, i_class_id#64, i_category_id#65]
 
-(76) ReusedExchange [Reuses operator id: 129]
-Output [1]: [d_date_sk#68]
+(79) ReusedExchange [Reuses operator id: 137]
+Output [1]: [d_date_sk#66]
 
-(77) BroadcastHashJoin [codegen id : 51]
-Left keys [1]: [cs_sold_date_sk#62]
-Right keys [1]: [d_date_sk#68]
+(80) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [cs_sold_date_sk#60]
+Right keys [1]: [d_date_sk#66]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 51]
-Output [5]: [cs_quantity#60, cs_list_price#61, i_brand_id#65, i_class_id#66, i_category_id#67]
-Input [7]: [cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62, i_brand_id#65, i_class_id#66, i_category_id#67, d_date_sk#68]
+(81) Project [codegen id : 50]
+Output [5]: [cs_quantity#58, cs_list_price#59, i_brand_id#63, i_class_id#64, i_category_id#65]
+Input [7]: [cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60, i_brand_id#63, i_class_id#64, i_category_id#65, d_date_sk#66]
+
+(82) HashAggregate [codegen id : 50]
+Input [5]: [cs_quantity#58, cs_list_price#59, i_brand_id#63, i_class_id#64, i_category_id#65]
+Keys [3]: [i_brand_id#63, i_class_id#64, i_category_id#65]
+Functions [2]: [partial_sum((cast(cs_quantity#58 as decimal(10,0)) * cs_list_price#59)), partial_count(1)]
+Aggregate Attributes [3]: [sum#67, isEmpty#68, count#69]
+Results [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
 
-(79) HashAggregate [codegen id : 51]
-Input [5]: [cs_quantity#60, cs_list_price#61, i_brand_id#65, i_class_id#66, i_category_id#67]
-Keys [3]: [i_brand_id#65, i_class_id#66, i_category_id#67]
-Functions [2]: [partial_sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61)), partial_count(1)]
-Aggregate Attributes [3]: [sum#69, isEmpty#70, count#71]
-Results [6]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum#72, isEmpty#73, count#74]
+(83) RowToColumnar
+Input [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
 
-(80) Exchange
-Input [6]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum#72, isEmpty#73, count#74]
-Arguments: hashpartitioning(i_brand_id#65, i_class_id#66, i_category_id#67, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(84) CometColumnarExchange
+Input [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
+Arguments: hashpartitioning(i_brand_id#63, i_class_id#64, i_category_id#65, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(81) HashAggregate [codegen id : 52]
-Input [6]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum#72, isEmpty#73, count#74]
-Keys [3]: [i_brand_id#65, i_class_id#66, i_category_id#67]
-Functions [2]: [sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61)), count(1)]
-Aggregate Attributes [2]: [sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61))#75, count(1)#76]
-Results [5]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61))#75 AS sales#77, count(1)#76 AS number_sales#78]
+(85) CometHashAggregate
+Input [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
+Keys [3]: [i_brand_id#63, i_class_id#64, i_category_id#65]
+Functions [2]: [sum((cast(cs_quantity#58 as decimal(10,0)) * cs_list_price#59)), count(1)]
 
-(82) Filter [codegen id : 52]
-Input [5]: [i_brand_id#65, i_class_id#66, i_category_id#67, sales#77, number_sales#78]
-Condition : (isnotnull(sales#77) AND (cast(sales#77 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#53, [id=#54] as decimal(32,6))))
+(86) CometFilter
+Input [5]: [i_brand_id#63, i_class_id#64, i_category_id#65, sales#73, number_sales#74]
+Condition : (isnotnull(sales#73) AND (cast(sales#73 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#51, [id=#52] as decimal(32,6))))
 
-(83) Project [codegen id : 52]
-Output [6]: [sales#77, number_sales#78, catalog AS channel#79, i_brand_id#65, i_class_id#66, i_category_id#67]
-Input [5]: [i_brand_id#65, i_class_id#66, i_category_id#67, sales#77, number_sales#78]
+(87) CometProject
+Input [5]: [i_brand_id#63, i_class_id#64, i_category_id#65, sales#73, number_sales#74]
+Arguments: [sales#73, number_sales#74, channel#75, i_brand_id#63, i_class_id#64, i_category_id#65], [sales#73, number_sales#74, catalog AS channel#75, i_brand_id#63, i_class_id#64, i_category_id#65]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83]
+Output [4]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#83), dynamicpruningexpression(ws_sold_date_sk#83 IN dynamicpruning#84)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#79), dynamicpruningexpression(ws_sold_date_sk#79 IN dynamicpruning#80)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(85) CometFilter
-Input [4]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83]
-Condition : isnotnull(ws_item_sk#80)
+(89) CometFilter
+Input [4]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79]
+Condition : isnotnull(ws_item_sk#76)
 
-(86) ColumnarToRow [codegen id : 77]
-Input [4]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83]
+(90) ColumnarToRow [codegen id : 75]
+Input [4]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79]
 
-(87) ReusedExchange [Reuses operator id: 50]
+(91) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(88) BroadcastHashJoin [codegen id : 77]
-Left keys [1]: [ws_item_sk#80]
+(92) BroadcastHashJoin [codegen id : 75]
+Left keys [1]: [ws_item_sk#76]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(89) ReusedExchange [Reuses operator id: 57]
-Output [4]: [i_item_sk#85, i_brand_id#86, i_class_id#87, i_category_id#88]
+(93) ReusedExchange [Reuses operator id: 59]
+Output [4]: [i_item_sk#81, i_brand_id#82, i_class_id#83, i_category_id#84]
 
-(90) BroadcastHashJoin [codegen id : 77]
-Left keys [1]: [ws_item_sk#80]
-Right keys [1]: [i_item_sk#85]
+(94) BroadcastHashJoin [codegen id : 75]
+Left keys [1]: [ws_item_sk#76]
+Right keys [1]: [i_item_sk#81]
 Join type: Inner
 Join condition: None
 
-(91) Project [codegen id : 77]
-Output [6]: [ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83, i_brand_id#86, i_class_id#87, i_category_id#88]
-Input [8]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83, i_item_sk#85, i_brand_id#86, i_class_id#87, i_category_id#88]
+(95) Project [codegen id : 75]
+Output [6]: [ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79, i_brand_id#82, i_class_id#83, i_category_id#84]
+Input [8]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79, i_item_sk#81, i_brand_id#82, i_class_id#83, i_category_id#84]
 
-(92) ReusedExchange [Reuses operator id: 129]
-Output [1]: [d_date_sk#89]
+(96) ReusedExchange [Reuses operator id: 137]
+Output [1]: [d_date_sk#85]
 
-(93) BroadcastHashJoin [codegen id : 77]
-Left keys [1]: [ws_sold_date_sk#83]
-Right keys [1]: [d_date_sk#89]
+(97) BroadcastHashJoin [codegen id : 75]
+Left keys [1]: [ws_sold_date_sk#79]
+Right keys [1]: [d_date_sk#85]
 Join type: Inner
 Join condition: None
 
-(94) Project [codegen id : 77]
-Output [5]: [ws_quantity#81, ws_list_price#82, i_brand_id#86, i_class_id#87, i_category_id#88]
-Input [7]: [ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83, i_brand_id#86, i_class_id#87, i_category_id#88, d_date_sk#89]
-
-(95) HashAggregate [codegen id : 77]
-Input [5]: [ws_quantity#81, ws_list_price#82, i_brand_id#86, i_class_id#87, i_category_id#88]
-Keys [3]: [i_brand_id#86, i_class_id#87, i_category_id#88]
-Functions [2]: [partial_sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82)), partial_count(1)]
-Aggregate Attributes [3]: [sum#90, isEmpty#91, count#92]
-Results [6]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum#93, isEmpty#94, count#95]
-
-(96) Exchange
-Input [6]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum#93, isEmpty#94, count#95]
-Arguments: hashpartitioning(i_brand_id#86, i_class_id#87, i_category_id#88, 5), ENSURE_REQUIREMENTS, [plan_id=11]
-
-(97) HashAggregate [codegen id : 78]
-Input [6]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum#93, isEmpty#94, count#95]
-Keys [3]: [i_brand_id#86, i_class_id#87, i_category_id#88]
-Functions [2]: [sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82))#96, count(1)#97]
-Results [5]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82))#96 AS sales#98, count(1)#97 AS number_sales#99]
-
-(98) Filter [codegen id : 78]
-Input [5]: [i_brand_id#86, i_class_id#87, i_category_id#88, sales#98, number_sales#99]
-Condition : (isnotnull(sales#98) AND (cast(sales#98 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#53, [id=#54] as decimal(32,6))))
-
-(99) Project [codegen id : 78]
-Output [6]: [sales#98, number_sales#99, web AS channel#100, i_brand_id#86, i_class_id#87, i_category_id#88]
-Input [5]: [i_brand_id#86, i_class_id#87, i_category_id#88, sales#98, number_sales#99]
-
-(100) Union
-
-(101) Expand [codegen id : 79]
-Input [6]: [sales#51, number_sales#52, channel#55, i_brand_id#56, i_class_id#57, i_category_id#58]
-Arguments: [[sales#51, number_sales#52, channel#55, i_brand_id#56, i_class_id#57, i_category_id#58, 0], [sales#51, number_sales#52, channel#55, i_brand_id#56, i_class_id#57, null, 1], [sales#51, number_sales#52, channel#55, i_brand_id#56, null, null, 3], [sales#51, number_sales#52, channel#55, null, null, null, 7], [sales#51, number_sales#52, null, null, null, null, 15]], [sales#51, number_sales#52, channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
-
-(102) HashAggregate [codegen id : 79]
-Input [7]: [sales#51, number_sales#52, channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
-Keys [5]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
-Functions [2]: [partial_sum(sales#51), partial_sum(number_sales#52)]
-Aggregate Attributes [3]: [sum#106, isEmpty#107, sum#108]
-Results [8]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, sum#109, isEmpty#110, sum#111]
-
-(103) Exchange
-Input [8]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, sum#109, isEmpty#110, sum#111]
-Arguments: hashpartitioning(channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, 5), ENSURE_REQUIREMENTS, [plan_id=12]
-
-(104) HashAggregate [codegen id : 80]
-Input [8]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, sum#109, isEmpty#110, sum#111]
-Keys [5]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
-Functions [2]: [sum(sales#51), sum(number_sales#52)]
-Aggregate Attributes [2]: [sum(sales#51)#112, sum(number_sales#52)#113]
-Results [6]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, sum(sales#51)#112 AS sum(sales)#114, sum(number_sales#52)#113 AS sum(number_sales)#115]
-
-(105) TakeOrderedAndProject
-Input [6]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, sum(sales)#114, sum(number_sales)#115]
-Arguments: 100, [channel#101 ASC NULLS FIRST, i_brand_id#102 ASC NULLS FIRST, i_class_id#103 ASC NULLS FIRST, i_category_id#104 ASC NULLS FIRST], [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, sum(sales)#114, sum(number_sales)#115]
+(98) Project [codegen id : 75]
+Output [5]: [ws_quantity#77, ws_list_price#78, i_brand_id#82, i_class_id#83, i_category_id#84]
+Input [7]: [ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79, i_brand_id#82, i_class_id#83, i_category_id#84, d_date_sk#85]
+
+(99) HashAggregate [codegen id : 75]
+Input [5]: [ws_quantity#77, ws_list_price#78, i_brand_id#82, i_class_id#83, i_category_id#84]
+Keys [3]: [i_brand_id#82, i_class_id#83, i_category_id#84]
+Functions [2]: [partial_sum((cast(ws_quantity#77 as decimal(10,0)) * ws_list_price#78)), partial_count(1)]
+Aggregate Attributes [3]: [sum#86, isEmpty#87, count#88]
+Results [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
+
+(100) RowToColumnar
+Input [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
+
+(101) CometColumnarExchange
+Input [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
+Arguments: hashpartitioning(i_brand_id#82, i_class_id#83, i_category_id#84, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+
+(102) CometHashAggregate
+Input [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
+Keys [3]: [i_brand_id#82, i_class_id#83, i_category_id#84]
+Functions [2]: [sum((cast(ws_quantity#77 as decimal(10,0)) * ws_list_price#78)), count(1)]
+
+(103) CometFilter
+Input [5]: [i_brand_id#82, i_class_id#83, i_category_id#84, sales#92, number_sales#93]
+Condition : (isnotnull(sales#92) AND (cast(sales#92 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#51, [id=#52] as decimal(32,6))))
+
+(104) CometProject
+Input [5]: [i_brand_id#82, i_class_id#83, i_category_id#84, sales#92, number_sales#93]
+Arguments: [sales#92, number_sales#93, channel#94, i_brand_id#82, i_class_id#83, i_category_id#84], [sales#92, number_sales#93, web AS channel#94, i_brand_id#82, i_class_id#83, i_category_id#84]
+
+(105) CometUnion
+Child 0 Input [6]: [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56]
+Child 1 Input [6]: [sales#73, number_sales#74, channel#75, i_brand_id#63, i_class_id#64, i_category_id#65]
+Child 2 Input [6]: [sales#92, number_sales#93, channel#94, i_brand_id#82, i_class_id#83, i_category_id#84]
+
+(106) CometExpand
+Input [6]: [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56]
+Arguments: [[sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56, 0], [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, null, 1], [sales#49, number_sales#50, channel#53, i_brand_id#54, null, null, 3], [sales#49, number_sales#50, channel#53, null, null, null, 7], [sales#49, number_sales#50, null, null, null, null, 15]], [sales#49, number_sales#50, channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
+
+(107) CometHashAggregate
+Input [7]: [sales#49, number_sales#50, channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
+Keys [5]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
+Functions [2]: [partial_sum(sales#49), partial_sum(number_sales#50)]
+
+(108) CometColumnarExchange
+Input [8]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99, sum#100, isEmpty#101, sum#102]
+Arguments: hashpartitioning(channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+
+(109) CometHashAggregate
+Input [8]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99, sum#100, isEmpty#101, sum#102]
+Keys [5]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
+Functions [2]: [sum(sales#49), sum(number_sales#50)]
+
+(110) CometTakeOrderedAndProject
+Input [6]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, sum(sales)#103, sum(number_sales)#104]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#95 ASC NULLS FIRST,i_brand_id#96 ASC NULLS FIRST,i_class_id#97 ASC NULLS FIRST,i_category_id#98 ASC NULLS FIRST], output=[channel#95,i_brand_id#96,i_class_id#97,i_category_id#98,sum(sales)#103,sum(number_sales)#104]), 100, [channel#95 ASC NULLS FIRST, i_brand_id#96 ASC NULLS FIRST, i_class_id#97 ASC NULLS FIRST, i_category_id#98 ASC NULLS FIRST], [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, sum(sales)#103, sum(number_sales)#104]
+
+(111) ColumnarToRow [codegen id : 76]
+Input [6]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, sum(sales)#103, sum(number_sales)#104]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#53, [id=#54]
-* HashAggregate (124)
-+- Exchange (123)
-   +- * HashAggregate (122)
-      +- Union (121)
-         :- * Project (110)
-         :  +- * BroadcastHashJoin Inner BuildRight (109)
-         :     :- * ColumnarToRow (107)
-         :     :  +- CometScan parquet spark_catalog.default.store_sales (106)
-         :     +- ReusedExchange (108)
-         :- * Project (115)
-         :  +- * BroadcastHashJoin Inner BuildRight (114)
-         :     :- * ColumnarToRow (112)
-         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (111)
-         :     +- ReusedExchange (113)
-         +- * Project (120)
-            +- * BroadcastHashJoin Inner BuildRight (119)
-               :- * ColumnarToRow (117)
-               :  +- CometScan parquet spark_catalog.default.web_sales (116)
-               +- ReusedExchange (118)
+Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#51, [id=#52]
+* ColumnarToRow (132)
++- CometHashAggregate (131)
+   +- CometColumnarExchange (130)
+      +- RowToColumnar (129)
+         +- * HashAggregate (128)
+            +- Union (127)
+               :- * Project (116)
+               :  +- * BroadcastHashJoin Inner BuildRight (115)
+               :     :- * ColumnarToRow (113)
+               :     :  +- CometScan parquet spark_catalog.default.store_sales (112)
+               :     +- ReusedExchange (114)
+               :- * Project (121)
+               :  +- * BroadcastHashJoin Inner BuildRight (120)
+               :     :- * ColumnarToRow (118)
+               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (117)
+               :     +- ReusedExchange (119)
+               +- * Project (126)
+                  +- * BroadcastHashJoin Inner BuildRight (125)
+                     :- * ColumnarToRow (123)
+                     :  +- CometScan parquet spark_catalog.default.web_sales (122)
+                     +- ReusedExchange (124)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#116, ss_list_price#117, ss_sold_date_sk#118]
+Output [3]: [ss_quantity#105, ss_list_price#106, ss_sold_date_sk#107]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#118), dynamicpruningexpression(ss_sold_date_sk#118 IN dynamicpruning#119)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#107), dynamicpruningexpression(ss_sold_date_sk#107 IN dynamicpruning#108)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(107) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#116, ss_list_price#117, ss_sold_date_sk#118]
+(113) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#105, ss_list_price#106, ss_sold_date_sk#107]
 
-(108) ReusedExchange [Reuses operator id: 134]
-Output [1]: [d_date_sk#120]
+(114) ReusedExchange [Reuses operator id: 142]
+Output [1]: [d_date_sk#109]
 
-(109) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#118]
-Right keys [1]: [d_date_sk#120]
+(115) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#107]
+Right keys [1]: [d_date_sk#109]
 Join type: Inner
 Join condition: None
 
-(110) Project [codegen id : 2]
-Output [2]: [ss_quantity#116 AS quantity#121, ss_list_price#117 AS list_price#122]
-Input [4]: [ss_quantity#116, ss_list_price#117, ss_sold_date_sk#118, d_date_sk#120]
+(116) Project [codegen id : 2]
+Output [2]: [ss_quantity#105 AS quantity#110, ss_list_price#106 AS list_price#111]
+Input [4]: [ss_quantity#105, ss_list_price#106, ss_sold_date_sk#107, d_date_sk#109]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#123, cs_list_price#124, cs_sold_date_sk#125]
+Output [3]: [cs_quantity#112, cs_list_price#113, cs_sold_date_sk#114]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#125), dynamicpruningexpression(cs_sold_date_sk#125 IN dynamicpruning#126)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#114), dynamicpruningexpression(cs_sold_date_sk#114 IN dynamicpruning#115)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(112) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#123, cs_list_price#124, cs_sold_date_sk#125]
+(118) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#112, cs_list_price#113, cs_sold_date_sk#114]
 
-(113) ReusedExchange [Reuses operator id: 134]
-Output [1]: [d_date_sk#127]
+(119) ReusedExchange [Reuses operator id: 142]
+Output [1]: [d_date_sk#116]
 
-(114) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#125]
-Right keys [1]: [d_date_sk#127]
+(120) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#114]
+Right keys [1]: [d_date_sk#116]
 Join type: Inner
 Join condition: None
 
-(115) Project [codegen id : 4]
-Output [2]: [cs_quantity#123 AS quantity#128, cs_list_price#124 AS list_price#129]
-Input [4]: [cs_quantity#123, cs_list_price#124, cs_sold_date_sk#125, d_date_sk#127]
+(121) Project [codegen id : 4]
+Output [2]: [cs_quantity#112 AS quantity#117, cs_list_price#113 AS list_price#118]
+Input [4]: [cs_quantity#112, cs_list_price#113, cs_sold_date_sk#114, d_date_sk#116]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#130, ws_list_price#131, ws_sold_date_sk#132]
+Output [3]: [ws_quantity#119, ws_list_price#120, ws_sold_date_sk#121]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#132), dynamicpruningexpression(ws_sold_date_sk#132 IN dynamicpruning#133)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#121), dynamicpruningexpression(ws_sold_date_sk#121 IN dynamicpruning#122)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(117) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#130, ws_list_price#131, ws_sold_date_sk#132]
+(123) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#119, ws_list_price#120, ws_sold_date_sk#121]
 
-(118) ReusedExchange [Reuses operator id: 134]
-Output [1]: [d_date_sk#134]
+(124) ReusedExchange [Reuses operator id: 142]
+Output [1]: [d_date_sk#123]
 
-(119) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#132]
-Right keys [1]: [d_date_sk#134]
+(125) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#121]
+Right keys [1]: [d_date_sk#123]
 Join type: Inner
 Join condition: None
 
-(120) Project [codegen id : 6]
-Output [2]: [ws_quantity#130 AS quantity#135, ws_list_price#131 AS list_price#136]
-Input [4]: [ws_quantity#130, ws_list_price#131, ws_sold_date_sk#132, d_date_sk#134]
+(126) Project [codegen id : 6]
+Output [2]: [ws_quantity#119 AS quantity#124, ws_list_price#120 AS list_price#125]
+Input [4]: [ws_quantity#119, ws_list_price#120, ws_sold_date_sk#121, d_date_sk#123]
 
-(121) Union
+(127) Union
 
-(122) HashAggregate [codegen id : 7]
-Input [2]: [quantity#121, list_price#122]
+(128) HashAggregate [codegen id : 7]
+Input [2]: [quantity#110, list_price#111]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#121 as decimal(10,0)) * list_price#122))]
-Aggregate Attributes [2]: [sum#137, count#138]
-Results [2]: [sum#139, count#140]
+Functions [1]: [partial_avg((cast(quantity#110 as decimal(10,0)) * list_price#111))]
+Aggregate Attributes [2]: [sum#126, count#127]
+Results [2]: [sum#128, count#129]
+
+(129) RowToColumnar
+Input [2]: [sum#128, count#129]
 
-(123) Exchange
-Input [2]: [sum#139, count#140]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=13]
+(130) CometColumnarExchange
+Input [2]: [sum#128, count#129]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
 
-(124) HashAggregate [codegen id : 8]
-Input [2]: [sum#139, count#140]
+(131) CometHashAggregate
+Input [2]: [sum#128, count#129]
 Keys: []
-Functions [1]: [avg((cast(quantity#121 as decimal(10,0)) * list_price#122))]
-Aggregate Attributes [1]: [avg((cast(quantity#121 as decimal(10,0)) * list_price#122))#141]
-Results [1]: [avg((cast(quantity#121 as decimal(10,0)) * list_price#122))#141 AS average_sales#142]
+Functions [1]: [avg((cast(quantity#110 as decimal(10,0)) * list_price#111))]
+
+(132) ColumnarToRow [codegen id : 8]
+Input [1]: [average_sales#130]
 
-Subquery:2 Hosting operator id = 106 Hosting Expression = ss_sold_date_sk#118 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 112 Hosting Expression = ss_sold_date_sk#107 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 111 Hosting Expression = cs_sold_date_sk#125 IN dynamicpruning#12
+Subquery:3 Hosting operator id = 117 Hosting Expression = cs_sold_date_sk#114 IN dynamicpruning#12
 
-Subquery:4 Hosting operator id = 116 Hosting Expression = ws_sold_date_sk#132 IN dynamicpruning#12
+Subquery:4 Hosting operator id = 122 Hosting Expression = ws_sold_date_sk#121 IN dynamicpruning#12
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (129)
-+- * ColumnarToRow (128)
-   +- CometProject (127)
-      +- CometFilter (126)
-         +- CometScan parquet spark_catalog.default.date_dim (125)
+BroadcastExchange (137)
++- * ColumnarToRow (136)
+   +- CometProject (135)
+      +- CometFilter (134)
+         +- CometScan parquet spark_catalog.default.date_dim (133)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#42, d_year#143, d_moy#144]
+Output [3]: [d_date_sk#42, d_year#131, d_moy#132]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(126) CometFilter
-Input [3]: [d_date_sk#42, d_year#143, d_moy#144]
-Condition : ((((isnotnull(d_year#143) AND isnotnull(d_moy#144)) AND (d_year#143 = 2001)) AND (d_moy#144 = 11)) AND isnotnull(d_date_sk#42))
+(134) CometFilter
+Input [3]: [d_date_sk#42, d_year#131, d_moy#132]
+Condition : ((((isnotnull(d_year#131) AND isnotnull(d_moy#132)) AND (d_year#131 = 2001)) AND (d_moy#132 = 11)) AND isnotnull(d_date_sk#42))
 
-(127) CometProject
-Input [3]: [d_date_sk#42, d_year#143, d_moy#144]
+(135) CometProject
+Input [3]: [d_date_sk#42, d_year#131, d_moy#132]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(128) ColumnarToRow [codegen id : 1]
+(136) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(129) BroadcastExchange
+(137) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
 Subquery:6 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (134)
-+- * ColumnarToRow (133)
-   +- CometProject (132)
-      +- CometFilter (131)
-         +- CometScan parquet spark_catalog.default.date_dim (130)
+BroadcastExchange (142)
++- * ColumnarToRow (141)
+   +- CometProject (140)
+      +- CometFilter (139)
+         +- CometScan parquet spark_catalog.default.date_dim (138)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#145]
+Output [2]: [d_date_sk#25, d_year#133]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1999), LessThanOrEqual(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(131) CometFilter
-Input [2]: [d_date_sk#25, d_year#145]
-Condition : (((isnotnull(d_year#145) AND (d_year#145 >= 1999)) AND (d_year#145 <= 2001)) AND isnotnull(d_date_sk#25))
+(139) CometFilter
+Input [2]: [d_date_sk#25, d_year#133]
+Condition : (((isnotnull(d_year#133) AND (d_year#133 >= 1999)) AND (d_year#133 <= 2001)) AND isnotnull(d_date_sk#25))
 
-(132) CometProject
-Input [2]: [d_date_sk#25, d_year#145]
+(140) CometProject
+Input [2]: [d_date_sk#25, d_year#133]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(133) ColumnarToRow [codegen id : 1]
+(141) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(134) BroadcastExchange
+(142) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
 Subquery:7 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:8 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:8 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 82 Hosting Expression = ReusedSubquery Subquery scalar-subquery#53, [id=#54]
+Subquery:9 Hosting operator id = 86 Hosting Expression = ReusedSubquery Subquery scalar-subquery#51, [id=#52]
 
-Subquery:10 Hosting operator id = 68 Hosting Expression = cs_sold_date_sk#62 IN dynamicpruning#5
+Subquery:10 Hosting operator id = 71 Hosting Expression = cs_sold_date_sk#60 IN dynamicpruning#5
 
-Subquery:11 Hosting operator id = 98 Hosting Expression = ReusedSubquery Subquery scalar-subquery#53, [id=#54]
+Subquery:11 Hosting operator id = 103 Hosting Expression = ReusedSubquery Subquery scalar-subquery#51, [id=#52]
 
-Subquery:12 Hosting operator id = 84 Hosting Expression = ws_sold_date_sk#83 IN dynamicpruning#5
+Subquery:12 Hosting operator id = 88 Hosting Expression = ws_sold_date_sk#79 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt
index cf688c4486..cd494e1546 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt
@@ -1,21 +1,21 @@
-TakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum(sales),sum(number_sales)]
-  WholeStageCodegen (80)
-    HashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum(sales),sum(number_sales),sum,isEmpty,sum]
-      InputAdapter
-        Exchange [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id] #1
-          WholeStageCodegen (79)
-            HashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
-              Expand [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
-                InputAdapter
-                  Union
-                    WholeStageCodegen (26)
-                      Project [sales,number_sales,i_brand_id,i_class_id,i_category_id]
-                        Filter [sales]
-                          Subquery #3
-                            WholeStageCodegen (8)
-                              HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
-                                InputAdapter
-                                  Exchange #13
+WholeStageCodegen (76)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum(sales),sum(number_sales)]
+        CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sum,isEmpty,sum]
+          CometColumnarExchange [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id] #1
+            CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sales,number_sales]
+              CometExpand [channel,i_brand_id,i_class_id,i_category_id] [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id]
+                CometUnion
+                  CometProject [i_brand_id,i_class_id,i_category_id] [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
+                    CometFilter [sales]
+                      Subquery #3
+                        WholeStageCodegen (8)
+                          ColumnarToRow
+                            InputAdapter
+                              CometHashAggregate [sum,count]
+                                CometColumnarExchange #13
+                                  RowToColumnar
                                     WholeStageCodegen (7)
                                       HashAggregate [quantity,list_price] [sum,count,sum,count]
                                         InputAdapter
@@ -47,44 +47,46 @@ TakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum(sales),su
                                                         ReusedSubquery [d_date_sk] #2
                                                   InputAdapter
                                                     ReusedExchange [d_date_sk] #7
-                          HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),sales,number_sales,sum,isEmpty,count]
-                            InputAdapter
-                              Exchange [i_brand_id,i_class_id,i_category_id] #2
-                                WholeStageCodegen (25)
-                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                    Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                        Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                            BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_item_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_year,d_moy,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #4
-                                                  WholeStageCodegen (11)
-                                                    Project [i_item_sk]
-                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                      CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                        CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #2
+                          RowToColumnar
+                            WholeStageCodegen (25)
+                              HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                        BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_item_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [i_brand_id,i_class_id,i_category_id]
-                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                        InputAdapter
-                                                          BroadcastExchange #5
-                                                            WholeStageCodegen (10)
-                                                              BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
-                                                                HashAggregate [brand_id,class_id,category_id]
-                                                                  InputAdapter
-                                                                    Exchange [brand_id,class_id,category_id] #6
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                          InputAdapter
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (11)
+                                                Project [i_item_sk]
+                                                  BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [i_brand_id,i_class_id,i_category_id]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                    InputAdapter
+                                                      BroadcastExchange #5
+                                                        WholeStageCodegen (10)
+                                                          BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometHashAggregate [brand_id,class_id,category_id]
+                                                                  CometColumnarExchange [brand_id,class_id,category_id] #6
+                                                                    RowToColumnar
                                                                       WholeStageCodegen (6)
                                                                         HashAggregate [brand_id,class_id,category_id]
                                                                           Project [i_brand_id,i_class_id,i_category_id]
@@ -134,81 +136,79 @@ TakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum(sales),su
                                                                                                       ReusedExchange [d_date_sk] #7
                                                                               InputAdapter
                                                                                 ReusedExchange [d_date_sk] #7
-                                                                InputAdapter
-                                                                  BroadcastExchange #11
-                                                                    WholeStageCodegen (9)
-                                                                      Project [i_brand_id,i_class_id,i_category_id]
-                                                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                          Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                            BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometFilter [ws_item_sk]
-                                                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                                      ReusedSubquery [d_date_sk] #2
-                                                                              InputAdapter
-                                                                                ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #10
+                                                            InputAdapter
+                                                              BroadcastExchange #11
+                                                                WholeStageCodegen (9)
+                                                                  Project [i_brand_id,i_class_id,i_category_id]
+                                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                      Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                        BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometFilter [ws_item_sk]
+                                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                                  ReusedSubquery [d_date_sk] #2
                                                                           InputAdapter
-                                                                            ReusedExchange [d_date_sk] #7
-                                            InputAdapter
-                                              BroadcastExchange #12
-                                                WholeStageCodegen (23)
-                                                  BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [i_item_sk]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                    InputAdapter
-                                                      ReusedExchange [ss_item_sk] #4
+                                                                            ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #10
+                                                                      InputAdapter
+                                                                        ReusedExchange [d_date_sk] #7
                                         InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                    WholeStageCodegen (52)
-                      Project [sales,number_sales,i_brand_id,i_class_id,i_category_id]
-                        Filter [sales]
-                          ReusedSubquery [average_sales] #3
-                          HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(cs_quantity as decimal(10,0)) * cs_list_price)),count(1),sales,number_sales,sum,isEmpty,count]
-                            InputAdapter
-                              Exchange [i_brand_id,i_class_id,i_category_id] #14
-                                WholeStageCodegen (51)
-                                  HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                    Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                        Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                          BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                            BroadcastHashJoin [cs_item_sk,ss_item_sk]
-                                              ColumnarToRow
+                                          BroadcastExchange #12
+                                            WholeStageCodegen (23)
+                                              BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [i_item_sk]
+                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
                                                 InputAdapter
-                                                  CometFilter [cs_item_sk]
-                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [ss_item_sk] #4
+                                                  ReusedExchange [ss_item_sk] #4
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #3
+                  CometProject [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
+                    CometFilter [sales]
+                      ReusedSubquery [average_sales] #3
+                      CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                        CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #14
+                          RowToColumnar
+                            WholeStageCodegen (50)
+                              HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
+                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                    Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                        BroadcastHashJoin [cs_item_sk,ss_item_sk]
+                                          ColumnarToRow
                                             InputAdapter
-                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
+                                              CometFilter [cs_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [ss_item_sk] #4
                                         InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                    WholeStageCodegen (78)
-                      Project [sales,number_sales,i_brand_id,i_class_id,i_category_id]
-                        Filter [sales]
-                          ReusedSubquery [average_sales] #3
-                          HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ws_quantity as decimal(10,0)) * ws_list_price)),count(1),sales,number_sales,sum,isEmpty,count]
-                            InputAdapter
-                              Exchange [i_brand_id,i_class_id,i_category_id] #15
-                                WholeStageCodegen (77)
-                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                    Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                            BroadcastHashJoin [ws_item_sk,ss_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ws_item_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [ss_item_sk] #4
+                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #3
+                  CometProject [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
+                    CometFilter [sales]
+                      ReusedSubquery [average_sales] #3
+                      CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                        CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #15
+                          RowToColumnar
+                            WholeStageCodegen (75)
+                              HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
+                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                    Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                        BroadcastHashJoin [ws_item_sk,ss_item_sk]
+                                          ColumnarToRow
                                             InputAdapter
-                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
+                                              CometFilter [ws_item_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [ss_item_sk] #4
                                         InputAdapter
-                                          ReusedExchange [d_date_sk] #3
+                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt
index 536306de5d..3ce08e1136 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt
@@ -1,88 +1,94 @@
 == Physical Plan ==
-TakeOrderedAndProject (84)
-+- * BroadcastHashJoin Inner BuildRight (83)
-   :- * Filter (66)
-   :  +- * HashAggregate (65)
-   :     +- Exchange (64)
-   :        +- * HashAggregate (63)
-   :           +- * Project (62)
-   :              +- * BroadcastHashJoin Inner BuildRight (61)
-   :                 :- * Project (59)
-   :                 :  +- * BroadcastHashJoin Inner BuildRight (58)
-   :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
-   :                 :     :  :- * ColumnarToRow (3)
-   :                 :     :  :  +- CometFilter (2)
-   :                 :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :                 :     :  +- BroadcastExchange (50)
-   :                 :     :     +- * Project (49)
-   :                 :     :        +- * BroadcastHashJoin Inner BuildRight (48)
-   :                 :     :           :- * ColumnarToRow (6)
-   :                 :     :           :  +- CometFilter (5)
-   :                 :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-   :                 :     :           +- BroadcastExchange (47)
-   :                 :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
-   :                 :     :                 :- * HashAggregate (35)
-   :                 :     :                 :  +- Exchange (34)
-   :                 :     :                 :     +- * HashAggregate (33)
-   :                 :     :                 :        +- * Project (32)
-   :                 :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
-   :                 :     :                 :              :- * Project (29)
-   :                 :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
-   :                 :     :                 :              :     :- * ColumnarToRow (9)
-   :                 :     :                 :              :     :  +- CometFilter (8)
-   :                 :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-   :                 :     :                 :              :     +- BroadcastExchange (27)
-   :                 :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-   :                 :     :                 :              :           :- * ColumnarToRow (12)
-   :                 :     :                 :              :           :  +- CometFilter (11)
-   :                 :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
-   :                 :     :                 :              :           +- BroadcastExchange (25)
-   :                 :     :                 :              :              +- * Project (24)
-   :                 :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
-   :                 :     :                 :              :                    :- * Project (21)
-   :                 :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-   :                 :     :                 :              :                    :     :- * ColumnarToRow (15)
-   :                 :     :                 :              :                    :     :  +- CometFilter (14)
-   :                 :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-   :                 :     :                 :              :                    :     +- BroadcastExchange (19)
-   :                 :     :                 :              :                    :        +- * ColumnarToRow (18)
-   :                 :     :                 :              :                    :           +- CometFilter (17)
-   :                 :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
-   :                 :     :                 :              :                    +- ReusedExchange (22)
-   :                 :     :                 :              +- ReusedExchange (30)
-   :                 :     :                 +- BroadcastExchange (45)
-   :                 :     :                    +- * Project (44)
-   :                 :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
-   :                 :     :                          :- * Project (41)
-   :                 :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
-   :                 :     :                          :     :- * ColumnarToRow (38)
-   :                 :     :                          :     :  +- CometFilter (37)
-   :                 :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
-   :                 :     :                          :     +- ReusedExchange (39)
-   :                 :     :                          +- ReusedExchange (42)
-   :                 :     +- BroadcastExchange (57)
-   :                 :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
-   :                 :           :- * ColumnarToRow (54)
-   :                 :           :  +- CometFilter (53)
-   :                 :           :     +- CometScan parquet spark_catalog.default.item (52)
-   :                 :           +- ReusedExchange (55)
-   :                 +- ReusedExchange (60)
-   +- BroadcastExchange (82)
-      +- * Filter (81)
-         +- * HashAggregate (80)
-            +- Exchange (79)
-               +- * HashAggregate (78)
-                  +- * Project (77)
-                     +- * BroadcastHashJoin Inner BuildRight (76)
-                        :- * Project (74)
-                        :  +- * BroadcastHashJoin Inner BuildRight (73)
-                        :     :- * BroadcastHashJoin LeftSemi BuildRight (71)
-                        :     :  :- * ColumnarToRow (69)
-                        :     :  :  +- CometFilter (68)
-                        :     :  :     +- CometScan parquet spark_catalog.default.store_sales (67)
-                        :     :  +- ReusedExchange (70)
-                        :     +- ReusedExchange (72)
-                        +- ReusedExchange (75)
+TakeOrderedAndProject (90)
++- * BroadcastHashJoin Inner BuildRight (89)
+   :- * ColumnarToRow (70)
+   :  +- CometFilter (69)
+   :     +- CometHashAggregate (68)
+   :        +- CometColumnarExchange (67)
+   :           +- RowToColumnar (66)
+   :              +- * HashAggregate (65)
+   :                 +- * Project (64)
+   :                    +- * BroadcastHashJoin Inner BuildRight (63)
+   :                       :- * Project (61)
+   :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
+   :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
+   :                       :     :  :- * ColumnarToRow (3)
+   :                       :     :  :  +- CometFilter (2)
+   :                       :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :                       :     :  +- BroadcastExchange (52)
+   :                       :     :     +- * Project (51)
+   :                       :     :        +- * BroadcastHashJoin Inner BuildRight (50)
+   :                       :     :           :- * ColumnarToRow (6)
+   :                       :     :           :  +- CometFilter (5)
+   :                       :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+   :                       :     :           +- BroadcastExchange (49)
+   :                       :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
+   :                       :     :                 :- * ColumnarToRow (37)
+   :                       :     :                 :  +- CometHashAggregate (36)
+   :                       :     :                 :     +- CometColumnarExchange (35)
+   :                       :     :                 :        +- RowToColumnar (34)
+   :                       :     :                 :           +- * HashAggregate (33)
+   :                       :     :                 :              +- * Project (32)
+   :                       :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
+   :                       :     :                 :                    :- * Project (29)
+   :                       :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
+   :                       :     :                 :                    :     :- * ColumnarToRow (9)
+   :                       :     :                 :                    :     :  +- CometFilter (8)
+   :                       :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+   :                       :     :                 :                    :     +- BroadcastExchange (27)
+   :                       :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+   :                       :     :                 :                    :           :- * ColumnarToRow (12)
+   :                       :     :                 :                    :           :  +- CometFilter (11)
+   :                       :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
+   :                       :     :                 :                    :           +- BroadcastExchange (25)
+   :                       :     :                 :                    :              +- * Project (24)
+   :                       :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
+   :                       :     :                 :                    :                    :- * Project (21)
+   :                       :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+   :                       :     :                 :                    :                    :     :- * ColumnarToRow (15)
+   :                       :     :                 :                    :                    :     :  +- CometFilter (14)
+   :                       :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+   :                       :     :                 :                    :                    :     +- BroadcastExchange (19)
+   :                       :     :                 :                    :                    :        +- * ColumnarToRow (18)
+   :                       :     :                 :                    :                    :           +- CometFilter (17)
+   :                       :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
+   :                       :     :                 :                    :                    +- ReusedExchange (22)
+   :                       :     :                 :                    +- ReusedExchange (30)
+   :                       :     :                 +- BroadcastExchange (47)
+   :                       :     :                    +- * Project (46)
+   :                       :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
+   :                       :     :                          :- * Project (43)
+   :                       :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
+   :                       :     :                          :     :- * ColumnarToRow (40)
+   :                       :     :                          :     :  +- CometFilter (39)
+   :                       :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
+   :                       :     :                          :     +- ReusedExchange (41)
+   :                       :     :                          +- ReusedExchange (44)
+   :                       :     +- BroadcastExchange (59)
+   :                       :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
+   :                       :           :- * ColumnarToRow (56)
+   :                       :           :  +- CometFilter (55)
+   :                       :           :     +- CometScan parquet spark_catalog.default.item (54)
+   :                       :           +- ReusedExchange (57)
+   :                       +- ReusedExchange (62)
+   +- BroadcastExchange (88)
+      +- * ColumnarToRow (87)
+         +- CometFilter (86)
+            +- CometHashAggregate (85)
+               +- CometColumnarExchange (84)
+                  +- RowToColumnar (83)
+                     +- * HashAggregate (82)
+                        +- * Project (81)
+                           +- * BroadcastHashJoin Inner BuildRight (80)
+                              :- * Project (78)
+                              :  +- * BroadcastHashJoin Inner BuildRight (77)
+                              :     :- * BroadcastHashJoin LeftSemi BuildRight (75)
+                              :     :  :- * ColumnarToRow (73)
+                              :     :  :  +- CometFilter (72)
+                              :     :  :     +- CometScan parquet spark_catalog.default.store_sales (71)
+                              :     :  +- ReusedExchange (74)
+                              :     +- ReusedExchange (76)
+                              +- ReusedExchange (79)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -186,7 +192,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 117]
+(22) ReusedExchange [Reuses operator id: 125]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -223,7 +229,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 117]
+(30) ReusedExchange [Reuses operator id: 125]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -243,16 +249,20 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) Exchange
+(34) RowToColumnar
 Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) HashAggregate [codegen id : 10]
+(35) CometColumnarExchange
+Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(36) CometHashAggregate
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [brand_id#26, class_id#27, category_id#28]
+
+(37) ColumnarToRow [codegen id : 10]
+Input [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -262,68 +272,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(37) CometFilter
+(39) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(38) ColumnarToRow [codegen id : 9]
+(40) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(39) ReusedExchange [Reuses operator id: 19]
+(41) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(40) BroadcastHashJoin [codegen id : 9]
+(42) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 9]
+(43) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) ReusedExchange [Reuses operator id: 117]
+(44) ReusedExchange [Reuses operator id: 125]
 Output [1]: [d_date_sk#36]
 
-(43) BroadcastHashJoin [codegen id : 9]
+(45) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 9]
+(46) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(46) BroadcastHashJoin [codegen id : 10]
+(48) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(48) BroadcastHashJoin [codegen id : 11]
+(50) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 11]
+(51) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(51) BroadcastHashJoin [codegen id : 25]
+(53) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -336,420 +346,434 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk), IsNotNull(i_brand_id), IsNotNull(i_class_id), IsNotNull(i_category_id)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(53) CometFilter
+(55) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : (((isnotnull(i_item_sk#38) AND isnotnull(i_brand_id#39)) AND isnotnull(i_class_id#40)) AND isnotnull(i_category_id#41))
 
-(54) ColumnarToRow [codegen id : 23]
+(56) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(55) ReusedExchange [Reuses operator id: 50]
+(57) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(56) BroadcastHashJoin [codegen id : 23]
+(58) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(57) BroadcastExchange
+(59) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(58) BroadcastHashJoin [codegen id : 25]
+(60) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 25]
+(61) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(60) ReusedExchange [Reuses operator id: 108]
+(62) ReusedExchange [Reuses operator id: 116]
 Output [1]: [d_date_sk#42]
 
-(61) BroadcastHashJoin [codegen id : 25]
+(63) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 25]
+(64) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(63) HashAggregate [codegen id : 25]
+(65) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(64) Exchange
+(66) RowToColumnar
+Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
+
+(67) CometColumnarExchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(65) HashAggregate [codegen id : 52]
+(68) CometHashAggregate
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
-Results [6]: [store AS channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#52, count(1)#50 AS number_sales#53]
 
-(66) Filter [codegen id : 52]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
-Condition : (isnotnull(sales#52) AND (cast(sales#52 as decimal(32,6)) > cast(Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+(69) CometFilter
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+Condition : (isnotnull(sales#50) AND (cast(sales#50 as decimal(32,6)) > cast(Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+
+(70) ColumnarToRow [codegen id : 52]
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
+Output [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#59), dynamicpruningexpression(ss_sold_date_sk#59 IN dynamicpruning#60)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#57), dynamicpruningexpression(ss_sold_date_sk#57 IN dynamicpruning#58)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(68) CometFilter
-Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
-Condition : isnotnull(ss_item_sk#56)
+(72) CometFilter
+Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
+Condition : isnotnull(ss_item_sk#54)
 
-(69) ColumnarToRow [codegen id : 50]
-Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
+(73) ColumnarToRow [codegen id : 50]
+Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
 
-(70) ReusedExchange [Reuses operator id: 50]
+(74) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(71) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#56]
+(75) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#54]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(72) ReusedExchange [Reuses operator id: 57]
-Output [4]: [i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
+(76) ReusedExchange [Reuses operator id: 59]
+Output [4]: [i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
 
-(73) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#56]
-Right keys [1]: [i_item_sk#61]
+(77) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#54]
+Right keys [1]: [i_item_sk#59]
 Join type: Inner
 Join condition: None
 
-(74) Project [codegen id : 50]
-Output [6]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64]
-Input [8]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
+(78) Project [codegen id : 50]
+Output [6]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62]
+Input [8]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
 
-(75) ReusedExchange [Reuses operator id: 122]
-Output [1]: [d_date_sk#65]
+(79) ReusedExchange [Reuses operator id: 130]
+Output [1]: [d_date_sk#63]
 
-(76) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_sold_date_sk#59]
-Right keys [1]: [d_date_sk#65]
+(80) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_sold_date_sk#57]
+Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 50]
-Output [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
-Input [7]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64, d_date_sk#65]
-
-(78) HashAggregate [codegen id : 50]
-Input [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
-Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
-Functions [2]: [partial_sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), partial_count(1)]
-Aggregate Attributes [3]: [sum#66, isEmpty#67, count#68]
-Results [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-
-(79) Exchange
-Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-Arguments: hashpartitioning(i_brand_id#62, i_class_id#63, i_category_id#64, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(80) HashAggregate [codegen id : 51]
-Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
-Functions [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72, count(1)#73]
-Results [6]: [store AS channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72 AS sales#75, count(1)#73 AS number_sales#76]
-
-(81) Filter [codegen id : 51]
-Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
-Condition : (isnotnull(sales#75) AND (cast(sales#75 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
-
-(82) BroadcastExchange
-Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+(81) Project [codegen id : 50]
+Output [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
+Input [7]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62, d_date_sk#63]
+
+(82) HashAggregate [codegen id : 50]
+Input [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
+Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Functions [2]: [partial_sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), partial_count(1)]
+Aggregate Attributes [3]: [sum#64, isEmpty#65, count#66]
+Results [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+
+(83) RowToColumnar
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+
+(84) CometColumnarExchange
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+Arguments: hashpartitioning(i_brand_id#60, i_class_id#61, i_category_id#62, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(85) CometHashAggregate
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Functions [2]: [sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), count(1)]
+
+(86) CometFilter
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+Condition : (isnotnull(sales#71) AND (cast(sales#71 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+
+(87) ColumnarToRow [codegen id : 51]
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+
+(88) BroadcastExchange
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
 Arguments: HashedRelationBroadcastMode(List(input[1, int, true], input[2, int, true], input[3, int, true]),false), [plan_id=11]
 
-(83) BroadcastHashJoin [codegen id : 52]
+(89) BroadcastHashJoin [codegen id : 52]
 Left keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
-Right keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Right keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
 Join type: Inner
 Join condition: None
 
-(84) TakeOrderedAndProject
-Input [12]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
-Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+(90) TakeOrderedAndProject
+Input [12]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#54, [id=#55]
-* HashAggregate (103)
-+- Exchange (102)
-   +- * HashAggregate (101)
-      +- Union (100)
-         :- * Project (89)
-         :  +- * BroadcastHashJoin Inner BuildRight (88)
-         :     :- * ColumnarToRow (86)
-         :     :  +- CometScan parquet spark_catalog.default.store_sales (85)
-         :     +- ReusedExchange (87)
-         :- * Project (94)
-         :  +- * BroadcastHashJoin Inner BuildRight (93)
-         :     :- * ColumnarToRow (91)
-         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (90)
-         :     +- ReusedExchange (92)
-         +- * Project (99)
-            +- * BroadcastHashJoin Inner BuildRight (98)
-               :- * ColumnarToRow (96)
-               :  +- CometScan parquet spark_catalog.default.web_sales (95)
-               +- ReusedExchange (97)
+Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#52, [id=#53]
+* ColumnarToRow (111)
++- CometHashAggregate (110)
+   +- CometColumnarExchange (109)
+      +- RowToColumnar (108)
+         +- * HashAggregate (107)
+            +- Union (106)
+               :- * Project (95)
+               :  +- * BroadcastHashJoin Inner BuildRight (94)
+               :     :- * ColumnarToRow (92)
+               :     :  +- CometScan parquet spark_catalog.default.store_sales (91)
+               :     +- ReusedExchange (93)
+               :- * Project (100)
+               :  +- * BroadcastHashJoin Inner BuildRight (99)
+               :     :- * ColumnarToRow (97)
+               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (96)
+               :     +- ReusedExchange (98)
+               +- * Project (105)
+                  +- * BroadcastHashJoin Inner BuildRight (104)
+                     :- * ColumnarToRow (102)
+                     :  +- CometScan parquet spark_catalog.default.web_sales (101)
+                     +- ReusedExchange (103)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
+Output [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#79), dynamicpruningexpression(ss_sold_date_sk#79 IN dynamicpruning#80)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#75), dynamicpruningexpression(ss_sold_date_sk#75 IN dynamicpruning#76)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(86) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
+(92) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
 
-(87) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#81]
+(93) ReusedExchange [Reuses operator id: 125]
+Output [1]: [d_date_sk#77]
 
-(88) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#79]
-Right keys [1]: [d_date_sk#81]
+(94) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#75]
+Right keys [1]: [d_date_sk#77]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 2]
-Output [2]: [ss_quantity#77 AS quantity#82, ss_list_price#78 AS list_price#83]
-Input [4]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79, d_date_sk#81]
+(95) Project [codegen id : 2]
+Output [2]: [ss_quantity#73 AS quantity#78, ss_list_price#74 AS list_price#79]
+Input [4]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75, d_date_sk#77]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
+Output [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#86), dynamicpruningexpression(cs_sold_date_sk#86 IN dynamicpruning#87)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#82), dynamicpruningexpression(cs_sold_date_sk#82 IN dynamicpruning#83)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(91) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
+(97) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
 
-(92) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#88]
+(98) ReusedExchange [Reuses operator id: 125]
+Output [1]: [d_date_sk#84]
 
-(93) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#86]
-Right keys [1]: [d_date_sk#88]
+(99) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#82]
+Right keys [1]: [d_date_sk#84]
 Join type: Inner
 Join condition: None
 
-(94) Project [codegen id : 4]
-Output [2]: [cs_quantity#84 AS quantity#89, cs_list_price#85 AS list_price#90]
-Input [4]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86, d_date_sk#88]
+(100) Project [codegen id : 4]
+Output [2]: [cs_quantity#80 AS quantity#85, cs_list_price#81 AS list_price#86]
+Input [4]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82, d_date_sk#84]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
+Output [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#93), dynamicpruningexpression(ws_sold_date_sk#93 IN dynamicpruning#94)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#89), dynamicpruningexpression(ws_sold_date_sk#89 IN dynamicpruning#90)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(96) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
+(102) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
 
-(97) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#95]
+(103) ReusedExchange [Reuses operator id: 125]
+Output [1]: [d_date_sk#91]
 
-(98) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#93]
-Right keys [1]: [d_date_sk#95]
+(104) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#89]
+Right keys [1]: [d_date_sk#91]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 6]
-Output [2]: [ws_quantity#91 AS quantity#96, ws_list_price#92 AS list_price#97]
-Input [4]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93, d_date_sk#95]
+(105) Project [codegen id : 6]
+Output [2]: [ws_quantity#87 AS quantity#92, ws_list_price#88 AS list_price#93]
+Input [4]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89, d_date_sk#91]
 
-(100) Union
+(106) Union
 
-(101) HashAggregate [codegen id : 7]
-Input [2]: [quantity#82, list_price#83]
+(107) HashAggregate [codegen id : 7]
+Input [2]: [quantity#78, list_price#79]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
-Aggregate Attributes [2]: [sum#98, count#99]
-Results [2]: [sum#100, count#101]
+Functions [1]: [partial_avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
+Aggregate Attributes [2]: [sum#94, count#95]
+Results [2]: [sum#96, count#97]
 
-(102) Exchange
-Input [2]: [sum#100, count#101]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
+(108) RowToColumnar
+Input [2]: [sum#96, count#97]
 
-(103) HashAggregate [codegen id : 8]
-Input [2]: [sum#100, count#101]
+(109) CometColumnarExchange
+Input [2]: [sum#96, count#97]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+
+(110) CometHashAggregate
+Input [2]: [sum#96, count#97]
 Keys: []
-Functions [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
-Aggregate Attributes [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102]
-Results [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102 AS average_sales#103]
+Functions [1]: [avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
+
+(111) ColumnarToRow [codegen id : 8]
+Input [1]: [average_sales#98]
 
-Subquery:2 Hosting operator id = 85 Hosting Expression = ss_sold_date_sk#79 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 91 Hosting Expression = ss_sold_date_sk#75 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 90 Hosting Expression = cs_sold_date_sk#86 IN dynamicpruning#12
+Subquery:3 Hosting operator id = 96 Hosting Expression = cs_sold_date_sk#82 IN dynamicpruning#12
 
-Subquery:4 Hosting operator id = 95 Hosting Expression = ws_sold_date_sk#93 IN dynamicpruning#12
+Subquery:4 Hosting operator id = 101 Hosting Expression = ws_sold_date_sk#89 IN dynamicpruning#12
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (108)
-+- * ColumnarToRow (107)
-   +- CometProject (106)
-      +- CometFilter (105)
-         +- CometScan parquet spark_catalog.default.date_dim (104)
+BroadcastExchange (116)
++- * ColumnarToRow (115)
+   +- CometProject (114)
+      +- CometFilter (113)
+         +- CometScan parquet spark_catalog.default.date_dim (112)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#42, d_week_seq#104]
+Output [2]: [d_date_sk#42, d_week_seq#99]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(105) CometFilter
-Input [2]: [d_date_sk#42, d_week_seq#104]
-Condition : ((isnotnull(d_week_seq#104) AND (d_week_seq#104 = Subquery scalar-subquery#105, [id=#106])) AND isnotnull(d_date_sk#42))
+(113) CometFilter
+Input [2]: [d_date_sk#42, d_week_seq#99]
+Condition : ((isnotnull(d_week_seq#99) AND (d_week_seq#99 = Subquery scalar-subquery#100, [id=#101])) AND isnotnull(d_date_sk#42))
 
-(106) CometProject
-Input [2]: [d_date_sk#42, d_week_seq#104]
+(114) CometProject
+Input [2]: [d_date_sk#42, d_week_seq#99]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(107) ColumnarToRow [codegen id : 1]
+(115) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(108) BroadcastExchange
+(116) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:6 Hosting operator id = 105 Hosting Expression = Subquery scalar-subquery#105, [id=#106]
-* ColumnarToRow (112)
-+- CometProject (111)
-   +- CometFilter (110)
-      +- CometScan parquet spark_catalog.default.date_dim (109)
+Subquery:6 Hosting operator id = 113 Hosting Expression = Subquery scalar-subquery#100, [id=#101]
+* ColumnarToRow (120)
++- CometProject (119)
+   +- CometFilter (118)
+      +- CometScan parquet spark_catalog.default.date_dim (117)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
+Output [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,2000), EqualTo(d_moy,12), EqualTo(d_dom,11)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(110) CometFilter
-Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
-Condition : (((((isnotnull(d_year#108) AND isnotnull(d_moy#109)) AND isnotnull(d_dom#110)) AND (d_year#108 = 2000)) AND (d_moy#109 = 12)) AND (d_dom#110 = 11))
+(118) CometFilter
+Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
+Condition : (((((isnotnull(d_year#103) AND isnotnull(d_moy#104)) AND isnotnull(d_dom#105)) AND (d_year#103 = 2000)) AND (d_moy#104 = 12)) AND (d_dom#105 = 11))
 
-(111) CometProject
-Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
-Arguments: [d_week_seq#107], [d_week_seq#107]
+(119) CometProject
+Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
+Arguments: [d_week_seq#102], [d_week_seq#102]
 
-(112) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#107]
+(120) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#102]
 
 Subquery:7 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (117)
-+- * ColumnarToRow (116)
-   +- CometProject (115)
-      +- CometFilter (114)
-         +- CometScan parquet spark_catalog.default.date_dim (113)
+BroadcastExchange (125)
++- * ColumnarToRow (124)
+   +- CometProject (123)
+      +- CometFilter (122)
+         +- CometScan parquet spark_catalog.default.date_dim (121)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#111]
+Output [2]: [d_date_sk#25, d_year#106]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1999), LessThanOrEqual(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(114) CometFilter
-Input [2]: [d_date_sk#25, d_year#111]
-Condition : (((isnotnull(d_year#111) AND (d_year#111 >= 1999)) AND (d_year#111 <= 2001)) AND isnotnull(d_date_sk#25))
+(122) CometFilter
+Input [2]: [d_date_sk#25, d_year#106]
+Condition : (((isnotnull(d_year#106) AND (d_year#106 >= 1999)) AND (d_year#106 <= 2001)) AND isnotnull(d_date_sk#25))
 
-(115) CometProject
-Input [2]: [d_date_sk#25, d_year#111]
+(123) CometProject
+Input [2]: [d_date_sk#25, d_year#106]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(116) ColumnarToRow [codegen id : 1]
+(124) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(117) BroadcastExchange
+(125) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
 Subquery:8 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:9 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:10 Hosting operator id = 81 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
+Subquery:10 Hosting operator id = 86 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
 
-Subquery:11 Hosting operator id = 67 Hosting Expression = ss_sold_date_sk#59 IN dynamicpruning#60
-BroadcastExchange (122)
-+- * ColumnarToRow (121)
-   +- CometProject (120)
-      +- CometFilter (119)
-         +- CometScan parquet spark_catalog.default.date_dim (118)
+Subquery:11 Hosting operator id = 71 Hosting Expression = ss_sold_date_sk#57 IN dynamicpruning#58
+BroadcastExchange (130)
++- * ColumnarToRow (129)
+   +- CometProject (128)
+      +- CometFilter (127)
+         +- CometScan parquet spark_catalog.default.date_dim (126)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#65, d_week_seq#112]
+Output [2]: [d_date_sk#63, d_week_seq#107]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(119) CometFilter
-Input [2]: [d_date_sk#65, d_week_seq#112]
-Condition : ((isnotnull(d_week_seq#112) AND (d_week_seq#112 = Subquery scalar-subquery#113, [id=#114])) AND isnotnull(d_date_sk#65))
+(127) CometFilter
+Input [2]: [d_date_sk#63, d_week_seq#107]
+Condition : ((isnotnull(d_week_seq#107) AND (d_week_seq#107 = Subquery scalar-subquery#108, [id=#109])) AND isnotnull(d_date_sk#63))
 
-(120) CometProject
-Input [2]: [d_date_sk#65, d_week_seq#112]
-Arguments: [d_date_sk#65], [d_date_sk#65]
+(128) CometProject
+Input [2]: [d_date_sk#63, d_week_seq#107]
+Arguments: [d_date_sk#63], [d_date_sk#63]
 
-(121) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#65]
+(129) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#63]
 
-(122) BroadcastExchange
-Input [1]: [d_date_sk#65]
+(130) BroadcastExchange
+Input [1]: [d_date_sk#63]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
-Subquery:12 Hosting operator id = 119 Hosting Expression = Subquery scalar-subquery#113, [id=#114]
-* ColumnarToRow (126)
-+- CometProject (125)
-   +- CometFilter (124)
-      +- CometScan parquet spark_catalog.default.date_dim (123)
+Subquery:12 Hosting operator id = 127 Hosting Expression = Subquery scalar-subquery#108, [id=#109]
+* ColumnarToRow (134)
++- CometProject (133)
+   +- CometFilter (132)
+      +- CometScan parquet spark_catalog.default.date_dim (131)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
+Output [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,1999), EqualTo(d_moy,12), EqualTo(d_dom,11)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(124) CometFilter
-Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
-Condition : (((((isnotnull(d_year#116) AND isnotnull(d_moy#117)) AND isnotnull(d_dom#118)) AND (d_year#116 = 1999)) AND (d_moy#117 = 12)) AND (d_dom#118 = 11))
+(132) CometFilter
+Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
+Condition : (((((isnotnull(d_year#111) AND isnotnull(d_moy#112)) AND isnotnull(d_dom#113)) AND (d_year#111 = 1999)) AND (d_moy#112 = 12)) AND (d_dom#113 = 11))
 
-(125) CometProject
-Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
-Arguments: [d_week_seq#115], [d_week_seq#115]
+(133) CometProject
+Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
+Arguments: [d_week_seq#110], [d_week_seq#110]
 
-(126) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#115]
+(134) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#110]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt
index 09d8d9dde3..13ac319fbd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt
@@ -1,202 +1,210 @@
 TakeOrderedAndProject [i_brand_id,i_class_id,i_category_id,channel,sales,number_sales,channel,i_brand_id,i_class_id,i_category_id,sales,number_sales]
   WholeStageCodegen (52)
     BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-      Filter [sales]
-        Subquery #4
-          WholeStageCodegen (8)
-            HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
-              InputAdapter
-                Exchange #12
-                  WholeStageCodegen (7)
-                    HashAggregate [quantity,list_price] [sum,count,sum,count]
-                      InputAdapter
-                        Union
-                          WholeStageCodegen (2)
-                            Project [ss_quantity,ss_list_price]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #3
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #6
-                          WholeStageCodegen (4)
-                            Project [cs_quantity,cs_list_price]
-                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #3
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #6
-                          WholeStageCodegen (6)
-                            Project [ws_quantity,ws_list_price]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+      ColumnarToRow
+        InputAdapter
+          CometFilter [sales]
+            Subquery #4
+              WholeStageCodegen (8)
+                ColumnarToRow
+                  InputAdapter
+                    CometHashAggregate [sum,count]
+                      CometColumnarExchange #12
+                        RowToColumnar
+                          WholeStageCodegen (7)
+                            HashAggregate [quantity,list_price] [sum,count,sum,count]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (2)
+                                    Project [ss_quantity,ss_list_price]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #6
+                                  WholeStageCodegen (4)
+                                    Project [cs_quantity,cs_list_price]
+                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #6
+                                  WholeStageCodegen (6)
+                                    Project [ws_quantity,ws_list_price]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #6
+            CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+              CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #1
+                RowToColumnar
+                  WholeStageCodegen (25)
+                    HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                      Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                          Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              BroadcastHashJoin [ss_item_sk,ss_item_sk]
                                 ColumnarToRow
                                   InputAdapter
-                                    CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #3
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_week_seq,d_date_sk]
+                                                      Subquery #2
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_week_seq]
+                                                                CometFilter [d_year,d_moy,d_dom]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #6
-        HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
-          InputAdapter
-            Exchange [i_brand_id,i_class_id,i_category_id] #1
-              WholeStageCodegen (25)
-                HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                  Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                      Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                          BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (11)
+                                      Project [i_item_sk]
+                                        BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_week_seq,d_date_sk]
-                                                  Subquery #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_week_seq]
-                                                            CometFilter [d_year,d_moy,d_dom]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
-                            InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (11)
-                                  Project [i_item_sk]
-                                    BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_brand_id,i_class_id,i_category_id]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                      InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (10)
-                                            BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
-                                              HashAggregate [brand_id,class_id,category_id]
-                                                InputAdapter
-                                                  Exchange [brand_id,class_id,category_id] #5
-                                                    WholeStageCodegen (6)
-                                                      HashAggregate [brand_id,class_id,category_id]
-                                                        Project [i_brand_id,i_class_id,i_category_id]
-                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                            Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [ss_item_sk]
-                                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                        SubqueryBroadcast [d_date_sk] #3
-                                                                          BroadcastExchange #6
-                                                                            WholeStageCodegen (1)
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometProject [d_date_sk]
-                                                                                    CometFilter [d_year,d_date_sk]
-                                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                InputAdapter
-                                                                  BroadcastExchange #7
-                                                                    WholeStageCodegen (4)
-                                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
+                                              CometFilter [i_brand_id,i_class_id,i_category_id]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                          InputAdapter
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (10)
+                                                BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometHashAggregate [brand_id,class_id,category_id]
+                                                        CometColumnarExchange [brand_id,class_id,category_id] #5
+                                                          RowToColumnar
+                                                            WholeStageCodegen (6)
+                                                              HashAggregate [brand_id,class_id,category_id]
+                                                                Project [i_brand_id,i_class_id,i_category_id]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #8
-                                                                            WholeStageCodegen (3)
-                                                                              Project [i_brand_id,i_class_id,i_category_id]
-                                                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                                  Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                            CometFilter [ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #3
+                                                                                  BroadcastExchange #6
+                                                                                    WholeStageCodegen (1)
                                                                                       ColumnarToRow
                                                                                         InputAdapter
-                                                                                          CometFilter [cs_item_sk]
-                                                                                            CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
-                                                                                              ReusedSubquery [d_date_sk] #3
-                                                                                      InputAdapter
-                                                                                        BroadcastExchange #9
-                                                                                          WholeStageCodegen (1)
-                                                                                            ColumnarToRow
-                                                                                              InputAdapter
-                                                                                                CometFilter [i_item_sk]
-                                                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                          CometProject [d_date_sk]
+                                                                                            CometFilter [d_year,d_date_sk]
+                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                        InputAdapter
+                                                                          BroadcastExchange #7
+                                                                            WholeStageCodegen (4)
+                                                                              BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
+                                                                                ColumnarToRow
                                                                                   InputAdapter
-                                                                                    ReusedExchange [d_date_sk] #6
+                                                                                    CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                InputAdapter
+                                                                                  BroadcastExchange #8
+                                                                                    WholeStageCodegen (3)
+                                                                                      Project [i_brand_id,i_class_id,i_category_id]
+                                                                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                                          Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                            BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                                              ColumnarToRow
+                                                                                                InputAdapter
+                                                                                                  CometFilter [cs_item_sk]
+                                                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                                                                                      ReusedSubquery [d_date_sk] #3
+                                                                                              InputAdapter
+                                                                                                BroadcastExchange #9
+                                                                                                  WholeStageCodegen (1)
+                                                                                                    ColumnarToRow
+                                                                                                      InputAdapter
+                                                                                                        CometFilter [i_item_sk]
+                                                                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                          InputAdapter
+                                                                                            ReusedExchange [d_date_sk] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk] #6
+                                                  InputAdapter
+                                                    BroadcastExchange #10
+                                                      WholeStageCodegen (9)
+                                                        Project [i_brand_id,i_class_id,i_category_id]
+                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                            Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                              BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [ws_item_sk]
+                                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                        ReusedSubquery [d_date_sk] #3
+                                                                InputAdapter
+                                                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
                                                             InputAdapter
                                                               ReusedExchange [d_date_sk] #6
-                                              InputAdapter
-                                                BroadcastExchange #10
-                                                  WholeStageCodegen (9)
-                                                    Project [i_brand_id,i_class_id,i_category_id]
-                                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                        Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [ws_item_sk]
-                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                    ReusedSubquery [d_date_sk] #3
-                                                            InputAdapter
-                                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
-                                                        InputAdapter
-                                                          ReusedExchange [d_date_sk] #6
+                              InputAdapter
+                                BroadcastExchange #11
+                                  WholeStageCodegen (23)
+                                    BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                      InputAdapter
+                                        ReusedExchange [ss_item_sk] #3
                           InputAdapter
-                            BroadcastExchange #11
-                              WholeStageCodegen (23)
-                                BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                  InputAdapter
-                                    ReusedExchange [ss_item_sk] #3
-                      InputAdapter
-                        ReusedExchange [d_date_sk] #2
+                            ReusedExchange [d_date_sk] #2
       InputAdapter
         BroadcastExchange #13
           WholeStageCodegen (51)
-            Filter [sales]
-              ReusedSubquery [average_sales] #4
-              HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
-                InputAdapter
-                  Exchange [i_brand_id,i_class_id,i_category_id] #14
-                    WholeStageCodegen (50)
-                      HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                        Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                  ColumnarToRow
+            ColumnarToRow
+              InputAdapter
+                CometFilter [sales]
+                  ReusedSubquery [average_sales] #4
+                  CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                    CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #14
+                      RowToColumnar
+                        WholeStageCodegen (50)
+                          HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                            Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                    BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #5
+                                                BroadcastExchange #15
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_week_seq,d_date_sk]
+                                                            Subquery #6
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [d_week_seq]
+                                                                      CometFilter [d_year,d_moy,d_dom]
+                                                                        CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                      InputAdapter
+                                        ReusedExchange [ss_item_sk] #3
                                     InputAdapter
-                                      CometFilter [ss_item_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #5
-                                            BroadcastExchange #15
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_week_seq,d_date_sk]
-                                                        Subquery #6
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_week_seq]
-                                                                  CometFilter [d_year,d_moy,d_dom]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
-                                  InputAdapter
-                                    ReusedExchange [ss_item_sk] #3
+                                      ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
                                 InputAdapter
-                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
-                            InputAdapter
-                              ReusedExchange [d_date_sk] #15
+                                  ReusedExchange [d_date_sk] #15
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt
index 811a9eef51..135162ca9d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt
@@ -1,26 +1,28 @@
 == Physical Plan ==
-TakeOrderedAndProject (22)
-+- * HashAggregate (21)
-   +- Exchange (20)
-      +- * HashAggregate (19)
-         +- * Project (18)
-            +- * BroadcastHashJoin Inner BuildRight (17)
-               :- * Project (15)
-               :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :- * Project (9)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :- * ColumnarToRow (3)
-               :     :     :  +- CometFilter (2)
-               :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :     :     +- BroadcastExchange (7)
-               :     :        +- * ColumnarToRow (6)
-               :     :           +- CometFilter (5)
-               :     :              +- CometScan parquet spark_catalog.default.customer (4)
-               :     +- BroadcastExchange (13)
-               :        +- * ColumnarToRow (12)
-               :           +- CometFilter (11)
-               :              +- CometScan parquet spark_catalog.default.customer_address (10)
-               +- ReusedExchange (16)
+* ColumnarToRow (24)
++- CometTakeOrderedAndProject (23)
+   +- CometHashAggregate (22)
+      +- CometColumnarExchange (21)
+         +- RowToColumnar (20)
+            +- * HashAggregate (19)
+               +- * Project (18)
+                  +- * BroadcastHashJoin Inner BuildRight (17)
+                     :- * Project (15)
+                     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :- * Project (9)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :- * ColumnarToRow (3)
+                     :     :     :  +- CometFilter (2)
+                     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                     :     :     +- BroadcastExchange (7)
+                     :     :        +- * ColumnarToRow (6)
+                     :     :           +- CometFilter (5)
+                     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                     :     +- BroadcastExchange (13)
+                     :        +- * ColumnarToRow (12)
+                     :           +- CometFilter (11)
+                     :              +- CometScan parquet spark_catalog.default.customer_address (10)
+                     +- ReusedExchange (16)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -94,7 +96,7 @@ Join condition: ((substr(ca_zip#9, 1, 5) IN (85669,86197,88274,83405,86475,85392
 Output [3]: [cs_sales_price#2, cs_sold_date_sk#3, ca_zip#9]
 Input [6]: [cs_sales_price#2, cs_sold_date_sk#3, c_current_addr_sk#6, ca_address_sk#7, ca_state#8, ca_zip#9]
 
-(16) ReusedExchange [Reuses operator id: 27]
+(16) ReusedExchange [Reuses operator id: 29]
 Output [1]: [d_date_sk#10]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -114,50 +116,54 @@ Functions [1]: [partial_sum(UnscaledValue(cs_sales_price#2))]
 Aggregate Attributes [1]: [sum#11]
 Results [2]: [ca_zip#9, sum#12]
 
-(20) Exchange
+(20) RowToColumnar
 Input [2]: [ca_zip#9, sum#12]
-Arguments: hashpartitioning(ca_zip#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [2]: [ca_zip#9, sum#12]
+Arguments: hashpartitioning(ca_zip#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [2]: [ca_zip#9, sum#12]
 Keys [1]: [ca_zip#9]
 Functions [1]: [sum(UnscaledValue(cs_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#2))#13]
-Results [2]: [ca_zip#9, MakeDecimal(sum(UnscaledValue(cs_sales_price#2))#13,17,2) AS sum(cs_sales_price)#14]
 
-(22) TakeOrderedAndProject
-Input [2]: [ca_zip#9, sum(cs_sales_price)#14]
-Arguments: 100, [ca_zip#9 ASC NULLS FIRST], [ca_zip#9, sum(cs_sales_price)#14]
+(23) CometTakeOrderedAndProject
+Input [2]: [ca_zip#9, sum(cs_sales_price)#13]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_zip#9 ASC NULLS FIRST], output=[ca_zip#9,sum(cs_sales_price)#13]), 100, [ca_zip#9 ASC NULLS FIRST], [ca_zip#9, sum(cs_sales_price)#13]
+
+(24) ColumnarToRow [codegen id : 5]
+Input [2]: [ca_zip#9, sum(cs_sales_price)#13]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (29)
++- * ColumnarToRow (28)
+   +- CometProject (27)
+      +- CometFilter (26)
+         +- CometScan parquet spark_catalog.default.date_dim (25)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#15, d_qoy#16]
+Output [3]: [d_date_sk#10, d_year#14, d_qoy#15]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(24) CometFilter
-Input [3]: [d_date_sk#10, d_year#15, d_qoy#16]
-Condition : ((((isnotnull(d_qoy#16) AND isnotnull(d_year#15)) AND (d_qoy#16 = 2)) AND (d_year#15 = 2001)) AND isnotnull(d_date_sk#10))
+(26) CometFilter
+Input [3]: [d_date_sk#10, d_year#14, d_qoy#15]
+Condition : ((((isnotnull(d_qoy#15) AND isnotnull(d_year#14)) AND (d_qoy#15 = 2)) AND (d_year#14 = 2001)) AND isnotnull(d_date_sk#10))
 
-(25) CometProject
-Input [3]: [d_date_sk#10, d_year#15, d_qoy#16]
+(27) CometProject
+Input [3]: [d_date_sk#10, d_year#14, d_qoy#15]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(26) ColumnarToRow [codegen id : 1]
+(28) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(27) BroadcastExchange
+(29) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt
index 5c750b2db8..58d3742879 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt
@@ -1,41 +1,43 @@
-TakeOrderedAndProject [ca_zip,sum(cs_sales_price)]
-  WholeStageCodegen (5)
-    HashAggregate [ca_zip,sum] [sum(UnscaledValue(cs_sales_price)),sum(cs_sales_price),sum]
-      InputAdapter
-        Exchange [ca_zip] #1
-          WholeStageCodegen (4)
-            HashAggregate [ca_zip,cs_sales_price] [sum,sum]
-              Project [cs_sales_price,ca_zip]
-                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                  Project [cs_sales_price,cs_sold_date_sk,ca_zip]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_zip,ca_state,cs_sales_price]
-                      Project [cs_sales_price,cs_sold_date_sk,c_current_addr_sk]
-                        BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [cs_bill_customer_sk]
-                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sales_price,cs_sold_date_sk]
-                                  SubqueryBroadcast [d_date_sk] #1
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [d_date_sk]
-                                              CometFilter [d_qoy,d_year,d_date_sk]
-                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_zip,sum(cs_sales_price)]
+        CometHashAggregate [ca_zip,sum]
+          CometColumnarExchange [ca_zip] #1
+            RowToColumnar
+              WholeStageCodegen (4)
+                HashAggregate [ca_zip,cs_sales_price] [sum,sum]
+                  Project [cs_sales_price,ca_zip]
+                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                      Project [cs_sales_price,cs_sold_date_sk,ca_zip]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_zip,ca_state,cs_sales_price]
+                          Project [cs_sales_price,cs_sold_date_sk,c_current_addr_sk]
+                            BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [cs_bill_customer_sk]
+                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sales_price,cs_sold_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [d_date_sk]
+                                                  CometFilter [d_qoy,d_year,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                              InputAdapter
+                                BroadcastExchange #3
+                                  WholeStageCodegen (1)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_current_addr_sk]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                           InputAdapter
-                            BroadcastExchange #3
-                              WholeStageCodegen (1)
+                            BroadcastExchange #4
+                              WholeStageCodegen (2)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [c_customer_sk,c_current_addr_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                    CometFilter [ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip]
                       InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (2)
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ca_address_sk]
-                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip]
-                  InputAdapter
-                    ReusedExchange [d_date_sk] #2
+                        ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
index 1762c8c6c8..cb01af81df 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-* HashAggregate (45)
-+- Exchange (44)
-   +- * HashAggregate (43)
-      +- * HashAggregate (42)
-         +- * HashAggregate (41)
-            +- * Project (40)
-               +- * BroadcastHashJoin Inner BuildRight (39)
-                  :- * Project (33)
-                  :  +- * BroadcastHashJoin Inner BuildRight (32)
-                  :     :- * Project (26)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                  :     :     :- * SortMergeJoin LeftAnti (19)
-                  :     :     :  :- * Project (13)
-                  :     :     :  :  +- * SortMergeJoin LeftSemi (12)
-                  :     :     :  :     :- * ColumnarToRow (6)
-                  :     :     :  :     :  +- CometSort (5)
-                  :     :     :  :     :     +- CometExchange (4)
-                  :     :     :  :     :        +- CometProject (3)
-                  :     :     :  :     :           +- CometFilter (2)
-                  :     :     :  :     :              +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                  :     :     :  :     +- * ColumnarToRow (11)
-                  :     :     :  :        +- CometSort (10)
-                  :     :     :  :           +- CometExchange (9)
-                  :     :     :  :              +- CometProject (8)
-                  :     :     :  :                 +- CometScan parquet spark_catalog.default.catalog_sales (7)
-                  :     :     :  +- * ColumnarToRow (18)
-                  :     :     :     +- CometSort (17)
-                  :     :     :        +- CometExchange (16)
-                  :     :     :           +- CometProject (15)
-                  :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (14)
-                  :     :     +- BroadcastExchange (24)
-                  :     :        +- * ColumnarToRow (23)
-                  :     :           +- CometProject (22)
-                  :     :              +- CometFilter (21)
-                  :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
-                  :     +- BroadcastExchange (31)
-                  :        +- * ColumnarToRow (30)
-                  :           +- CometProject (29)
-                  :              +- CometFilter (28)
-                  :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-                  +- BroadcastExchange (38)
-                     +- * ColumnarToRow (37)
-                        +- CometProject (36)
-                           +- CometFilter (35)
-                              +- CometScan parquet spark_catalog.default.call_center (34)
+* ColumnarToRow (47)
++- CometHashAggregate (46)
+   +- CometColumnarExchange (45)
+      +- RowToColumnar (44)
+         +- * HashAggregate (43)
+            +- * HashAggregate (42)
+               +- * HashAggregate (41)
+                  +- * Project (40)
+                     +- * BroadcastHashJoin Inner BuildRight (39)
+                        :- * Project (33)
+                        :  +- * BroadcastHashJoin Inner BuildRight (32)
+                        :     :- * Project (26)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                        :     :     :- * SortMergeJoin LeftAnti (19)
+                        :     :     :  :- * Project (13)
+                        :     :     :  :  +- * SortMergeJoin LeftSemi (12)
+                        :     :     :  :     :- * ColumnarToRow (6)
+                        :     :     :  :     :  +- CometSort (5)
+                        :     :     :  :     :     +- CometColumnarExchange (4)
+                        :     :     :  :     :        +- CometProject (3)
+                        :     :     :  :     :           +- CometFilter (2)
+                        :     :     :  :     :              +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                        :     :     :  :     +- * ColumnarToRow (11)
+                        :     :     :  :        +- CometSort (10)
+                        :     :     :  :           +- CometColumnarExchange (9)
+                        :     :     :  :              +- CometProject (8)
+                        :     :     :  :                 +- CometScan parquet spark_catalog.default.catalog_sales (7)
+                        :     :     :  +- * ColumnarToRow (18)
+                        :     :     :     +- CometSort (17)
+                        :     :     :        +- CometColumnarExchange (16)
+                        :     :     :           +- CometProject (15)
+                        :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (14)
+                        :     :     +- BroadcastExchange (24)
+                        :     :        +- * ColumnarToRow (23)
+                        :     :           +- CometProject (22)
+                        :     :              +- CometFilter (21)
+                        :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
+                        :     +- BroadcastExchange (31)
+                        :        +- * ColumnarToRow (30)
+                        :           +- CometProject (29)
+                        :              +- CometFilter (28)
+                        :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+                        +- BroadcastExchange (38)
+                           +- * ColumnarToRow (37)
+                              +- CometProject (36)
+                                 +- CometFilter (35)
+                                    +- CometScan parquet spark_catalog.default.call_center (34)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -61,9 +63,9 @@ Condition : ((isnotnull(cs_ship_date_sk#1) AND isnotnull(cs_ship_addr_sk#2)) AND
 Input [8]: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7, cs_sold_date_sk#8]
 Arguments: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7], [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7]
 
-(4) CometExchange
+(4) CometColumnarExchange
 Input [7]: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7]
-Arguments: hashpartitioning(cs_order_number#5, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(cs_order_number#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (5) CometSort
 Input [7]: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7]
@@ -82,9 +84,9 @@ ReadSchema: struct<cs_warehouse_sk:int,cs_order_number:int>
 Input [3]: [cs_warehouse_sk#9, cs_order_number#10, cs_sold_date_sk#11]
 Arguments: [cs_warehouse_sk#9, cs_order_number#10], [cs_warehouse_sk#9, cs_order_number#10]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [2]: [cs_warehouse_sk#9, cs_order_number#10]
-Arguments: hashpartitioning(cs_order_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(cs_order_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [cs_warehouse_sk#9, cs_order_number#10]
@@ -113,9 +115,9 @@ ReadSchema: struct<cr_order_number:int>
 Input [2]: [cr_order_number#12, cr_returned_date_sk#13]
 Arguments: [cr_order_number#12], [cr_order_number#12]
 
-(16) CometExchange
+(16) CometColumnarExchange
 Input [1]: [cr_order_number#12]
-Arguments: hashpartitioning(cr_order_number#12, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(cr_order_number#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
 (17) CometSort
 Input [1]: [cr_order_number#12]
@@ -247,14 +249,18 @@ Functions [3]: [merge_sum(UnscaledValue(cs_ext_ship_cost#6)), merge_sum(Unscaled
 Aggregate Attributes [3]: [sum(UnscaledValue(cs_ext_ship_cost#6))#20, sum(UnscaledValue(cs_net_profit#7))#21, count(cs_order_number#5)#24]
 Results [3]: [sum#22, sum#23, count#25]
 
-(44) Exchange
+(44) RowToColumnar
 Input [3]: [sum#22, sum#23, count#25]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(45) HashAggregate [codegen id : 9]
+(45) CometColumnarExchange
+Input [3]: [sum#22, sum#23, count#25]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(46) CometHashAggregate
 Input [3]: [sum#22, sum#23, count#25]
 Keys: []
 Functions [3]: [sum(UnscaledValue(cs_ext_ship_cost#6)), sum(UnscaledValue(cs_net_profit#7)), count(distinct cs_order_number#5)]
-Aggregate Attributes [3]: [sum(UnscaledValue(cs_ext_ship_cost#6))#20, sum(UnscaledValue(cs_net_profit#7))#21, count(cs_order_number#5)#24]
-Results [3]: [count(cs_order_number#5)#24 AS order count #26, MakeDecimal(sum(UnscaledValue(cs_ext_ship_cost#6))#20,17,2) AS total shipping cost #27, MakeDecimal(sum(UnscaledValue(cs_net_profit#7))#21,17,2) AS total net profit #28]
+
+(47) ColumnarToRow [codegen id : 9]
+Input [3]: [order count #26, total shipping cost #27, total net profit #28]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt
index 213726372e..eed6c6d22d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt
@@ -1,68 +1,70 @@
 WholeStageCodegen (9)
-  HashAggregate [sum,sum,count] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (8)
-          HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),sum,sum,count,sum,sum,count]
-            HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
-              HashAggregate [cs_order_number,cs_ext_ship_cost,cs_net_profit] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
-                Project [cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                  BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
-                    Project [cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                      BroadcastHashJoin [cs_ship_addr_sk,ca_address_sk]
-                        Project [cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                          BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
-                            SortMergeJoin [cs_order_number,cr_order_number]
-                              InputAdapter
-                                WholeStageCodegen (3)
-                                  Project [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                                    SortMergeJoin [cs_order_number,cs_order_number,cs_warehouse_sk,cs_warehouse_sk]
-                                      InputAdapter
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [cs_order_number]
-                                                CometExchange [cs_order_number] #2
-                                                  CometProject [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                                                    CometFilter [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk]
-                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit,cs_sold_date_sk]
-                                      InputAdapter
-                                        WholeStageCodegen (2)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [cs_order_number]
-                                                CometExchange [cs_order_number] #3
-                                                  CometProject [cs_warehouse_sk,cs_order_number]
-                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_order_number,cs_sold_date_sk]
-                              InputAdapter
-                                WholeStageCodegen (4)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometSort [cr_order_number]
-                                        CometExchange [cr_order_number] #4
-                                          CometProject [cr_order_number]
-                                            CometScan parquet spark_catalog.default.catalog_returns [cr_order_number,cr_returned_date_sk]
+      CometHashAggregate [sum,sum,count]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (8)
+              HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),sum,sum,count,sum,sum,count]
+                HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
+                  HashAggregate [cs_order_number,cs_ext_ship_cost,cs_net_profit] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
+                    Project [cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                      BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
+                        Project [cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                          BroadcastHashJoin [cs_ship_addr_sk,ca_address_sk]
+                            Project [cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                              BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
+                                SortMergeJoin [cs_order_number,cr_order_number]
+                                  InputAdapter
+                                    WholeStageCodegen (3)
+                                      Project [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                                        SortMergeJoin [cs_order_number,cs_order_number,cs_warehouse_sk,cs_warehouse_sk]
+                                          InputAdapter
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometSort [cs_order_number]
+                                                    CometColumnarExchange [cs_order_number] #2
+                                                      CometProject [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                                                        CometFilter [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk]
+                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit,cs_sold_date_sk]
+                                          InputAdapter
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometSort [cs_order_number]
+                                                    CometColumnarExchange [cs_order_number] #3
+                                                      CometProject [cs_warehouse_sk,cs_order_number]
+                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_order_number,cs_sold_date_sk]
+                                  InputAdapter
+                                    WholeStageCodegen (4)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometSort [cr_order_number]
+                                            CometColumnarExchange [cr_order_number] #4
+                                              CometProject [cr_order_number]
+                                                CometScan parquet spark_catalog.default.catalog_returns [cr_order_number,cr_returned_date_sk]
+                                InputAdapter
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (5)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [d_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                             InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (5)
+                              BroadcastExchange #6
+                                WholeStageCodegen (6)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [d_date_sk]
-                                        CometFilter [d_date,d_date_sk]
-                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                      CometProject [ca_address_sk]
+                                        CometFilter [ca_state,ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                         InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (6)
+                          BroadcastExchange #7
+                            WholeStageCodegen (7)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [ca_address_sk]
-                                    CometFilter [ca_state,ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (7)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [cc_call_center_sk]
-                                CometFilter [cc_county,cc_call_center_sk]
-                                  CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_county]
+                                  CometProject [cc_call_center_sk]
+                                    CometFilter [cc_county,cc_call_center_sk]
+                                      CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_county]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt
index 5e9b6d1da7..759cb2384e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt
@@ -1,44 +1,46 @@
 == Physical Plan ==
-TakeOrderedAndProject (40)
-+- * HashAggregate (39)
-   +- Exchange (38)
-      +- * HashAggregate (37)
-         +- * Project (36)
-            +- * BroadcastHashJoin Inner BuildRight (35)
-               :- * Project (30)
-               :  +- * BroadcastHashJoin Inner BuildRight (29)
-               :     :- * Project (24)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (23)
-               :     :     :- * Project (21)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :     :     :     :- * Project (18)
-               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-               :     :     :     :     :- * Project (15)
-               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :     :     :     :- * Project (9)
-               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :     :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :     :     :     :  +- CometFilter (2)
-               :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :     :     :     :     :     +- BroadcastExchange (7)
-               :     :     :     :     :     :        +- * ColumnarToRow (6)
-               :     :     :     :     :     :           +- CometFilter (5)
-               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-               :     :     :     :     :     +- BroadcastExchange (13)
-               :     :     :     :     :        +- * ColumnarToRow (12)
-               :     :     :     :     :           +- CometFilter (11)
-               :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
-               :     :     :     :     +- ReusedExchange (16)
-               :     :     :     +- ReusedExchange (19)
-               :     :     +- ReusedExchange (22)
-               :     +- BroadcastExchange (28)
-               :        +- * ColumnarToRow (27)
-               :           +- CometFilter (26)
-               :              +- CometScan parquet spark_catalog.default.store (25)
-               +- BroadcastExchange (34)
-                  +- * ColumnarToRow (33)
-                     +- CometFilter (32)
-                        +- CometScan parquet spark_catalog.default.item (31)
+TakeOrderedAndProject (42)
++- * HashAggregate (41)
+   +- * ColumnarToRow (40)
+      +- CometColumnarExchange (39)
+         +- RowToColumnar (38)
+            +- * HashAggregate (37)
+               +- * Project (36)
+                  +- * BroadcastHashJoin Inner BuildRight (35)
+                     :- * Project (30)
+                     :  +- * BroadcastHashJoin Inner BuildRight (29)
+                     :     :- * Project (24)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (23)
+                     :     :     :- * Project (21)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :     :     :     :- * Project (18)
+                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                     :     :     :     :     :- * Project (15)
+                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :     :     :     :- * Project (9)
+                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :     :     :     :     :     +- BroadcastExchange (7)
+                     :     :     :     :     :     :        +- * ColumnarToRow (6)
+                     :     :     :     :     :     :           +- CometFilter (5)
+                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+                     :     :     :     :     :     +- BroadcastExchange (13)
+                     :     :     :     :     :        +- * ColumnarToRow (12)
+                     :     :     :     :     :           +- CometFilter (11)
+                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
+                     :     :     :     :     +- ReusedExchange (16)
+                     :     :     :     +- ReusedExchange (19)
+                     :     :     +- ReusedExchange (22)
+                     :     +- BroadcastExchange (28)
+                     :        +- * ColumnarToRow (27)
+                     :           +- CometFilter (26)
+                     :              +- CometScan parquet spark_catalog.default.store (25)
+                     +- BroadcastExchange (34)
+                        +- * ColumnarToRow (33)
+                           +- CometFilter (32)
+                              +- CometScan parquet spark_catalog.default.item (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -114,7 +116,7 @@ Join condition: None
 Output [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [12]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_item_sk#8, sr_customer_sk#9, sr_return_quantity#11, sr_returned_date_sk#12, cs_bill_customer_sk#14, cs_item_sk#15, cs_quantity#16, cs_sold_date_sk#17]
 
-(16) ReusedExchange [Reuses operator id: 45]
+(16) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#19]
 
 (17) BroadcastHashJoin [codegen id : 8]
@@ -127,7 +129,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [9]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#19]
 
-(19) ReusedExchange [Reuses operator id: 50]
+(19) ReusedExchange [Reuses operator id: 52]
 Output [1]: [d_date_sk#20]
 
 (20) BroadcastHashJoin [codegen id : 8]
@@ -140,7 +142,7 @@ Join condition: None
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, cs_quantity#16, cs_sold_date_sk#17]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#20]
 
-(22) ReusedExchange [Reuses operator id: 50]
+(22) ReusedExchange [Reuses operator id: 52]
 Output [1]: [d_date_sk#21]
 
 (23) BroadcastHashJoin [codegen id : 8]
@@ -216,29 +218,35 @@ Functions [9]: [partial_count(ss_quantity#5), partial_avg(ss_quantity#5), partia
 Aggregate Attributes [18]: [count#27, sum#28, count#29, n#30, avg#31, m2#32, count#33, sum#34, count#35, n#36, avg#37, m2#38, count#39, sum#40, count#41, n#42, avg#43, m2#44]
 Results [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
 
-(38) Exchange
+(38) RowToColumnar
 Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
-Arguments: hashpartitioning(i_item_id#25, i_item_desc#26, s_state#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) HashAggregate [codegen id : 9]
+(39) CometColumnarExchange
+Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
+Arguments: hashpartitioning(i_item_id#25, i_item_desc#26, s_state#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(40) ColumnarToRow [codegen id : 9]
+Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
+
+(41) HashAggregate [codegen id : 9]
 Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
 Keys [3]: [i_item_id#25, i_item_desc#26, s_state#23]
 Functions [9]: [count(ss_quantity#5), avg(ss_quantity#5), stddev_samp(cast(ss_quantity#5 as double)), count(sr_return_quantity#11), avg(sr_return_quantity#11), stddev_samp(cast(sr_return_quantity#11 as double)), count(cs_quantity#16), avg(cs_quantity#16), stddev_samp(cast(cs_quantity#16 as double))]
 Aggregate Attributes [9]: [count(ss_quantity#5)#63, avg(ss_quantity#5)#64, stddev_samp(cast(ss_quantity#5 as double))#65, count(sr_return_quantity#11)#66, avg(sr_return_quantity#11)#67, stddev_samp(cast(sr_return_quantity#11 as double))#68, count(cs_quantity#16)#69, avg(cs_quantity#16)#70, stddev_samp(cast(cs_quantity#16 as double))#71]
 Results [15]: [i_item_id#25, i_item_desc#26, s_state#23, count(ss_quantity#5)#63 AS store_sales_quantitycount#72, avg(ss_quantity#5)#64 AS store_sales_quantityave#73, stddev_samp(cast(ss_quantity#5 as double))#65 AS store_sales_quantitystdev#74, (stddev_samp(cast(ss_quantity#5 as double))#65 / avg(ss_quantity#5)#64) AS store_sales_quantitycov#75, count(sr_return_quantity#11)#66 AS as_store_returns_quantitycount#76, avg(sr_return_quantity#11)#67 AS as_store_returns_quantityave#77, stddev_samp(cast(sr_return_quantity#11 as double))#68 AS as_store_returns_quantitystdev#78, (stddev_samp(cast(sr_return_quantity#11 as double))#68 / avg(sr_return_quantity#11)#67) AS store_returns_quantitycov#79, count(cs_quantity#16)#69 AS catalog_sales_quantitycount#80, avg(cs_quantity#16)#70 AS catalog_sales_quantityave#81, (stddev_samp(cast(cs_quantity#16 as double))#71 / avg(cs_quantity#16)#70) AS catalog_sales_quantitystdev#82, (stddev_samp(cast(cs_quantity#16 as double))#71 / avg(cs_quantity#16)#70) AS catalog_sales_quantitycov#83]
 
-(40) TakeOrderedAndProject
+(42) TakeOrderedAndProject
 Input [15]: [i_item_id#25, i_item_desc#26, s_state#23, store_sales_quantitycount#72, store_sales_quantityave#73, store_sales_quantitystdev#74, store_sales_quantitycov#75, as_store_returns_quantitycount#76, as_store_returns_quantityave#77, as_store_returns_quantitystdev#78, store_returns_quantitycov#79, catalog_sales_quantitycount#80, catalog_sales_quantityave#81, catalog_sales_quantitystdev#82, catalog_sales_quantitycov#83]
 Arguments: 100, [i_item_id#25 ASC NULLS FIRST, i_item_desc#26 ASC NULLS FIRST, s_state#23 ASC NULLS FIRST], [i_item_id#25, i_item_desc#26, s_state#23, store_sales_quantitycount#72, store_sales_quantityave#73, store_sales_quantitystdev#74, store_sales_quantitycov#75, as_store_returns_quantitycount#76, as_store_returns_quantityave#77, as_store_returns_quantitystdev#78, store_returns_quantitycov#79, catalog_sales_quantitycount#80, catalog_sales_quantityave#81, catalog_sales_quantitystdev#82, catalog_sales_quantitycov#83]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (45)
-+- * ColumnarToRow (44)
-   +- CometProject (43)
-      +- CometFilter (42)
-         +- CometScan parquet spark_catalog.default.date_dim (41)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -248,27 +256,27 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_quarter_name), EqualTo(d_quarter_name,2001Q1), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_quarter_name:string>
 
-(42) CometFilter
+(44) CometFilter
 Input [2]: [d_date_sk#19, d_quarter_name#84]
 Condition : ((isnotnull(d_quarter_name#84) AND (d_quarter_name#84 = 2001Q1)) AND isnotnull(d_date_sk#19))
 
-(43) CometProject
+(45) CometProject
 Input [2]: [d_date_sk#19, d_quarter_name#84]
 Arguments: [d_date_sk#19], [d_date_sk#19]
 
-(44) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#19]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (52)
++- * ColumnarToRow (51)
+   +- CometProject (50)
+      +- CometFilter (49)
+         +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -278,18 +286,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_quarter_name, [2001Q1,2001Q2,2001Q3]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_quarter_name:string>
 
-(47) CometFilter
+(49) CometFilter
 Input [2]: [d_date_sk#20, d_quarter_name#85]
 Condition : (d_quarter_name#85 IN (2001Q1,2001Q2,2001Q3) AND isnotnull(d_date_sk#20))
 
-(48) CometProject
+(50) CometProject
 Input [2]: [d_date_sk#20, d_quarter_name#85]
 Arguments: [d_date_sk#20], [d_date_sk#20]
 
-(49) ColumnarToRow [codegen id : 1]
+(51) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#20]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [d_date_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt
index 9f4d67decc..13d7ab8775 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt
@@ -1,76 +1,78 @@
 TakeOrderedAndProject [i_item_id,i_item_desc,s_state,store_sales_quantitycount,store_sales_quantityave,store_sales_quantitystdev,store_sales_quantitycov,as_store_returns_quantitycount,as_store_returns_quantityave,as_store_returns_quantitystdev,store_returns_quantitycov,catalog_sales_quantitycount,catalog_sales_quantityave,catalog_sales_quantitystdev,catalog_sales_quantitycov]
   WholeStageCodegen (9)
     HashAggregate [i_item_id,i_item_desc,s_state,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2] [count(ss_quantity),avg(ss_quantity),stddev_samp(cast(ss_quantity as double)),count(sr_return_quantity),avg(sr_return_quantity),stddev_samp(cast(sr_return_quantity as double)),count(cs_quantity),avg(cs_quantity),stddev_samp(cast(cs_quantity as double)),store_sales_quantitycount,store_sales_quantityave,store_sales_quantitystdev,store_sales_quantitycov,as_store_returns_quantitycount,as_store_returns_quantityave,as_store_returns_quantitystdev,store_returns_quantitycov,catalog_sales_quantitycount,catalog_sales_quantityave,catalog_sales_quantitystdev,catalog_sales_quantitycov,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2]
-      InputAdapter
-        Exchange [i_item_id,i_item_desc,s_state] #1
-          WholeStageCodegen (8)
-            HashAggregate [i_item_id,i_item_desc,s_state,ss_quantity,sr_return_quantity,cs_quantity] [count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2]
-              Project [ss_quantity,sr_return_quantity,cs_quantity,s_state,i_item_id,i_item_desc]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_state]
-                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
-                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
-                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                  Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                    BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
-                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
-                                        BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #2
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_quarter_name,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
+      ColumnarToRow
+        InputAdapter
+          CometColumnarExchange [i_item_id,i_item_desc,s_state] #1
+            RowToColumnar
+              WholeStageCodegen (8)
+                HashAggregate [i_item_id,i_item_desc,s_state,ss_quantity,sr_return_quantity,cs_quantity] [count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2]
+                  Project [ss_quantity,sr_return_quantity,cs_quantity,s_state,i_item_id,i_item_desc]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_state]
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
+                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
+                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                                  Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                        BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
+                                          Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
+                                            BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #2
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_quarter_name,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
+                                              InputAdapter
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #2
+                                                              BroadcastExchange #4
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_quarter_name,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
                                           InputAdapter
-                                            BroadcastExchange #3
-                                              WholeStageCodegen (1)
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (2)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #2
-                                                          BroadcastExchange #4
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometProject [d_date_sk]
-                                                                    CometFilter [d_quarter_name,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
+                                                    CometFilter [cs_bill_customer_sk,cs_item_sk]
+                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #2
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (2)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #2
+                                        ReusedExchange [d_date_sk] #2
                                   InputAdapter
-                                    ReusedExchange [d_date_sk] #2
+                                    ReusedExchange [d_date_sk] #4
                               InputAdapter
                                 ReusedExchange [d_date_sk] #4
                           InputAdapter
-                            ReusedExchange [d_date_sk] #4
+                            BroadcastExchange #6
+                              WholeStageCodegen (6)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [s_store_sk]
+                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (6)
+                        BroadcastExchange #7
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [s_store_sk]
-                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                  InputAdapter
-                    BroadcastExchange #7
-                      WholeStageCodegen (7)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [i_item_sk]
-                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
+                                CometFilter [i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt
index 613377a61a..159a82afde 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt
@@ -1,47 +1,49 @@
 == Physical Plan ==
-TakeOrderedAndProject (43)
-+- * HashAggregate (42)
-   +- Exchange (41)
-      +- * HashAggregate (40)
-         +- * Expand (39)
-            +- * Project (38)
-               +- * BroadcastHashJoin Inner BuildRight (37)
-                  :- * Project (32)
-                  :  +- * BroadcastHashJoin Inner BuildRight (31)
-                  :     :- * Project (29)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (28)
-                  :     :     :- * Project (23)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
-                  :     :     :     :- * Project (17)
-                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-                  :     :     :     :     :- * Project (10)
-                  :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                  :     :     :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                  :     :     :     :     :     +- BroadcastExchange (8)
-                  :     :     :     :     :        +- * ColumnarToRow (7)
-                  :     :     :     :     :           +- CometProject (6)
-                  :     :     :     :     :              +- CometFilter (5)
-                  :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-                  :     :     :     :     +- BroadcastExchange (15)
-                  :     :     :     :        +- * ColumnarToRow (14)
-                  :     :     :     :           +- CometProject (13)
-                  :     :     :     :              +- CometFilter (12)
-                  :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
-                  :     :     :     +- BroadcastExchange (21)
-                  :     :     :        +- * ColumnarToRow (20)
-                  :     :     :           +- CometFilter (19)
-                  :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
-                  :     :     +- BroadcastExchange (27)
-                  :     :        +- * ColumnarToRow (26)
-                  :     :           +- CometFilter (25)
-                  :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
-                  :     +- ReusedExchange (30)
-                  +- BroadcastExchange (36)
-                     +- * ColumnarToRow (35)
-                        +- CometFilter (34)
-                           +- CometScan parquet spark_catalog.default.item (33)
+* ColumnarToRow (45)
++- CometTakeOrderedAndProject (44)
+   +- CometHashAggregate (43)
+      +- CometColumnarExchange (42)
+         +- RowToColumnar (41)
+            +- * HashAggregate (40)
+               +- * Expand (39)
+                  +- * Project (38)
+                     +- * BroadcastHashJoin Inner BuildRight (37)
+                        :- * Project (32)
+                        :  +- * BroadcastHashJoin Inner BuildRight (31)
+                        :     :- * Project (29)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (28)
+                        :     :     :- * Project (23)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
+                        :     :     :     :- * Project (17)
+                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+                        :     :     :     :     :- * Project (10)
+                        :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                        :     :     :     :     :     :- * ColumnarToRow (3)
+                        :     :     :     :     :     :  +- CometFilter (2)
+                        :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                        :     :     :     :     :     +- BroadcastExchange (8)
+                        :     :     :     :     :        +- * ColumnarToRow (7)
+                        :     :     :     :     :           +- CometProject (6)
+                        :     :     :     :     :              +- CometFilter (5)
+                        :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+                        :     :     :     :     +- BroadcastExchange (15)
+                        :     :     :     :        +- * ColumnarToRow (14)
+                        :     :     :     :           +- CometProject (13)
+                        :     :     :     :              +- CometFilter (12)
+                        :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
+                        :     :     :     +- BroadcastExchange (21)
+                        :     :     :        +- * ColumnarToRow (20)
+                        :     :     :           +- CometFilter (19)
+                        :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
+                        :     :     +- BroadcastExchange (27)
+                        :     :        +- * ColumnarToRow (26)
+                        :     :           +- CometFilter (25)
+                        :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
+                        :     +- ReusedExchange (30)
+                        +- BroadcastExchange (36)
+                           +- * ColumnarToRow (35)
+                              +- CometFilter (34)
+                                 +- CometScan parquet spark_catalog.default.item (33)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -179,7 +181,7 @@ Join condition: None
 Output [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_county#22, ca_state#23, ca_country#24]
 Input [14]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_county#22, ca_state#23, ca_country#24]
 
-(30) ReusedExchange [Reuses operator id: 48]
+(30) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 7]
@@ -231,50 +233,54 @@ Functions [7]: [partial_avg(cast(cs_quantity#4 as decimal(12,2))), partial_avg(c
 Aggregate Attributes [14]: [sum#33, count#34, sum#35, count#36, sum#37, count#38, sum#39, count#40, sum#41, count#42, sum#43, count#44, sum#45, count#46]
 Results [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
 
-(41) Exchange
+(41) RowToColumnar
 Input [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
-Arguments: hashpartitioning(i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(42) HashAggregate [codegen id : 8]
+(42) CometColumnarExchange
+Input [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
+Arguments: hashpartitioning(i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(43) CometHashAggregate
 Input [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
 Keys [5]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32]
 Functions [7]: [avg(cast(cs_quantity#4 as decimal(12,2))), avg(cast(cs_list_price#5 as decimal(12,2))), avg(cast(cs_coupon_amt#7 as decimal(12,2))), avg(cast(cs_sales_price#6 as decimal(12,2))), avg(cast(cs_net_profit#8 as decimal(12,2))), avg(cast(c_birth_year#19 as decimal(12,2))), avg(cast(cd_dep_count#14 as decimal(12,2)))]
-Aggregate Attributes [7]: [avg(cast(cs_quantity#4 as decimal(12,2)))#61, avg(cast(cs_list_price#5 as decimal(12,2)))#62, avg(cast(cs_coupon_amt#7 as decimal(12,2)))#63, avg(cast(cs_sales_price#6 as decimal(12,2)))#64, avg(cast(cs_net_profit#8 as decimal(12,2)))#65, avg(cast(c_birth_year#19 as decimal(12,2)))#66, avg(cast(cd_dep_count#14 as decimal(12,2)))#67]
-Results [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, avg(cast(cs_quantity#4 as decimal(12,2)))#61 AS agg1#68, avg(cast(cs_list_price#5 as decimal(12,2)))#62 AS agg2#69, avg(cast(cs_coupon_amt#7 as decimal(12,2)))#63 AS agg3#70, avg(cast(cs_sales_price#6 as decimal(12,2)))#64 AS agg4#71, avg(cast(cs_net_profit#8 as decimal(12,2)))#65 AS agg5#72, avg(cast(c_birth_year#19 as decimal(12,2)))#66 AS agg6#73, avg(cast(cd_dep_count#14 as decimal(12,2)))#67 AS agg7#74]
 
-(43) TakeOrderedAndProject
-Input [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#68, agg2#69, agg3#70, agg4#71, agg5#72, agg6#73, agg7#74]
-Arguments: 100, [ca_country#29 ASC NULLS FIRST, ca_state#30 ASC NULLS FIRST, ca_county#31 ASC NULLS FIRST, i_item_id#28 ASC NULLS FIRST], [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#68, agg2#69, agg3#70, agg4#71, agg5#72, agg6#73, agg7#74]
+(44) CometTakeOrderedAndProject
+Input [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#61, agg2#62, agg3#63, agg4#64, agg5#65, agg6#66, agg7#67]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_country#29 ASC NULLS FIRST,ca_state#30 ASC NULLS FIRST,ca_county#31 ASC NULLS FIRST,i_item_id#28 ASC NULLS FIRST], output=[i_item_id#28,ca_country#29,ca_state#30,ca_county#31,agg1#61,agg2#62,agg3#63,agg4#64,agg5#65,agg6#66,agg7#67]), 100, [ca_country#29 ASC NULLS FIRST, ca_state#30 ASC NULLS FIRST, ca_county#31 ASC NULLS FIRST, i_item_id#28 ASC NULLS FIRST], [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#61, agg2#62, agg3#63, agg4#64, agg5#65, agg6#66, agg7#67]
+
+(45) ColumnarToRow [codegen id : 8]
+Input [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#61, agg2#62, agg3#63, agg4#64, agg5#65, agg6#66, agg7#67]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#75]
+Output [2]: [d_date_sk#25, d_year#68]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(45) CometFilter
-Input [2]: [d_date_sk#25, d_year#75]
-Condition : ((isnotnull(d_year#75) AND (d_year#75 = 1998)) AND isnotnull(d_date_sk#25))
+(47) CometFilter
+Input [2]: [d_date_sk#25, d_year#68]
+Condition : ((isnotnull(d_year#68) AND (d_year#68 = 1998)) AND isnotnull(d_date_sk#25))
 
-(46) CometProject
-Input [2]: [d_date_sk#25, d_year#75]
+(48) CometProject
+Input [2]: [d_date_sk#25, d_year#68]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(47) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(48) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt
index 47911b9ba3..0f94dd57c4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt
@@ -1,71 +1,73 @@
-TakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
-  WholeStageCodegen (8)
-    HashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(cast(cs_quantity as decimal(12,2))),avg(cast(cs_list_price as decimal(12,2))),avg(cast(cs_coupon_amt as decimal(12,2))),avg(cast(cs_sales_price as decimal(12,2))),avg(cast(cs_net_profit as decimal(12,2))),avg(cast(c_birth_year as decimal(12,2))),avg(cast(cd_dep_count as decimal(12,2))),agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-      InputAdapter
-        Exchange [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id] #1
-          WholeStageCodegen (7)
-            HashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-              Expand [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
-                Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
-                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+WholeStageCodegen (8)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
+        CometHashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+          CometColumnarExchange [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (7)
+                HashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                  Expand [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
+                    Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #2
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                            InputAdapter
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [cd_demo_sk,cd_dep_count]
+                                                        CometFilter [cd_gender,cd_education_status,cd_demo_sk]
+                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
                                         InputAdapter
-                                          BroadcastExchange #3
-                                            WholeStageCodegen (1)
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometProject [cd_demo_sk,cd_dep_count]
-                                                    CometFilter [cd_gender,cd_education_status,cd_demo_sk]
-                                                      CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
+                                                  CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                                    CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
                                     InputAdapter
-                                      BroadcastExchange #4
-                                        WholeStageCodegen (2)
+                                      BroadcastExchange #5
+                                        WholeStageCodegen (3)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                                CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
+                                              CometFilter [cd_demo_sk]
+                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
                                 InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (3)
+                                  BroadcastExchange #6
+                                    WholeStageCodegen (4)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [cd_demo_sk]
-                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
+                                          CometFilter [ca_state,ca_address_sk]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
                             InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (4)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ca_state,ca_address_sk]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (6)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                          BroadcastExchange #7
+                            WholeStageCodegen (6)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt
index 1150b3d665..5f4b64a18d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt
@@ -1,43 +1,45 @@
 == Physical Plan ==
-TakeOrderedAndProject (39)
-+- * HashAggregate (38)
-   +- Exchange (37)
-      +- * HashAggregate (36)
-         +- * Project (35)
-            +- * BroadcastHashJoin Inner BuildRight (34)
-               :- * Project (29)
-               :  +- * BroadcastHashJoin Inner BuildRight (28)
-               :     :- * Project (23)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (22)
-               :     :     :- * Project (17)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-               :     :     :     :- * Project (10)
-               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :     :     :     :- * ColumnarToRow (4)
-               :     :     :     :     :  +- CometProject (3)
-               :     :     :     :     :     +- CometFilter (2)
-               :     :     :     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-               :     :     :     :     +- BroadcastExchange (8)
-               :     :     :     :        +- * ColumnarToRow (7)
-               :     :     :     :           +- CometFilter (6)
-               :     :     :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-               :     :     :     +- BroadcastExchange (15)
-               :     :     :        +- * ColumnarToRow (14)
-               :     :     :           +- CometProject (13)
-               :     :     :              +- CometFilter (12)
-               :     :     :                 +- CometScan parquet spark_catalog.default.item (11)
-               :     :     +- BroadcastExchange (21)
-               :     :        +- * ColumnarToRow (20)
-               :     :           +- CometFilter (19)
-               :     :              +- CometScan parquet spark_catalog.default.customer (18)
-               :     +- BroadcastExchange (27)
-               :        +- * ColumnarToRow (26)
-               :           +- CometFilter (25)
-               :              +- CometScan parquet spark_catalog.default.customer_address (24)
-               +- BroadcastExchange (33)
-                  +- * ColumnarToRow (32)
-                     +- CometFilter (31)
-                        +- CometScan parquet spark_catalog.default.store (30)
+* ColumnarToRow (41)
++- CometTakeOrderedAndProject (40)
+   +- CometHashAggregate (39)
+      +- CometColumnarExchange (38)
+         +- RowToColumnar (37)
+            +- * HashAggregate (36)
+               +- * Project (35)
+                  +- * BroadcastHashJoin Inner BuildRight (34)
+                     :- * Project (29)
+                     :  +- * BroadcastHashJoin Inner BuildRight (28)
+                     :     :- * Project (23)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
+                     :     :     :- * Project (17)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+                     :     :     :     :- * Project (10)
+                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :     :     :     :- * ColumnarToRow (4)
+                     :     :     :     :     :  +- CometProject (3)
+                     :     :     :     :     :     +- CometFilter (2)
+                     :     :     :     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+                     :     :     :     :     +- BroadcastExchange (8)
+                     :     :     :     :        +- * ColumnarToRow (7)
+                     :     :     :     :           +- CometFilter (6)
+                     :     :     :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                     :     :     :     +- BroadcastExchange (15)
+                     :     :     :        +- * ColumnarToRow (14)
+                     :     :     :           +- CometProject (13)
+                     :     :     :              +- CometFilter (12)
+                     :     :     :                 +- CometScan parquet spark_catalog.default.item (11)
+                     :     :     +- BroadcastExchange (21)
+                     :     :        +- * ColumnarToRow (20)
+                     :     :           +- CometFilter (19)
+                     :     :              +- CometScan parquet spark_catalog.default.customer (18)
+                     :     +- BroadcastExchange (27)
+                     :        +- * ColumnarToRow (26)
+                     :           +- CometFilter (25)
+                     :              +- CometScan parquet spark_catalog.default.customer_address (24)
+                     +- BroadcastExchange (33)
+                        +- * ColumnarToRow (32)
+                           +- CometFilter (31)
+                              +- CometScan parquet spark_catalog.default.store (30)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -210,18 +212,22 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#7))]
 Aggregate Attributes [1]: [sum#21]
 Results [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
 
-(37) Exchange
+(37) RowToColumnar
 Input [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
-Arguments: hashpartitioning(i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(38) HashAggregate [codegen id : 7]
+(38) CometColumnarExchange
+Input [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
+Arguments: hashpartitioning(i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(39) CometHashAggregate
 Input [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
 Keys [4]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#7))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#7))#23]
-Results [5]: [i_brand_id#10 AS brand_id#24, i_brand#11 AS brand#25, i_manufact_id#12, i_manufact#13, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#7))#23,17,2) AS ext_price#26]
 
-(39) TakeOrderedAndProject
-Input [5]: [brand_id#24, brand#25, i_manufact_id#12, i_manufact#13, ext_price#26]
-Arguments: 100, [ext_price#26 DESC NULLS LAST, brand#25 ASC NULLS FIRST, brand_id#24 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST, i_manufact#13 ASC NULLS FIRST], [brand_id#24, brand#25, i_manufact_id#12, i_manufact#13, ext_price#26]
+(40) CometTakeOrderedAndProject
+Input [5]: [brand_id#23, brand#24, i_manufact_id#12, i_manufact#13, ext_price#25]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ext_price#25 DESC NULLS LAST,brand#24 ASC NULLS FIRST,brand_id#23 ASC NULLS FIRST,i_manufact_id#12 ASC NULLS FIRST,i_manufact#13 ASC NULLS FIRST], output=[brand_id#23,brand#24,i_manufact_id#12,i_manufact#13,ext_price#25]), 100, [ext_price#25 DESC NULLS LAST, brand#24 ASC NULLS FIRST, brand_id#23 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST, i_manufact#13 ASC NULLS FIRST], [brand_id#23, brand#24, i_manufact_id#12, i_manufact#13, ext_price#25]
+
+(41) ColumnarToRow [codegen id : 7]
+Input [5]: [brand_id#23, brand#24, i_manufact_id#12, i_manufact#13, ext_price#25]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt
index c2f5d1a876..5b9f4956e5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt
@@ -1,58 +1,60 @@
-TakeOrderedAndProject [ext_price,brand,brand_id,i_manufact_id,i_manufact]
-  WholeStageCodegen (7)
-    HashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,ext_price,sum]
-      InputAdapter
-        Exchange [i_brand,i_brand_id,i_manufact_id,i_manufact] #1
-          WholeStageCodegen (6)
-            HashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,ss_ext_sales_price] [sum,sum]
-              Project [ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
-                BroadcastHashJoin [ss_store_sk,s_store_sk,ca_zip,s_zip]
-                  Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,ca_zip]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,c_current_addr_sk]
-                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                          Project [ss_customer_sk,ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              Project [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price]
-                                BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [d_date_sk]
-                                        CometFilter [d_moy,d_year,d_date_sk]
-                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (7)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ext_price,brand,brand_id,i_manufact_id,i_manufact]
+        CometHashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,sum]
+          CometColumnarExchange [i_brand,i_brand_id,i_manufact_id,i_manufact] #1
+            RowToColumnar
+              WholeStageCodegen (6)
+                HashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,ss_ext_sales_price] [sum,sum]
+                  Project [ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
+                    BroadcastHashJoin [ss_store_sk,s_store_sk,ca_zip,s_zip]
+                      Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,ca_zip]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,c_current_addr_sk]
+                            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                              Project [ss_customer_sk,ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [d_date_sk]
+                                            CometFilter [d_moy,d_year,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                      InputAdapter
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_item_sk,ss_customer_sk,ss_store_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
                                   InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
+                                    BroadcastExchange #3
+                                      WholeStageCodegen (2)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometFilter [ss_item_sk,ss_customer_sk,ss_store_sk]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                            CometProject [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact]
+                                              CometFilter [i_manager_id,i_item_sk]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact,i_manager_id]
                               InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (2)
+                                BroadcastExchange #4
+                                  WholeStageCodegen (3)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometProject [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact]
-                                          CometFilter [i_manager_id,i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact,i_manager_id]
+                                        CometFilter [c_customer_sk,c_current_addr_sk]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (3)
+                            BroadcastExchange #5
+                              WholeStageCodegen (4)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [c_customer_sk,c_current_addr_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                    CometFilter [ca_address_sk,ca_zip]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (4)
+                        BroadcastExchange #6
+                          WholeStageCodegen (5)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ca_address_sk,ca_zip]
-                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
-                  InputAdapter
-                    BroadcastExchange #6
-                      WholeStageCodegen (5)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [s_zip,s_store_sk]
-                              CometScan parquet spark_catalog.default.store [s_store_sk,s_zip]
+                                CometFilter [s_zip,s_store_sk]
+                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_zip]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt
index 2fea53fa79..7974fb4eeb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt
@@ -1,40 +1,45 @@
 == Physical Plan ==
-* Sort (36)
-+- Exchange (35)
-   +- * Project (34)
-      +- * BroadcastHashJoin Inner BuildRight (33)
-         :- * Project (22)
-         :  +- * BroadcastHashJoin Inner BuildRight (21)
-         :     :- * HashAggregate (15)
-         :     :  +- Exchange (14)
-         :     :     +- * HashAggregate (13)
-         :     :        +- * Project (12)
-         :     :           +- * BroadcastHashJoin Inner BuildRight (11)
-         :     :              :- * ColumnarToRow (6)
-         :     :              :  +- CometUnion (5)
-         :     :              :     :- CometProject (2)
-         :     :              :     :  +- CometScan parquet spark_catalog.default.web_sales (1)
-         :     :              :     +- CometProject (4)
-         :     :              :        +- CometScan parquet spark_catalog.default.catalog_sales (3)
-         :     :              +- BroadcastExchange (10)
-         :     :                 +- * ColumnarToRow (9)
-         :     :                    +- CometFilter (8)
-         :     :                       +- CometScan parquet spark_catalog.default.date_dim (7)
-         :     +- BroadcastExchange (20)
-         :        +- * ColumnarToRow (19)
-         :           +- CometProject (18)
-         :              +- CometFilter (17)
-         :                 +- CometScan parquet spark_catalog.default.date_dim (16)
-         +- BroadcastExchange (32)
-            +- * Project (31)
-               +- * BroadcastHashJoin Inner BuildRight (30)
-                  :- * HashAggregate (24)
-                  :  +- ReusedExchange (23)
-                  +- BroadcastExchange (29)
-                     +- * ColumnarToRow (28)
-                        +- CometProject (27)
-                           +- CometFilter (26)
-                              +- CometScan parquet spark_catalog.default.date_dim (25)
+* ColumnarToRow (41)
++- CometSort (40)
+   +- CometColumnarExchange (39)
+      +- RowToColumnar (38)
+         +- * Project (37)
+            +- * BroadcastHashJoin Inner BuildRight (36)
+               :- * Project (24)
+               :  +- * BroadcastHashJoin Inner BuildRight (23)
+               :     :- * ColumnarToRow (17)
+               :     :  +- CometHashAggregate (16)
+               :     :     +- CometColumnarExchange (15)
+               :     :        +- RowToColumnar (14)
+               :     :           +- * HashAggregate (13)
+               :     :              +- * Project (12)
+               :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
+               :     :                    :- * ColumnarToRow (6)
+               :     :                    :  +- CometUnion (5)
+               :     :                    :     :- CometProject (2)
+               :     :                    :     :  +- CometScan parquet spark_catalog.default.web_sales (1)
+               :     :                    :     +- CometProject (4)
+               :     :                    :        +- CometScan parquet spark_catalog.default.catalog_sales (3)
+               :     :                    +- BroadcastExchange (10)
+               :     :                       +- * ColumnarToRow (9)
+               :     :                          +- CometFilter (8)
+               :     :                             +- CometScan parquet spark_catalog.default.date_dim (7)
+               :     +- BroadcastExchange (22)
+               :        +- * ColumnarToRow (21)
+               :           +- CometProject (20)
+               :              +- CometFilter (19)
+               :                 +- CometScan parquet spark_catalog.default.date_dim (18)
+               +- BroadcastExchange (35)
+                  +- * Project (34)
+                     +- * BroadcastHashJoin Inner BuildRight (33)
+                        :- * ColumnarToRow (27)
+                        :  +- CometHashAggregate (26)
+                        :     +- ReusedExchange (25)
+                        +- BroadcastExchange (32)
+                           +- * ColumnarToRow (31)
+                              +- CometProject (30)
+                                 +- CometFilter (29)
+                                    +- CometScan parquet spark_catalog.default.date_dim (28)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -101,110 +106,121 @@ Functions [7]: [partial_sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   )
 Aggregate Attributes [7]: [sum#12, sum#13, sum#14, sum#15, sum#16, sum#17, sum#18]
 Results [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
 
-(14) Exchange
+(14) RowToColumnar
 Input [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
-Arguments: hashpartitioning(d_week_seq#10, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 8]
+(15) CometColumnarExchange
+Input [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
+Arguments: hashpartitioning(d_week_seq#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
 Keys [1]: [d_week_seq#10]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))]
-Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32]
-Results [8]: [d_week_seq#10, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26,17,2) AS sun_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27,17,2) AS mon_sales#34, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28,17,2) AS tue_sales#35, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29,17,2) AS wed_sales#36, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30,17,2) AS thu_sales#37, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31,17,2) AS fri_sales#38, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32,17,2) AS sat_sales#39]
+
+(17) ColumnarToRow [codegen id : 8]
+Input [8]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_week_seq#40, d_year#41]
+Output [2]: [d_week_seq#33, d_year#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_week_seq:int,d_year:int>
 
-(17) CometFilter
-Input [2]: [d_week_seq#40, d_year#41]
-Condition : ((isnotnull(d_year#41) AND (d_year#41 = 2001)) AND isnotnull(d_week_seq#40))
+(19) CometFilter
+Input [2]: [d_week_seq#33, d_year#34]
+Condition : ((isnotnull(d_year#34) AND (d_year#34 = 2001)) AND isnotnull(d_week_seq#33))
 
-(18) CometProject
-Input [2]: [d_week_seq#40, d_year#41]
-Arguments: [d_week_seq#40], [d_week_seq#40]
+(20) CometProject
+Input [2]: [d_week_seq#33, d_year#34]
+Arguments: [d_week_seq#33], [d_week_seq#33]
 
-(19) ColumnarToRow [codegen id : 3]
-Input [1]: [d_week_seq#40]
+(21) ColumnarToRow [codegen id : 3]
+Input [1]: [d_week_seq#33]
 
-(20) BroadcastExchange
-Input [1]: [d_week_seq#40]
+(22) BroadcastExchange
+Input [1]: [d_week_seq#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(21) BroadcastHashJoin [codegen id : 8]
+(23) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [d_week_seq#10]
-Right keys [1]: [d_week_seq#40]
+Right keys [1]: [d_week_seq#33]
 Join type: Inner
 Join condition: None
 
-(22) Project [codegen id : 8]
-Output [8]: [d_week_seq#10 AS d_week_seq1#42, sun_sales#33 AS sun_sales1#43, mon_sales#34 AS mon_sales1#44, tue_sales#35 AS tue_sales1#45, wed_sales#36 AS wed_sales1#46, thu_sales#37 AS thu_sales1#47, fri_sales#38 AS fri_sales1#48, sat_sales#39 AS sat_sales1#49]
-Input [9]: [d_week_seq#10, sun_sales#33, mon_sales#34, tue_sales#35, wed_sales#36, thu_sales#37, fri_sales#38, sat_sales#39, d_week_seq#40]
+(24) Project [codegen id : 8]
+Output [8]: [d_week_seq#10 AS d_week_seq1#35, sun_sales#26 AS sun_sales1#36, mon_sales#27 AS mon_sales1#37, tue_sales#28 AS tue_sales1#38, wed_sales#29 AS wed_sales1#39, thu_sales#30 AS thu_sales1#40, fri_sales#31 AS fri_sales1#41, sat_sales#32 AS sat_sales1#42]
+Input [9]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32, d_week_seq#33]
 
-(23) ReusedExchange [Reuses operator id: 14]
-Output [8]: [d_week_seq#10, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
+(25) ReusedExchange [Reuses operator id: 15]
+Output [8]: [d_week_seq#10, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
 
-(24) HashAggregate [codegen id : 7]
-Input [8]: [d_week_seq#10, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
+(26) CometHashAggregate
+Input [8]: [d_week_seq#10, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
 Keys [1]: [d_week_seq#10]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))]
-Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32]
-Results [8]: [d_week_seq#10, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26,17,2) AS sun_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27,17,2) AS mon_sales#34, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28,17,2) AS tue_sales#35, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29,17,2) AS wed_sales#36, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30,17,2) AS thu_sales#37, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31,17,2) AS fri_sales#38, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32,17,2) AS sat_sales#39]
+
+(27) ColumnarToRow [codegen id : 7]
+Input [8]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_week_seq#57, d_year#58]
+Output [2]: [d_week_seq#50, d_year#51]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_week_seq:int,d_year:int>
 
-(26) CometFilter
-Input [2]: [d_week_seq#57, d_year#58]
-Condition : ((isnotnull(d_year#58) AND (d_year#58 = 2002)) AND isnotnull(d_week_seq#57))
+(29) CometFilter
+Input [2]: [d_week_seq#50, d_year#51]
+Condition : ((isnotnull(d_year#51) AND (d_year#51 = 2002)) AND isnotnull(d_week_seq#50))
 
-(27) CometProject
-Input [2]: [d_week_seq#57, d_year#58]
-Arguments: [d_week_seq#57], [d_week_seq#57]
+(30) CometProject
+Input [2]: [d_week_seq#50, d_year#51]
+Arguments: [d_week_seq#50], [d_week_seq#50]
 
-(28) ColumnarToRow [codegen id : 6]
-Input [1]: [d_week_seq#57]
+(31) ColumnarToRow [codegen id : 6]
+Input [1]: [d_week_seq#50]
 
-(29) BroadcastExchange
-Input [1]: [d_week_seq#57]
+(32) BroadcastExchange
+Input [1]: [d_week_seq#50]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(30) BroadcastHashJoin [codegen id : 7]
+(33) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [d_week_seq#10]
-Right keys [1]: [d_week_seq#57]
+Right keys [1]: [d_week_seq#50]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 7]
-Output [8]: [d_week_seq#10 AS d_week_seq2#59, sun_sales#33 AS sun_sales2#60, mon_sales#34 AS mon_sales2#61, tue_sales#35 AS tue_sales2#62, wed_sales#36 AS wed_sales2#63, thu_sales#37 AS thu_sales2#64, fri_sales#38 AS fri_sales2#65, sat_sales#39 AS sat_sales2#66]
-Input [9]: [d_week_seq#10, sun_sales#33, mon_sales#34, tue_sales#35, wed_sales#36, thu_sales#37, fri_sales#38, sat_sales#39, d_week_seq#57]
+(34) Project [codegen id : 7]
+Output [8]: [d_week_seq#10 AS d_week_seq2#52, sun_sales#26 AS sun_sales2#53, mon_sales#27 AS mon_sales2#54, tue_sales#28 AS tue_sales2#55, wed_sales#29 AS wed_sales2#56, thu_sales#30 AS thu_sales2#57, fri_sales#31 AS fri_sales2#58, sat_sales#32 AS sat_sales2#59]
+Input [9]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32, d_week_seq#50]
 
-(32) BroadcastExchange
-Input [8]: [d_week_seq2#59, sun_sales2#60, mon_sales2#61, tue_sales2#62, wed_sales2#63, thu_sales2#64, fri_sales2#65, sat_sales2#66]
+(35) BroadcastExchange
+Input [8]: [d_week_seq2#52, sun_sales2#53, mon_sales2#54, tue_sales2#55, wed_sales2#56, thu_sales2#57, fri_sales2#58, sat_sales2#59]
 Arguments: HashedRelationBroadcastMode(List(cast((input[0, int, true] - 53) as bigint)),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [d_week_seq1#42]
-Right keys [1]: [(d_week_seq2#59 - 53)]
+(36) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [d_week_seq1#35]
+Right keys [1]: [(d_week_seq2#52 - 53)]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 8]
-Output [8]: [d_week_seq1#42, round((sun_sales1#43 / sun_sales2#60), 2) AS round((sun_sales1 / sun_sales2), 2)#67, round((mon_sales1#44 / mon_sales2#61), 2) AS round((mon_sales1 / mon_sales2), 2)#68, round((tue_sales1#45 / tue_sales2#62), 2) AS round((tue_sales1 / tue_sales2), 2)#69, round((wed_sales1#46 / wed_sales2#63), 2) AS round((wed_sales1 / wed_sales2), 2)#70, round((thu_sales1#47 / thu_sales2#64), 2) AS round((thu_sales1 / thu_sales2), 2)#71, round((fri_sales1#48 / fri_sales2#65), 2) AS round((fri_sales1 / fri_sales2), 2)#72, round((sat_sales1#49 / sat_sales2#66), 2) AS round((sat_sales1 / sat_sales2), 2)#73]
-Input [16]: [d_week_seq1#42, sun_sales1#43, mon_sales1#44, tue_sales1#45, wed_sales1#46, thu_sales1#47, fri_sales1#48, sat_sales1#49, d_week_seq2#59, sun_sales2#60, mon_sales2#61, tue_sales2#62, wed_sales2#63, thu_sales2#64, fri_sales2#65, sat_sales2#66]
+(37) Project [codegen id : 8]
+Output [8]: [d_week_seq1#35, round((sun_sales1#36 / sun_sales2#53), 2) AS round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1#37 / mon_sales2#54), 2) AS round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1#38 / tue_sales2#55), 2) AS round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1#39 / wed_sales2#56), 2) AS round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1#40 / thu_sales2#57), 2) AS round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1#41 / fri_sales2#58), 2) AS round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1#42 / sat_sales2#59), 2) AS round((sat_sales1 / sat_sales2), 2)#66]
+Input [16]: [d_week_seq1#35, sun_sales1#36, mon_sales1#37, tue_sales1#38, wed_sales1#39, thu_sales1#40, fri_sales1#41, sat_sales1#42, d_week_seq2#52, sun_sales2#53, mon_sales2#54, tue_sales2#55, wed_sales2#56, thu_sales2#57, fri_sales2#58, sat_sales2#59]
+
+(38) RowToColumnar
+Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
+
+(39) CometColumnarExchange
+Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
+Arguments: rangepartitioning(d_week_seq1#35 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(35) Exchange
-Input [8]: [d_week_seq1#42, round((sun_sales1 / sun_sales2), 2)#67, round((mon_sales1 / mon_sales2), 2)#68, round((tue_sales1 / tue_sales2), 2)#69, round((wed_sales1 / wed_sales2), 2)#70, round((thu_sales1 / thu_sales2), 2)#71, round((fri_sales1 / fri_sales2), 2)#72, round((sat_sales1 / sat_sales2), 2)#73]
-Arguments: rangepartitioning(d_week_seq1#42 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(40) CometSort
+Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
+Arguments: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66], [d_week_seq1#35 ASC NULLS FIRST]
 
-(36) Sort [codegen id : 9]
-Input [8]: [d_week_seq1#42, round((sun_sales1 / sun_sales2), 2)#67, round((mon_sales1 / mon_sales2), 2)#68, round((tue_sales1 / tue_sales2), 2)#69, round((wed_sales1 / wed_sales2), 2)#70, round((thu_sales1 / thu_sales2), 2)#71, round((fri_sales1 / fri_sales2), 2)#72, round((sat_sales1 / sat_sales2), 2)#73]
-Arguments: [d_week_seq1#42 ASC NULLS FIRST], true, 0
+(41) ColumnarToRow [codegen id : 9]
+Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt
index 8856ce80d2..f4b68cfee2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt
@@ -1,54 +1,59 @@
 WholeStageCodegen (9)
-  Sort [d_week_seq1]
+  ColumnarToRow
     InputAdapter
-      Exchange [d_week_seq1] #1
-        WholeStageCodegen (8)
-          Project [d_week_seq1,sun_sales1,sun_sales2,mon_sales1,mon_sales2,tue_sales1,tue_sales2,wed_sales1,wed_sales2,thu_sales1,thu_sales2,fri_sales1,fri_sales2,sat_sales1,sat_sales2]
-            BroadcastHashJoin [d_week_seq1,d_week_seq2]
-              Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
-                BroadcastHashJoin [d_week_seq,d_week_seq]
-                  HashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
-                    InputAdapter
-                      Exchange [d_week_seq] #2
-                        WholeStageCodegen (2)
-                          HashAggregate [d_week_seq,d_day_name,sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                            Project [sales_price,d_week_seq,d_day_name]
-                              BroadcastHashJoin [sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometUnion
-                                      CometProject [ws_sold_date_sk,ws_ext_sales_price] [sold_date_sk,sales_price]
-                                        CometScan parquet spark_catalog.default.web_sales [ws_ext_sales_price,ws_sold_date_sk]
-                                      CometProject [cs_sold_date_sk,cs_ext_sales_price] [sold_date_sk,sales_price]
-                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ext_sales_price,cs_sold_date_sk]
-                                InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
+      CometSort [d_week_seq1]
+        CometColumnarExchange [d_week_seq1] #1
+          RowToColumnar
+            WholeStageCodegen (8)
+              Project [d_week_seq1,sun_sales1,sun_sales2,mon_sales1,mon_sales2,tue_sales1,tue_sales2,wed_sales1,wed_sales2,thu_sales1,thu_sales2,fri_sales1,fri_sales2,sat_sales1,sat_sales2]
+                BroadcastHashJoin [d_week_seq1,d_week_seq2]
+                  Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
+                    BroadcastHashJoin [d_week_seq,d_week_seq]
+                      ColumnarToRow
+                        InputAdapter
+                          CometHashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum]
+                            CometColumnarExchange [d_week_seq] #2
+                              RowToColumnar
+                                WholeStageCodegen (2)
+                                  HashAggregate [d_week_seq,d_day_name,sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                                    Project [sales_price,d_week_seq,d_day_name]
+                                      BroadcastHashJoin [sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometUnion
+                                              CometProject [ws_sold_date_sk,ws_ext_sales_price] [sold_date_sk,sales_price]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_ext_sales_price,ws_sold_date_sk]
+                                              CometProject [cs_sold_date_sk,cs_ext_sales_price] [sold_date_sk,sales_price]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_ext_sales_price,cs_sold_date_sk]
                                         InputAdapter
-                                          CometFilter [d_date_sk,d_week_seq]
-                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
+                                          BroadcastExchange #3
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [d_date_sk,d_week_seq]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
+                      InputAdapter
+                        BroadcastExchange #4
+                          WholeStageCodegen (3)
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [d_week_seq]
+                                  CometFilter [d_year,d_week_seq]
+                                    CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
                   InputAdapter
-                    BroadcastExchange #4
-                      WholeStageCodegen (3)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [d_week_seq]
-                              CometFilter [d_year,d_week_seq]
-                                CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
-              InputAdapter
-                BroadcastExchange #5
-                  WholeStageCodegen (7)
-                    Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
-                      BroadcastHashJoin [d_week_seq,d_week_seq]
-                        HashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
-                          InputAdapter
-                            ReusedExchange [d_week_seq,sum,sum,sum,sum,sum,sum,sum] #2
-                        InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (6)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometProject [d_week_seq]
-                                    CometFilter [d_year,d_week_seq]
-                                      CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
+                    BroadcastExchange #5
+                      WholeStageCodegen (7)
+                        Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
+                          BroadcastHashJoin [d_week_seq,d_week_seq]
+                            ColumnarToRow
+                              InputAdapter
+                                CometHashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum]
+                                  ReusedExchange [d_week_seq,sum,sum,sum,sum,sum,sum,sum] #2
+                            InputAdapter
+                              BroadcastExchange #6
+                                WholeStageCodegen (6)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [d_week_seq]
+                                        CometFilter [d_year,d_week_seq]
+                                          CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt
index eedf666dd1..5d279243c5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt
@@ -1,24 +1,26 @@
 == Physical Plan ==
-TakeOrderedAndProject (20)
-+- * Project (19)
-   +- Window (18)
-      +- * Sort (17)
-         +- Exchange (16)
-            +- * HashAggregate (15)
-               +- Exchange (14)
-                  +- * HashAggregate (13)
-                     +- * Project (12)
-                        +- * BroadcastHashJoin Inner BuildRight (11)
-                           :- * Project (9)
-                           :  +- * BroadcastHashJoin Inner BuildRight (8)
-                           :     :- * ColumnarToRow (3)
-                           :     :  +- CometFilter (2)
-                           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                           :     +- BroadcastExchange (7)
-                           :        +- * ColumnarToRow (6)
-                           :           +- CometFilter (5)
-                           :              +- CometScan parquet spark_catalog.default.item (4)
-                           +- ReusedExchange (10)
+TakeOrderedAndProject (22)
++- * Project (21)
+   +- Window (20)
+      +- * ColumnarToRow (19)
+         +- CometSort (18)
+            +- CometColumnarExchange (17)
+               +- CometHashAggregate (16)
+                  +- CometColumnarExchange (15)
+                     +- RowToColumnar (14)
+                        +- * HashAggregate (13)
+                           +- * Project (12)
+                              +- * BroadcastHashJoin Inner BuildRight (11)
+                                 :- * Project (9)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                 :     :- * ColumnarToRow (3)
+                                 :     :  +- CometFilter (2)
+                                 :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                                 :     +- BroadcastExchange (7)
+                                 :        +- * ColumnarToRow (6)
+                                 :           +- CometFilter (5)
+                                 :              +- CometScan parquet spark_catalog.default.item (4)
+                                 +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -64,7 +66,7 @@ Join condition: None
 Output [7]: [cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [cs_item_sk#1, cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 25]
+(10) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -84,66 +86,70 @@ Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) Exchange
+(14) RowToColumnar
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#2))#14]
-Results [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS _w0#16, i_item_id#6]
 
-(16) Exchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(17) CometColumnarExchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(18) CometSort
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6], [i_class#9 ASC NULLS FIRST]
 
-(17) Sort [codegen id : 5]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: [i_class#9 ASC NULLS FIRST], false, 0
+(19) ColumnarToRow [codegen id : 4]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
 
-(18) Window
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
+(20) Window
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
 
-(19) Project [codegen id : 6]
-Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18, i_item_id#6]
-Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6, _we0#17]
+(21) Project [codegen id : 5]
+Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
+Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
 
-(20) TakeOrderedAndProject
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+(22) TakeOrderedAndProject
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (25)
-+- * ColumnarToRow (24)
-   +- CometProject (23)
-      +- CometFilter (22)
-         +- CometScan parquet spark_catalog.default.date_dim (21)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#19]
+Output [2]: [d_date_sk#11, d_date#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(22) CometFilter
-Input [2]: [d_date_sk#11, d_date#19]
-Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(24) CometFilter
+Input [2]: [d_date_sk#11, d_date#18]
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(23) CometProject
-Input [2]: [d_date_sk#11, d_date#19]
+(25) CometProject
+Input [2]: [d_date_sk#11, d_date#18]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(24) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(25) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt
index 52c42bdf2b..202a09b6d3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (6)
+  WholeStageCodegen (5)
     Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (5)
-            Sort [i_class]
+          WholeStageCodegen (4)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_class] #1
-                  WholeStageCodegen (4)
-                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(cs_ext_sales_price)),itemrevenue,_w0,sum]
-                      InputAdapter
-                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                CometSort [i_class]
+                  CometColumnarExchange [i_class] #1
+                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
+                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                        RowToColumnar
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,cs_ext_sales_price] [sum,sum]
                               Project [cs_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
index b5625d8e03..5c69eb848b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
@@ -1,28 +1,30 @@
 == Physical Plan ==
-TakeOrderedAndProject (24)
-+- * Filter (23)
-   +- * HashAggregate (22)
-      +- Exchange (21)
-         +- * HashAggregate (20)
-            +- * Project (19)
-               +- * BroadcastHashJoin Inner BuildRight (18)
-                  :- * Project (16)
-                  :  +- * BroadcastHashJoin Inner BuildRight (15)
-                  :     :- * Project (9)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :- * ColumnarToRow (3)
-                  :     :     :  +- CometFilter (2)
-                  :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-                  :     :     +- BroadcastExchange (7)
-                  :     :        +- * ColumnarToRow (6)
-                  :     :           +- CometFilter (5)
-                  :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-                  :     +- BroadcastExchange (14)
-                  :        +- * ColumnarToRow (13)
-                  :           +- CometProject (12)
-                  :              +- CometFilter (11)
-                  :                 +- CometScan parquet spark_catalog.default.item (10)
-                  +- ReusedExchange (17)
+* ColumnarToRow (26)
++- CometTakeOrderedAndProject (25)
+   +- CometFilter (24)
+      +- CometHashAggregate (23)
+         +- CometColumnarExchange (22)
+            +- RowToColumnar (21)
+               +- * HashAggregate (20)
+                  +- * Project (19)
+                     +- * BroadcastHashJoin Inner BuildRight (18)
+                        :- * Project (16)
+                        :  +- * BroadcastHashJoin Inner BuildRight (15)
+                        :     :- * Project (9)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                        :     :     :- * ColumnarToRow (3)
+                        :     :     :  +- CometFilter (2)
+                        :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+                        :     :     +- BroadcastExchange (7)
+                        :     :        +- * ColumnarToRow (6)
+                        :     :           +- CometFilter (5)
+                        :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+                        :     +- BroadcastExchange (14)
+                        :        +- * ColumnarToRow (13)
+                        :           +- CometProject (12)
+                        :              +- CometFilter (11)
+                        :                 +- CometScan parquet spark_catalog.default.item (10)
+                        +- ReusedExchange (17)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -100,7 +102,7 @@ Join condition: None
 Output [4]: [inv_quantity_on_hand#3, inv_date_sk#4, w_warehouse_name#7, i_item_id#9]
 Input [6]: [inv_item_sk#1, inv_quantity_on_hand#3, inv_date_sk#4, w_warehouse_name#7, i_item_sk#8, i_item_id#9]
 
-(17) ReusedExchange [Reuses operator id: 28]
+(17) ReusedExchange [Reuses operator id: 30]
 Output [2]: [d_date_sk#11, d_date#12]
 
 (18) BroadcastHashJoin [codegen id : 4]
@@ -120,32 +122,36 @@ Functions [2]: [partial_sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity
 Aggregate Attributes [2]: [sum#13, sum#14]
 Results [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
 
-(21) Exchange
+(21) RowToColumnar
 Input [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
-Arguments: hashpartitioning(w_warehouse_name#7, i_item_id#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) HashAggregate [codegen id : 5]
+(22) CometColumnarExchange
+Input [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
+Arguments: hashpartitioning(w_warehouse_name#7, i_item_id#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(23) CometHashAggregate
 Input [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
 Keys [2]: [w_warehouse_name#7, i_item_id#9]
 Functions [2]: [sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END), sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)]
-Aggregate Attributes [2]: [sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#17, sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#18]
-Results [4]: [w_warehouse_name#7, i_item_id#9, sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#17 AS inv_before#19, sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#18 AS inv_after#20]
 
-(23) Filter [codegen id : 5]
-Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
-Condition : (CASE WHEN (inv_before#19 > 0) THEN ((cast(inv_after#20 as double) / cast(inv_before#19 as double)) >= 0.666667) END AND CASE WHEN (inv_before#19 > 0) THEN ((cast(inv_after#20 as double) / cast(inv_before#19 as double)) <= 1.5) END)
+(24) CometFilter
+Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
+Condition : (CASE WHEN (inv_before#17 > 0) THEN ((cast(inv_after#18 as double) / cast(inv_before#17 as double)) >= 0.666667) END AND CASE WHEN (inv_before#17 > 0) THEN ((cast(inv_after#18 as double) / cast(inv_before#17 as double)) <= 1.5) END)
+
+(25) CometTakeOrderedAndProject
+Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[w_warehouse_name#7 ASC NULLS FIRST,i_item_id#9 ASC NULLS FIRST], output=[w_warehouse_name#7,i_item_id#9,inv_before#17,inv_after#18]), 100, [w_warehouse_name#7 ASC NULLS FIRST, i_item_id#9 ASC NULLS FIRST], [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
 
-(24) TakeOrderedAndProject
-Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
-Arguments: 100, [w_warehouse_name#7 ASC NULLS FIRST, i_item_id#9 ASC NULLS FIRST], [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
+(26) ColumnarToRow [codegen id : 5]
+Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (28)
-+- * ColumnarToRow (27)
-   +- CometFilter (26)
-      +- CometScan parquet spark_catalog.default.date_dim (25)
+BroadcastExchange (30)
++- * ColumnarToRow (29)
+   +- CometFilter (28)
+      +- CometScan parquet spark_catalog.default.date_dim (27)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -155,14 +161,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-10), LessThanOrEqual(d_date,2000-04-10), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(26) CometFilter
+(28) CometFilter
 Input [2]: [d_date_sk#11, d_date#12]
 Condition : (((isnotnull(d_date#12) AND (d_date#12 >= 2000-02-10)) AND (d_date#12 <= 2000-04-10)) AND isnotnull(d_date_sk#11))
 
-(27) ColumnarToRow [codegen id : 1]
+(29) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#11, d_date#12]
 
-(28) BroadcastExchange
+(30) BroadcastExchange
 Input [2]: [d_date_sk#11, d_date#12]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
index e20755e12f..3556650ca1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
@@ -1,42 +1,44 @@
-TakeOrderedAndProject [w_warehouse_name,i_item_id,inv_before,inv_after]
-  WholeStageCodegen (5)
-    Filter [inv_before,inv_after]
-      HashAggregate [w_warehouse_name,i_item_id,sum,sum] [sum(CASE WHEN (d_date < 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),sum(CASE WHEN (d_date >= 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),inv_before,inv_after,sum,sum]
-        InputAdapter
-          Exchange [w_warehouse_name,i_item_id] #1
-            WholeStageCodegen (4)
-              HashAggregate [w_warehouse_name,i_item_id,d_date,inv_quantity_on_hand] [sum,sum,sum,sum]
-                Project [inv_quantity_on_hand,w_warehouse_name,i_item_id,d_date]
-                  BroadcastHashJoin [inv_date_sk,d_date_sk]
-                    Project [inv_quantity_on_hand,inv_date_sk,w_warehouse_name,i_item_id]
-                      BroadcastHashJoin [inv_item_sk,i_item_sk]
-                        Project [inv_item_sk,inv_quantity_on_hand,inv_date_sk,w_warehouse_name]
-                          BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [inv_warehouse_sk,inv_item_sk]
-                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [d_date,d_date_sk]
-                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [w_warehouse_name,i_item_id,inv_before,inv_after]
+        CometFilter [inv_before,inv_after]
+          CometHashAggregate [w_warehouse_name,i_item_id,sum,sum]
+            CometColumnarExchange [w_warehouse_name,i_item_id] #1
+              RowToColumnar
+                WholeStageCodegen (4)
+                  HashAggregate [w_warehouse_name,i_item_id,d_date,inv_quantity_on_hand] [sum,sum,sum,sum]
+                    Project [inv_quantity_on_hand,w_warehouse_name,i_item_id,d_date]
+                      BroadcastHashJoin [inv_date_sk,d_date_sk]
+                        Project [inv_quantity_on_hand,inv_date_sk,w_warehouse_name,i_item_id]
+                          BroadcastHashJoin [inv_item_sk,i_item_sk]
+                            Project [inv_item_sk,inv_quantity_on_hand,inv_date_sk,w_warehouse_name]
+                              BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [inv_warehouse_sk,inv_item_sk]
+                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [d_date,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                InputAdapter
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [w_warehouse_sk]
+                                            CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (1)
+                              BroadcastExchange #4
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [w_warehouse_sk]
-                                        CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                      CometProject [i_item_sk,i_item_id]
+                                        CometFilter [i_current_price,i_item_sk]
+                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (2)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometProject [i_item_sk,i_item_id]
-                                    CometFilter [i_current_price,i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
-                    InputAdapter
-                      ReusedExchange [d_date_sk,d_date] #2
+                          ReusedExchange [d_date_sk,d_date] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt
index 7dfa2dc06a..13689dc21e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt
@@ -1,27 +1,29 @@
 == Physical Plan ==
-TakeOrderedAndProject (23)
-+- * HashAggregate (22)
-   +- Exchange (21)
-      +- * HashAggregate (20)
-         +- * Expand (19)
-            +- * Project (18)
-               +- * BroadcastHashJoin Inner BuildRight (17)
-                  :- * Project (12)
-                  :  +- * BroadcastHashJoin Inner BuildRight (11)
-                  :     :- * Project (6)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                  :     :     :- * ColumnarToRow (3)
-                  :     :     :  +- CometFilter (2)
-                  :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-                  :     :     +- ReusedExchange (4)
-                  :     +- BroadcastExchange (10)
-                  :        +- * ColumnarToRow (9)
-                  :           +- CometFilter (8)
-                  :              +- CometScan parquet spark_catalog.default.item (7)
-                  +- BroadcastExchange (16)
-                     +- * ColumnarToRow (15)
-                        +- CometFilter (14)
-                           +- CometScan parquet spark_catalog.default.warehouse (13)
+* ColumnarToRow (25)
++- CometTakeOrderedAndProject (24)
+   +- CometHashAggregate (23)
+      +- CometColumnarExchange (22)
+         +- RowToColumnar (21)
+            +- * HashAggregate (20)
+               +- * Expand (19)
+                  +- * Project (18)
+                     +- * BroadcastHashJoin Inner BuildRight (17)
+                        :- * Project (12)
+                        :  +- * BroadcastHashJoin Inner BuildRight (11)
+                        :     :- * Project (6)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                        :     :     :- * ColumnarToRow (3)
+                        :     :     :  +- CometFilter (2)
+                        :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+                        :     :     +- ReusedExchange (4)
+                        :     +- BroadcastExchange (10)
+                        :        +- * ColumnarToRow (9)
+                        :           +- CometFilter (8)
+                        :              +- CometScan parquet spark_catalog.default.item (7)
+                        +- BroadcastExchange (16)
+                           +- * ColumnarToRow (15)
+                              +- CometFilter (14)
+                                 +- CometScan parquet spark_catalog.default.warehouse (13)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -39,7 +41,7 @@ Condition : (isnotnull(inv_item_sk#1) AND isnotnull(inv_warehouse_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [4]: [inv_item_sk#1, inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 28]
+(4) ReusedExchange [Reuses operator id: 30]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -119,50 +121,54 @@ Functions [1]: [partial_avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [sum#18, count#19]
 Results [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
 
-(21) Exchange
+(21) RowToColumnar
 Input [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
-Arguments: hashpartitioning(i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) HashAggregate [codegen id : 5]
+(22) CometColumnarExchange
+Input [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
+Arguments: hashpartitioning(i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(23) CometHashAggregate
 Input [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
 Keys [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#22]
-Results [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, avg(inv_quantity_on_hand#3)#22 AS qoh#23]
 
-(23) TakeOrderedAndProject
-Input [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#23]
-Arguments: 100, [qoh#23 ASC NULLS FIRST, i_product_name#13 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_category#16 ASC NULLS FIRST], [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#23]
+(24) CometTakeOrderedAndProject
+Input [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#22]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[qoh#22 ASC NULLS FIRST,i_product_name#13 ASC NULLS FIRST,i_brand#14 ASC NULLS FIRST,i_class#15 ASC NULLS FIRST,i_category#16 ASC NULLS FIRST], output=[i_product_name#13,i_brand#14,i_class#15,i_category#16,qoh#22]), 100, [qoh#22 ASC NULLS FIRST, i_product_name#13 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_category#16 ASC NULLS FIRST], [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#22]
+
+(25) ColumnarToRow [codegen id : 5]
+Input [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (28)
-+- * ColumnarToRow (27)
-   +- CometProject (26)
-      +- CometFilter (25)
-         +- CometScan parquet spark_catalog.default.date_dim (24)
+BroadcastExchange (30)
++- * ColumnarToRow (29)
+   +- CometProject (28)
+      +- CometFilter (27)
+         +- CometScan parquet spark_catalog.default.date_dim (26)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_month_seq#24]
+Output [2]: [d_date_sk#6, d_month_seq#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(25) CometFilter
-Input [2]: [d_date_sk#6, d_month_seq#24]
-Condition : (((isnotnull(d_month_seq#24) AND (d_month_seq#24 >= 1200)) AND (d_month_seq#24 <= 1211)) AND isnotnull(d_date_sk#6))
+(27) CometFilter
+Input [2]: [d_date_sk#6, d_month_seq#23]
+Condition : (((isnotnull(d_month_seq#23) AND (d_month_seq#23 >= 1200)) AND (d_month_seq#23 <= 1211)) AND isnotnull(d_date_sk#6))
 
-(26) CometProject
-Input [2]: [d_date_sk#6, d_month_seq#24]
+(28) CometProject
+Input [2]: [d_date_sk#6, d_month_seq#23]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(27) ColumnarToRow [codegen id : 1]
+(29) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(28) BroadcastExchange
+(30) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt
index 92714bb02d..b0c2728e3a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt
@@ -1,42 +1,44 @@
-TakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
-  WholeStageCodegen (5)
-    HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-      InputAdapter
-        Exchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
-          WholeStageCodegen (4)
-            HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
-              Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                  BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                    Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                      BroadcastHashJoin [inv_item_sk,i_item_sk]
-                        Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
-                          BroadcastHashJoin [inv_date_sk,d_date_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [inv_item_sk,inv_warehouse_sk]
-                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_month_seq,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
+        CometHashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count]
+          CometColumnarExchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (4)
+                HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
+                  Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                    Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                        Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                          BroadcastHashJoin [inv_item_sk,i_item_sk]
+                            Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
+                              BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [inv_item_sk,inv_warehouse_sk]
+                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_month_seq,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
                         InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (2)
+                          BroadcastExchange #4
+                            WholeStageCodegen (3)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
-                    InputAdapter
-                      BroadcastExchange #4
-                        WholeStageCodegen (3)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [w_warehouse_sk]
-                                CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
+                                  CometFilter [w_warehouse_sk]
+                                    CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt
index 5ec1794c1b..973532dc28 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt
@@ -1,70 +1,79 @@
 == Physical Plan ==
-* HashAggregate (66)
-+- Exchange (65)
-   +- * HashAggregate (64)
-      +- Union (63)
-         :- * Project (45)
-         :  +- * BroadcastHashJoin Inner BuildRight (44)
-         :     :- * Project (42)
-         :     :  +- * SortMergeJoin LeftSemi (41)
-         :     :     :- * Sort (24)
-         :     :     :  +- Exchange (23)
-         :     :     :     +- * Project (22)
-         :     :     :        +- * BroadcastHashJoin LeftSemi BuildRight (21)
-         :     :     :           :- * ColumnarToRow (2)
-         :     :     :           :  +- CometScan parquet spark_catalog.default.catalog_sales (1)
-         :     :     :           +- BroadcastExchange (20)
-         :     :     :              +- * Project (19)
-         :     :     :                 +- * Filter (18)
-         :     :     :                    +- * HashAggregate (17)
-         :     :     :                       +- Exchange (16)
-         :     :     :                          +- * HashAggregate (15)
-         :     :     :                             +- * Project (14)
-         :     :     :                                +- * BroadcastHashJoin Inner BuildRight (13)
-         :     :     :                                   :- * Project (8)
-         :     :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (7)
-         :     :     :                                   :     :- * ColumnarToRow (5)
-         :     :     :                                   :     :  +- CometFilter (4)
-         :     :     :                                   :     :     +- CometScan parquet spark_catalog.default.store_sales (3)
-         :     :     :                                   :     +- ReusedExchange (6)
-         :     :     :                                   +- BroadcastExchange (12)
-         :     :     :                                      +- * ColumnarToRow (11)
-         :     :     :                                         +- CometFilter (10)
-         :     :     :                                            +- CometScan parquet spark_catalog.default.item (9)
-         :     :     +- * Sort (40)
-         :     :        +- * Project (39)
-         :     :           +- * Filter (38)
-         :     :              +- * HashAggregate (37)
-         :     :                 +- Exchange (36)
-         :     :                    +- * HashAggregate (35)
-         :     :                       +- * Project (34)
-         :     :                          +- * BroadcastHashJoin Inner BuildRight (33)
-         :     :                             :- * ColumnarToRow (28)
-         :     :                             :  +- CometProject (27)
-         :     :                             :     +- CometFilter (26)
-         :     :                             :        +- CometScan parquet spark_catalog.default.store_sales (25)
-         :     :                             +- BroadcastExchange (32)
-         :     :                                +- * ColumnarToRow (31)
-         :     :                                   +- CometFilter (30)
-         :     :                                      +- CometScan parquet spark_catalog.default.customer (29)
-         :     +- ReusedExchange (43)
-         +- * Project (62)
-            +- * BroadcastHashJoin Inner BuildRight (61)
-               :- * Project (59)
-               :  +- * SortMergeJoin LeftSemi (58)
-               :     :- * Sort (52)
-               :     :  +- Exchange (51)
-               :     :     +- * Project (50)
-               :     :        +- * BroadcastHashJoin LeftSemi BuildRight (49)
-               :     :           :- * ColumnarToRow (47)
-               :     :           :  +- CometScan parquet spark_catalog.default.web_sales (46)
-               :     :           +- ReusedExchange (48)
-               :     +- * Sort (57)
-               :        +- * Project (56)
-               :           +- * Filter (55)
-               :              +- * HashAggregate (54)
-               :                 +- ReusedExchange (53)
-               +- ReusedExchange (60)
+* ColumnarToRow (75)
++- CometHashAggregate (74)
+   +- CometColumnarExchange (73)
+      +- RowToColumnar (72)
+         +- * HashAggregate (71)
+            +- Union (70)
+               :- * Project (50)
+               :  +- * BroadcastHashJoin Inner BuildRight (49)
+               :     :- * ColumnarToRow (47)
+               :     :  +- CometProject (46)
+               :     :     +- CometSortMergeJoin (45)
+               :     :        :- CometSort (27)
+               :     :        :  +- CometColumnarExchange (26)
+               :     :        :     +- RowToColumnar (25)
+               :     :        :        +- * Project (24)
+               :     :        :           +- * BroadcastHashJoin LeftSemi BuildRight (23)
+               :     :        :              :- * ColumnarToRow (2)
+               :     :        :              :  +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :     :        :              +- BroadcastExchange (22)
+               :     :        :                 +- * ColumnarToRow (21)
+               :     :        :                    +- CometProject (20)
+               :     :        :                       +- CometFilter (19)
+               :     :        :                          +- CometHashAggregate (18)
+               :     :        :                             +- CometColumnarExchange (17)
+               :     :        :                                +- RowToColumnar (16)
+               :     :        :                                   +- * HashAggregate (15)
+               :     :        :                                      +- * Project (14)
+               :     :        :                                         +- * BroadcastHashJoin Inner BuildRight (13)
+               :     :        :                                            :- * Project (8)
+               :     :        :                                            :  +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :        :                                            :     :- * ColumnarToRow (5)
+               :     :        :                                            :     :  +- CometFilter (4)
+               :     :        :                                            :     :     +- CometScan parquet spark_catalog.default.store_sales (3)
+               :     :        :                                            :     +- ReusedExchange (6)
+               :     :        :                                            +- BroadcastExchange (12)
+               :     :        :                                               +- * ColumnarToRow (11)
+               :     :        :                                                  +- CometFilter (10)
+               :     :        :                                                     +- CometScan parquet spark_catalog.default.item (9)
+               :     :        +- CometSort (44)
+               :     :           +- CometProject (43)
+               :     :              +- CometFilter (42)
+               :     :                 +- CometHashAggregate (41)
+               :     :                    +- CometColumnarExchange (40)
+               :     :                       +- RowToColumnar (39)
+               :     :                          +- * HashAggregate (38)
+               :     :                             +- * Project (37)
+               :     :                                +- * BroadcastHashJoin Inner BuildRight (36)
+               :     :                                   :- * ColumnarToRow (31)
+               :     :                                   :  +- CometProject (30)
+               :     :                                   :     +- CometFilter (29)
+               :     :                                   :        +- CometScan parquet spark_catalog.default.store_sales (28)
+               :     :                                   +- BroadcastExchange (35)
+               :     :                                      +- * ColumnarToRow (34)
+               :     :                                         +- CometFilter (33)
+               :     :                                            +- CometScan parquet spark_catalog.default.customer (32)
+               :     +- ReusedExchange (48)
+               +- * Project (69)
+                  +- * BroadcastHashJoin Inner BuildRight (68)
+                     :- * ColumnarToRow (66)
+                     :  +- CometProject (65)
+                     :     +- CometSortMergeJoin (64)
+                     :        :- CometSort (58)
+                     :        :  +- CometColumnarExchange (57)
+                     :        :     +- RowToColumnar (56)
+                     :        :        +- * Project (55)
+                     :        :           +- * BroadcastHashJoin LeftSemi BuildRight (54)
+                     :        :              :- * ColumnarToRow (52)
+                     :        :              :  +- CometScan parquet spark_catalog.default.web_sales (51)
+                     :        :              +- ReusedExchange (53)
+                     :        +- CometSort (63)
+                     :           +- CometProject (62)
+                     :              +- CometFilter (61)
+                     :                 +- CometHashAggregate (60)
+                     :                    +- ReusedExchange (59)
+                     +- ReusedExchange (67)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -92,7 +101,7 @@ Condition : isnotnull(ss_item_sk#7)
 (5) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_item_sk#7, ss_sold_date_sk#8]
 
-(6) ReusedExchange [Reuses operator id: 76]
+(6) ReusedExchange [Reuses operator id: 85]
 Output [2]: [d_date_sk#10, d_date#11]
 
 (7) BroadcastHashJoin [codegen id : 3]
@@ -140,431 +149,450 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#15]
 Results [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 
-(16) Exchange
+(16) RowToColumnar
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
-Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(17) HashAggregate [codegen id : 4]
+(17) CometColumnarExchange
+Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
+Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(18) CometHashAggregate
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 Keys [3]: [_groupingexpression#14, i_item_sk#12, d_date#11]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#17]
-Results [2]: [i_item_sk#12 AS item_sk#18, count(1)#17 AS cnt#19]
 
-(18) Filter [codegen id : 4]
-Input [2]: [item_sk#18, cnt#19]
-Condition : (cnt#19 > 4)
+(19) CometFilter
+Input [2]: [item_sk#17, cnt#18]
+Condition : (cnt#18 > 4)
 
-(19) Project [codegen id : 4]
-Output [1]: [item_sk#18]
-Input [2]: [item_sk#18, cnt#19]
+(20) CometProject
+Input [2]: [item_sk#17, cnt#18]
+Arguments: [item_sk#17], [item_sk#17]
 
-(20) BroadcastExchange
-Input [1]: [item_sk#18]
+(21) ColumnarToRow [codegen id : 4]
+Input [1]: [item_sk#17]
+
+(22) BroadcastExchange
+Input [1]: [item_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(21) BroadcastHashJoin [codegen id : 5]
+(23) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [cs_item_sk#2]
-Right keys [1]: [item_sk#18]
+Right keys [1]: [item_sk#17]
 Join type: LeftSemi
 Join condition: None
 
-(22) Project [codegen id : 5]
+(24) Project [codegen id : 5]
 Output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 Input [5]: [cs_bill_customer_sk#1, cs_item_sk#2, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(23) Exchange
+(25) RowToColumnar
+Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+
+(26) CometColumnarExchange
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(24) Sort [codegen id : 6]
+(27) CometSort
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: [cs_bill_customer_sk#1 ASC NULLS FIRST], false, 0
+Arguments: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5], [cs_bill_customer_sk#1 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
+Output [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(26) CometFilter
-Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
-Condition : isnotnull(ss_customer_sk#20)
+(29) CometFilter
+Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
+Condition : isnotnull(ss_customer_sk#19)
 
-(27) CometProject
-Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
-Arguments: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22], [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
+(30) CometProject
+Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
+Arguments: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21], [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
 
-(28) ColumnarToRow [codegen id : 8]
-Input [3]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
+(31) ColumnarToRow [codegen id : 7]
+Input [3]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [1]: [c_customer_sk#24]
+Output [1]: [c_customer_sk#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int>
 
-(30) CometFilter
-Input [1]: [c_customer_sk#24]
-Condition : isnotnull(c_customer_sk#24)
+(33) CometFilter
+Input [1]: [c_customer_sk#23]
+Condition : isnotnull(c_customer_sk#23)
 
-(31) ColumnarToRow [codegen id : 7]
-Input [1]: [c_customer_sk#24]
+(34) ColumnarToRow [codegen id : 6]
+Input [1]: [c_customer_sk#23]
 
-(32) BroadcastExchange
-Input [1]: [c_customer_sk#24]
+(35) BroadcastExchange
+Input [1]: [c_customer_sk#23]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_customer_sk#20]
-Right keys [1]: [c_customer_sk#24]
+(36) BroadcastHashJoin [codegen id : 7]
+Left keys [1]: [ss_customer_sk#19]
+Right keys [1]: [c_customer_sk#23]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 8]
-Output [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
-Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
-
-(35) HashAggregate [codegen id : 8]
-Input [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [partial_sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [2]: [sum#25, isEmpty#26]
-Results [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-
-(36) Exchange
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Arguments: hashpartitioning(c_customer_sk#24, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(37) HashAggregate [codegen id : 9]
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
-Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
-
-(38) Filter [codegen id : 9]
-Input [2]: [c_customer_sk#24, ssales#30]
-Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#31, [id=#32])))
-
-(39) Project [codegen id : 9]
-Output [1]: [c_customer_sk#24]
-Input [2]: [c_customer_sk#24, ssales#30]
-
-(40) Sort [codegen id : 9]
-Input [1]: [c_customer_sk#24]
-Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
-
-(41) SortMergeJoin [codegen id : 11]
-Left keys [1]: [cs_bill_customer_sk#1]
-Right keys [1]: [c_customer_sk#24]
-Join type: LeftSemi
-Join condition: None
+(37) Project [codegen id : 7]
+Output [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
+Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
+
+(38) HashAggregate [codegen id : 7]
+Input [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [partial_sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+Aggregate Attributes [2]: [sum#24, isEmpty#25]
+Results [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+
+(39) RowToColumnar
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+
+(40) CometColumnarExchange
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Arguments: hashpartitioning(c_customer_sk#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(41) CometHashAggregate
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+
+(42) CometFilter
+Input [2]: [c_customer_sk#23, ssales#28]
+Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#29, [id=#30])))
+
+(43) CometProject
+Input [2]: [c_customer_sk#23, ssales#28]
+Arguments: [c_customer_sk#23], [c_customer_sk#23]
 
-(42) Project [codegen id : 11]
-Output [3]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+(44) CometSort
+Input [1]: [c_customer_sk#23]
+Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+
+(45) CometSortMergeJoin
+Left output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+Right output [1]: [c_customer_sk#23]
+Arguments: [cs_bill_customer_sk#1], [c_customer_sk#23], LeftSemi
+
+(46) CometProject
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+Arguments: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5], [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(43) ReusedExchange [Reuses operator id: 71]
-Output [1]: [d_date_sk#33]
+(47) ColumnarToRow [codegen id : 9]
+Input [3]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(44) BroadcastHashJoin [codegen id : 11]
+(48) ReusedExchange [Reuses operator id: 80]
+Output [1]: [d_date_sk#31]
+
+(49) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [cs_sold_date_sk#5]
-Right keys [1]: [d_date_sk#33]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 11]
-Output [1]: [(cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4) AS sales#34]
-Input [4]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, d_date_sk#33]
+(50) Project [codegen id : 9]
+Output [1]: [(cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4) AS sales#32]
+Input [4]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, d_date_sk#31]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#35, ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+Output [5]: [ws_item_sk#33, ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#39), dynamicpruningexpression(ws_sold_date_sk#39 IN dynamicpruning#40)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#37), dynamicpruningexpression(ws_sold_date_sk#37 IN dynamicpruning#38)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(47) ColumnarToRow [codegen id : 16]
-Input [5]: [ws_item_sk#35, ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+(52) ColumnarToRow [codegen id : 14]
+Input [5]: [ws_item_sk#33, ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
 
-(48) ReusedExchange [Reuses operator id: 20]
-Output [1]: [item_sk#18]
+(53) ReusedExchange [Reuses operator id: 22]
+Output [1]: [item_sk#17]
 
-(49) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [ws_item_sk#35]
-Right keys [1]: [item_sk#18]
+(54) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_item_sk#33]
+Right keys [1]: [item_sk#17]
 Join type: LeftSemi
 Join condition: None
 
-(50) Project [codegen id : 16]
-Output [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
-Input [5]: [ws_item_sk#35, ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+(55) Project [codegen id : 14]
+Output [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+Input [5]: [ws_item_sk#33, ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
 
-(51) Exchange
-Input [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
-Arguments: hashpartitioning(ws_bill_customer_sk#36, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(56) RowToColumnar
+Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
 
-(52) Sort [codegen id : 17]
-Input [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
-Arguments: [ws_bill_customer_sk#36 ASC NULLS FIRST], false, 0
+(57) CometColumnarExchange
+Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+Arguments: hashpartitioning(ws_bill_customer_sk#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(53) ReusedExchange [Reuses operator id: 36]
-Output [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+(58) CometSort
+Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+Arguments: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37], [ws_bill_customer_sk#34 ASC NULLS FIRST]
 
-(54) HashAggregate [codegen id : 20]
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
-Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
+(59) ReusedExchange [Reuses operator id: 40]
+Output [3]: [c_customer_sk#23, sum#26, isEmpty#27]
 
-(55) Filter [codegen id : 20]
-Input [2]: [c_customer_sk#24, ssales#30]
-Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#31, [id=#32])))
+(60) CometHashAggregate
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
 
-(56) Project [codegen id : 20]
-Output [1]: [c_customer_sk#24]
-Input [2]: [c_customer_sk#24, ssales#30]
+(61) CometFilter
+Input [2]: [c_customer_sk#23, ssales#28]
+Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#29, [id=#30])))
 
-(57) Sort [codegen id : 20]
-Input [1]: [c_customer_sk#24]
-Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
+(62) CometProject
+Input [2]: [c_customer_sk#23, ssales#28]
+Arguments: [c_customer_sk#23], [c_customer_sk#23]
 
-(58) SortMergeJoin [codegen id : 22]
-Left keys [1]: [ws_bill_customer_sk#36]
-Right keys [1]: [c_customer_sk#24]
-Join type: LeftSemi
-Join condition: None
+(63) CometSort
+Input [1]: [c_customer_sk#23]
+Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+
+(64) CometSortMergeJoin
+Left output [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+Right output [1]: [c_customer_sk#23]
+Arguments: [ws_bill_customer_sk#34], [c_customer_sk#23], LeftSemi
 
-(59) Project [codegen id : 22]
-Output [3]: [ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
-Input [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+(65) CometProject
+Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+Arguments: [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37], [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
 
-(60) ReusedExchange [Reuses operator id: 71]
-Output [1]: [d_date_sk#41]
+(66) ColumnarToRow [codegen id : 18]
+Input [3]: [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
 
-(61) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_sold_date_sk#39]
-Right keys [1]: [d_date_sk#41]
+(67) ReusedExchange [Reuses operator id: 80]
+Output [1]: [d_date_sk#39]
+
+(68) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_sold_date_sk#37]
+Right keys [1]: [d_date_sk#39]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 22]
-Output [1]: [(cast(ws_quantity#37 as decimal(10,0)) * ws_list_price#38) AS sales#42]
-Input [4]: [ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39, d_date_sk#41]
+(69) Project [codegen id : 18]
+Output [1]: [(cast(ws_quantity#35 as decimal(10,0)) * ws_list_price#36) AS sales#40]
+Input [4]: [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37, d_date_sk#39]
 
-(63) Union
+(70) Union
 
-(64) HashAggregate [codegen id : 23]
-Input [1]: [sales#34]
+(71) HashAggregate [codegen id : 19]
+Input [1]: [sales#32]
 Keys: []
-Functions [1]: [partial_sum(sales#34)]
-Aggregate Attributes [2]: [sum#43, isEmpty#44]
-Results [2]: [sum#45, isEmpty#46]
+Functions [1]: [partial_sum(sales#32)]
+Aggregate Attributes [2]: [sum#41, isEmpty#42]
+Results [2]: [sum#43, isEmpty#44]
+
+(72) RowToColumnar
+Input [2]: [sum#43, isEmpty#44]
 
-(65) Exchange
-Input [2]: [sum#45, isEmpty#46]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=8]
+(73) CometColumnarExchange
+Input [2]: [sum#43, isEmpty#44]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(66) HashAggregate [codegen id : 24]
-Input [2]: [sum#45, isEmpty#46]
+(74) CometHashAggregate
+Input [2]: [sum#43, isEmpty#44]
 Keys: []
-Functions [1]: [sum(sales#34)]
-Aggregate Attributes [1]: [sum(sales#34)#47]
-Results [1]: [sum(sales#34)#47 AS sum(sales)#48]
+Functions [1]: [sum(sales#32)]
+
+(75) ColumnarToRow [codegen id : 20]
+Input [1]: [sum(sales)#45]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (71)
-+- * ColumnarToRow (70)
-   +- CometProject (69)
-      +- CometFilter (68)
-         +- CometScan parquet spark_catalog.default.date_dim (67)
+BroadcastExchange (80)
++- * ColumnarToRow (79)
+   +- CometProject (78)
+      +- CometFilter (77)
+         +- CometScan parquet spark_catalog.default.date_dim (76)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#33, d_year#49, d_moy#50]
+Output [3]: [d_date_sk#31, d_year#46, d_moy#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(68) CometFilter
-Input [3]: [d_date_sk#33, d_year#49, d_moy#50]
-Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 2000)) AND (d_moy#50 = 2)) AND isnotnull(d_date_sk#33))
+(77) CometFilter
+Input [3]: [d_date_sk#31, d_year#46, d_moy#47]
+Condition : ((((isnotnull(d_year#46) AND isnotnull(d_moy#47)) AND (d_year#46 = 2000)) AND (d_moy#47 = 2)) AND isnotnull(d_date_sk#31))
 
-(69) CometProject
-Input [3]: [d_date_sk#33, d_year#49, d_moy#50]
-Arguments: [d_date_sk#33], [d_date_sk#33]
+(78) CometProject
+Input [3]: [d_date_sk#31, d_year#46, d_moy#47]
+Arguments: [d_date_sk#31], [d_date_sk#31]
 
-(70) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#33]
+(79) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#31]
 
-(71) BroadcastExchange
-Input [1]: [d_date_sk#33]
+(80) BroadcastExchange
+Input [1]: [d_date_sk#31]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
 Subquery:2 Hosting operator id = 3 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (76)
-+- * ColumnarToRow (75)
-   +- CometProject (74)
-      +- CometFilter (73)
-         +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (85)
++- * ColumnarToRow (84)
+   +- CometProject (83)
+      +- CometFilter (82)
+         +- CometScan parquet spark_catalog.default.date_dim (81)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_date#11, d_year#51]
+Output [3]: [d_date_sk#10, d_date#11, d_year#48]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_year:int>
 
-(73) CometFilter
-Input [3]: [d_date_sk#10, d_date#11, d_year#51]
-Condition : (d_year#51 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
+(82) CometFilter
+Input [3]: [d_date_sk#10, d_date#11, d_year#48]
+Condition : (d_year#48 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
 
-(74) CometProject
-Input [3]: [d_date_sk#10, d_date#11, d_year#51]
+(83) CometProject
+Input [3]: [d_date_sk#10, d_date#11, d_year#48]
 Arguments: [d_date_sk#10, d_date#11], [d_date_sk#10, d_date#11]
 
-(75) ColumnarToRow [codegen id : 1]
+(84) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#10, d_date#11]
 
-(76) BroadcastExchange
+(85) BroadcastExchange
 Input [2]: [d_date_sk#10, d_date#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=10]
 
-Subquery:3 Hosting operator id = 38 Hosting Expression = Subquery scalar-subquery#31, [id=#32]
-* HashAggregate (91)
-+- Exchange (90)
-   +- * HashAggregate (89)
-      +- * HashAggregate (88)
-         +- Exchange (87)
-            +- * HashAggregate (86)
-               +- * Project (85)
-                  +- * BroadcastHashJoin Inner BuildRight (84)
-                     :- * Project (82)
-                     :  +- * BroadcastHashJoin Inner BuildRight (81)
-                     :     :- * ColumnarToRow (79)
-                     :     :  +- CometFilter (78)
-                     :     :     +- CometScan parquet spark_catalog.default.store_sales (77)
-                     :     +- ReusedExchange (80)
-                     +- ReusedExchange (83)
+Subquery:3 Hosting operator id = 42 Hosting Expression = Subquery scalar-subquery#29, [id=#30]
+* ColumnarToRow (102)
++- CometHashAggregate (101)
+   +- CometColumnarExchange (100)
+      +- CometHashAggregate (99)
+         +- CometHashAggregate (98)
+            +- CometColumnarExchange (97)
+               +- RowToColumnar (96)
+                  +- * HashAggregate (95)
+                     +- * Project (94)
+                        +- * BroadcastHashJoin Inner BuildRight (93)
+                           :- * Project (91)
+                           :  +- * BroadcastHashJoin Inner BuildRight (90)
+                           :     :- * ColumnarToRow (88)
+                           :     :  +- CometFilter (87)
+                           :     :     +- CometScan parquet spark_catalog.default.store_sales (86)
+                           :     +- ReusedExchange (89)
+                           +- ReusedExchange (92)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55]
+Output [4]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#55), dynamicpruningexpression(ss_sold_date_sk#55 IN dynamicpruning#56)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#52), dynamicpruningexpression(ss_sold_date_sk#52 IN dynamicpruning#53)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(78) CometFilter
-Input [4]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55]
-Condition : isnotnull(ss_customer_sk#52)
+(87) CometFilter
+Input [4]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52]
+Condition : isnotnull(ss_customer_sk#49)
 
-(79) ColumnarToRow [codegen id : 3]
-Input [4]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55]
+(88) ColumnarToRow [codegen id : 3]
+Input [4]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52]
 
-(80) ReusedExchange [Reuses operator id: 32]
-Output [1]: [c_customer_sk#57]
+(89) ReusedExchange [Reuses operator id: 35]
+Output [1]: [c_customer_sk#54]
 
-(81) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_customer_sk#52]
-Right keys [1]: [c_customer_sk#57]
+(90) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_customer_sk#49]
+Right keys [1]: [c_customer_sk#54]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 3]
-Output [4]: [ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55, c_customer_sk#57]
-Input [5]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55, c_customer_sk#57]
+(91) Project [codegen id : 3]
+Output [4]: [ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52, c_customer_sk#54]
+Input [5]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52, c_customer_sk#54]
 
-(83) ReusedExchange [Reuses operator id: 96]
-Output [1]: [d_date_sk#58]
+(92) ReusedExchange [Reuses operator id: 107]
+Output [1]: [d_date_sk#55]
 
-(84) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_sold_date_sk#55]
-Right keys [1]: [d_date_sk#58]
+(93) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_sold_date_sk#52]
+Right keys [1]: [d_date_sk#55]
 Join type: Inner
 Join condition: None
 
-(85) Project [codegen id : 3]
-Output [3]: [ss_quantity#53, ss_sales_price#54, c_customer_sk#57]
-Input [5]: [ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55, c_customer_sk#57, d_date_sk#58]
-
-(86) HashAggregate [codegen id : 3]
-Input [3]: [ss_quantity#53, ss_sales_price#54, c_customer_sk#57]
-Keys [1]: [c_customer_sk#57]
-Functions [1]: [partial_sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))]
-Aggregate Attributes [2]: [sum#59, isEmpty#60]
-Results [3]: [c_customer_sk#57, sum#61, isEmpty#62]
-
-(87) Exchange
-Input [3]: [c_customer_sk#57, sum#61, isEmpty#62]
-Arguments: hashpartitioning(c_customer_sk#57, 5), ENSURE_REQUIREMENTS, [plan_id=11]
-
-(88) HashAggregate [codegen id : 4]
-Input [3]: [c_customer_sk#57, sum#61, isEmpty#62]
-Keys [1]: [c_customer_sk#57]
-Functions [1]: [sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))#63]
-Results [1]: [sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))#63 AS csales#64]
-
-(89) HashAggregate [codegen id : 4]
-Input [1]: [csales#64]
+(94) Project [codegen id : 3]
+Output [3]: [ss_quantity#50, ss_sales_price#51, c_customer_sk#54]
+Input [5]: [ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52, c_customer_sk#54, d_date_sk#55]
+
+(95) HashAggregate [codegen id : 3]
+Input [3]: [ss_quantity#50, ss_sales_price#51, c_customer_sk#54]
+Keys [1]: [c_customer_sk#54]
+Functions [1]: [partial_sum((cast(ss_quantity#50 as decimal(10,0)) * ss_sales_price#51))]
+Aggregate Attributes [2]: [sum#56, isEmpty#57]
+Results [3]: [c_customer_sk#54, sum#58, isEmpty#59]
+
+(96) RowToColumnar
+Input [3]: [c_customer_sk#54, sum#58, isEmpty#59]
+
+(97) CometColumnarExchange
+Input [3]: [c_customer_sk#54, sum#58, isEmpty#59]
+Arguments: hashpartitioning(c_customer_sk#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+
+(98) CometHashAggregate
+Input [3]: [c_customer_sk#54, sum#58, isEmpty#59]
+Keys [1]: [c_customer_sk#54]
+Functions [1]: [sum((cast(ss_quantity#50 as decimal(10,0)) * ss_sales_price#51))]
+
+(99) CometHashAggregate
+Input [1]: [csales#60]
 Keys: []
-Functions [1]: [partial_max(csales#64)]
-Aggregate Attributes [1]: [max#65]
-Results [1]: [max#66]
+Functions [1]: [partial_max(csales#60)]
 
-(90) Exchange
-Input [1]: [max#66]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
+(100) CometColumnarExchange
+Input [1]: [max#61]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(91) HashAggregate [codegen id : 5]
-Input [1]: [max#66]
+(101) CometHashAggregate
+Input [1]: [max#61]
 Keys: []
-Functions [1]: [max(csales#64)]
-Aggregate Attributes [1]: [max(csales#64)#67]
-Results [1]: [max(csales#64)#67 AS tpcds_cmax#68]
+Functions [1]: [max(csales#60)]
+
+(102) ColumnarToRow [codegen id : 4]
+Input [1]: [tpcds_cmax#62]
 
-Subquery:4 Hosting operator id = 77 Hosting Expression = ss_sold_date_sk#55 IN dynamicpruning#56
-BroadcastExchange (96)
-+- * ColumnarToRow (95)
-   +- CometProject (94)
-      +- CometFilter (93)
-         +- CometScan parquet spark_catalog.default.date_dim (92)
+Subquery:4 Hosting operator id = 86 Hosting Expression = ss_sold_date_sk#52 IN dynamicpruning#53
+BroadcastExchange (107)
++- * ColumnarToRow (106)
+   +- CometProject (105)
+      +- CometFilter (104)
+         +- CometScan parquet spark_catalog.default.date_dim (103)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#58, d_year#69]
+Output [2]: [d_date_sk#55, d_year#63]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(93) CometFilter
-Input [2]: [d_date_sk#58, d_year#69]
-Condition : (d_year#69 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#58))
+(104) CometFilter
+Input [2]: [d_date_sk#55, d_year#63]
+Condition : (d_year#63 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#55))
 
-(94) CometProject
-Input [2]: [d_date_sk#58, d_year#69]
-Arguments: [d_date_sk#58], [d_date_sk#58]
+(105) CometProject
+Input [2]: [d_date_sk#55, d_year#63]
+Arguments: [d_date_sk#55], [d_date_sk#55]
 
-(95) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#58]
+(106) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#55]
 
-(96) BroadcastExchange
-Input [1]: [d_date_sk#58]
+(107) BroadcastExchange
+Input [1]: [d_date_sk#55]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:5 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#39 IN dynamicpruning#6
+Subquery:5 Hosting operator id = 51 Hosting Expression = ws_sold_date_sk#37 IN dynamicpruning#6
 
-Subquery:6 Hosting operator id = 55 Hosting Expression = ReusedSubquery Subquery scalar-subquery#31, [id=#32]
+Subquery:6 Hosting operator id = 61 Hosting Expression = ReusedSubquery Subquery scalar-subquery#29, [id=#30]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt
index 0ec56d0e72..51a411e3c9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt
@@ -1,155 +1,154 @@
-WholeStageCodegen (24)
-  HashAggregate [sum,isEmpty] [sum(sales),sum(sales),sum,isEmpty]
+WholeStageCodegen (20)
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (23)
-          HashAggregate [sales] [sum,isEmpty,sum,isEmpty]
-            InputAdapter
-              Union
-                WholeStageCodegen (11)
-                  Project [cs_quantity,cs_list_price]
-                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                      Project [cs_quantity,cs_list_price,cs_sold_date_sk]
-                        SortMergeJoin [cs_bill_customer_sk,c_customer_sk]
-                          InputAdapter
-                            WholeStageCodegen (6)
-                              Sort [cs_bill_customer_sk]
-                                InputAdapter
-                                  Exchange [cs_bill_customer_sk] #2
-                                    WholeStageCodegen (5)
-                                      Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                        BroadcastHashJoin [cs_item_sk,item_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                          InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (4)
-                                                Project [item_sk]
-                                                  Filter [cnt]
-                                                    HashAggregate [_groupingexpression,i_item_sk,d_date,count] [count(1),item_sk,cnt,count]
+      CometHashAggregate [sum,isEmpty]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (19)
+              HashAggregate [sales] [sum,isEmpty,sum,isEmpty]
+                InputAdapter
+                  Union
+                    WholeStageCodegen (9)
+                      Project [cs_quantity,cs_list_price]
+                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                CometSortMergeJoin [cs_bill_customer_sk,c_customer_sk]
+                                  CometSort [cs_bill_customer_sk]
+                                    CometColumnarExchange [cs_bill_customer_sk] #2
+                                      RowToColumnar
+                                        WholeStageCodegen (5)
+                                          Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                            BroadcastHashJoin [cs_item_sk,item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #4
+                                                  WholeStageCodegen (4)
+                                                    ColumnarToRow
                                                       InputAdapter
-                                                        Exchange [_groupingexpression,i_item_sk,d_date] #5
-                                                          WholeStageCodegen (3)
-                                                            HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
-                                                              Project [d_date,i_item_sk,i_item_desc]
-                                                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                  Project [ss_item_sk,d_date]
-                                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometFilter [ss_item_sk]
-                                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                              SubqueryBroadcast [d_date_sk] #2
-                                                                                BroadcastExchange #6
-                                                                                  WholeStageCodegen (1)
-                                                                                    ColumnarToRow
-                                                                                      InputAdapter
-                                                                                        CometProject [d_date_sk,d_date]
-                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
-                                                                      InputAdapter
-                                                                        ReusedExchange [d_date_sk,d_date] #6
-                                                                  InputAdapter
-                                                                    BroadcastExchange #7
-                                                                      WholeStageCodegen (2)
+                                                        CometProject [item_sk]
+                                                          CometFilter [cnt]
+                                                            CometHashAggregate [_groupingexpression,i_item_sk,d_date,count]
+                                                              CometColumnarExchange [_groupingexpression,i_item_sk,d_date] #5
+                                                                RowToColumnar
+                                                                  WholeStageCodegen (3)
+                                                                    HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
+                                                                      Project [d_date,i_item_sk,i_item_desc]
+                                                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                          Project [ss_item_sk,d_date]
+                                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometFilter [ss_item_sk]
+                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                                      SubqueryBroadcast [d_date_sk] #2
+                                                                                        BroadcastExchange #6
+                                                                                          WholeStageCodegen (1)
+                                                                                            ColumnarToRow
+                                                                                              InputAdapter
+                                                                                                CometProject [d_date_sk,d_date]
+                                                                                                  CometFilter [d_year,d_date_sk]
+                                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
+                                                                              InputAdapter
+                                                                                ReusedExchange [d_date_sk,d_date] #6
+                                                                          InputAdapter
+                                                                            BroadcastExchange #7
+                                                                              WholeStageCodegen (2)
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometFilter [i_item_sk]
+                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                                  CometSort [c_customer_sk]
+                                    CometProject [c_customer_sk]
+                                      CometFilter [ssales]
+                                        Subquery #3
+                                          WholeStageCodegen (4)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometHashAggregate [max]
+                                                  CometColumnarExchange #10
+                                                    CometHashAggregate [csales]
+                                                      CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                                        CometColumnarExchange [c_customer_sk] #11
+                                                          RowToColumnar
+                                                            WholeStageCodegen (3)
+                                                              HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                                                Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
+                                                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [i_item_sk]
-                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
-                          InputAdapter
-                            WholeStageCodegen (9)
-                              Sort [c_customer_sk]
-                                Project [c_customer_sk]
-                                  Filter [ssales]
-                                    Subquery #3
-                                      WholeStageCodegen (5)
-                                        HashAggregate [max] [max(csales),tpcds_cmax,max]
-                                          InputAdapter
-                                            Exchange #10
-                                              WholeStageCodegen (4)
-                                                HashAggregate [csales] [max,max]
-                                                  HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),csales,sum,isEmpty]
-                                                    InputAdapter
-                                                      Exchange [c_customer_sk] #11
-                                                        WholeStageCodegen (3)
-                                                          HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                                            Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
-                                                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometFilter [ss_customer_sk]
-                                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                                            SubqueryBroadcast [d_date_sk] #4
-                                                                              BroadcastExchange #12
-                                                                                WholeStageCodegen (1)
-                                                                                  ColumnarToRow
-                                                                                    InputAdapter
-                                                                                      CometProject [d_date_sk]
-                                                                                        CometFilter [d_year,d_date_sk]
-                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                            CometFilter [ss_customer_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #4
+                                                                                  BroadcastExchange #12
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometProject [d_date_sk]
+                                                                                            CometFilter [d_year,d_date_sk]
+                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                        InputAdapter
+                                                                          ReusedExchange [c_customer_sk] #9
                                                                     InputAdapter
-                                                                      ReusedExchange [c_customer_sk] #9
-                                                                InputAdapter
-                                                                  ReusedExchange [d_date_sk] #12
-                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [c_customer_sk] #8
-                                          WholeStageCodegen (8)
-                                            HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                              Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
-                                                        CometFilter [ss_customer_sk]
-                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                  InputAdapter
-                                                    BroadcastExchange #9
-                                                      WholeStageCodegen (7)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [c_customer_sk]
-                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk]
-                      InputAdapter
-                        ReusedExchange [d_date_sk] #3
-                WholeStageCodegen (22)
-                  Project [ws_quantity,ws_list_price]
-                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                      Project [ws_quantity,ws_list_price,ws_sold_date_sk]
-                        SortMergeJoin [ws_bill_customer_sk,c_customer_sk]
+                                                                      ReusedExchange [d_date_sk] #12
+                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                          CometColumnarExchange [c_customer_sk] #8
+                                            RowToColumnar
+                                              WholeStageCodegen (7)
+                                                HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                                  Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                    BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
+                                                            CometFilter [ss_customer_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                      InputAdapter
+                                                        BroadcastExchange #9
+                                                          WholeStageCodegen (6)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [c_customer_sk]
+                                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk]
                           InputAdapter
-                            WholeStageCodegen (17)
-                              Sort [ws_bill_customer_sk]
-                                InputAdapter
-                                  Exchange [ws_bill_customer_sk] #13
-                                    WholeStageCodegen (16)
-                                      Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                        BroadcastHashJoin [ws_item_sk,item_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [item_sk] #4
+                            ReusedExchange [d_date_sk] #3
+                    WholeStageCodegen (18)
+                      Project [ws_quantity,ws_list_price]
+                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                CometSortMergeJoin [ws_bill_customer_sk,c_customer_sk]
+                                  CometSort [ws_bill_customer_sk]
+                                    CometColumnarExchange [ws_bill_customer_sk] #13
+                                      RowToColumnar
+                                        WholeStageCodegen (14)
+                                          Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                            BroadcastHashJoin [ws_item_sk,item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [item_sk] #4
+                                  CometSort [c_customer_sk]
+                                    CometProject [c_customer_sk]
+                                      CometFilter [ssales]
+                                        ReusedSubquery [tpcds_cmax] #3
+                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                          ReusedExchange [c_customer_sk,sum,isEmpty] #8
                           InputAdapter
-                            WholeStageCodegen (20)
-                              Sort [c_customer_sk]
-                                Project [c_customer_sk]
-                                  Filter [ssales]
-                                    ReusedSubquery [tpcds_cmax] #3
-                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
-                                      InputAdapter
-                                        ReusedExchange [c_customer_sk,sum,isEmpty] #8
-                      InputAdapter
-                        ReusedExchange [d_date_sk] #3
+                            ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt
index 86227b8324..5d9f6a6715 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt
@@ -1,91 +1,101 @@
 == Physical Plan ==
-TakeOrderedAndProject (87)
-+- Union (86)
-   :- * HashAggregate (62)
-   :  +- Exchange (61)
-   :     +- * HashAggregate (60)
-   :        +- * Project (59)
-   :           +- * BroadcastHashJoin Inner BuildRight (58)
-   :              :- * Project (56)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (55)
-   :              :     :- * SortMergeJoin LeftSemi (42)
-   :              :     :  :- * Sort (25)
-   :              :     :  :  +- Exchange (24)
-   :              :     :  :     +- * Project (23)
-   :              :     :  :        +- * BroadcastHashJoin LeftSemi BuildRight (22)
-   :              :     :  :           :- * ColumnarToRow (3)
-   :              :     :  :           :  +- CometFilter (2)
-   :              :     :  :           :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-   :              :     :  :           +- BroadcastExchange (21)
-   :              :     :  :              +- * Project (20)
-   :              :     :  :                 +- * Filter (19)
-   :              :     :  :                    +- * HashAggregate (18)
-   :              :     :  :                       +- Exchange (17)
-   :              :     :  :                          +- * HashAggregate (16)
-   :              :     :  :                             +- * Project (15)
-   :              :     :  :                                +- * BroadcastHashJoin Inner BuildRight (14)
-   :              :     :  :                                   :- * Project (9)
-   :              :     :  :                                   :  +- * BroadcastHashJoin Inner BuildRight (8)
-   :              :     :  :                                   :     :- * ColumnarToRow (6)
-   :              :     :  :                                   :     :  +- CometFilter (5)
-   :              :     :  :                                   :     :     +- CometScan parquet spark_catalog.default.store_sales (4)
-   :              :     :  :                                   :     +- ReusedExchange (7)
-   :              :     :  :                                   +- BroadcastExchange (13)
-   :              :     :  :                                      +- * ColumnarToRow (12)
-   :              :     :  :                                         +- CometFilter (11)
-   :              :     :  :                                            +- CometScan parquet spark_catalog.default.item (10)
-   :              :     :  +- * Sort (41)
-   :              :     :     +- * Project (40)
-   :              :     :        +- * Filter (39)
-   :              :     :           +- * HashAggregate (38)
-   :              :     :              +- Exchange (37)
-   :              :     :                 +- * HashAggregate (36)
-   :              :     :                    +- * Project (35)
-   :              :     :                       +- * BroadcastHashJoin Inner BuildRight (34)
-   :              :     :                          :- * ColumnarToRow (29)
-   :              :     :                          :  +- CometProject (28)
-   :              :     :                          :     +- CometFilter (27)
-   :              :     :                          :        +- CometScan parquet spark_catalog.default.store_sales (26)
-   :              :     :                          +- BroadcastExchange (33)
-   :              :     :                             +- * ColumnarToRow (32)
-   :              :     :                                +- CometFilter (31)
-   :              :     :                                   +- CometScan parquet spark_catalog.default.customer (30)
-   :              :     +- BroadcastExchange (54)
-   :              :        +- * SortMergeJoin LeftSemi (53)
-   :              :           :- * ColumnarToRow (47)
-   :              :           :  +- CometSort (46)
-   :              :           :     +- CometExchange (45)
-   :              :           :        +- CometFilter (44)
-   :              :           :           +- CometScan parquet spark_catalog.default.customer (43)
-   :              :           +- * Sort (52)
-   :              :              +- * Project (51)
-   :              :                 +- * Filter (50)
-   :              :                    +- * HashAggregate (49)
-   :              :                       +- ReusedExchange (48)
-   :              +- ReusedExchange (57)
-   +- * HashAggregate (85)
-      +- Exchange (84)
-         +- * HashAggregate (83)
-            +- * Project (82)
-               +- * BroadcastHashJoin Inner BuildRight (81)
-                  :- * Project (79)
-                  :  +- * BroadcastHashJoin Inner BuildRight (78)
-                  :     :- * SortMergeJoin LeftSemi (76)
-                  :     :  :- * Sort (70)
-                  :     :  :  +- Exchange (69)
-                  :     :  :     +- * Project (68)
-                  :     :  :        +- * BroadcastHashJoin LeftSemi BuildRight (67)
-                  :     :  :           :- * ColumnarToRow (65)
-                  :     :  :           :  +- CometFilter (64)
-                  :     :  :           :     +- CometScan parquet spark_catalog.default.web_sales (63)
-                  :     :  :           +- ReusedExchange (66)
-                  :     :  +- * Sort (75)
-                  :     :     +- * Project (74)
-                  :     :        +- * Filter (73)
-                  :     :           +- * HashAggregate (72)
-                  :     :              +- ReusedExchange (71)
-                  :     +- ReusedExchange (77)
-                  +- ReusedExchange (80)
+* ColumnarToRow (97)
++- CometTakeOrderedAndProject (96)
+   +- CometUnion (95)
+      :- CometHashAggregate (68)
+      :  +- CometColumnarExchange (67)
+      :     +- RowToColumnar (66)
+      :        +- * HashAggregate (65)
+      :           +- * Project (64)
+      :              +- * BroadcastHashJoin Inner BuildRight (63)
+      :                 :- * Project (61)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (60)
+      :                 :     :- * ColumnarToRow (47)
+      :                 :     :  +- CometSortMergeJoin (46)
+      :                 :     :     :- CometSort (28)
+      :                 :     :     :  +- CometColumnarExchange (27)
+      :                 :     :     :     +- RowToColumnar (26)
+      :                 :     :     :        +- * Project (25)
+      :                 :     :     :           +- * BroadcastHashJoin LeftSemi BuildRight (24)
+      :                 :     :     :              :- * ColumnarToRow (3)
+      :                 :     :     :              :  +- CometFilter (2)
+      :                 :     :     :              :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+      :                 :     :     :              +- BroadcastExchange (23)
+      :                 :     :     :                 +- * ColumnarToRow (22)
+      :                 :     :     :                    +- CometProject (21)
+      :                 :     :     :                       +- CometFilter (20)
+      :                 :     :     :                          +- CometHashAggregate (19)
+      :                 :     :     :                             +- CometColumnarExchange (18)
+      :                 :     :     :                                +- RowToColumnar (17)
+      :                 :     :     :                                   +- * HashAggregate (16)
+      :                 :     :     :                                      +- * Project (15)
+      :                 :     :     :                                         +- * BroadcastHashJoin Inner BuildRight (14)
+      :                 :     :     :                                            :- * Project (9)
+      :                 :     :     :                                            :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :                 :     :     :                                            :     :- * ColumnarToRow (6)
+      :                 :     :     :                                            :     :  +- CometFilter (5)
+      :                 :     :     :                                            :     :     +- CometScan parquet spark_catalog.default.store_sales (4)
+      :                 :     :     :                                            :     +- ReusedExchange (7)
+      :                 :     :     :                                            +- BroadcastExchange (13)
+      :                 :     :     :                                               +- * ColumnarToRow (12)
+      :                 :     :     :                                                  +- CometFilter (11)
+      :                 :     :     :                                                     +- CometScan parquet spark_catalog.default.item (10)
+      :                 :     :     +- CometSort (45)
+      :                 :     :        +- CometProject (44)
+      :                 :     :           +- CometFilter (43)
+      :                 :     :              +- CometHashAggregate (42)
+      :                 :     :                 +- CometColumnarExchange (41)
+      :                 :     :                    +- RowToColumnar (40)
+      :                 :     :                       +- * HashAggregate (39)
+      :                 :     :                          +- * Project (38)
+      :                 :     :                             +- * BroadcastHashJoin Inner BuildRight (37)
+      :                 :     :                                :- * ColumnarToRow (32)
+      :                 :     :                                :  +- CometProject (31)
+      :                 :     :                                :     +- CometFilter (30)
+      :                 :     :                                :        +- CometScan parquet spark_catalog.default.store_sales (29)
+      :                 :     :                                +- BroadcastExchange (36)
+      :                 :     :                                   +- * ColumnarToRow (35)
+      :                 :     :                                      +- CometFilter (34)
+      :                 :     :                                         +- CometScan parquet spark_catalog.default.customer (33)
+      :                 :     +- BroadcastExchange (59)
+      :                 :        +- * ColumnarToRow (58)
+      :                 :           +- CometSortMergeJoin (57)
+      :                 :              :- CometSort (51)
+      :                 :              :  +- CometColumnarExchange (50)
+      :                 :              :     +- CometFilter (49)
+      :                 :              :        +- CometScan parquet spark_catalog.default.customer (48)
+      :                 :              +- CometSort (56)
+      :                 :                 +- CometProject (55)
+      :                 :                    +- CometFilter (54)
+      :                 :                       +- CometHashAggregate (53)
+      :                 :                          +- ReusedExchange (52)
+      :                 +- ReusedExchange (62)
+      +- CometHashAggregate (94)
+         +- CometColumnarExchange (93)
+            +- RowToColumnar (92)
+               +- * HashAggregate (91)
+                  +- * Project (90)
+                     +- * BroadcastHashJoin Inner BuildRight (89)
+                        :- * Project (87)
+                        :  +- * BroadcastHashJoin Inner BuildRight (86)
+                        :     :- * ColumnarToRow (84)
+                        :     :  +- CometSortMergeJoin (83)
+                        :     :     :- CometSort (77)
+                        :     :     :  +- CometColumnarExchange (76)
+                        :     :     :     +- RowToColumnar (75)
+                        :     :     :        +- * Project (74)
+                        :     :     :           +- * BroadcastHashJoin LeftSemi BuildRight (73)
+                        :     :     :              :- * ColumnarToRow (71)
+                        :     :     :              :  +- CometFilter (70)
+                        :     :     :              :     +- CometScan parquet spark_catalog.default.web_sales (69)
+                        :     :     :              +- ReusedExchange (72)
+                        :     :     +- CometSort (82)
+                        :     :        +- CometProject (81)
+                        :     :           +- CometFilter (80)
+                        :     :              +- CometHashAggregate (79)
+                        :     :                 +- ReusedExchange (78)
+                        :     +- ReusedExchange (85)
+                        +- ReusedExchange (88)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -118,7 +128,7 @@ Condition : isnotnull(ss_item_sk#7)
 (6) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_item_sk#7, ss_sold_date_sk#8]
 
-(7) ReusedExchange [Reuses operator id: 97]
+(7) ReusedExchange [Reuses operator id: 107]
 Output [2]: [d_date_sk#10, d_date#11]
 
 (8) BroadcastHashJoin [codegen id : 3]
@@ -166,529 +176,548 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#15]
 Results [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 
-(17) Exchange
+(17) RowToColumnar
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
-Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(18) HashAggregate [codegen id : 4]
+(18) CometColumnarExchange
+Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
+Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(19) CometHashAggregate
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 Keys [3]: [_groupingexpression#14, i_item_sk#12, d_date#11]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#17]
-Results [2]: [i_item_sk#12 AS item_sk#18, count(1)#17 AS cnt#19]
 
-(19) Filter [codegen id : 4]
-Input [2]: [item_sk#18, cnt#19]
-Condition : (cnt#19 > 4)
+(20) CometFilter
+Input [2]: [item_sk#17, cnt#18]
+Condition : (cnt#18 > 4)
+
+(21) CometProject
+Input [2]: [item_sk#17, cnt#18]
+Arguments: [item_sk#17], [item_sk#17]
 
-(20) Project [codegen id : 4]
-Output [1]: [item_sk#18]
-Input [2]: [item_sk#18, cnt#19]
+(22) ColumnarToRow [codegen id : 4]
+Input [1]: [item_sk#17]
 
-(21) BroadcastExchange
-Input [1]: [item_sk#18]
+(23) BroadcastExchange
+Input [1]: [item_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(22) BroadcastHashJoin [codegen id : 5]
+(24) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [cs_item_sk#2]
-Right keys [1]: [item_sk#18]
+Right keys [1]: [item_sk#17]
 Join type: LeftSemi
 Join condition: None
 
-(23) Project [codegen id : 5]
+(25) Project [codegen id : 5]
 Output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 Input [5]: [cs_bill_customer_sk#1, cs_item_sk#2, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(24) Exchange
+(26) RowToColumnar
+Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+
+(27) CometColumnarExchange
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(25) Sort [codegen id : 6]
+(28) CometSort
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: [cs_bill_customer_sk#1 ASC NULLS FIRST], false, 0
+Arguments: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5], [cs_bill_customer_sk#1 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
+Output [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(27) CometFilter
-Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
-Condition : isnotnull(ss_customer_sk#20)
+(30) CometFilter
+Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
+Condition : isnotnull(ss_customer_sk#19)
 
-(28) CometProject
-Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
-Arguments: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22], [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
+(31) CometProject
+Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
+Arguments: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21], [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
 
-(29) ColumnarToRow [codegen id : 8]
-Input [3]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
+(32) ColumnarToRow [codegen id : 7]
+Input [3]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [1]: [c_customer_sk#24]
+Output [1]: [c_customer_sk#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int>
 
-(31) CometFilter
-Input [1]: [c_customer_sk#24]
-Condition : isnotnull(c_customer_sk#24)
+(34) CometFilter
+Input [1]: [c_customer_sk#23]
+Condition : isnotnull(c_customer_sk#23)
 
-(32) ColumnarToRow [codegen id : 7]
-Input [1]: [c_customer_sk#24]
+(35) ColumnarToRow [codegen id : 6]
+Input [1]: [c_customer_sk#23]
 
-(33) BroadcastExchange
-Input [1]: [c_customer_sk#24]
+(36) BroadcastExchange
+Input [1]: [c_customer_sk#23]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(34) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_customer_sk#20]
-Right keys [1]: [c_customer_sk#24]
+(37) BroadcastHashJoin [codegen id : 7]
+Left keys [1]: [ss_customer_sk#19]
+Right keys [1]: [c_customer_sk#23]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
-Output [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
-Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
-
-(36) HashAggregate [codegen id : 8]
-Input [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [partial_sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [2]: [sum#25, isEmpty#26]
-Results [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-
-(37) Exchange
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Arguments: hashpartitioning(c_customer_sk#24, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(38) HashAggregate [codegen id : 9]
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
-Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
-
-(39) Filter [codegen id : 9]
-Input [2]: [c_customer_sk#24, ssales#30]
-Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#31, [id=#32])))
-
-(40) Project [codegen id : 9]
-Output [1]: [c_customer_sk#24]
-Input [2]: [c_customer_sk#24, ssales#30]
-
-(41) Sort [codegen id : 9]
-Input [1]: [c_customer_sk#24]
-Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
-
-(42) SortMergeJoin [codegen id : 16]
-Left keys [1]: [cs_bill_customer_sk#1]
-Right keys [1]: [c_customer_sk#24]
-Join type: LeftSemi
-Join condition: None
+(38) Project [codegen id : 7]
+Output [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
+Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
+
+(39) HashAggregate [codegen id : 7]
+Input [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [partial_sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+Aggregate Attributes [2]: [sum#24, isEmpty#25]
+Results [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+
+(40) RowToColumnar
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+
+(41) CometColumnarExchange
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Arguments: hashpartitioning(c_customer_sk#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometHashAggregate
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+
+(43) CometFilter
+Input [2]: [c_customer_sk#23, ssales#28]
+Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#29, [id=#30])))
+
+(44) CometProject
+Input [2]: [c_customer_sk#23, ssales#28]
+Arguments: [c_customer_sk#23], [c_customer_sk#23]
+
+(45) CometSort
+Input [1]: [c_customer_sk#23]
+Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+
+(46) CometSortMergeJoin
+Left output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+Right output [1]: [c_customer_sk#23]
+Arguments: [cs_bill_customer_sk#1], [c_customer_sk#23], LeftSemi
+
+(47) ColumnarToRow [codegen id : 12]
+Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
+Output [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_first_name:string,c_last_name:string>
 
-(44) CometFilter
-Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
-Condition : isnotnull(c_customer_sk#33)
+(49) CometFilter
+Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+Condition : isnotnull(c_customer_sk#31)
 
-(45) CometExchange
-Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
-Arguments: hashpartitioning(c_customer_sk#33, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+(50) CometColumnarExchange
+Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+Arguments: hashpartitioning(c_customer_sk#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(46) CometSort
-Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
-Arguments: [c_customer_sk#33, c_first_name#34, c_last_name#35], [c_customer_sk#33 ASC NULLS FIRST]
+(51) CometSort
+Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+Arguments: [c_customer_sk#31, c_first_name#32, c_last_name#33], [c_customer_sk#31 ASC NULLS FIRST]
 
-(47) ColumnarToRow [codegen id : 10]
-Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
+(52) ReusedExchange [Reuses operator id: 41]
+Output [3]: [c_customer_sk#23, sum#26, isEmpty#27]
 
-(48) ReusedExchange [Reuses operator id: 37]
-Output [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+(53) CometHashAggregate
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
 
-(49) HashAggregate [codegen id : 13]
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
-Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
+(54) CometFilter
+Input [2]: [c_customer_sk#23, ssales#28]
+Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#29, [id=#30])))
 
-(50) Filter [codegen id : 13]
-Input [2]: [c_customer_sk#24, ssales#30]
-Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#31, [id=#32])))
+(55) CometProject
+Input [2]: [c_customer_sk#23, ssales#28]
+Arguments: [c_customer_sk#23], [c_customer_sk#23]
 
-(51) Project [codegen id : 13]
-Output [1]: [c_customer_sk#24]
-Input [2]: [c_customer_sk#24, ssales#30]
+(56) CometSort
+Input [1]: [c_customer_sk#23]
+Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
 
-(52) Sort [codegen id : 13]
-Input [1]: [c_customer_sk#24]
-Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
+(57) CometSortMergeJoin
+Left output [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+Right output [1]: [c_customer_sk#23]
+Arguments: [c_customer_sk#31], [c_customer_sk#23], LeftSemi
 
-(53) SortMergeJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#33]
-Right keys [1]: [c_customer_sk#24]
-Join type: LeftSemi
-Join condition: None
+(58) ColumnarToRow [codegen id : 10]
+Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
 
-(54) BroadcastExchange
-Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
+(59) BroadcastExchange
+Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(55) BroadcastHashJoin [codegen id : 16]
+(60) BroadcastHashJoin [codegen id : 12]
 Left keys [1]: [cs_bill_customer_sk#1]
-Right keys [1]: [c_customer_sk#33]
+Right keys [1]: [c_customer_sk#31]
 Join type: Inner
 Join condition: None
 
-(56) Project [codegen id : 16]
-Output [5]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#34, c_last_name#35]
-Input [7]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_customer_sk#33, c_first_name#34, c_last_name#35]
+(61) Project [codegen id : 12]
+Output [5]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#32, c_last_name#33]
+Input [7]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_customer_sk#31, c_first_name#32, c_last_name#33]
 
-(57) ReusedExchange [Reuses operator id: 92]
-Output [1]: [d_date_sk#36]
+(62) ReusedExchange [Reuses operator id: 102]
+Output [1]: [d_date_sk#34]
 
-(58) BroadcastHashJoin [codegen id : 16]
+(63) BroadcastHashJoin [codegen id : 12]
 Left keys [1]: [cs_sold_date_sk#5]
-Right keys [1]: [d_date_sk#36]
+Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 16]
-Output [4]: [cs_quantity#3, cs_list_price#4, c_first_name#34, c_last_name#35]
-Input [6]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#34, c_last_name#35, d_date_sk#36]
+(64) Project [codegen id : 12]
+Output [4]: [cs_quantity#3, cs_list_price#4, c_first_name#32, c_last_name#33]
+Input [6]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#32, c_last_name#33, d_date_sk#34]
 
-(60) HashAggregate [codegen id : 16]
-Input [4]: [cs_quantity#3, cs_list_price#4, c_first_name#34, c_last_name#35]
-Keys [2]: [c_last_name#35, c_first_name#34]
+(65) HashAggregate [codegen id : 12]
+Input [4]: [cs_quantity#3, cs_list_price#4, c_first_name#32, c_last_name#33]
+Keys [2]: [c_last_name#33, c_first_name#32]
 Functions [1]: [partial_sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))]
-Aggregate Attributes [2]: [sum#37, isEmpty#38]
-Results [4]: [c_last_name#35, c_first_name#34, sum#39, isEmpty#40]
+Aggregate Attributes [2]: [sum#35, isEmpty#36]
+Results [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
 
-(61) Exchange
-Input [4]: [c_last_name#35, c_first_name#34, sum#39, isEmpty#40]
-Arguments: hashpartitioning(c_last_name#35, c_first_name#34, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(66) RowToColumnar
+Input [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
 
-(62) HashAggregate [codegen id : 17]
-Input [4]: [c_last_name#35, c_first_name#34, sum#39, isEmpty#40]
-Keys [2]: [c_last_name#35, c_first_name#34]
+(67) CometColumnarExchange
+Input [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
+Arguments: hashpartitioning(c_last_name#33, c_first_name#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(68) CometHashAggregate
+Input [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
+Keys [2]: [c_last_name#33, c_first_name#32]
 Functions [1]: [sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))]
-Aggregate Attributes [1]: [sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))#41]
-Results [3]: [c_last_name#35, c_first_name#34, sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))#41 AS sales#42]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+Output [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#47), dynamicpruningexpression(ws_sold_date_sk#47 IN dynamicpruning#48)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#43), dynamicpruningexpression(ws_sold_date_sk#43 IN dynamicpruning#44)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(64) CometFilter
-Input [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
-Condition : isnotnull(ws_bill_customer_sk#44)
+(70) CometFilter
+Input [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+Condition : isnotnull(ws_bill_customer_sk#40)
 
-(65) ColumnarToRow [codegen id : 22]
-Input [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+(71) ColumnarToRow [codegen id : 17]
+Input [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
 
-(66) ReusedExchange [Reuses operator id: 21]
-Output [1]: [item_sk#18]
+(72) ReusedExchange [Reuses operator id: 23]
+Output [1]: [item_sk#17]
 
-(67) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_item_sk#43]
-Right keys [1]: [item_sk#18]
+(73) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_item_sk#39]
+Right keys [1]: [item_sk#17]
 Join type: LeftSemi
 Join condition: None
 
-(68) Project [codegen id : 22]
-Output [4]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
-Input [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+(74) Project [codegen id : 17]
+Output [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+Input [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
 
-(69) Exchange
-Input [4]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
-Arguments: hashpartitioning(ws_bill_customer_sk#44, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(75) RowToColumnar
+Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
 
-(70) Sort [codegen id : 23]
-Input [4]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
-Arguments: [ws_bill_customer_sk#44 ASC NULLS FIRST], false, 0
+(76) CometColumnarExchange
+Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+Arguments: hashpartitioning(ws_bill_customer_sk#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(71) ReusedExchange [Reuses operator id: 37]
-Output [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+(77) CometSort
+Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+Arguments: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43], [ws_bill_customer_sk#40 ASC NULLS FIRST]
 
-(72) HashAggregate [codegen id : 26]
-Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
-Keys [1]: [c_customer_sk#24]
-Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
-Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
+(78) ReusedExchange [Reuses operator id: 41]
+Output [3]: [c_customer_sk#23, sum#26, isEmpty#27]
 
-(73) Filter [codegen id : 26]
-Input [2]: [c_customer_sk#24, ssales#30]
-Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#31, [id=#32])))
+(79) CometHashAggregate
+Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+Keys [1]: [c_customer_sk#23]
+Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
 
-(74) Project [codegen id : 26]
-Output [1]: [c_customer_sk#24]
-Input [2]: [c_customer_sk#24, ssales#30]
+(80) CometFilter
+Input [2]: [c_customer_sk#23, ssales#28]
+Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#29, [id=#30])))
 
-(75) Sort [codegen id : 26]
-Input [1]: [c_customer_sk#24]
-Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
+(81) CometProject
+Input [2]: [c_customer_sk#23, ssales#28]
+Arguments: [c_customer_sk#23], [c_customer_sk#23]
 
-(76) SortMergeJoin [codegen id : 33]
-Left keys [1]: [ws_bill_customer_sk#44]
-Right keys [1]: [c_customer_sk#24]
-Join type: LeftSemi
-Join condition: None
+(82) CometSort
+Input [1]: [c_customer_sk#23]
+Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+
+(83) CometSortMergeJoin
+Left output [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+Right output [1]: [c_customer_sk#23]
+Arguments: [ws_bill_customer_sk#40], [c_customer_sk#23], LeftSemi
 
-(77) ReusedExchange [Reuses operator id: 54]
-Output [3]: [c_customer_sk#49, c_first_name#50, c_last_name#51]
+(84) ColumnarToRow [codegen id : 24]
+Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
 
-(78) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ws_bill_customer_sk#44]
-Right keys [1]: [c_customer_sk#49]
+(85) ReusedExchange [Reuses operator id: 59]
+Output [3]: [c_customer_sk#45, c_first_name#46, c_last_name#47]
+
+(86) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ws_bill_customer_sk#40]
+Right keys [1]: [c_customer_sk#45]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 33]
-Output [5]: [ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47, c_first_name#50, c_last_name#51]
-Input [7]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47, c_customer_sk#49, c_first_name#50, c_last_name#51]
+(87) Project [codegen id : 24]
+Output [5]: [ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43, c_first_name#46, c_last_name#47]
+Input [7]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43, c_customer_sk#45, c_first_name#46, c_last_name#47]
 
-(80) ReusedExchange [Reuses operator id: 92]
-Output [1]: [d_date_sk#52]
+(88) ReusedExchange [Reuses operator id: 102]
+Output [1]: [d_date_sk#48]
 
-(81) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ws_sold_date_sk#47]
-Right keys [1]: [d_date_sk#52]
+(89) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ws_sold_date_sk#43]
+Right keys [1]: [d_date_sk#48]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 33]
-Output [4]: [ws_quantity#45, ws_list_price#46, c_first_name#50, c_last_name#51]
-Input [6]: [ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47, c_first_name#50, c_last_name#51, d_date_sk#52]
+(90) Project [codegen id : 24]
+Output [4]: [ws_quantity#41, ws_list_price#42, c_first_name#46, c_last_name#47]
+Input [6]: [ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43, c_first_name#46, c_last_name#47, d_date_sk#48]
+
+(91) HashAggregate [codegen id : 24]
+Input [4]: [ws_quantity#41, ws_list_price#42, c_first_name#46, c_last_name#47]
+Keys [2]: [c_last_name#47, c_first_name#46]
+Functions [1]: [partial_sum((cast(ws_quantity#41 as decimal(10,0)) * ws_list_price#42))]
+Aggregate Attributes [2]: [sum#49, isEmpty#50]
+Results [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
 
-(83) HashAggregate [codegen id : 33]
-Input [4]: [ws_quantity#45, ws_list_price#46, c_first_name#50, c_last_name#51]
-Keys [2]: [c_last_name#51, c_first_name#50]
-Functions [1]: [partial_sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))]
-Aggregate Attributes [2]: [sum#53, isEmpty#54]
-Results [4]: [c_last_name#51, c_first_name#50, sum#55, isEmpty#56]
+(92) RowToColumnar
+Input [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
 
-(84) Exchange
-Input [4]: [c_last_name#51, c_first_name#50, sum#55, isEmpty#56]
-Arguments: hashpartitioning(c_last_name#51, c_first_name#50, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(93) CometColumnarExchange
+Input [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
+Arguments: hashpartitioning(c_last_name#47, c_first_name#46, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(85) HashAggregate [codegen id : 34]
-Input [4]: [c_last_name#51, c_first_name#50, sum#55, isEmpty#56]
-Keys [2]: [c_last_name#51, c_first_name#50]
-Functions [1]: [sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))]
-Aggregate Attributes [1]: [sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))#57]
-Results [3]: [c_last_name#51, c_first_name#50, sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))#57 AS sales#58]
+(94) CometHashAggregate
+Input [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
+Keys [2]: [c_last_name#47, c_first_name#46]
+Functions [1]: [sum((cast(ws_quantity#41 as decimal(10,0)) * ws_list_price#42))]
 
-(86) Union
+(95) CometUnion
+Child 0 Input [3]: [c_last_name#33, c_first_name#32, sales#53]
+Child 1 Input [3]: [c_last_name#47, c_first_name#46, sales#54]
 
-(87) TakeOrderedAndProject
-Input [3]: [c_last_name#35, c_first_name#34, sales#42]
-Arguments: 100, [c_last_name#35 ASC NULLS FIRST, c_first_name#34 ASC NULLS FIRST, sales#42 ASC NULLS FIRST], [c_last_name#35, c_first_name#34, sales#42]
+(96) CometTakeOrderedAndProject
+Input [3]: [c_last_name#33, c_first_name#32, sales#53]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[c_last_name#33 ASC NULLS FIRST,c_first_name#32 ASC NULLS FIRST,sales#53 ASC NULLS FIRST], output=[c_last_name#33,c_first_name#32,sales#53]), 100, [c_last_name#33 ASC NULLS FIRST, c_first_name#32 ASC NULLS FIRST, sales#53 ASC NULLS FIRST], [c_last_name#33, c_first_name#32, sales#53]
+
+(97) ColumnarToRow [codegen id : 25]
+Input [3]: [c_last_name#33, c_first_name#32, sales#53]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (92)
-+- * ColumnarToRow (91)
-   +- CometProject (90)
-      +- CometFilter (89)
-         +- CometScan parquet spark_catalog.default.date_dim (88)
+BroadcastExchange (102)
++- * ColumnarToRow (101)
+   +- CometProject (100)
+      +- CometFilter (99)
+         +- CometScan parquet spark_catalog.default.date_dim (98)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#36, d_year#59, d_moy#60]
+Output [3]: [d_date_sk#34, d_year#55, d_moy#56]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(89) CometFilter
-Input [3]: [d_date_sk#36, d_year#59, d_moy#60]
-Condition : ((((isnotnull(d_year#59) AND isnotnull(d_moy#60)) AND (d_year#59 = 2000)) AND (d_moy#60 = 2)) AND isnotnull(d_date_sk#36))
+(99) CometFilter
+Input [3]: [d_date_sk#34, d_year#55, d_moy#56]
+Condition : ((((isnotnull(d_year#55) AND isnotnull(d_moy#56)) AND (d_year#55 = 2000)) AND (d_moy#56 = 2)) AND isnotnull(d_date_sk#34))
 
-(90) CometProject
-Input [3]: [d_date_sk#36, d_year#59, d_moy#60]
-Arguments: [d_date_sk#36], [d_date_sk#36]
+(100) CometProject
+Input [3]: [d_date_sk#34, d_year#55, d_moy#56]
+Arguments: [d_date_sk#34], [d_date_sk#34]
 
-(91) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#36]
+(101) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#34]
 
-(92) BroadcastExchange
-Input [1]: [d_date_sk#36]
+(102) BroadcastExchange
+Input [1]: [d_date_sk#34]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (97)
-+- * ColumnarToRow (96)
-   +- CometProject (95)
-      +- CometFilter (94)
-         +- CometScan parquet spark_catalog.default.date_dim (93)
+BroadcastExchange (107)
++- * ColumnarToRow (106)
+   +- CometProject (105)
+      +- CometFilter (104)
+         +- CometScan parquet spark_catalog.default.date_dim (103)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_date#11, d_year#61]
+Output [3]: [d_date_sk#10, d_date#11, d_year#57]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_year:int>
 
-(94) CometFilter
-Input [3]: [d_date_sk#10, d_date#11, d_year#61]
-Condition : (d_year#61 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
+(104) CometFilter
+Input [3]: [d_date_sk#10, d_date#11, d_year#57]
+Condition : (d_year#57 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
 
-(95) CometProject
-Input [3]: [d_date_sk#10, d_date#11, d_year#61]
+(105) CometProject
+Input [3]: [d_date_sk#10, d_date#11, d_year#57]
 Arguments: [d_date_sk#10, d_date#11], [d_date_sk#10, d_date#11]
 
-(96) ColumnarToRow [codegen id : 1]
+(106) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#10, d_date#11]
 
-(97) BroadcastExchange
+(107) BroadcastExchange
 Input [2]: [d_date_sk#10, d_date#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 39 Hosting Expression = Subquery scalar-subquery#31, [id=#32]
-* HashAggregate (112)
-+- Exchange (111)
-   +- * HashAggregate (110)
-      +- * HashAggregate (109)
-         +- Exchange (108)
-            +- * HashAggregate (107)
-               +- * Project (106)
-                  +- * BroadcastHashJoin Inner BuildRight (105)
-                     :- * Project (103)
-                     :  +- * BroadcastHashJoin Inner BuildRight (102)
-                     :     :- * ColumnarToRow (100)
-                     :     :  +- CometFilter (99)
-                     :     :     +- CometScan parquet spark_catalog.default.store_sales (98)
-                     :     +- ReusedExchange (101)
-                     +- ReusedExchange (104)
+Subquery:3 Hosting operator id = 43 Hosting Expression = Subquery scalar-subquery#29, [id=#30]
+* ColumnarToRow (124)
++- CometHashAggregate (123)
+   +- CometColumnarExchange (122)
+      +- CometHashAggregate (121)
+         +- CometHashAggregate (120)
+            +- CometColumnarExchange (119)
+               +- RowToColumnar (118)
+                  +- * HashAggregate (117)
+                     +- * Project (116)
+                        +- * BroadcastHashJoin Inner BuildRight (115)
+                           :- * Project (113)
+                           :  +- * BroadcastHashJoin Inner BuildRight (112)
+                           :     :- * ColumnarToRow (110)
+                           :     :  +- CometFilter (109)
+                           :     :     +- CometScan parquet spark_catalog.default.store_sales (108)
+                           :     +- ReusedExchange (111)
+                           +- ReusedExchange (114)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65]
+Output [4]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#65), dynamicpruningexpression(ss_sold_date_sk#65 IN dynamicpruning#66)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#61), dynamicpruningexpression(ss_sold_date_sk#61 IN dynamicpruning#62)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(99) CometFilter
-Input [4]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65]
-Condition : isnotnull(ss_customer_sk#62)
+(109) CometFilter
+Input [4]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61]
+Condition : isnotnull(ss_customer_sk#58)
 
-(100) ColumnarToRow [codegen id : 3]
-Input [4]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65]
+(110) ColumnarToRow [codegen id : 3]
+Input [4]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61]
 
-(101) ReusedExchange [Reuses operator id: 33]
-Output [1]: [c_customer_sk#67]
+(111) ReusedExchange [Reuses operator id: 36]
+Output [1]: [c_customer_sk#63]
 
-(102) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_customer_sk#62]
-Right keys [1]: [c_customer_sk#67]
+(112) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_customer_sk#58]
+Right keys [1]: [c_customer_sk#63]
 Join type: Inner
 Join condition: None
 
-(103) Project [codegen id : 3]
-Output [4]: [ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65, c_customer_sk#67]
-Input [5]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65, c_customer_sk#67]
+(113) Project [codegen id : 3]
+Output [4]: [ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61, c_customer_sk#63]
+Input [5]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61, c_customer_sk#63]
 
-(104) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#68]
+(114) ReusedExchange [Reuses operator id: 129]
+Output [1]: [d_date_sk#64]
 
-(105) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_sold_date_sk#65]
-Right keys [1]: [d_date_sk#68]
+(115) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_sold_date_sk#61]
+Right keys [1]: [d_date_sk#64]
 Join type: Inner
 Join condition: None
 
-(106) Project [codegen id : 3]
-Output [3]: [ss_quantity#63, ss_sales_price#64, c_customer_sk#67]
-Input [5]: [ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65, c_customer_sk#67, d_date_sk#68]
-
-(107) HashAggregate [codegen id : 3]
-Input [3]: [ss_quantity#63, ss_sales_price#64, c_customer_sk#67]
-Keys [1]: [c_customer_sk#67]
-Functions [1]: [partial_sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))]
-Aggregate Attributes [2]: [sum#69, isEmpty#70]
-Results [3]: [c_customer_sk#67, sum#71, isEmpty#72]
-
-(108) Exchange
-Input [3]: [c_customer_sk#67, sum#71, isEmpty#72]
-Arguments: hashpartitioning(c_customer_sk#67, 5), ENSURE_REQUIREMENTS, [plan_id=14]
-
-(109) HashAggregate [codegen id : 4]
-Input [3]: [c_customer_sk#67, sum#71, isEmpty#72]
-Keys [1]: [c_customer_sk#67]
-Functions [1]: [sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))]
-Aggregate Attributes [1]: [sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))#73]
-Results [1]: [sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))#73 AS csales#74]
-
-(110) HashAggregate [codegen id : 4]
-Input [1]: [csales#74]
+(116) Project [codegen id : 3]
+Output [3]: [ss_quantity#59, ss_sales_price#60, c_customer_sk#63]
+Input [5]: [ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61, c_customer_sk#63, d_date_sk#64]
+
+(117) HashAggregate [codegen id : 3]
+Input [3]: [ss_quantity#59, ss_sales_price#60, c_customer_sk#63]
+Keys [1]: [c_customer_sk#63]
+Functions [1]: [partial_sum((cast(ss_quantity#59 as decimal(10,0)) * ss_sales_price#60))]
+Aggregate Attributes [2]: [sum#65, isEmpty#66]
+Results [3]: [c_customer_sk#63, sum#67, isEmpty#68]
+
+(118) RowToColumnar
+Input [3]: [c_customer_sk#63, sum#67, isEmpty#68]
+
+(119) CometColumnarExchange
+Input [3]: [c_customer_sk#63, sum#67, isEmpty#68]
+Arguments: hashpartitioning(c_customer_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+
+(120) CometHashAggregate
+Input [3]: [c_customer_sk#63, sum#67, isEmpty#68]
+Keys [1]: [c_customer_sk#63]
+Functions [1]: [sum((cast(ss_quantity#59 as decimal(10,0)) * ss_sales_price#60))]
+
+(121) CometHashAggregate
+Input [1]: [csales#69]
 Keys: []
-Functions [1]: [partial_max(csales#74)]
-Aggregate Attributes [1]: [max#75]
-Results [1]: [max#76]
+Functions [1]: [partial_max(csales#69)]
 
-(111) Exchange
-Input [1]: [max#76]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=15]
+(122) CometColumnarExchange
+Input [1]: [max#70]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(112) HashAggregate [codegen id : 5]
-Input [1]: [max#76]
+(123) CometHashAggregate
+Input [1]: [max#70]
 Keys: []
-Functions [1]: [max(csales#74)]
-Aggregate Attributes [1]: [max(csales#74)#77]
-Results [1]: [max(csales#74)#77 AS tpcds_cmax#78]
+Functions [1]: [max(csales#69)]
+
+(124) ColumnarToRow [codegen id : 4]
+Input [1]: [tpcds_cmax#71]
 
-Subquery:4 Hosting operator id = 98 Hosting Expression = ss_sold_date_sk#65 IN dynamicpruning#66
-BroadcastExchange (117)
-+- * ColumnarToRow (116)
-   +- CometProject (115)
-      +- CometFilter (114)
-         +- CometScan parquet spark_catalog.default.date_dim (113)
+Subquery:4 Hosting operator id = 108 Hosting Expression = ss_sold_date_sk#61 IN dynamicpruning#62
+BroadcastExchange (129)
++- * ColumnarToRow (128)
+   +- CometProject (127)
+      +- CometFilter (126)
+         +- CometScan parquet spark_catalog.default.date_dim (125)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#68, d_year#79]
+Output [2]: [d_date_sk#64, d_year#72]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(114) CometFilter
-Input [2]: [d_date_sk#68, d_year#79]
-Condition : (d_year#79 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#68))
+(126) CometFilter
+Input [2]: [d_date_sk#64, d_year#72]
+Condition : (d_year#72 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#64))
 
-(115) CometProject
-Input [2]: [d_date_sk#68, d_year#79]
-Arguments: [d_date_sk#68], [d_date_sk#68]
+(127) CometProject
+Input [2]: [d_date_sk#64, d_year#72]
+Arguments: [d_date_sk#64], [d_date_sk#64]
 
-(116) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#68]
+(128) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#64]
 
-(117) BroadcastExchange
-Input [1]: [d_date_sk#68]
+(129) BroadcastExchange
+Input [1]: [d_date_sk#64]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=16]
 
-Subquery:5 Hosting operator id = 50 Hosting Expression = ReusedSubquery Subquery scalar-subquery#31, [id=#32]
+Subquery:5 Hosting operator id = 54 Hosting Expression = ReusedSubquery Subquery scalar-subquery#29, [id=#30]
 
-Subquery:6 Hosting operator id = 63 Hosting Expression = ws_sold_date_sk#47 IN dynamicpruning#6
+Subquery:6 Hosting operator id = 69 Hosting Expression = ws_sold_date_sk#43 IN dynamicpruning#6
 
-Subquery:7 Hosting operator id = 73 Hosting Expression = ReusedSubquery Subquery scalar-subquery#31, [id=#32]
+Subquery:7 Hosting operator id = 80 Hosting Expression = ReusedSubquery Subquery scalar-subquery#29, [id=#30]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt
index 9cbb568a9a..2dd7ddf4af 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt
@@ -1,186 +1,179 @@
-TakeOrderedAndProject [c_last_name,c_first_name,sales]
-  Union
-    WholeStageCodegen (17)
-      HashAggregate [c_last_name,c_first_name,sum,isEmpty] [sum((cast(cs_quantity as decimal(10,0)) * cs_list_price)),sales,sum,isEmpty]
-        InputAdapter
-          Exchange [c_last_name,c_first_name] #1
-            WholeStageCodegen (16)
-              HashAggregate [c_last_name,c_first_name,cs_quantity,cs_list_price] [sum,isEmpty,sum,isEmpty]
-                Project [cs_quantity,cs_list_price,c_first_name,c_last_name]
-                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                    Project [cs_quantity,cs_list_price,cs_sold_date_sk,c_first_name,c_last_name]
-                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                        SortMergeJoin [cs_bill_customer_sk,c_customer_sk]
-                          InputAdapter
-                            WholeStageCodegen (6)
-                              Sort [cs_bill_customer_sk]
-                                InputAdapter
-                                  Exchange [cs_bill_customer_sk] #2
-                                    WholeStageCodegen (5)
-                                      Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                        BroadcastHashJoin [cs_item_sk,item_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                          InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (4)
-                                                Project [item_sk]
-                                                  Filter [cnt]
-                                                    HashAggregate [_groupingexpression,i_item_sk,d_date,count] [count(1),item_sk,cnt,count]
+WholeStageCodegen (25)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [c_last_name,c_first_name,sales]
+        CometUnion
+          CometHashAggregate [c_last_name,c_first_name,sum,isEmpty]
+            CometColumnarExchange [c_last_name,c_first_name] #1
+              RowToColumnar
+                WholeStageCodegen (12)
+                  HashAggregate [c_last_name,c_first_name,cs_quantity,cs_list_price] [sum,isEmpty,sum,isEmpty]
+                    Project [cs_quantity,cs_list_price,c_first_name,c_last_name]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_quantity,cs_list_price,cs_sold_date_sk,c_first_name,c_last_name]
+                          BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometSortMergeJoin [cs_bill_customer_sk,c_customer_sk]
+                                  CometSort [cs_bill_customer_sk]
+                                    CometColumnarExchange [cs_bill_customer_sk] #2
+                                      RowToColumnar
+                                        WholeStageCodegen (5)
+                                          Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                            BroadcastHashJoin [cs_item_sk,item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [cs_bill_customer_sk]
+                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_year,d_moy,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #4
+                                                  WholeStageCodegen (4)
+                                                    ColumnarToRow
                                                       InputAdapter
-                                                        Exchange [_groupingexpression,i_item_sk,d_date] #5
-                                                          WholeStageCodegen (3)
-                                                            HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
-                                                              Project [d_date,i_item_sk,i_item_desc]
-                                                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                  Project [ss_item_sk,d_date]
-                                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometFilter [ss_item_sk]
-                                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                              SubqueryBroadcast [d_date_sk] #2
-                                                                                BroadcastExchange #6
-                                                                                  WholeStageCodegen (1)
-                                                                                    ColumnarToRow
-                                                                                      InputAdapter
-                                                                                        CometProject [d_date_sk,d_date]
-                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
-                                                                      InputAdapter
-                                                                        ReusedExchange [d_date_sk,d_date] #6
-                                                                  InputAdapter
-                                                                    BroadcastExchange #7
-                                                                      WholeStageCodegen (2)
+                                                        CometProject [item_sk]
+                                                          CometFilter [cnt]
+                                                            CometHashAggregate [_groupingexpression,i_item_sk,d_date,count]
+                                                              CometColumnarExchange [_groupingexpression,i_item_sk,d_date] #5
+                                                                RowToColumnar
+                                                                  WholeStageCodegen (3)
+                                                                    HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
+                                                                      Project [d_date,i_item_sk,i_item_desc]
+                                                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                          Project [ss_item_sk,d_date]
+                                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometFilter [ss_item_sk]
+                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                                      SubqueryBroadcast [d_date_sk] #2
+                                                                                        BroadcastExchange #6
+                                                                                          WholeStageCodegen (1)
+                                                                                            ColumnarToRow
+                                                                                              InputAdapter
+                                                                                                CometProject [d_date_sk,d_date]
+                                                                                                  CometFilter [d_year,d_date_sk]
+                                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
+                                                                              InputAdapter
+                                                                                ReusedExchange [d_date_sk,d_date] #6
+                                                                          InputAdapter
+                                                                            BroadcastExchange #7
+                                                                              WholeStageCodegen (2)
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometFilter [i_item_sk]
+                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                                  CometSort [c_customer_sk]
+                                    CometProject [c_customer_sk]
+                                      CometFilter [ssales]
+                                        Subquery #3
+                                          WholeStageCodegen (4)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometHashAggregate [max]
+                                                  CometColumnarExchange #10
+                                                    CometHashAggregate [csales]
+                                                      CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                                        CometColumnarExchange [c_customer_sk] #11
+                                                          RowToColumnar
+                                                            WholeStageCodegen (3)
+                                                              HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                                                Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
+                                                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [i_item_sk]
-                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
-                          InputAdapter
-                            WholeStageCodegen (9)
-                              Sort [c_customer_sk]
-                                Project [c_customer_sk]
-                                  Filter [ssales]
-                                    Subquery #3
-                                      WholeStageCodegen (5)
-                                        HashAggregate [max] [max(csales),tpcds_cmax,max]
-                                          InputAdapter
-                                            Exchange #10
-                                              WholeStageCodegen (4)
-                                                HashAggregate [csales] [max,max]
-                                                  HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),csales,sum,isEmpty]
-                                                    InputAdapter
-                                                      Exchange [c_customer_sk] #11
-                                                        WholeStageCodegen (3)
-                                                          HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                                            Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
-                                                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometFilter [ss_customer_sk]
-                                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                                            SubqueryBroadcast [d_date_sk] #4
-                                                                              BroadcastExchange #12
-                                                                                WholeStageCodegen (1)
-                                                                                  ColumnarToRow
-                                                                                    InputAdapter
-                                                                                      CometProject [d_date_sk]
-                                                                                        CometFilter [d_year,d_date_sk]
-                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                            CometFilter [ss_customer_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #4
+                                                                                  BroadcastExchange #12
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometProject [d_date_sk]
+                                                                                            CometFilter [d_year,d_date_sk]
+                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                        InputAdapter
+                                                                          ReusedExchange [c_customer_sk] #9
                                                                     InputAdapter
-                                                                      ReusedExchange [c_customer_sk] #9
-                                                                InputAdapter
-                                                                  ReusedExchange [d_date_sk] #12
-                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [c_customer_sk] #8
-                                          WholeStageCodegen (8)
-                                            HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                              Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
-                                                        CometFilter [ss_customer_sk]
-                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                  InputAdapter
-                                                    BroadcastExchange #9
-                                                      WholeStageCodegen (7)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [c_customer_sk]
-                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk]
-                        InputAdapter
-                          BroadcastExchange #13
-                            WholeStageCodegen (14)
-                              SortMergeJoin [c_customer_sk,c_customer_sk]
-                                InputAdapter
-                                  WholeStageCodegen (10)
-                                    ColumnarToRow
-                                      InputAdapter
+                                                                      ReusedExchange [d_date_sk] #12
+                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                          CometColumnarExchange [c_customer_sk] #8
+                                            RowToColumnar
+                                              WholeStageCodegen (7)
+                                                HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                                  Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                    BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
+                                                            CometFilter [ss_customer_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                      InputAdapter
+                                                        BroadcastExchange #9
+                                                          WholeStageCodegen (6)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [c_customer_sk]
+                                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk]
+                            InputAdapter
+                              BroadcastExchange #13
+                                WholeStageCodegen (10)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometSortMergeJoin [c_customer_sk,c_customer_sk]
                                         CometSort [c_customer_sk]
-                                          CometExchange [c_customer_sk] #14
+                                          CometColumnarExchange [c_customer_sk] #14
                                             CometFilter [c_customer_sk]
                                               CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
-                                InputAdapter
-                                  WholeStageCodegen (13)
-                                    Sort [c_customer_sk]
-                                      Project [c_customer_sk]
-                                        Filter [ssales]
-                                          ReusedSubquery [tpcds_cmax] #3
-                                          HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
-                                            InputAdapter
-                                              ReusedExchange [c_customer_sk,sum,isEmpty] #8
-                    InputAdapter
-                      ReusedExchange [d_date_sk] #3
-    WholeStageCodegen (34)
-      HashAggregate [c_last_name,c_first_name,sum,isEmpty] [sum((cast(ws_quantity as decimal(10,0)) * ws_list_price)),sales,sum,isEmpty]
-        InputAdapter
-          Exchange [c_last_name,c_first_name] #15
-            WholeStageCodegen (33)
-              HashAggregate [c_last_name,c_first_name,ws_quantity,ws_list_price] [sum,isEmpty,sum,isEmpty]
-                Project [ws_quantity,ws_list_price,c_first_name,c_last_name]
-                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                    Project [ws_quantity,ws_list_price,ws_sold_date_sk,c_first_name,c_last_name]
-                      BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                        SortMergeJoin [ws_bill_customer_sk,c_customer_sk]
-                          InputAdapter
-                            WholeStageCodegen (23)
-                              Sort [ws_bill_customer_sk]
-                                InputAdapter
-                                  Exchange [ws_bill_customer_sk] #16
-                                    WholeStageCodegen (22)
-                                      Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                        BroadcastHashJoin [ws_item_sk,item_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [item_sk] #4
-                          InputAdapter
-                            WholeStageCodegen (26)
-                              Sort [c_customer_sk]
-                                Project [c_customer_sk]
-                                  Filter [ssales]
-                                    ReusedSubquery [tpcds_cmax] #3
-                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
-                                      InputAdapter
-                                        ReusedExchange [c_customer_sk,sum,isEmpty] #8
+                                        CometSort [c_customer_sk]
+                                          CometProject [c_customer_sk]
+                                            CometFilter [ssales]
+                                              ReusedSubquery [tpcds_cmax] #3
+                                              CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                                ReusedExchange [c_customer_sk,sum,isEmpty] #8
+                        InputAdapter
+                          ReusedExchange [d_date_sk] #3
+          CometHashAggregate [c_last_name,c_first_name,sum,isEmpty]
+            CometColumnarExchange [c_last_name,c_first_name] #15
+              RowToColumnar
+                WholeStageCodegen (24)
+                  HashAggregate [c_last_name,c_first_name,ws_quantity,ws_list_price] [sum,isEmpty,sum,isEmpty]
+                    Project [ws_quantity,ws_list_price,c_first_name,c_last_name]
+                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                        Project [ws_quantity,ws_list_price,ws_sold_date_sk,c_first_name,c_last_name]
+                          BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometSortMergeJoin [ws_bill_customer_sk,c_customer_sk]
+                                  CometSort [ws_bill_customer_sk]
+                                    CometColumnarExchange [ws_bill_customer_sk] #16
+                                      RowToColumnar
+                                        WholeStageCodegen (17)
+                                          Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                            BroadcastHashJoin [ws_item_sk,item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ws_bill_customer_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [item_sk] #4
+                                  CometSort [c_customer_sk]
+                                    CometProject [c_customer_sk]
+                                      CometFilter [ssales]
+                                        ReusedSubquery [tpcds_cmax] #3
+                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
+                                          ReusedExchange [c_customer_sk,sum,isEmpty] #8
+                            InputAdapter
+                              ReusedExchange [c_customer_sk,c_first_name,c_last_name] #13
                         InputAdapter
-                          ReusedExchange [c_customer_sk,c_first_name,c_last_name] #13
-                    InputAdapter
-                      ReusedExchange [d_date_sk] #3
+                          ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt
index 6e03148d53..a7ccfef3ab 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-* Filter (45)
-+- * HashAggregate (44)
-   +- Exchange (43)
-      +- * HashAggregate (42)
-         +- * HashAggregate (41)
-            +- Exchange (40)
-               +- * HashAggregate (39)
-                  +- * Project (38)
-                     +- * BroadcastHashJoin Inner BuildRight (37)
-                        :- * Project (32)
-                        :  +- * BroadcastHashJoin Inner BuildRight (31)
-                        :     :- * Project (26)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                        :     :     :- * Project (20)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-                        :     :     :     :- * ColumnarToRow (13)
-                        :     :     :     :  +- CometProject (12)
-                        :     :     :     :     +- CometSortMergeJoin (11)
-                        :     :     :     :        :- CometSort (5)
-                        :     :     :     :        :  +- CometExchange (4)
-                        :     :     :     :        :     +- CometProject (3)
-                        :     :     :     :        :        +- CometFilter (2)
-                        :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
-                        :     :     :     :        +- CometSort (10)
-                        :     :     :     :           +- CometExchange (9)
-                        :     :     :     :              +- CometProject (8)
-                        :     :     :     :                 +- CometFilter (7)
-                        :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
-                        :     :     :     +- BroadcastExchange (18)
-                        :     :     :        +- * ColumnarToRow (17)
-                        :     :     :           +- CometProject (16)
-                        :     :     :              +- CometFilter (15)
-                        :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
-                        :     :     +- BroadcastExchange (24)
-                        :     :        +- * ColumnarToRow (23)
-                        :     :           +- CometFilter (22)
-                        :     :              +- CometScan parquet spark_catalog.default.item (21)
-                        :     +- BroadcastExchange (30)
-                        :        +- * ColumnarToRow (29)
-                        :           +- CometFilter (28)
-                        :              +- CometScan parquet spark_catalog.default.customer (27)
-                        +- BroadcastExchange (36)
-                           +- * ColumnarToRow (35)
-                              +- CometFilter (34)
-                                 +- CometScan parquet spark_catalog.default.customer_address (33)
+* ColumnarToRow (47)
++- CometFilter (46)
+   +- CometHashAggregate (45)
+      +- CometColumnarExchange (44)
+         +- CometHashAggregate (43)
+            +- CometHashAggregate (42)
+               +- CometColumnarExchange (41)
+                  +- RowToColumnar (40)
+                     +- * HashAggregate (39)
+                        +- * Project (38)
+                           +- * BroadcastHashJoin Inner BuildRight (37)
+                              :- * Project (32)
+                              :  +- * BroadcastHashJoin Inner BuildRight (31)
+                              :     :- * Project (26)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                              :     :     :- * Project (20)
+                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+                              :     :     :     :- * ColumnarToRow (13)
+                              :     :     :     :  +- CometProject (12)
+                              :     :     :     :     +- CometSortMergeJoin (11)
+                              :     :     :     :        :- CometSort (5)
+                              :     :     :     :        :  +- CometColumnarExchange (4)
+                              :     :     :     :        :     +- CometProject (3)
+                              :     :     :     :        :        +- CometFilter (2)
+                              :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     :     :     :        +- CometSort (10)
+                              :     :     :     :           +- CometColumnarExchange (9)
+                              :     :     :     :              +- CometProject (8)
+                              :     :     :     :                 +- CometFilter (7)
+                              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
+                              :     :     :     +- BroadcastExchange (18)
+                              :     :     :        +- * ColumnarToRow (17)
+                              :     :     :           +- CometProject (16)
+                              :     :     :              +- CometFilter (15)
+                              :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
+                              :     :     +- BroadcastExchange (24)
+                              :     :        +- * ColumnarToRow (23)
+                              :     :           +- CometFilter (22)
+                              :     :              +- CometScan parquet spark_catalog.default.item (21)
+                              :     +- BroadcastExchange (30)
+                              :        +- * ColumnarToRow (29)
+                              :           +- CometFilter (28)
+                              :              +- CometScan parquet spark_catalog.default.customer (27)
+                              +- BroadcastExchange (36)
+                                 +- * ColumnarToRow (35)
+                                    +- CometFilter (34)
+                                       +- CometScan parquet spark_catalog.default.customer_address (33)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -61,9 +63,9 @@ Condition : (((isnotnull(ss_ticket_number#4) AND isnotnull(ss_item_sk#1)) AND is
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(4) CometExchange
+(4) CometColumnarExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (5) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
@@ -84,9 +86,9 @@ Condition : (isnotnull(sr_ticket_number#8) AND isnotnull(sr_item_sk#7))
 Input [3]: [sr_item_sk#7, sr_ticket_number#8, sr_returned_date_sk#9]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_item_sk#7, sr_ticket_number#8]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
-Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
@@ -227,108 +229,110 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
 Aggregate Attributes [1]: [sum#28]
 Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 
-(40) Exchange
+(40) RowToColumnar
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) HashAggregate [codegen id : 6]
+(41) CometColumnarExchange
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(42) CometHashAggregate
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
-Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(42) HashAggregate [codegen id : 6]
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#31]
+(43) CometHashAggregate
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#30]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [partial_sum(netpaid#31)]
-Aggregate Attributes [2]: [sum#32, isEmpty#33]
-Results [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
+Functions [1]: [partial_sum(netpaid#30)]
 
-(43) Exchange
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(44) CometColumnarExchange
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(44) HashAggregate [codegen id : 7]
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
+(45) CometHashAggregate
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [sum(netpaid#31)]
-Aggregate Attributes [1]: [sum(netpaid#31)#36]
-Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, sum(netpaid#31)#36 AS paid#37]
+Functions [1]: [sum(netpaid#30)]
 
-(45) Filter [codegen id : 7]
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#37]
-Condition : (isnotnull(paid#37) AND (cast(paid#37 as decimal(33,8)) > cast(Subquery scalar-subquery#38, [id=#39] as decimal(33,8))))
+(46) CometFilter
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
+Condition : (isnotnull(paid#33) AND (cast(paid#33 as decimal(33,8)) > cast(Subquery scalar-subquery#34, [id=#35] as decimal(33,8))))
+
+(47) ColumnarToRow [codegen id : 6]
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 45 Hosting Expression = Subquery scalar-subquery#38, [id=#39]
-* HashAggregate (73)
-+- Exchange (72)
-   +- * HashAggregate (71)
-      +- * HashAggregate (70)
-         +- Exchange (69)
-            +- * HashAggregate (68)
-               +- * Project (67)
-                  +- * BroadcastHashJoin Inner BuildRight (66)
-                     :- * Project (64)
-                     :  +- * BroadcastHashJoin Inner BuildRight (63)
-                     :     :- * Project (61)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (60)
-                     :     :     :- * Project (55)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-                     :     :     :     :- * ColumnarToRow (52)
-                     :     :     :     :  +- CometProject (51)
-                     :     :     :     :     +- CometSortMergeJoin (50)
-                     :     :     :     :        :- CometSort (47)
-                     :     :     :     :        :  +- ReusedExchange (46)
-                     :     :     :     :        +- CometSort (49)
-                     :     :     :     :           +- ReusedExchange (48)
-                     :     :     :     +- ReusedExchange (53)
-                     :     :     +- BroadcastExchange (59)
-                     :     :        +- * ColumnarToRow (58)
-                     :     :           +- CometFilter (57)
-                     :     :              +- CometScan parquet spark_catalog.default.item (56)
-                     :     +- ReusedExchange (62)
-                     +- ReusedExchange (65)
-
-
-(46) ReusedExchange [Reuses operator id: 4]
+Subquery:1 Hosting operator id = 46 Hosting Expression = Subquery scalar-subquery#34, [id=#35]
+* ColumnarToRow (77)
++- CometHashAggregate (76)
+   +- CometColumnarExchange (75)
+      +- CometHashAggregate (74)
+         +- CometHashAggregate (73)
+            +- CometColumnarExchange (72)
+               +- RowToColumnar (71)
+                  +- * HashAggregate (70)
+                     +- * Project (69)
+                        +- * BroadcastHashJoin Inner BuildRight (68)
+                           :- * Project (66)
+                           :  +- * BroadcastHashJoin Inner BuildRight (65)
+                           :     :- * Project (63)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (62)
+                           :     :     :- * Project (57)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+                           :     :     :     :- * ColumnarToRow (54)
+                           :     :     :     :  +- CometProject (53)
+                           :     :     :     :     +- CometSortMergeJoin (52)
+                           :     :     :     :        :- CometSort (49)
+                           :     :     :     :        :  +- ReusedExchange (48)
+                           :     :     :     :        +- CometSort (51)
+                           :     :     :     :           +- ReusedExchange (50)
+                           :     :     :     +- ReusedExchange (55)
+                           :     :     +- BroadcastExchange (61)
+                           :     :        +- * ColumnarToRow (60)
+                           :     :           +- CometFilter (59)
+                           :     :              +- CometScan parquet spark_catalog.default.item (58)
+                           :     +- ReusedExchange (64)
+                           +- ReusedExchange (67)
+
+
+(48) ReusedExchange [Reuses operator id: 4]
 Output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(47) CometSort
+(49) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_ticket_number#4 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST]
 
-(48) ReusedExchange [Reuses operator id: 9]
+(50) ReusedExchange [Reuses operator id: 9]
 Output [2]: [sr_item_sk#7, sr_ticket_number#8]
 
-(49) CometSort
+(51) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_ticket_number#8 ASC NULLS FIRST, sr_item_sk#7 ASC NULLS FIRST]
 
-(50) CometSortMergeJoin
+(52) CometSortMergeJoin
 Left output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Right output [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_ticket_number#4, ss_item_sk#1], [sr_ticket_number#8, sr_item_sk#7], Inner
 
-(51) CometProject
+(53) CometProject
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(52) ColumnarToRow [codegen id : 5]
+(54) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(53) ReusedExchange [Reuses operator id: 18]
+(55) ReusedExchange [Reuses operator id: 18]
 Output [4]: [s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
-(54) BroadcastHashJoin [codegen id : 5]
+(56) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#10]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 5]
+(57) Project [codegen id : 5]
 Output [6]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14]
 Input [8]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5, s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
@@ -339,87 +343,87 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_size:string,i_color:string,i_units:string,i_manager_id:int>
 
-(57) CometFilter
+(59) CometFilter
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Condition : isnotnull(i_item_sk#15)
 
-(58) ColumnarToRow [codegen id : 2]
+(60) ColumnarToRow [codegen id : 2]
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(59) BroadcastExchange
+(61) BroadcastExchange
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 5]
+(62) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#15]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 5]
+(63) Project [codegen id : 5]
 Output [10]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(62) ReusedExchange [Reuses operator id: 30]
+(64) ReusedExchange [Reuses operator id: 30]
 Output [4]: [c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(63) BroadcastHashJoin [codegen id : 5]
+(65) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 5]
+(66) Project [codegen id : 5]
 Output [12]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24]
 Input [14]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(65) ReusedExchange [Reuses operator id: 36]
+(67) ReusedExchange [Reuses operator id: 36]
 Output [3]: [ca_state#25, ca_zip#26, ca_country#27]
 
-(66) BroadcastHashJoin [codegen id : 5]
+(68) BroadcastHashJoin [codegen id : 5]
 Left keys [2]: [c_birth_country#24, s_zip#14]
 Right keys [2]: [upper(ca_country#27), ca_zip#26]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 5]
+(69) Project [codegen id : 5]
 Output [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Input [15]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24, ca_state#25, ca_zip#26, ca_country#27]
 
-(68) HashAggregate [codegen id : 5]
+(70) HashAggregate [codegen id : 5]
 Input [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum#40]
-Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
+Aggregate Attributes [1]: [sum#36]
+Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+
+(71) RowToColumnar
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
 
-(69) Exchange
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(72) CometColumnarExchange
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(70) HashAggregate [codegen id : 6]
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
+(73) CometHashAggregate
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(71) HashAggregate [codegen id : 6]
-Input [1]: [netpaid#31]
+(74) CometHashAggregate
+Input [1]: [netpaid#30]
 Keys: []
-Functions [1]: [partial_avg(netpaid#31)]
-Aggregate Attributes [2]: [sum#42, count#43]
-Results [2]: [sum#44, count#45]
+Functions [1]: [partial_avg(netpaid#30)]
 
-(72) Exchange
-Input [2]: [sum#44, count#45]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=11]
+(75) CometColumnarExchange
+Input [2]: [sum#38, count#39]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(73) HashAggregate [codegen id : 7]
-Input [2]: [sum#44, count#45]
+(76) CometHashAggregate
+Input [2]: [sum#38, count#39]
 Keys: []
-Functions [1]: [avg(netpaid#31)]
-Aggregate Attributes [1]: [avg(netpaid#31)#46]
-Results [1]: [(0.05 * avg(netpaid#31)#46) AS (0.05 * avg(netpaid))#47]
+Functions [1]: [avg(netpaid#30)]
+
+(77) ColumnarToRow [codegen id : 6]
+Input [1]: [(0.05 * avg(netpaid))#40]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt
index a4b8fef5d3..558a960ab1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt
@@ -1,54 +1,54 @@
-WholeStageCodegen (7)
-  Filter [paid]
-    Subquery #1
-      WholeStageCodegen (7)
-        HashAggregate [sum,count] [avg(netpaid),(0.05 * avg(netpaid)),sum,count]
-          InputAdapter
-            Exchange #9
-              WholeStageCodegen (6)
-                HashAggregate [netpaid] [sum,count,sum,count]
-                  HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
-                    InputAdapter
-                      Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
-                        WholeStageCodegen (5)
-                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
-                            Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
-                              BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
-                                Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
-                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                    Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
-                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                        Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
-                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
-                                                  CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    CometSort [ss_ticket_number,ss_item_sk]
-                                                      ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
-                                                    CometSort [sr_ticket_number,sr_item_sk]
-                                                      ReusedExchange [sr_item_sk,sr_ticket_number] #4
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometFilter [paid]
+        Subquery #1
+          WholeStageCodegen (6)
+            ColumnarToRow
+              InputAdapter
+                CometHashAggregate [sum,count]
+                  CometColumnarExchange #9
+                    CometHashAggregate [netpaid]
+                      CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
+                        CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
+                          RowToColumnar
+                            WholeStageCodegen (5)
+                              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
+                                Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
+                                  BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
+                                    Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
+                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                        Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                            Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
+                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
+                                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                        CometSort [ss_ticket_number,ss_item_sk]
+                                                          ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
+                                                        CometSort [sr_ticket_number,sr_item_sk]
+                                                          ReusedExchange [sr_item_sk,sr_ticket_number] #4
+                                                InputAdapter
+                                                  ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
                                             InputAdapter
-                                              ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
+                                              BroadcastExchange #11
+                                                WholeStageCodegen (2)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [i_item_sk]
+                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
                                         InputAdapter
-                                          BroadcastExchange #11
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [i_item_sk]
-                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                          ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
                                     InputAdapter
-                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
-                                InputAdapter
-                                  ReusedExchange [ca_state,ca_zip,ca_country] #8
-    HashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty] [sum(netpaid),paid,sum,isEmpty]
-      InputAdapter
-        Exchange [c_last_name,c_first_name,s_store_name] #1
-          WholeStageCodegen (6)
-            HashAggregate [c_last_name,c_first_name,s_store_name,netpaid] [sum,isEmpty,sum,isEmpty]
-              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
-                InputAdapter
-                  Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
+                                      ReusedExchange [ca_state,ca_zip,ca_country] #8
+        CometHashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty]
+          CometColumnarExchange [c_last_name,c_first_name,s_store_name] #1
+            CometHashAggregate [c_last_name,c_first_name,s_store_name,netpaid]
+              CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
+                CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
+                  RowToColumnar
                     WholeStageCodegen (5)
                       HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
                         Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
@@ -64,12 +64,12 @@ WholeStageCodegen (7)
                                             CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
                                               CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                 CometSort [ss_ticket_number,ss_item_sk]
-                                                  CometExchange [ss_ticket_number,ss_item_sk] #3
+                                                  CometColumnarExchange [ss_ticket_number,ss_item_sk] #3
                                                     CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
                                                       CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
                                                         CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
                                                 CometSort [sr_ticket_number,sr_item_sk]
-                                                  CometExchange [sr_ticket_number,sr_item_sk] #4
+                                                  CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
                                                     CometProject [sr_item_sk,sr_ticket_number]
                                                       CometFilter [sr_ticket_number,sr_item_sk]
                                                         CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt
index fb3113df00..17f27af6ac 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-* Filter (45)
-+- * HashAggregate (44)
-   +- Exchange (43)
-      +- * HashAggregate (42)
-         +- * HashAggregate (41)
-            +- Exchange (40)
-               +- * HashAggregate (39)
-                  +- * Project (38)
-                     +- * BroadcastHashJoin Inner BuildRight (37)
-                        :- * Project (32)
-                        :  +- * BroadcastHashJoin Inner BuildRight (31)
-                        :     :- * Project (26)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                        :     :     :- * Project (20)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-                        :     :     :     :- * ColumnarToRow (13)
-                        :     :     :     :  +- CometProject (12)
-                        :     :     :     :     +- CometSortMergeJoin (11)
-                        :     :     :     :        :- CometSort (5)
-                        :     :     :     :        :  +- CometExchange (4)
-                        :     :     :     :        :     +- CometProject (3)
-                        :     :     :     :        :        +- CometFilter (2)
-                        :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
-                        :     :     :     :        +- CometSort (10)
-                        :     :     :     :           +- CometExchange (9)
-                        :     :     :     :              +- CometProject (8)
-                        :     :     :     :                 +- CometFilter (7)
-                        :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
-                        :     :     :     +- BroadcastExchange (18)
-                        :     :     :        +- * ColumnarToRow (17)
-                        :     :     :           +- CometProject (16)
-                        :     :     :              +- CometFilter (15)
-                        :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
-                        :     :     +- BroadcastExchange (24)
-                        :     :        +- * ColumnarToRow (23)
-                        :     :           +- CometFilter (22)
-                        :     :              +- CometScan parquet spark_catalog.default.item (21)
-                        :     +- BroadcastExchange (30)
-                        :        +- * ColumnarToRow (29)
-                        :           +- CometFilter (28)
-                        :              +- CometScan parquet spark_catalog.default.customer (27)
-                        +- BroadcastExchange (36)
-                           +- * ColumnarToRow (35)
-                              +- CometFilter (34)
-                                 +- CometScan parquet spark_catalog.default.customer_address (33)
+* ColumnarToRow (47)
++- CometFilter (46)
+   +- CometHashAggregate (45)
+      +- CometColumnarExchange (44)
+         +- CometHashAggregate (43)
+            +- CometHashAggregate (42)
+               +- CometColumnarExchange (41)
+                  +- RowToColumnar (40)
+                     +- * HashAggregate (39)
+                        +- * Project (38)
+                           +- * BroadcastHashJoin Inner BuildRight (37)
+                              :- * Project (32)
+                              :  +- * BroadcastHashJoin Inner BuildRight (31)
+                              :     :- * Project (26)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                              :     :     :- * Project (20)
+                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+                              :     :     :     :- * ColumnarToRow (13)
+                              :     :     :     :  +- CometProject (12)
+                              :     :     :     :     +- CometSortMergeJoin (11)
+                              :     :     :     :        :- CometSort (5)
+                              :     :     :     :        :  +- CometColumnarExchange (4)
+                              :     :     :     :        :     +- CometProject (3)
+                              :     :     :     :        :        +- CometFilter (2)
+                              :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     :     :     :        +- CometSort (10)
+                              :     :     :     :           +- CometColumnarExchange (9)
+                              :     :     :     :              +- CometProject (8)
+                              :     :     :     :                 +- CometFilter (7)
+                              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
+                              :     :     :     +- BroadcastExchange (18)
+                              :     :     :        +- * ColumnarToRow (17)
+                              :     :     :           +- CometProject (16)
+                              :     :     :              +- CometFilter (15)
+                              :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
+                              :     :     +- BroadcastExchange (24)
+                              :     :        +- * ColumnarToRow (23)
+                              :     :           +- CometFilter (22)
+                              :     :              +- CometScan parquet spark_catalog.default.item (21)
+                              :     +- BroadcastExchange (30)
+                              :        +- * ColumnarToRow (29)
+                              :           +- CometFilter (28)
+                              :              +- CometScan parquet spark_catalog.default.customer (27)
+                              +- BroadcastExchange (36)
+                                 +- * ColumnarToRow (35)
+                                    +- CometFilter (34)
+                                       +- CometScan parquet spark_catalog.default.customer_address (33)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -61,9 +63,9 @@ Condition : (((isnotnull(ss_ticket_number#4) AND isnotnull(ss_item_sk#1)) AND is
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(4) CometExchange
+(4) CometColumnarExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (5) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
@@ -84,9 +86,9 @@ Condition : (isnotnull(sr_ticket_number#8) AND isnotnull(sr_item_sk#7))
 Input [3]: [sr_item_sk#7, sr_ticket_number#8, sr_returned_date_sk#9]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_item_sk#7, sr_ticket_number#8]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
-Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
@@ -227,108 +229,110 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
 Aggregate Attributes [1]: [sum#28]
 Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 
-(40) Exchange
+(40) RowToColumnar
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) HashAggregate [codegen id : 6]
+(41) CometColumnarExchange
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(42) CometHashAggregate
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
-Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(42) HashAggregate [codegen id : 6]
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#31]
+(43) CometHashAggregate
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#30]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [partial_sum(netpaid#31)]
-Aggregate Attributes [2]: [sum#32, isEmpty#33]
-Results [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
+Functions [1]: [partial_sum(netpaid#30)]
 
-(43) Exchange
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(44) CometColumnarExchange
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(44) HashAggregate [codegen id : 7]
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
+(45) CometHashAggregate
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [sum(netpaid#31)]
-Aggregate Attributes [1]: [sum(netpaid#31)#36]
-Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, sum(netpaid#31)#36 AS paid#37]
+Functions [1]: [sum(netpaid#30)]
 
-(45) Filter [codegen id : 7]
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#37]
-Condition : (isnotnull(paid#37) AND (cast(paid#37 as decimal(33,8)) > cast(Subquery scalar-subquery#38, [id=#39] as decimal(33,8))))
+(46) CometFilter
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
+Condition : (isnotnull(paid#33) AND (cast(paid#33 as decimal(33,8)) > cast(Subquery scalar-subquery#34, [id=#35] as decimal(33,8))))
+
+(47) ColumnarToRow [codegen id : 6]
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 45 Hosting Expression = Subquery scalar-subquery#38, [id=#39]
-* HashAggregate (73)
-+- Exchange (72)
-   +- * HashAggregate (71)
-      +- * HashAggregate (70)
-         +- Exchange (69)
-            +- * HashAggregate (68)
-               +- * Project (67)
-                  +- * BroadcastHashJoin Inner BuildRight (66)
-                     :- * Project (64)
-                     :  +- * BroadcastHashJoin Inner BuildRight (63)
-                     :     :- * Project (61)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (60)
-                     :     :     :- * Project (55)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-                     :     :     :     :- * ColumnarToRow (52)
-                     :     :     :     :  +- CometProject (51)
-                     :     :     :     :     +- CometSortMergeJoin (50)
-                     :     :     :     :        :- CometSort (47)
-                     :     :     :     :        :  +- ReusedExchange (46)
-                     :     :     :     :        +- CometSort (49)
-                     :     :     :     :           +- ReusedExchange (48)
-                     :     :     :     +- ReusedExchange (53)
-                     :     :     +- BroadcastExchange (59)
-                     :     :        +- * ColumnarToRow (58)
-                     :     :           +- CometFilter (57)
-                     :     :              +- CometScan parquet spark_catalog.default.item (56)
-                     :     +- ReusedExchange (62)
-                     +- ReusedExchange (65)
-
-
-(46) ReusedExchange [Reuses operator id: 4]
+Subquery:1 Hosting operator id = 46 Hosting Expression = Subquery scalar-subquery#34, [id=#35]
+* ColumnarToRow (77)
++- CometHashAggregate (76)
+   +- CometColumnarExchange (75)
+      +- CometHashAggregate (74)
+         +- CometHashAggregate (73)
+            +- CometColumnarExchange (72)
+               +- RowToColumnar (71)
+                  +- * HashAggregate (70)
+                     +- * Project (69)
+                        +- * BroadcastHashJoin Inner BuildRight (68)
+                           :- * Project (66)
+                           :  +- * BroadcastHashJoin Inner BuildRight (65)
+                           :     :- * Project (63)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (62)
+                           :     :     :- * Project (57)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+                           :     :     :     :- * ColumnarToRow (54)
+                           :     :     :     :  +- CometProject (53)
+                           :     :     :     :     +- CometSortMergeJoin (52)
+                           :     :     :     :        :- CometSort (49)
+                           :     :     :     :        :  +- ReusedExchange (48)
+                           :     :     :     :        +- CometSort (51)
+                           :     :     :     :           +- ReusedExchange (50)
+                           :     :     :     +- ReusedExchange (55)
+                           :     :     +- BroadcastExchange (61)
+                           :     :        +- * ColumnarToRow (60)
+                           :     :           +- CometFilter (59)
+                           :     :              +- CometScan parquet spark_catalog.default.item (58)
+                           :     +- ReusedExchange (64)
+                           +- ReusedExchange (67)
+
+
+(48) ReusedExchange [Reuses operator id: 4]
 Output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(47) CometSort
+(49) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_ticket_number#4 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST]
 
-(48) ReusedExchange [Reuses operator id: 9]
+(50) ReusedExchange [Reuses operator id: 9]
 Output [2]: [sr_item_sk#7, sr_ticket_number#8]
 
-(49) CometSort
+(51) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_ticket_number#8 ASC NULLS FIRST, sr_item_sk#7 ASC NULLS FIRST]
 
-(50) CometSortMergeJoin
+(52) CometSortMergeJoin
 Left output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Right output [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_ticket_number#4, ss_item_sk#1], [sr_ticket_number#8, sr_item_sk#7], Inner
 
-(51) CometProject
+(53) CometProject
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(52) ColumnarToRow [codegen id : 5]
+(54) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(53) ReusedExchange [Reuses operator id: 18]
+(55) ReusedExchange [Reuses operator id: 18]
 Output [4]: [s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
-(54) BroadcastHashJoin [codegen id : 5]
+(56) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#10]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 5]
+(57) Project [codegen id : 5]
 Output [6]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14]
 Input [8]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5, s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
@@ -339,87 +343,87 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_size:string,i_color:string,i_units:string,i_manager_id:int>
 
-(57) CometFilter
+(59) CometFilter
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Condition : isnotnull(i_item_sk#15)
 
-(58) ColumnarToRow [codegen id : 2]
+(60) ColumnarToRow [codegen id : 2]
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(59) BroadcastExchange
+(61) BroadcastExchange
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 5]
+(62) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#15]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 5]
+(63) Project [codegen id : 5]
 Output [10]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(62) ReusedExchange [Reuses operator id: 30]
+(64) ReusedExchange [Reuses operator id: 30]
 Output [4]: [c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(63) BroadcastHashJoin [codegen id : 5]
+(65) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 5]
+(66) Project [codegen id : 5]
 Output [12]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24]
 Input [14]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(65) ReusedExchange [Reuses operator id: 36]
+(67) ReusedExchange [Reuses operator id: 36]
 Output [3]: [ca_state#25, ca_zip#26, ca_country#27]
 
-(66) BroadcastHashJoin [codegen id : 5]
+(68) BroadcastHashJoin [codegen id : 5]
 Left keys [2]: [c_birth_country#24, s_zip#14]
 Right keys [2]: [upper(ca_country#27), ca_zip#26]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 5]
+(69) Project [codegen id : 5]
 Output [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Input [15]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24, ca_state#25, ca_zip#26, ca_country#27]
 
-(68) HashAggregate [codegen id : 5]
+(70) HashAggregate [codegen id : 5]
 Input [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum#40]
-Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
+Aggregate Attributes [1]: [sum#36]
+Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+
+(71) RowToColumnar
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
 
-(69) Exchange
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(72) CometColumnarExchange
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(70) HashAggregate [codegen id : 6]
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
+(73) CometHashAggregate
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(71) HashAggregate [codegen id : 6]
-Input [1]: [netpaid#31]
+(74) CometHashAggregate
+Input [1]: [netpaid#30]
 Keys: []
-Functions [1]: [partial_avg(netpaid#31)]
-Aggregate Attributes [2]: [sum#42, count#43]
-Results [2]: [sum#44, count#45]
+Functions [1]: [partial_avg(netpaid#30)]
 
-(72) Exchange
-Input [2]: [sum#44, count#45]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=11]
+(75) CometColumnarExchange
+Input [2]: [sum#38, count#39]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(73) HashAggregate [codegen id : 7]
-Input [2]: [sum#44, count#45]
+(76) CometHashAggregate
+Input [2]: [sum#38, count#39]
 Keys: []
-Functions [1]: [avg(netpaid#31)]
-Aggregate Attributes [1]: [avg(netpaid#31)#46]
-Results [1]: [(0.05 * avg(netpaid#31)#46) AS (0.05 * avg(netpaid))#47]
+Functions [1]: [avg(netpaid#30)]
+
+(77) ColumnarToRow [codegen id : 6]
+Input [1]: [(0.05 * avg(netpaid))#40]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt
index a4b8fef5d3..558a960ab1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt
@@ -1,54 +1,54 @@
-WholeStageCodegen (7)
-  Filter [paid]
-    Subquery #1
-      WholeStageCodegen (7)
-        HashAggregate [sum,count] [avg(netpaid),(0.05 * avg(netpaid)),sum,count]
-          InputAdapter
-            Exchange #9
-              WholeStageCodegen (6)
-                HashAggregate [netpaid] [sum,count,sum,count]
-                  HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
-                    InputAdapter
-                      Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
-                        WholeStageCodegen (5)
-                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
-                            Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
-                              BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
-                                Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
-                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                    Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
-                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                        Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
-                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
-                                                  CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    CometSort [ss_ticket_number,ss_item_sk]
-                                                      ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
-                                                    CometSort [sr_ticket_number,sr_item_sk]
-                                                      ReusedExchange [sr_item_sk,sr_ticket_number] #4
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometFilter [paid]
+        Subquery #1
+          WholeStageCodegen (6)
+            ColumnarToRow
+              InputAdapter
+                CometHashAggregate [sum,count]
+                  CometColumnarExchange #9
+                    CometHashAggregate [netpaid]
+                      CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
+                        CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
+                          RowToColumnar
+                            WholeStageCodegen (5)
+                              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
+                                Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
+                                  BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
+                                    Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
+                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                        Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                            Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
+                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
+                                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                        CometSort [ss_ticket_number,ss_item_sk]
+                                                          ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
+                                                        CometSort [sr_ticket_number,sr_item_sk]
+                                                          ReusedExchange [sr_item_sk,sr_ticket_number] #4
+                                                InputAdapter
+                                                  ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
                                             InputAdapter
-                                              ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
+                                              BroadcastExchange #11
+                                                WholeStageCodegen (2)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [i_item_sk]
+                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
                                         InputAdapter
-                                          BroadcastExchange #11
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [i_item_sk]
-                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                          ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
                                     InputAdapter
-                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
-                                InputAdapter
-                                  ReusedExchange [ca_state,ca_zip,ca_country] #8
-    HashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty] [sum(netpaid),paid,sum,isEmpty]
-      InputAdapter
-        Exchange [c_last_name,c_first_name,s_store_name] #1
-          WholeStageCodegen (6)
-            HashAggregate [c_last_name,c_first_name,s_store_name,netpaid] [sum,isEmpty,sum,isEmpty]
-              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
-                InputAdapter
-                  Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
+                                      ReusedExchange [ca_state,ca_zip,ca_country] #8
+        CometHashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty]
+          CometColumnarExchange [c_last_name,c_first_name,s_store_name] #1
+            CometHashAggregate [c_last_name,c_first_name,s_store_name,netpaid]
+              CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
+                CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
+                  RowToColumnar
                     WholeStageCodegen (5)
                       HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
                         Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
@@ -64,12 +64,12 @@ WholeStageCodegen (7)
                                             CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
                                               CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                 CometSort [ss_ticket_number,ss_item_sk]
-                                                  CometExchange [ss_ticket_number,ss_item_sk] #3
+                                                  CometColumnarExchange [ss_ticket_number,ss_item_sk] #3
                                                     CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
                                                       CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
                                                         CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
                                                 CometSort [sr_ticket_number,sr_item_sk]
-                                                  CometExchange [sr_ticket_number,sr_item_sk] #4
+                                                  CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
                                                     CometProject [sr_item_sk,sr_ticket_number]
                                                       CometFilter [sr_ticket_number,sr_item_sk]
                                                         CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt
index 7eb30b6fb4..6b203e283f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt
@@ -1,44 +1,46 @@
 == Physical Plan ==
-TakeOrderedAndProject (40)
-+- * HashAggregate (39)
-   +- Exchange (38)
-      +- * HashAggregate (37)
-         +- * Project (36)
-            +- * BroadcastHashJoin Inner BuildRight (35)
-               :- * Project (30)
-               :  +- * BroadcastHashJoin Inner BuildRight (29)
-               :     :- * Project (24)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (23)
-               :     :     :- * Project (21)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :     :     :     :- * Project (18)
-               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-               :     :     :     :     :- * Project (15)
-               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :     :     :     :- * Project (9)
-               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :     :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :     :     :     :  +- CometFilter (2)
-               :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :     :     :     :     :     +- BroadcastExchange (7)
-               :     :     :     :     :     :        +- * ColumnarToRow (6)
-               :     :     :     :     :     :           +- CometFilter (5)
-               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-               :     :     :     :     :     +- BroadcastExchange (13)
-               :     :     :     :     :        +- * ColumnarToRow (12)
-               :     :     :     :     :           +- CometFilter (11)
-               :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
-               :     :     :     :     +- ReusedExchange (16)
-               :     :     :     +- ReusedExchange (19)
-               :     :     +- ReusedExchange (22)
-               :     +- BroadcastExchange (28)
-               :        +- * ColumnarToRow (27)
-               :           +- CometFilter (26)
-               :              +- CometScan parquet spark_catalog.default.store (25)
-               +- BroadcastExchange (34)
-                  +- * ColumnarToRow (33)
-                     +- CometFilter (32)
-                        +- CometScan parquet spark_catalog.default.item (31)
+* ColumnarToRow (42)
++- CometTakeOrderedAndProject (41)
+   +- CometHashAggregate (40)
+      +- CometColumnarExchange (39)
+         +- RowToColumnar (38)
+            +- * HashAggregate (37)
+               +- * Project (36)
+                  +- * BroadcastHashJoin Inner BuildRight (35)
+                     :- * Project (30)
+                     :  +- * BroadcastHashJoin Inner BuildRight (29)
+                     :     :- * Project (24)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (23)
+                     :     :     :- * Project (21)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :     :     :     :- * Project (18)
+                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                     :     :     :     :     :- * Project (15)
+                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :     :     :     :- * Project (9)
+                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :     :     :     :     :     +- BroadcastExchange (7)
+                     :     :     :     :     :     :        +- * ColumnarToRow (6)
+                     :     :     :     :     :     :           +- CometFilter (5)
+                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+                     :     :     :     :     :     +- BroadcastExchange (13)
+                     :     :     :     :     :        +- * ColumnarToRow (12)
+                     :     :     :     :     :           +- CometFilter (11)
+                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
+                     :     :     :     :     +- ReusedExchange (16)
+                     :     :     :     +- ReusedExchange (19)
+                     :     :     +- ReusedExchange (22)
+                     :     +- BroadcastExchange (28)
+                     :        +- * ColumnarToRow (27)
+                     :           +- CometFilter (26)
+                     :              +- CometScan parquet spark_catalog.default.store (25)
+                     +- BroadcastExchange (34)
+                        +- * ColumnarToRow (33)
+                           +- CometFilter (32)
+                              +- CometScan parquet spark_catalog.default.item (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -114,7 +116,7 @@ Join condition: None
 Output [8]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, ss_sold_date_sk#6, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17]
 Input [12]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, ss_sold_date_sk#6, sr_item_sk#8, sr_customer_sk#9, sr_net_loss#11, sr_returned_date_sk#12, cs_bill_customer_sk#14, cs_item_sk#15, cs_net_profit#16, cs_sold_date_sk#17]
 
-(16) ReusedExchange [Reuses operator id: 45]
+(16) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#19]
 
 (17) BroadcastHashJoin [codegen id : 8]
@@ -127,7 +129,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17]
 Input [9]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, ss_sold_date_sk#6, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17, d_date_sk#19]
 
-(19) ReusedExchange [Reuses operator id: 50]
+(19) ReusedExchange [Reuses operator id: 52]
 Output [1]: [d_date_sk#20]
 
 (20) BroadcastHashJoin [codegen id : 8]
@@ -140,7 +142,7 @@ Join condition: None
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, sr_net_loss#11, cs_net_profit#16, cs_sold_date_sk#17]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17, d_date_sk#20]
 
-(22) ReusedExchange [Reuses operator id: 50]
+(22) ReusedExchange [Reuses operator id: 52]
 Output [1]: [d_date_sk#21]
 
 (23) BroadcastHashJoin [codegen id : 8]
@@ -216,80 +218,84 @@ Functions [3]: [partial_sum(UnscaledValue(ss_net_profit#5)), partial_sum(Unscale
 Aggregate Attributes [3]: [sum#28, sum#29, sum#30]
 Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 
-(38) Exchange
+(38) RowToColumnar
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
-Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) HashAggregate [codegen id : 9]
+(39) CometColumnarExchange
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
+Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(40) CometHashAggregate
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 Keys [4]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24]
 Functions [3]: [sum(UnscaledValue(ss_net_profit#5)), sum(UnscaledValue(sr_net_loss#11)), sum(UnscaledValue(cs_net_profit#16))]
-Aggregate Attributes [3]: [sum(UnscaledValue(ss_net_profit#5))#34, sum(UnscaledValue(sr_net_loss#11))#35, sum(UnscaledValue(cs_net_profit#16))#36]
-Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, MakeDecimal(sum(UnscaledValue(ss_net_profit#5))#34,17,2) AS store_sales_profit#37, MakeDecimal(sum(UnscaledValue(sr_net_loss#11))#35,17,2) AS store_returns_loss#38, MakeDecimal(sum(UnscaledValue(cs_net_profit#16))#36,17,2) AS catalog_sales_profit#39]
 
-(40) TakeOrderedAndProject
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#37, store_returns_loss#38, catalog_sales_profit#39]
-Arguments: 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#37, store_returns_loss#38, catalog_sales_profit#39]
+(41) CometTakeOrderedAndProject
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#34, store_returns_loss#35, catalog_sales_profit#36]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#26 ASC NULLS FIRST,i_item_desc#27 ASC NULLS FIRST,s_store_id#23 ASC NULLS FIRST,s_store_name#24 ASC NULLS FIRST], output=[i_item_id#26,i_item_desc#27,s_store_id#23,s_store_name#24,store_sales_profit#34,store_returns_loss#35,catalog_sales_profit#36]), 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#34, store_returns_loss#35, catalog_sales_profit#36]
+
+(42) ColumnarToRow [codegen id : 9]
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#34, store_returns_loss#35, catalog_sales_profit#36]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (45)
-+- * ColumnarToRow (44)
-   +- CometProject (43)
-      +- CometFilter (42)
-         +- CometScan parquet spark_catalog.default.date_dim (41)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#19, d_year#40, d_moy#41]
+Output [3]: [d_date_sk#19, d_year#37, d_moy#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,4), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(42) CometFilter
-Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
-Condition : ((((isnotnull(d_moy#41) AND isnotnull(d_year#40)) AND (d_moy#41 = 4)) AND (d_year#40 = 2001)) AND isnotnull(d_date_sk#19))
+(44) CometFilter
+Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
+Condition : ((((isnotnull(d_moy#38) AND isnotnull(d_year#37)) AND (d_moy#38 = 4)) AND (d_year#37 = 2001)) AND isnotnull(d_date_sk#19))
 
-(43) CometProject
-Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
+(45) CometProject
+Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
 Arguments: [d_date_sk#19], [d_date_sk#19]
 
-(44) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#19]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (52)
++- * ColumnarToRow (51)
+   +- CometProject (50)
+      +- CometFilter (49)
+         +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#20, d_year#42, d_moy#43]
+Output [3]: [d_date_sk#20, d_year#39, d_moy#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,10), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
-Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
-Condition : (((((isnotnull(d_moy#43) AND isnotnull(d_year#42)) AND (d_moy#43 >= 4)) AND (d_moy#43 <= 10)) AND (d_year#42 = 2001)) AND isnotnull(d_date_sk#20))
+(49) CometFilter
+Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
+Condition : (((((isnotnull(d_moy#40) AND isnotnull(d_year#39)) AND (d_moy#40 >= 4)) AND (d_moy#40 <= 10)) AND (d_year#39 = 2001)) AND isnotnull(d_date_sk#20))
 
-(48) CometProject
-Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
+(50) CometProject
+Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
 Arguments: [d_date_sk#20], [d_date_sk#20]
 
-(49) ColumnarToRow [codegen id : 1]
+(51) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#20]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [d_date_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt
index eda7f6b64d..9d8f0b4415 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt
@@ -1,76 +1,78 @@
-TakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_profit,store_returns_loss,catalog_sales_profit]
-  WholeStageCodegen (9)
-    HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(sr_net_loss)),sum(UnscaledValue(cs_net_profit)),store_sales_profit,store_returns_loss,catalog_sales_profit,sum,sum,sum]
-      InputAdapter
-        Exchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
-          WholeStageCodegen (8)
-            HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_net_profit,sr_net_loss,cs_net_profit] [sum,sum,sum,sum,sum,sum]
-              Project [ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name,i_item_id,i_item_desc]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [ss_item_sk,ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name]
-                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit]
-                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                          Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit,cs_sold_date_sk]
-                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
-                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                  Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
-                                    BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
-                                      Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_net_loss,sr_returned_date_sk]
-                                        BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_profit,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #2
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_moy,d_year,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (9)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_profit,store_returns_loss,catalog_sales_profit]
+        CometHashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum]
+          CometColumnarExchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
+            RowToColumnar
+              WholeStageCodegen (8)
+                HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_net_profit,sr_net_loss,cs_net_profit] [sum,sum,sum,sum,sum,sum]
+                  Project [ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name,i_item_id,i_item_desc]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [ss_item_sk,ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name]
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit]
+                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit,cs_sold_date_sk]
+                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                                  Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
+                                        BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
+                                          Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_net_loss,sr_returned_date_sk]
+                                            BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_profit,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #2
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_moy,d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_net_loss,sr_returned_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #2
+                                                              BroadcastExchange #4
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_moy,d_year,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            BroadcastExchange #3
-                                              WholeStageCodegen (1)
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (2)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_net_loss,sr_returned_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #2
-                                                          BroadcastExchange #4
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometProject [d_date_sk]
-                                                                    CometFilter [d_moy,d_year,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                    CometFilter [cs_bill_customer_sk,cs_item_sk]
+                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_net_profit,cs_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #2
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (2)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #2
+                                        ReusedExchange [d_date_sk] #2
                                   InputAdapter
-                                    ReusedExchange [d_date_sk] #2
+                                    ReusedExchange [d_date_sk] #4
                               InputAdapter
                                 ReusedExchange [d_date_sk] #4
                           InputAdapter
-                            ReusedExchange [d_date_sk] #4
+                            BroadcastExchange #6
+                              WholeStageCodegen (6)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [s_store_sk]
+                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (6)
+                        BroadcastExchange #7
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [s_store_sk]
-                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
-                  InputAdapter
-                    BroadcastExchange #7
-                      WholeStageCodegen (7)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [i_item_sk]
-                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
+                                CometFilter [i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt
index 55bae9c8c3..cdb47fded7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt
@@ -1,34 +1,36 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * HashAggregate (29)
-   +- Exchange (28)
-      +- * HashAggregate (27)
-         +- * Project (26)
-            +- * BroadcastHashJoin Inner BuildRight (25)
-               :- * Project (19)
-               :  +- * BroadcastHashJoin Inner BuildRight (18)
-               :     :- * Project (13)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :     :     :- * Project (10)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :  +- CometFilter (2)
-               :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :     :     :     +- BroadcastExchange (8)
-               :     :     :        +- * ColumnarToRow (7)
-               :     :     :           +- CometProject (6)
-               :     :     :              +- CometFilter (5)
-               :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-               :     :     +- ReusedExchange (11)
-               :     +- BroadcastExchange (17)
-               :        +- * ColumnarToRow (16)
-               :           +- CometFilter (15)
-               :              +- CometScan parquet spark_catalog.default.item (14)
-               +- BroadcastExchange (24)
-                  +- * ColumnarToRow (23)
-                     +- CometProject (22)
-                        +- CometFilter (21)
-                           +- CometScan parquet spark_catalog.default.promotion (20)
+* ColumnarToRow (32)
++- CometTakeOrderedAndProject (31)
+   +- CometHashAggregate (30)
+      +- CometColumnarExchange (29)
+         +- RowToColumnar (28)
+            +- * HashAggregate (27)
+               +- * Project (26)
+                  +- * BroadcastHashJoin Inner BuildRight (25)
+                     :- * Project (19)
+                     :  +- * BroadcastHashJoin Inner BuildRight (18)
+                     :     :- * Project (13)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+                     :     :     :- * Project (10)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                     :     :     :     +- BroadcastExchange (8)
+                     :     :     :        +- * ColumnarToRow (7)
+                     :     :     :           +- CometProject (6)
+                     :     :     :              +- CometFilter (5)
+                     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+                     :     :     +- ReusedExchange (11)
+                     :     +- BroadcastExchange (17)
+                     :        +- * ColumnarToRow (16)
+                     :           +- CometFilter (15)
+                     :              +- CometScan parquet spark_catalog.default.item (14)
+                     +- BroadcastExchange (24)
+                        +- * ColumnarToRow (23)
+                           +- CometProject (22)
+                              +- CometFilter (21)
+                                 +- CometScan parquet spark_catalog.default.promotion (20)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -78,7 +80,7 @@ Join condition: None
 Output [7]: [cs_item_sk#2, cs_promo_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_sold_date_sk#8]
 Input [9]: [cs_bill_cdemo_sk#1, cs_item_sk#2, cs_promo_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 35]
+(11) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -158,50 +160,54 @@ Functions [4]: [partial_avg(cs_quantity#4), partial_avg(UnscaledValue(cs_list_pr
 Aggregate Attributes [8]: [sum#20, count#21, sum#22, count#23, sum#24, count#25, sum#26, count#27]
 Results [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 
-(28) Exchange
+(28) RowToColumnar
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
-Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) HashAggregate [codegen id : 6]
+(29) CometColumnarExchange
+Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
+Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(30) CometHashAggregate
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 Keys [1]: [i_item_id#16]
 Functions [4]: [avg(cs_quantity#4), avg(UnscaledValue(cs_list_price#5)), avg(UnscaledValue(cs_coupon_amt#7)), avg(UnscaledValue(cs_sales_price#6))]
-Aggregate Attributes [4]: [avg(cs_quantity#4)#36, avg(UnscaledValue(cs_list_price#5))#37, avg(UnscaledValue(cs_coupon_amt#7))#38, avg(UnscaledValue(cs_sales_price#6))#39]
-Results [5]: [i_item_id#16, avg(cs_quantity#4)#36 AS agg1#40, cast((avg(UnscaledValue(cs_list_price#5))#37 / 100.0) as decimal(11,6)) AS agg2#41, cast((avg(UnscaledValue(cs_coupon_amt#7))#38 / 100.0) as decimal(11,6)) AS agg3#42, cast((avg(UnscaledValue(cs_sales_price#6))#39 / 100.0) as decimal(11,6)) AS agg4#43]
 
-(30) TakeOrderedAndProject
-Input [5]: [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
-Arguments: 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
+(31) CometTakeOrderedAndProject
+Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#16 ASC NULLS FIRST], output=[i_item_id#16,agg1#36,agg2#37,agg3#38,agg4#39]), 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
+
+(32) ColumnarToRow [codegen id : 6]
+Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#44]
+Output [2]: [d_date_sk#14, d_year#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(32) CometFilter
-Input [2]: [d_date_sk#14, d_year#44]
-Condition : ((isnotnull(d_year#44) AND (d_year#44 = 2000)) AND isnotnull(d_date_sk#14))
+(34) CometFilter
+Input [2]: [d_date_sk#14, d_year#40]
+Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2000)) AND isnotnull(d_date_sk#14))
 
-(33) CometProject
-Input [2]: [d_date_sk#14, d_year#44]
+(35) CometProject
+Input [2]: [d_date_sk#14, d_year#40]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(34) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(35) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt
index 7d38936244..1d9e320882 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt
@@ -1,52 +1,54 @@
-TakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
-  WholeStageCodegen (6)
-    HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count] [avg(cs_quantity),avg(UnscaledValue(cs_list_price)),avg(UnscaledValue(cs_coupon_amt)),avg(UnscaledValue(cs_sales_price)),agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
-      InputAdapter
-        Exchange [i_item_id] #1
-          WholeStageCodegen (5)
-            HashAggregate [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-              Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
-                BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                  Project [cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
-                    BroadcastHashJoin [cs_item_sk,i_item_sk]
-                      Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt]
-                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                          Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
-                            BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk]
-                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [d_date_sk]
-                                                  CometFilter [d_year,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
+        CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count]
+          CometColumnarExchange [i_item_id] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                HashAggregate [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                  Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
+                    BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                      Project [cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
+                        BroadcastHashJoin [cs_item_sk,i_item_sk]
+                          Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt]
+                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                              Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
+                                BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk]
+                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_year,d_date_sk]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                  InputAdapter
+                                    BroadcastExchange #3
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [cd_demo_sk]
+                                              CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                               InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [cd_demo_sk]
-                                          CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+                                ReusedExchange [d_date_sk] #2
                           InputAdapter
-                            ReusedExchange [d_date_sk] #2
+                            BroadcastExchange #4
+                              WholeStageCodegen (3)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                       InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (3)
+                        BroadcastExchange #5
+                          WholeStageCodegen (4)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                  InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (4)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [p_promo_sk]
-                              CometFilter [p_channel_email,p_channel_event,p_promo_sk]
-                                CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
+                                CometProject [p_promo_sk]
+                                  CometFilter [p_channel_email,p_channel_event,p_promo_sk]
+                                    CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt
index eca71fb097..7a4a7aaf9b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt
@@ -1,34 +1,36 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * HashAggregate (29)
-   +- Exchange (28)
-      +- * HashAggregate (27)
-         +- * Expand (26)
-            +- * Project (25)
-               +- * BroadcastHashJoin Inner BuildRight (24)
-                  :- * Project (19)
-                  :  +- * BroadcastHashJoin Inner BuildRight (18)
-                  :     :- * Project (13)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-                  :     :     :- * Project (10)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                  :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :     :     :     +- BroadcastExchange (8)
-                  :     :     :        +- * ColumnarToRow (7)
-                  :     :     :           +- CometProject (6)
-                  :     :     :              +- CometFilter (5)
-                  :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-                  :     :     +- ReusedExchange (11)
-                  :     +- BroadcastExchange (17)
-                  :        +- * ColumnarToRow (16)
-                  :           +- CometFilter (15)
-                  :              +- CometScan parquet spark_catalog.default.store (14)
-                  +- BroadcastExchange (23)
-                     +- * ColumnarToRow (22)
-                        +- CometFilter (21)
-                           +- CometScan parquet spark_catalog.default.item (20)
+* ColumnarToRow (32)
++- CometTakeOrderedAndProject (31)
+   +- CometHashAggregate (30)
+      +- CometColumnarExchange (29)
+         +- RowToColumnar (28)
+            +- * HashAggregate (27)
+               +- * Expand (26)
+                  +- * Project (25)
+                     +- * BroadcastHashJoin Inner BuildRight (24)
+                        :- * Project (19)
+                        :  +- * BroadcastHashJoin Inner BuildRight (18)
+                        :     :- * Project (13)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+                        :     :     :- * Project (10)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                        :     :     :     :- * ColumnarToRow (3)
+                        :     :     :     :  +- CometFilter (2)
+                        :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                        :     :     :     +- BroadcastExchange (8)
+                        :     :     :        +- * ColumnarToRow (7)
+                        :     :     :           +- CometProject (6)
+                        :     :     :              +- CometFilter (5)
+                        :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+                        :     :     +- ReusedExchange (11)
+                        :     +- BroadcastExchange (17)
+                        :        +- * ColumnarToRow (16)
+                        :           +- CometFilter (15)
+                        :              +- CometScan parquet spark_catalog.default.store (14)
+                        +- BroadcastExchange (23)
+                           +- * ColumnarToRow (22)
+                              +- CometFilter (21)
+                                 +- CometScan parquet spark_catalog.default.item (20)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -78,7 +80,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 35]
+(11) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -158,50 +160,54 @@ Functions [4]: [partial_avg(ss_quantity#4), partial_avg(UnscaledValue(ss_list_pr
 Aggregate Attributes [8]: [sum#22, count#23, sum#24, count#25, sum#26, count#27, sum#28, count#29]
 Results [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
 
-(28) Exchange
+(28) RowToColumnar
 Input [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
-Arguments: hashpartitioning(i_item_id#19, s_state#20, spark_grouping_id#21, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) HashAggregate [codegen id : 6]
+(29) CometColumnarExchange
+Input [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
+Arguments: hashpartitioning(i_item_id#19, s_state#20, spark_grouping_id#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(30) CometHashAggregate
 Input [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
 Keys [3]: [i_item_id#19, s_state#20, spark_grouping_id#21]
 Functions [4]: [avg(ss_quantity#4), avg(UnscaledValue(ss_list_price#5)), avg(UnscaledValue(ss_coupon_amt#7)), avg(UnscaledValue(ss_sales_price#6))]
-Aggregate Attributes [4]: [avg(ss_quantity#4)#38, avg(UnscaledValue(ss_list_price#5))#39, avg(UnscaledValue(ss_coupon_amt#7))#40, avg(UnscaledValue(ss_sales_price#6))#41]
-Results [7]: [i_item_id#19, s_state#20, cast((shiftright(spark_grouping_id#21, 0) & 1) as tinyint) AS g_state#42, avg(ss_quantity#4)#38 AS agg1#43, cast((avg(UnscaledValue(ss_list_price#5))#39 / 100.0) as decimal(11,6)) AS agg2#44, cast((avg(UnscaledValue(ss_coupon_amt#7))#40 / 100.0) as decimal(11,6)) AS agg3#45, cast((avg(UnscaledValue(ss_sales_price#6))#41 / 100.0) as decimal(11,6)) AS agg4#46]
 
-(30) TakeOrderedAndProject
-Input [7]: [i_item_id#19, s_state#20, g_state#42, agg1#43, agg2#44, agg3#45, agg4#46]
-Arguments: 100, [i_item_id#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST], [i_item_id#19, s_state#20, g_state#42, agg1#43, agg2#44, agg3#45, agg4#46]
+(31) CometTakeOrderedAndProject
+Input [7]: [i_item_id#19, s_state#20, g_state#38, agg1#39, agg2#40, agg3#41, agg4#42]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#19 ASC NULLS FIRST,s_state#20 ASC NULLS FIRST], output=[i_item_id#19,s_state#20,g_state#38,agg1#39,agg2#40,agg3#41,agg4#42]), 100, [i_item_id#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST], [i_item_id#19, s_state#20, g_state#38, agg1#39, agg2#40, agg3#41, agg4#42]
+
+(32) ColumnarToRow [codegen id : 6]
+Input [7]: [i_item_id#19, s_state#20, g_state#38, agg1#39, agg2#40, agg3#41, agg4#42]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#47]
+Output [2]: [d_date_sk#14, d_year#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(32) CometFilter
-Input [2]: [d_date_sk#14, d_year#47]
-Condition : ((isnotnull(d_year#47) AND (d_year#47 = 2002)) AND isnotnull(d_date_sk#14))
+(34) CometFilter
+Input [2]: [d_date_sk#14, d_year#43]
+Condition : ((isnotnull(d_year#43) AND (d_year#43 = 2002)) AND isnotnull(d_date_sk#14))
 
-(33) CometProject
-Input [2]: [d_date_sk#14, d_year#47]
+(35) CometProject
+Input [2]: [d_date_sk#14, d_year#43]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(34) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(35) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt
index 9d073ff67c..191ff0322c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt
@@ -1,52 +1,54 @@
-TakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
-  WholeStageCodegen (6)
-    HashAggregate [i_item_id,s_state,spark_grouping_id,sum,count,sum,count,sum,count,sum,count] [avg(ss_quantity),avg(UnscaledValue(ss_list_price)),avg(UnscaledValue(ss_coupon_amt)),avg(UnscaledValue(ss_sales_price)),g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
-      InputAdapter
-        Exchange [i_item_id,s_state,spark_grouping_id] #1
-          WholeStageCodegen (5)
-            HashAggregate [i_item_id,s_state,spark_grouping_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-              Expand [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
-                Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
-                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_year,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
+        CometHashAggregate [i_item_id,s_state,spark_grouping_id,sum,count,sum,count,sum,count,sum,count]
+          CometColumnarExchange [i_item_id,s_state,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                HashAggregate [i_item_id,s_state,spark_grouping_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                  Expand [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
+                    Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
+                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [cd_demo_sk]
+                                                CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [cd_demo_sk]
-                                            CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #4
+                                WholeStageCodegen (3)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [s_state,s_store_sk]
+                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (3)
+                          BroadcastExchange #5
+                            WholeStageCodegen (4)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [s_state,s_store_sk]
-                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                    InputAdapter
-                      BroadcastExchange #5
-                        WholeStageCodegen (4)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt
index db6d112e64..16063ddeac 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt
@@ -1,74 +1,86 @@
 == Physical Plan ==
-* BroadcastNestedLoopJoin Inner BuildRight (70)
-:- * BroadcastNestedLoopJoin Inner BuildRight (58)
-:  :- * BroadcastNestedLoopJoin Inner BuildRight (46)
-:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (34)
-:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (22)
-:  :  :  :  :- * HashAggregate (10)
-:  :  :  :  :  +- Exchange (9)
-:  :  :  :  :     +- * HashAggregate (8)
-:  :  :  :  :        +- * HashAggregate (7)
-:  :  :  :  :           +- * ColumnarToRow (6)
-:  :  :  :  :              +- CometExchange (5)
-:  :  :  :  :                 +- CometHashAggregate (4)
-:  :  :  :  :                    +- CometProject (3)
-:  :  :  :  :                       +- CometFilter (2)
-:  :  :  :  :                          +- CometScan parquet spark_catalog.default.store_sales (1)
-:  :  :  :  +- BroadcastExchange (21)
-:  :  :  :     +- * HashAggregate (20)
-:  :  :  :        +- Exchange (19)
-:  :  :  :           +- * HashAggregate (18)
-:  :  :  :              +- * HashAggregate (17)
-:  :  :  :                 +- * ColumnarToRow (16)
-:  :  :  :                    +- CometExchange (15)
-:  :  :  :                       +- CometHashAggregate (14)
-:  :  :  :                          +- CometProject (13)
-:  :  :  :                             +- CometFilter (12)
-:  :  :  :                                +- CometScan parquet spark_catalog.default.store_sales (11)
-:  :  :  +- BroadcastExchange (33)
-:  :  :     +- * HashAggregate (32)
-:  :  :        +- Exchange (31)
-:  :  :           +- * HashAggregate (30)
-:  :  :              +- * HashAggregate (29)
-:  :  :                 +- * ColumnarToRow (28)
-:  :  :                    +- CometExchange (27)
-:  :  :                       +- CometHashAggregate (26)
-:  :  :                          +- CometProject (25)
-:  :  :                             +- CometFilter (24)
-:  :  :                                +- CometScan parquet spark_catalog.default.store_sales (23)
-:  :  +- BroadcastExchange (45)
-:  :     +- * HashAggregate (44)
-:  :        +- Exchange (43)
-:  :           +- * HashAggregate (42)
-:  :              +- * HashAggregate (41)
-:  :                 +- * ColumnarToRow (40)
-:  :                    +- CometExchange (39)
-:  :                       +- CometHashAggregate (38)
-:  :                          +- CometProject (37)
-:  :                             +- CometFilter (36)
-:  :                                +- CometScan parquet spark_catalog.default.store_sales (35)
-:  +- BroadcastExchange (57)
-:     +- * HashAggregate (56)
-:        +- Exchange (55)
-:           +- * HashAggregate (54)
-:              +- * HashAggregate (53)
-:                 +- * ColumnarToRow (52)
-:                    +- CometExchange (51)
-:                       +- CometHashAggregate (50)
-:                          +- CometProject (49)
-:                             +- CometFilter (48)
-:                                +- CometScan parquet spark_catalog.default.store_sales (47)
-+- BroadcastExchange (69)
-   +- * HashAggregate (68)
-      +- Exchange (67)
-         +- * HashAggregate (66)
-            +- * HashAggregate (65)
-               +- * ColumnarToRow (64)
-                  +- CometExchange (63)
-                     +- CometHashAggregate (62)
-                        +- CometProject (61)
-                           +- CometFilter (60)
-                              +- CometScan parquet spark_catalog.default.store_sales (59)
+* BroadcastNestedLoopJoin Inner BuildRight (82)
+:- * BroadcastNestedLoopJoin Inner BuildRight (68)
+:  :- * BroadcastNestedLoopJoin Inner BuildRight (54)
+:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (40)
+:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (26)
+:  :  :  :  :- * ColumnarToRow (12)
+:  :  :  :  :  +- CometHashAggregate (11)
+:  :  :  :  :     +- CometColumnarExchange (10)
+:  :  :  :  :        +- RowToColumnar (9)
+:  :  :  :  :           +- * HashAggregate (8)
+:  :  :  :  :              +- * HashAggregate (7)
+:  :  :  :  :                 +- * ColumnarToRow (6)
+:  :  :  :  :                    +- CometColumnarExchange (5)
+:  :  :  :  :                       +- CometHashAggregate (4)
+:  :  :  :  :                          +- CometProject (3)
+:  :  :  :  :                             +- CometFilter (2)
+:  :  :  :  :                                +- CometScan parquet spark_catalog.default.store_sales (1)
+:  :  :  :  +- BroadcastExchange (25)
+:  :  :  :     +- * ColumnarToRow (24)
+:  :  :  :        +- CometHashAggregate (23)
+:  :  :  :           +- CometColumnarExchange (22)
+:  :  :  :              +- RowToColumnar (21)
+:  :  :  :                 +- * HashAggregate (20)
+:  :  :  :                    +- * HashAggregate (19)
+:  :  :  :                       +- * ColumnarToRow (18)
+:  :  :  :                          +- CometColumnarExchange (17)
+:  :  :  :                             +- CometHashAggregate (16)
+:  :  :  :                                +- CometProject (15)
+:  :  :  :                                   +- CometFilter (14)
+:  :  :  :                                      +- CometScan parquet spark_catalog.default.store_sales (13)
+:  :  :  +- BroadcastExchange (39)
+:  :  :     +- * ColumnarToRow (38)
+:  :  :        +- CometHashAggregate (37)
+:  :  :           +- CometColumnarExchange (36)
+:  :  :              +- RowToColumnar (35)
+:  :  :                 +- * HashAggregate (34)
+:  :  :                    +- * HashAggregate (33)
+:  :  :                       +- * ColumnarToRow (32)
+:  :  :                          +- CometColumnarExchange (31)
+:  :  :                             +- CometHashAggregate (30)
+:  :  :                                +- CometProject (29)
+:  :  :                                   +- CometFilter (28)
+:  :  :                                      +- CometScan parquet spark_catalog.default.store_sales (27)
+:  :  +- BroadcastExchange (53)
+:  :     +- * ColumnarToRow (52)
+:  :        +- CometHashAggregate (51)
+:  :           +- CometColumnarExchange (50)
+:  :              +- RowToColumnar (49)
+:  :                 +- * HashAggregate (48)
+:  :                    +- * HashAggregate (47)
+:  :                       +- * ColumnarToRow (46)
+:  :                          +- CometColumnarExchange (45)
+:  :                             +- CometHashAggregate (44)
+:  :                                +- CometProject (43)
+:  :                                   +- CometFilter (42)
+:  :                                      +- CometScan parquet spark_catalog.default.store_sales (41)
+:  +- BroadcastExchange (67)
+:     +- * ColumnarToRow (66)
+:        +- CometHashAggregate (65)
+:           +- CometColumnarExchange (64)
+:              +- RowToColumnar (63)
+:                 +- * HashAggregate (62)
+:                    +- * HashAggregate (61)
+:                       +- * ColumnarToRow (60)
+:                          +- CometColumnarExchange (59)
+:                             +- CometHashAggregate (58)
+:                                +- CometProject (57)
+:                                   +- CometFilter (56)
+:                                      +- CometScan parquet spark_catalog.default.store_sales (55)
++- BroadcastExchange (81)
+   +- * ColumnarToRow (80)
+      +- CometHashAggregate (79)
+         +- CometColumnarExchange (78)
+            +- RowToColumnar (77)
+               +- * HashAggregate (76)
+                  +- * HashAggregate (75)
+                     +- * ColumnarToRow (74)
+                        +- CometColumnarExchange (73)
+                           +- CometHashAggregate (72)
+                              +- CometProject (71)
+                                 +- CometFilter (70)
+                                    +- CometScan parquet spark_catalog.default.store_sales (69)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -91,9 +103,9 @@ Input [1]: [ss_list_price#3]
 Keys [1]: [ss_list_price#3]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#3)), partial_count(ss_list_price#3)]
 
-(5) CometExchange
+(5) CometColumnarExchange
 Input [4]: [ss_list_price#3, sum#6, count#7, count#8]
-Arguments: hashpartitioning(ss_list_price#3, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_list_price#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (6) ColumnarToRow [codegen id : 1]
 Input [4]: [ss_list_price#3, sum#6, count#7, count#8]
@@ -112,16 +124,20 @@ Functions [3]: [merge_avg(UnscaledValue(ss_list_price#3)), merge_count(ss_list_p
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#3))#9, count(ss_list_price#3)#10, count(ss_list_price#3)#11]
 Results [4]: [sum#6, count#7, count#8, count#12]
 
-(9) Exchange
+(9) RowToColumnar
 Input [4]: [sum#6, count#7, count#8, count#12]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=2]
 
-(10) HashAggregate [codegen id : 12]
+(10) CometColumnarExchange
+Input [4]: [sum#6, count#7, count#8, count#12]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(11) CometHashAggregate
 Input [4]: [sum#6, count#7, count#8, count#12]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#3)), count(ss_list_price#3), count(distinct ss_list_price#3)]
-Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#3))#9, count(ss_list_price#3)#10, count(ss_list_price#3)#11]
-Results [3]: [cast((avg(UnscaledValue(ss_list_price#3))#9 / 100.0) as decimal(11,6)) AS B1_LP#13, count(ss_list_price#3)#10 AS B1_CNT#14, count(ss_list_price#3)#11 AS B1_CNTD#15]
+
+(12) ColumnarToRow [codegen id : 12]
+Input [3]: [B1_LP#13, B1_CNT#14, B1_CNTD#15]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
@@ -130,56 +146,60 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,6), LessThanOrEqual(ss_quantity,10), Or(Or(And(GreaterThanOrEqual(ss_list_price,90.00),LessThanOrEqual(ss_list_price,100.00)),And(GreaterThanOrEqual(ss_coupon_amt,2323.00),LessThanOrEqual(ss_coupon_amt,3323.00))),And(GreaterThanOrEqual(ss_wholesale_cost,31.00),LessThanOrEqual(ss_wholesale_cost,51.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(12) CometFilter
+(14) CometFilter
 Input [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
 Condition : (((isnotnull(ss_quantity#16) AND (ss_quantity#16 >= 6)) AND (ss_quantity#16 <= 10)) AND ((((ss_list_price#18 >= 90.00) AND (ss_list_price#18 <= 100.00)) OR ((ss_coupon_amt#19 >= 2323.00) AND (ss_coupon_amt#19 <= 3323.00))) OR ((ss_wholesale_cost#17 >= 31.00) AND (ss_wholesale_cost#17 <= 51.00))))
 
-(13) CometProject
+(15) CometProject
 Input [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
 Arguments: [ss_list_price#18], [ss_list_price#18]
 
-(14) CometHashAggregate
+(16) CometHashAggregate
 Input [1]: [ss_list_price#18]
 Keys [1]: [ss_list_price#18]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#18)), partial_count(ss_list_price#18)]
 
-(15) CometExchange
+(17) CometColumnarExchange
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
-Arguments: hashpartitioning(ss_list_price#18, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(ss_list_price#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(16) ColumnarToRow [codegen id : 2]
+(18) ColumnarToRow [codegen id : 2]
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
 
-(17) HashAggregate [codegen id : 2]
+(19) HashAggregate [codegen id : 2]
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
 Keys [1]: [ss_list_price#18]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#18)), merge_count(ss_list_price#18)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25]
 Results [4]: [ss_list_price#18, sum#21, count#22, count#23]
 
-(18) HashAggregate [codegen id : 2]
+(20) HashAggregate [codegen id : 2]
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#18)), merge_count(ss_list_price#18), partial_count(distinct ss_list_price#18)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25, count(ss_list_price#18)#26]
 Results [4]: [sum#21, count#22, count#23, count#27]
 
-(19) Exchange
+(21) RowToColumnar
 Input [4]: [sum#21, count#22, count#23, count#27]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(20) HashAggregate [codegen id : 3]
+(22) CometColumnarExchange
+Input [4]: [sum#21, count#22, count#23, count#27]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(23) CometHashAggregate
 Input [4]: [sum#21, count#22, count#23, count#27]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#18)), count(ss_list_price#18), count(distinct ss_list_price#18)]
-Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25, count(ss_list_price#18)#26]
-Results [3]: [cast((avg(UnscaledValue(ss_list_price#18))#24 / 100.0) as decimal(11,6)) AS B2_LP#28, count(ss_list_price#18)#25 AS B2_CNT#29, count(ss_list_price#18)#26 AS B2_CNTD#30]
 
-(21) BroadcastExchange
+(24) ColumnarToRow [codegen id : 3]
+Input [3]: [B2_LP#28, B2_CNT#29, B2_CNTD#30]
+
+(25) BroadcastExchange
 Input [3]: [B2_LP#28, B2_CNT#29, B2_CNTD#30]
 Arguments: IdentityBroadcastMode, [plan_id=5]
 
-(22) BroadcastNestedLoopJoin [codegen id : 12]
+(26) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -190,56 +210,60 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,11), LessThanOrEqual(ss_quantity,15), Or(Or(And(GreaterThanOrEqual(ss_list_price,142.00),LessThanOrEqual(ss_list_price,152.00)),And(GreaterThanOrEqual(ss_coupon_amt,12214.00),LessThanOrEqual(ss_coupon_amt,13214.00))),And(GreaterThanOrEqual(ss_wholesale_cost,79.00),LessThanOrEqual(ss_wholesale_cost,99.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(24) CometFilter
+(28) CometFilter
 Input [5]: [ss_quantity#31, ss_wholesale_cost#32, ss_list_price#33, ss_coupon_amt#34, ss_sold_date_sk#35]
 Condition : (((isnotnull(ss_quantity#31) AND (ss_quantity#31 >= 11)) AND (ss_quantity#31 <= 15)) AND ((((ss_list_price#33 >= 142.00) AND (ss_list_price#33 <= 152.00)) OR ((ss_coupon_amt#34 >= 12214.00) AND (ss_coupon_amt#34 <= 13214.00))) OR ((ss_wholesale_cost#32 >= 79.00) AND (ss_wholesale_cost#32 <= 99.00))))
 
-(25) CometProject
+(29) CometProject
 Input [5]: [ss_quantity#31, ss_wholesale_cost#32, ss_list_price#33, ss_coupon_amt#34, ss_sold_date_sk#35]
 Arguments: [ss_list_price#33], [ss_list_price#33]
 
-(26) CometHashAggregate
+(30) CometHashAggregate
 Input [1]: [ss_list_price#33]
 Keys [1]: [ss_list_price#33]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#33)), partial_count(ss_list_price#33)]
 
-(27) CometExchange
+(31) CometColumnarExchange
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
-Arguments: hashpartitioning(ss_list_price#33, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=6]
+Arguments: hashpartitioning(ss_list_price#33, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(28) ColumnarToRow [codegen id : 4]
+(32) ColumnarToRow [codegen id : 4]
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
 
-(29) HashAggregate [codegen id : 4]
+(33) HashAggregate [codegen id : 4]
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
 Keys [1]: [ss_list_price#33]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#33)), merge_count(ss_list_price#33)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40]
 Results [4]: [ss_list_price#33, sum#36, count#37, count#38]
 
-(30) HashAggregate [codegen id : 4]
+(34) HashAggregate [codegen id : 4]
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#33)), merge_count(ss_list_price#33), partial_count(distinct ss_list_price#33)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40, count(ss_list_price#33)#41]
 Results [4]: [sum#36, count#37, count#38, count#42]
 
-(31) Exchange
+(35) RowToColumnar
+Input [4]: [sum#36, count#37, count#38, count#42]
+
+(36) CometColumnarExchange
 Input [4]: [sum#36, count#37, count#38, count#42]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(32) HashAggregate [codegen id : 5]
+(37) CometHashAggregate
 Input [4]: [sum#36, count#37, count#38, count#42]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#33)), count(ss_list_price#33), count(distinct ss_list_price#33)]
-Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40, count(ss_list_price#33)#41]
-Results [3]: [cast((avg(UnscaledValue(ss_list_price#33))#39 / 100.0) as decimal(11,6)) AS B3_LP#43, count(ss_list_price#33)#40 AS B3_CNT#44, count(ss_list_price#33)#41 AS B3_CNTD#45]
 
-(33) BroadcastExchange
+(38) ColumnarToRow [codegen id : 5]
+Input [3]: [B3_LP#43, B3_CNT#44, B3_CNTD#45]
+
+(39) BroadcastExchange
 Input [3]: [B3_LP#43, B3_CNT#44, B3_CNTD#45]
 Arguments: IdentityBroadcastMode, [plan_id=8]
 
-(34) BroadcastNestedLoopJoin [codegen id : 12]
+(40) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -250,56 +274,60 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,16), LessThanOrEqual(ss_quantity,20), Or(Or(And(GreaterThanOrEqual(ss_list_price,135.00),LessThanOrEqual(ss_list_price,145.00)),And(GreaterThanOrEqual(ss_coupon_amt,6071.00),LessThanOrEqual(ss_coupon_amt,7071.00))),And(GreaterThanOrEqual(ss_wholesale_cost,38.00),LessThanOrEqual(ss_wholesale_cost,58.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(36) CometFilter
+(42) CometFilter
 Input [5]: [ss_quantity#46, ss_wholesale_cost#47, ss_list_price#48, ss_coupon_amt#49, ss_sold_date_sk#50]
 Condition : (((isnotnull(ss_quantity#46) AND (ss_quantity#46 >= 16)) AND (ss_quantity#46 <= 20)) AND ((((ss_list_price#48 >= 135.00) AND (ss_list_price#48 <= 145.00)) OR ((ss_coupon_amt#49 >= 6071.00) AND (ss_coupon_amt#49 <= 7071.00))) OR ((ss_wholesale_cost#47 >= 38.00) AND (ss_wholesale_cost#47 <= 58.00))))
 
-(37) CometProject
+(43) CometProject
 Input [5]: [ss_quantity#46, ss_wholesale_cost#47, ss_list_price#48, ss_coupon_amt#49, ss_sold_date_sk#50]
 Arguments: [ss_list_price#48], [ss_list_price#48]
 
-(38) CometHashAggregate
+(44) CometHashAggregate
 Input [1]: [ss_list_price#48]
 Keys [1]: [ss_list_price#48]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#48)), partial_count(ss_list_price#48)]
 
-(39) CometExchange
+(45) CometColumnarExchange
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
-Arguments: hashpartitioning(ss_list_price#48, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=9]
+Arguments: hashpartitioning(ss_list_price#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(40) ColumnarToRow [codegen id : 6]
+(46) ColumnarToRow [codegen id : 6]
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
 
-(41) HashAggregate [codegen id : 6]
+(47) HashAggregate [codegen id : 6]
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
 Keys [1]: [ss_list_price#48]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#48)), merge_count(ss_list_price#48)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55]
 Results [4]: [ss_list_price#48, sum#51, count#52, count#53]
 
-(42) HashAggregate [codegen id : 6]
+(48) HashAggregate [codegen id : 6]
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#48)), merge_count(ss_list_price#48), partial_count(distinct ss_list_price#48)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55, count(ss_list_price#48)#56]
 Results [4]: [sum#51, count#52, count#53, count#57]
 
-(43) Exchange
+(49) RowToColumnar
 Input [4]: [sum#51, count#52, count#53, count#57]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=10]
 
-(44) HashAggregate [codegen id : 7]
+(50) CometColumnarExchange
+Input [4]: [sum#51, count#52, count#53, count#57]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(51) CometHashAggregate
 Input [4]: [sum#51, count#52, count#53, count#57]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#48)), count(ss_list_price#48), count(distinct ss_list_price#48)]
-Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55, count(ss_list_price#48)#56]
-Results [3]: [cast((avg(UnscaledValue(ss_list_price#48))#54 / 100.0) as decimal(11,6)) AS B4_LP#58, count(ss_list_price#48)#55 AS B4_CNT#59, count(ss_list_price#48)#56 AS B4_CNTD#60]
 
-(45) BroadcastExchange
+(52) ColumnarToRow [codegen id : 7]
+Input [3]: [B4_LP#58, B4_CNT#59, B4_CNTD#60]
+
+(53) BroadcastExchange
 Input [3]: [B4_LP#58, B4_CNT#59, B4_CNTD#60]
 Arguments: IdentityBroadcastMode, [plan_id=11]
 
-(46) BroadcastNestedLoopJoin [codegen id : 12]
+(54) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -310,56 +338,60 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,21), LessThanOrEqual(ss_quantity,25), Or(Or(And(GreaterThanOrEqual(ss_list_price,122.00),LessThanOrEqual(ss_list_price,132.00)),And(GreaterThanOrEqual(ss_coupon_amt,836.00),LessThanOrEqual(ss_coupon_amt,1836.00))),And(GreaterThanOrEqual(ss_wholesale_cost,17.00),LessThanOrEqual(ss_wholesale_cost,37.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(48) CometFilter
+(56) CometFilter
 Input [5]: [ss_quantity#61, ss_wholesale_cost#62, ss_list_price#63, ss_coupon_amt#64, ss_sold_date_sk#65]
 Condition : (((isnotnull(ss_quantity#61) AND (ss_quantity#61 >= 21)) AND (ss_quantity#61 <= 25)) AND ((((ss_list_price#63 >= 122.00) AND (ss_list_price#63 <= 132.00)) OR ((ss_coupon_amt#64 >= 836.00) AND (ss_coupon_amt#64 <= 1836.00))) OR ((ss_wholesale_cost#62 >= 17.00) AND (ss_wholesale_cost#62 <= 37.00))))
 
-(49) CometProject
+(57) CometProject
 Input [5]: [ss_quantity#61, ss_wholesale_cost#62, ss_list_price#63, ss_coupon_amt#64, ss_sold_date_sk#65]
 Arguments: [ss_list_price#63], [ss_list_price#63]
 
-(50) CometHashAggregate
+(58) CometHashAggregate
 Input [1]: [ss_list_price#63]
 Keys [1]: [ss_list_price#63]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#63)), partial_count(ss_list_price#63)]
 
-(51) CometExchange
+(59) CometColumnarExchange
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
-Arguments: hashpartitioning(ss_list_price#63, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
+Arguments: hashpartitioning(ss_list_price#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(52) ColumnarToRow [codegen id : 8]
+(60) ColumnarToRow [codegen id : 8]
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
 
-(53) HashAggregate [codegen id : 8]
+(61) HashAggregate [codegen id : 8]
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
 Keys [1]: [ss_list_price#63]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#63)), merge_count(ss_list_price#63)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70]
 Results [4]: [ss_list_price#63, sum#66, count#67, count#68]
 
-(54) HashAggregate [codegen id : 8]
+(62) HashAggregate [codegen id : 8]
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#63)), merge_count(ss_list_price#63), partial_count(distinct ss_list_price#63)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70, count(ss_list_price#63)#71]
 Results [4]: [sum#66, count#67, count#68, count#72]
 
-(55) Exchange
+(63) RowToColumnar
 Input [4]: [sum#66, count#67, count#68, count#72]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=13]
 
-(56) HashAggregate [codegen id : 9]
+(64) CometColumnarExchange
+Input [4]: [sum#66, count#67, count#68, count#72]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+
+(65) CometHashAggregate
 Input [4]: [sum#66, count#67, count#68, count#72]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#63)), count(ss_list_price#63), count(distinct ss_list_price#63)]
-Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70, count(ss_list_price#63)#71]
-Results [3]: [cast((avg(UnscaledValue(ss_list_price#63))#69 / 100.0) as decimal(11,6)) AS B5_LP#73, count(ss_list_price#63)#70 AS B5_CNT#74, count(ss_list_price#63)#71 AS B5_CNTD#75]
 
-(57) BroadcastExchange
+(66) ColumnarToRow [codegen id : 9]
+Input [3]: [B5_LP#73, B5_CNT#74, B5_CNTD#75]
+
+(67) BroadcastExchange
 Input [3]: [B5_LP#73, B5_CNT#74, B5_CNTD#75]
 Arguments: IdentityBroadcastMode, [plan_id=14]
 
-(58) BroadcastNestedLoopJoin [codegen id : 12]
+(68) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -370,56 +402,60 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,26), LessThanOrEqual(ss_quantity,30), Or(Or(And(GreaterThanOrEqual(ss_list_price,154.00),LessThanOrEqual(ss_list_price,164.00)),And(GreaterThanOrEqual(ss_coupon_amt,7326.00),LessThanOrEqual(ss_coupon_amt,8326.00))),And(GreaterThanOrEqual(ss_wholesale_cost,7.00),LessThanOrEqual(ss_wholesale_cost,27.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(60) CometFilter
+(70) CometFilter
 Input [5]: [ss_quantity#76, ss_wholesale_cost#77, ss_list_price#78, ss_coupon_amt#79, ss_sold_date_sk#80]
 Condition : (((isnotnull(ss_quantity#76) AND (ss_quantity#76 >= 26)) AND (ss_quantity#76 <= 30)) AND ((((ss_list_price#78 >= 154.00) AND (ss_list_price#78 <= 164.00)) OR ((ss_coupon_amt#79 >= 7326.00) AND (ss_coupon_amt#79 <= 8326.00))) OR ((ss_wholesale_cost#77 >= 7.00) AND (ss_wholesale_cost#77 <= 27.00))))
 
-(61) CometProject
+(71) CometProject
 Input [5]: [ss_quantity#76, ss_wholesale_cost#77, ss_list_price#78, ss_coupon_amt#79, ss_sold_date_sk#80]
 Arguments: [ss_list_price#78], [ss_list_price#78]
 
-(62) CometHashAggregate
+(72) CometHashAggregate
 Input [1]: [ss_list_price#78]
 Keys [1]: [ss_list_price#78]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#78)), partial_count(ss_list_price#78)]
 
-(63) CometExchange
+(73) CometColumnarExchange
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
-Arguments: hashpartitioning(ss_list_price#78, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=15]
+Arguments: hashpartitioning(ss_list_price#78, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(64) ColumnarToRow [codegen id : 10]
+(74) ColumnarToRow [codegen id : 10]
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
 
-(65) HashAggregate [codegen id : 10]
+(75) HashAggregate [codegen id : 10]
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
 Keys [1]: [ss_list_price#78]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#78)), merge_count(ss_list_price#78)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85]
 Results [4]: [ss_list_price#78, sum#81, count#82, count#83]
 
-(66) HashAggregate [codegen id : 10]
+(76) HashAggregate [codegen id : 10]
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#78)), merge_count(ss_list_price#78), partial_count(distinct ss_list_price#78)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85, count(ss_list_price#78)#86]
 Results [4]: [sum#81, count#82, count#83, count#87]
 
-(67) Exchange
+(77) RowToColumnar
+Input [4]: [sum#81, count#82, count#83, count#87]
+
+(78) CometColumnarExchange
 Input [4]: [sum#81, count#82, count#83, count#87]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=16]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
 
-(68) HashAggregate [codegen id : 11]
+(79) CometHashAggregate
 Input [4]: [sum#81, count#82, count#83, count#87]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#78)), count(ss_list_price#78), count(distinct ss_list_price#78)]
-Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85, count(ss_list_price#78)#86]
-Results [3]: [cast((avg(UnscaledValue(ss_list_price#78))#84 / 100.0) as decimal(11,6)) AS B6_LP#88, count(ss_list_price#78)#85 AS B6_CNT#89, count(ss_list_price#78)#86 AS B6_CNTD#90]
 
-(69) BroadcastExchange
+(80) ColumnarToRow [codegen id : 11]
+Input [3]: [B6_LP#88, B6_CNT#89, B6_CNTD#90]
+
+(81) BroadcastExchange
 Input [3]: [B6_LP#88, B6_CNT#89, B6_CNTD#90]
 Arguments: IdentityBroadcastMode, [plan_id=17]
 
-(70) BroadcastNestedLoopJoin [codegen id : 12]
+(82) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt
index 2f9802ab65..e84abd7c1f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt
@@ -4,96 +4,108 @@ WholeStageCodegen (12)
       BroadcastNestedLoopJoin
         BroadcastNestedLoopJoin
           BroadcastNestedLoopJoin
-            HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B1_LP,B1_CNT,B1_CNTD,sum,count,count,count]
+            ColumnarToRow
               InputAdapter
-                Exchange #1
-                  WholeStageCodegen (1)
-                    HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
-                      HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
-                        ColumnarToRow
-                          InputAdapter
-                            CometExchange [ss_list_price] #2
-                              CometHashAggregate [ss_list_price]
-                                CometProject [ss_list_price]
-                                  CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                CometHashAggregate [sum,count,count,count]
+                  CometColumnarExchange #1
+                    RowToColumnar
+                      WholeStageCodegen (1)
+                        HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
+                          HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [ss_list_price] #2
+                                  CometHashAggregate [ss_list_price]
+                                    CometProject [ss_list_price]
+                                      CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
             InputAdapter
               BroadcastExchange #3
                 WholeStageCodegen (3)
-                  HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B2_LP,B2_CNT,B2_CNTD,sum,count,count,count]
+                  ColumnarToRow
                     InputAdapter
-                      Exchange #4
-                        WholeStageCodegen (2)
+                      CometHashAggregate [sum,count,count,count]
+                        CometColumnarExchange #4
+                          RowToColumnar
+                            WholeStageCodegen (2)
+                              HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
+                                HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [ss_list_price] #5
+                                        CometHashAggregate [ss_list_price]
+                                          CometProject [ss_list_price]
+                                            CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+          InputAdapter
+            BroadcastExchange #6
+              WholeStageCodegen (5)
+                ColumnarToRow
+                  InputAdapter
+                    CometHashAggregate [sum,count,count,count]
+                      CometColumnarExchange #7
+                        RowToColumnar
+                          WholeStageCodegen (4)
+                            HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
+                              HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometColumnarExchange [ss_list_price] #8
+                                      CometHashAggregate [ss_list_price]
+                                        CometProject [ss_list_price]
+                                          CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+        InputAdapter
+          BroadcastExchange #9
+            WholeStageCodegen (7)
+              ColumnarToRow
+                InputAdapter
+                  CometHashAggregate [sum,count,count,count]
+                    CometColumnarExchange #10
+                      RowToColumnar
+                        WholeStageCodegen (6)
                           HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
                             HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
                               ColumnarToRow
                                 InputAdapter
-                                  CometExchange [ss_list_price] #5
+                                  CometColumnarExchange [ss_list_price] #11
                                     CometHashAggregate [ss_list_price]
                                       CometProject [ss_list_price]
                                         CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
                                           CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-          InputAdapter
-            BroadcastExchange #6
-              WholeStageCodegen (5)
-                HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B3_LP,B3_CNT,B3_CNTD,sum,count,count,count]
-                  InputAdapter
-                    Exchange #7
-                      WholeStageCodegen (4)
+      InputAdapter
+        BroadcastExchange #12
+          WholeStageCodegen (9)
+            ColumnarToRow
+              InputAdapter
+                CometHashAggregate [sum,count,count,count]
+                  CometColumnarExchange #13
+                    RowToColumnar
+                      WholeStageCodegen (8)
                         HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
                           HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
                             ColumnarToRow
                               InputAdapter
-                                CometExchange [ss_list_price] #8
+                                CometColumnarExchange [ss_list_price] #14
                                   CometHashAggregate [ss_list_price]
                                     CometProject [ss_list_price]
                                       CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
                                         CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-        InputAdapter
-          BroadcastExchange #9
-            WholeStageCodegen (7)
-              HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B4_LP,B4_CNT,B4_CNTD,sum,count,count,count]
-                InputAdapter
-                  Exchange #10
-                    WholeStageCodegen (6)
+    InputAdapter
+      BroadcastExchange #15
+        WholeStageCodegen (11)
+          ColumnarToRow
+            InputAdapter
+              CometHashAggregate [sum,count,count,count]
+                CometColumnarExchange #16
+                  RowToColumnar
+                    WholeStageCodegen (10)
                       HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
                         HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
                           ColumnarToRow
                             InputAdapter
-                              CometExchange [ss_list_price] #11
+                              CometColumnarExchange [ss_list_price] #17
                                 CometHashAggregate [ss_list_price]
                                   CometProject [ss_list_price]
                                     CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
                                       CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-      InputAdapter
-        BroadcastExchange #12
-          WholeStageCodegen (9)
-            HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B5_LP,B5_CNT,B5_CNTD,sum,count,count,count]
-              InputAdapter
-                Exchange #13
-                  WholeStageCodegen (8)
-                    HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
-                      HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
-                        ColumnarToRow
-                          InputAdapter
-                            CometExchange [ss_list_price] #14
-                              CometHashAggregate [ss_list_price]
-                                CometProject [ss_list_price]
-                                  CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-    InputAdapter
-      BroadcastExchange #15
-        WholeStageCodegen (11)
-          HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B6_LP,B6_CNT,B6_CNTD,sum,count,count,count]
-            InputAdapter
-              Exchange #16
-                WholeStageCodegen (10)
-                  HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
-                    HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
-                      ColumnarToRow
-                        InputAdapter
-                          CometExchange [ss_list_price] #17
-                            CometHashAggregate [ss_list_price]
-                              CometProject [ss_list_price]
-                                CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt
index e74f10d25a..69e36471f3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt
@@ -1,44 +1,46 @@
 == Physical Plan ==
-TakeOrderedAndProject (40)
-+- * HashAggregate (39)
-   +- Exchange (38)
-      +- * HashAggregate (37)
-         +- * Project (36)
-            +- * BroadcastHashJoin Inner BuildRight (35)
-               :- * Project (30)
-               :  +- * BroadcastHashJoin Inner BuildRight (29)
-               :     :- * Project (24)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (23)
-               :     :     :- * Project (21)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :     :     :     :- * Project (18)
-               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-               :     :     :     :     :- * Project (15)
-               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :     :     :     :- * Project (9)
-               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :     :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :     :     :     :  +- CometFilter (2)
-               :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :     :     :     :     :     +- BroadcastExchange (7)
-               :     :     :     :     :     :        +- * ColumnarToRow (6)
-               :     :     :     :     :     :           +- CometFilter (5)
-               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-               :     :     :     :     :     +- BroadcastExchange (13)
-               :     :     :     :     :        +- * ColumnarToRow (12)
-               :     :     :     :     :           +- CometFilter (11)
-               :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
-               :     :     :     :     +- ReusedExchange (16)
-               :     :     :     +- ReusedExchange (19)
-               :     :     +- ReusedExchange (22)
-               :     +- BroadcastExchange (28)
-               :        +- * ColumnarToRow (27)
-               :           +- CometFilter (26)
-               :              +- CometScan parquet spark_catalog.default.store (25)
-               +- BroadcastExchange (34)
-                  +- * ColumnarToRow (33)
-                     +- CometFilter (32)
-                        +- CometScan parquet spark_catalog.default.item (31)
+* ColumnarToRow (42)
++- CometTakeOrderedAndProject (41)
+   +- CometHashAggregate (40)
+      +- CometColumnarExchange (39)
+         +- RowToColumnar (38)
+            +- * HashAggregate (37)
+               +- * Project (36)
+                  +- * BroadcastHashJoin Inner BuildRight (35)
+                     :- * Project (30)
+                     :  +- * BroadcastHashJoin Inner BuildRight (29)
+                     :     :- * Project (24)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (23)
+                     :     :     :- * Project (21)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :     :     :     :- * Project (18)
+                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                     :     :     :     :     :- * Project (15)
+                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :     :     :     :- * Project (9)
+                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :     :     :     :     :     +- BroadcastExchange (7)
+                     :     :     :     :     :     :        +- * ColumnarToRow (6)
+                     :     :     :     :     :     :           +- CometFilter (5)
+                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+                     :     :     :     :     :     +- BroadcastExchange (13)
+                     :     :     :     :     :        +- * ColumnarToRow (12)
+                     :     :     :     :     :           +- CometFilter (11)
+                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
+                     :     :     :     :     +- ReusedExchange (16)
+                     :     :     :     +- ReusedExchange (19)
+                     :     :     +- ReusedExchange (22)
+                     :     +- BroadcastExchange (28)
+                     :        +- * ColumnarToRow (27)
+                     :           +- CometFilter (26)
+                     :              +- CometScan parquet spark_catalog.default.store (25)
+                     +- BroadcastExchange (34)
+                        +- * ColumnarToRow (33)
+                           +- CometFilter (32)
+                              +- CometScan parquet spark_catalog.default.item (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -114,7 +116,7 @@ Join condition: None
 Output [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [12]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_item_sk#8, sr_customer_sk#9, sr_return_quantity#11, sr_returned_date_sk#12, cs_bill_customer_sk#14, cs_item_sk#15, cs_quantity#16, cs_sold_date_sk#17]
 
-(16) ReusedExchange [Reuses operator id: 45]
+(16) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#19]
 
 (17) BroadcastHashJoin [codegen id : 8]
@@ -127,7 +129,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [9]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#19]
 
-(19) ReusedExchange [Reuses operator id: 50]
+(19) ReusedExchange [Reuses operator id: 52]
 Output [1]: [d_date_sk#20]
 
 (20) BroadcastHashJoin [codegen id : 8]
@@ -140,7 +142,7 @@ Join condition: None
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, cs_quantity#16, cs_sold_date_sk#17]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#20]
 
-(22) ReusedExchange [Reuses operator id: 55]
+(22) ReusedExchange [Reuses operator id: 57]
 Output [1]: [d_date_sk#21]
 
 (23) BroadcastHashJoin [codegen id : 8]
@@ -216,110 +218,114 @@ Functions [3]: [partial_sum(ss_quantity#5), partial_sum(sr_return_quantity#11),
 Aggregate Attributes [3]: [sum#28, sum#29, sum#30]
 Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 
-(38) Exchange
+(38) RowToColumnar
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
-Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) HashAggregate [codegen id : 9]
+(39) CometColumnarExchange
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
+Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(40) CometHashAggregate
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 Keys [4]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24]
 Functions [3]: [sum(ss_quantity#5), sum(sr_return_quantity#11), sum(cs_quantity#16)]
-Aggregate Attributes [3]: [sum(ss_quantity#5)#34, sum(sr_return_quantity#11)#35, sum(cs_quantity#16)#36]
-Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum(ss_quantity#5)#34 AS store_sales_quantity#37, sum(sr_return_quantity#11)#35 AS store_returns_quantity#38, sum(cs_quantity#16)#36 AS catalog_sales_quantity#39]
 
-(40) TakeOrderedAndProject
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#37, store_returns_quantity#38, catalog_sales_quantity#39]
-Arguments: 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#37, store_returns_quantity#38, catalog_sales_quantity#39]
+(41) CometTakeOrderedAndProject
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#34, store_returns_quantity#35, catalog_sales_quantity#36]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#26 ASC NULLS FIRST,i_item_desc#27 ASC NULLS FIRST,s_store_id#23 ASC NULLS FIRST,s_store_name#24 ASC NULLS FIRST], output=[i_item_id#26,i_item_desc#27,s_store_id#23,s_store_name#24,store_sales_quantity#34,store_returns_quantity#35,catalog_sales_quantity#36]), 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#34, store_returns_quantity#35, catalog_sales_quantity#36]
+
+(42) ColumnarToRow [codegen id : 9]
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#34, store_returns_quantity#35, catalog_sales_quantity#36]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (45)
-+- * ColumnarToRow (44)
-   +- CometProject (43)
-      +- CometFilter (42)
-         +- CometScan parquet spark_catalog.default.date_dim (41)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#19, d_year#40, d_moy#41]
+Output [3]: [d_date_sk#19, d_year#37, d_moy#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,9), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(42) CometFilter
-Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
-Condition : ((((isnotnull(d_moy#41) AND isnotnull(d_year#40)) AND (d_moy#41 = 9)) AND (d_year#40 = 1999)) AND isnotnull(d_date_sk#19))
+(44) CometFilter
+Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
+Condition : ((((isnotnull(d_moy#38) AND isnotnull(d_year#37)) AND (d_moy#38 = 9)) AND (d_year#37 = 1999)) AND isnotnull(d_date_sk#19))
 
-(43) CometProject
-Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
+(45) CometProject
+Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
 Arguments: [d_date_sk#19], [d_date_sk#19]
 
-(44) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#19]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (52)
++- * ColumnarToRow (51)
+   +- CometProject (50)
+      +- CometFilter (49)
+         +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#20, d_year#42, d_moy#43]
+Output [3]: [d_date_sk#20, d_year#39, d_moy#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), GreaterThanOrEqual(d_moy,9), LessThanOrEqual(d_moy,12), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
-Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
-Condition : (((((isnotnull(d_moy#43) AND isnotnull(d_year#42)) AND (d_moy#43 >= 9)) AND (d_moy#43 <= 12)) AND (d_year#42 = 1999)) AND isnotnull(d_date_sk#20))
+(49) CometFilter
+Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
+Condition : (((((isnotnull(d_moy#40) AND isnotnull(d_year#39)) AND (d_moy#40 >= 9)) AND (d_moy#40 <= 12)) AND (d_year#39 = 1999)) AND isnotnull(d_date_sk#20))
 
-(48) CometProject
-Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
+(50) CometProject
+Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
 Arguments: [d_date_sk#20], [d_date_sk#20]
 
-(49) ColumnarToRow [codegen id : 1]
+(51) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#20]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [d_date_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
 Subquery:3 Hosting operator id = 10 Hosting Expression = cs_sold_date_sk#17 IN dynamicpruning#18
-BroadcastExchange (55)
-+- * ColumnarToRow (54)
-   +- CometProject (53)
-      +- CometFilter (52)
-         +- CometScan parquet spark_catalog.default.date_dim (51)
+BroadcastExchange (57)
++- * ColumnarToRow (56)
+   +- CometProject (55)
+      +- CometFilter (54)
+         +- CometScan parquet spark_catalog.default.date_dim (53)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#21, d_year#44]
+Output [2]: [d_date_sk#21, d_year#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(52) CometFilter
-Input [2]: [d_date_sk#21, d_year#44]
-Condition : (d_year#44 IN (1999,2000,2001) AND isnotnull(d_date_sk#21))
+(54) CometFilter
+Input [2]: [d_date_sk#21, d_year#41]
+Condition : (d_year#41 IN (1999,2000,2001) AND isnotnull(d_date_sk#21))
 
-(53) CometProject
-Input [2]: [d_date_sk#21, d_year#44]
+(55) CometProject
+Input [2]: [d_date_sk#21, d_year#41]
 Arguments: [d_date_sk#21], [d_date_sk#21]
 
-(54) ColumnarToRow [codegen id : 1]
+(56) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#21]
 
-(55) BroadcastExchange
+(57) BroadcastExchange
 Input [1]: [d_date_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt
index 68a127d357..753b11f806 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt
@@ -1,83 +1,85 @@
-TakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_quantity,store_returns_quantity,catalog_sales_quantity]
-  WholeStageCodegen (9)
-    HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum] [sum(ss_quantity),sum(sr_return_quantity),sum(cs_quantity),store_sales_quantity,store_returns_quantity,catalog_sales_quantity,sum,sum,sum]
-      InputAdapter
-        Exchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
-          WholeStageCodegen (8)
-            HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_quantity,sr_return_quantity,cs_quantity] [sum,sum,sum,sum,sum,sum]
-              Project [ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name,i_item_id,i_item_desc]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name]
-                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
-                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
-                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                  Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                    BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
-                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
-                                        BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #2
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_moy,d_year,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (9)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_quantity,store_returns_quantity,catalog_sales_quantity]
+        CometHashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum]
+          CometColumnarExchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
+            RowToColumnar
+              WholeStageCodegen (8)
+                HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_quantity,sr_return_quantity,cs_quantity] [sum,sum,sum,sum,sum,sum]
+                  Project [ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name,i_item_id,i_item_desc]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name]
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
+                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
+                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                                  Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                        BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
+                                          Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
+                                            BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #2
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_moy,d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #2
+                                                              BroadcastExchange #4
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_moy,d_year,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            BroadcastExchange #3
-                                              WholeStageCodegen (1)
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (2)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #2
-                                                          BroadcastExchange #4
+                                                    CometFilter [cs_bill_customer_sk,cs_item_sk]
+                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #3
+                                                          BroadcastExchange #6
                                                             WholeStageCodegen (1)
                                                               ColumnarToRow
                                                                 InputAdapter
                                                                   CometProject [d_date_sk]
-                                                                    CometFilter [d_moy,d_year,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                    CometFilter [d_year,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (2)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #3
-                                                      BroadcastExchange #6
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                        ReusedExchange [d_date_sk] #2
                                   InputAdapter
-                                    ReusedExchange [d_date_sk] #2
+                                    ReusedExchange [d_date_sk] #4
                               InputAdapter
-                                ReusedExchange [d_date_sk] #4
+                                ReusedExchange [d_date_sk] #6
                           InputAdapter
-                            ReusedExchange [d_date_sk] #6
+                            BroadcastExchange #7
+                              WholeStageCodegen (6)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [s_store_sk]
+                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (6)
+                        BroadcastExchange #8
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [s_store_sk]
-                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
-                  InputAdapter
-                    BroadcastExchange #8
-                      WholeStageCodegen (7)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [i_item_sk]
-                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
+                                CometFilter [i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt
index 22b8681f2a..2baeadfd8b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt
@@ -1,25 +1,27 @@
 == Physical Plan ==
-TakeOrderedAndProject (21)
-+- * HashAggregate (20)
-   +- Exchange (19)
-      +- * HashAggregate (18)
-         +- * Project (17)
-            +- * BroadcastHashJoin Inner BuildRight (16)
-               :- * Project (10)
-               :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :- * ColumnarToRow (4)
-               :     :  +- CometProject (3)
-               :     :     +- CometFilter (2)
-               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-               :     +- BroadcastExchange (8)
-               :        +- * ColumnarToRow (7)
-               :           +- CometFilter (6)
-               :              +- CometScan parquet spark_catalog.default.store_sales (5)
-               +- BroadcastExchange (15)
-                  +- * ColumnarToRow (14)
-                     +- CometProject (13)
-                        +- CometFilter (12)
-                           +- CometScan parquet spark_catalog.default.item (11)
+* ColumnarToRow (23)
++- CometTakeOrderedAndProject (22)
+   +- CometHashAggregate (21)
+      +- CometColumnarExchange (20)
+         +- RowToColumnar (19)
+            +- * HashAggregate (18)
+               +- * Project (17)
+                  +- * BroadcastHashJoin Inner BuildRight (16)
+                     :- * Project (10)
+                     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :- * ColumnarToRow (4)
+                     :     :  +- CometProject (3)
+                     :     :     +- CometFilter (2)
+                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+                     :     +- BroadcastExchange (8)
+                     :        +- * ColumnarToRow (7)
+                     :           +- CometFilter (6)
+                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                     +- BroadcastExchange (15)
+                        +- * ColumnarToRow (14)
+                           +- CometProject (13)
+                              +- CometFilter (12)
+                                 +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -108,18 +110,22 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 
-(19) Exchange
+(19) RowToColumnar
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
-Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
+Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(21) CometHashAggregate
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 Keys [3]: [d_year#2, i_brand#9, i_brand_id#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
-Results [4]: [d_year#2, i_brand_id#8 AS brand_id#14, i_brand#9 AS brand#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS sum_agg#16]
 
-(21) TakeOrderedAndProject
-Input [4]: [d_year#2, brand_id#14, brand#15, sum_agg#16]
-Arguments: 100, [d_year#2 ASC NULLS FIRST, sum_agg#16 DESC NULLS LAST, brand_id#14 ASC NULLS FIRST], [d_year#2, brand_id#14, brand#15, sum_agg#16]
+(22) CometTakeOrderedAndProject
+Input [4]: [d_year#2, brand_id#13, brand#14, sum_agg#15]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[d_year#2 ASC NULLS FIRST,sum_agg#15 DESC NULLS LAST,brand_id#13 ASC NULLS FIRST], output=[d_year#2,brand_id#13,brand#14,sum_agg#15]), 100, [d_year#2 ASC NULLS FIRST, sum_agg#15 DESC NULLS LAST, brand_id#13 ASC NULLS FIRST], [d_year#2, brand_id#13, brand#14, sum_agg#15]
+
+(23) ColumnarToRow [codegen id : 4]
+Input [4]: [d_year#2, brand_id#13, brand#14, sum_agg#15]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt
index 3946c0cd8f..a627b6b25e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt
@@ -1,31 +1,33 @@
-TakeOrderedAndProject [d_year,sum_agg,brand_id,brand]
-  WholeStageCodegen (4)
-    HashAggregate [d_year,i_brand,i_brand_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,sum_agg,sum]
-      InputAdapter
-        Exchange [d_year,i_brand,i_brand_id] #1
-          WholeStageCodegen (3)
-            HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
-              Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [d_year,ss_item_sk,ss_ext_sales_price]
-                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [d_date_sk,d_year]
-                            CometFilter [d_moy,d_date_sk]
-                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (4)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [d_year,sum_agg,brand_id,brand]
+        CometHashAggregate [d_year,i_brand,i_brand_id,sum]
+          CometColumnarExchange [d_year,i_brand,i_brand_id] #1
+            RowToColumnar
+              WholeStageCodegen (3)
+                HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
+                  Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [d_year,ss_item_sk,ss_ext_sales_price]
+                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [d_date_sk,d_year]
+                                CometFilter [d_moy,d_date_sk]
+                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                          InputAdapter
+                            BroadcastExchange #2
+                              WholeStageCodegen (1)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
                       InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (1)
+                        BroadcastExchange #3
+                          WholeStageCodegen (2)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                  InputAdapter
-                    BroadcastExchange #3
-                      WholeStageCodegen (2)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [i_item_sk,i_brand_id,i_brand]
-                              CometFilter [i_manufact_id,i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id]
+                                CometProject [i_item_sk,i_brand_id,i_brand]
+                                  CometFilter [i_manufact_id,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt
index 5da800fe40..13d06f87c1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt
@@ -1,53 +1,57 @@
 == Physical Plan ==
-TakeOrderedAndProject (49)
-+- * Project (48)
-   +- * BroadcastHashJoin Inner BuildRight (47)
-      :- * Project (41)
-      :  +- * BroadcastHashJoin Inner BuildRight (40)
-      :     :- * Project (35)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-      :     :     :- * Filter (16)
-      :     :     :  +- * HashAggregate (15)
-      :     :     :     +- Exchange (14)
-      :     :     :        +- * HashAggregate (13)
-      :     :     :           +- * Project (12)
-      :     :     :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :                 :- * Project (6)
-      :     :     :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :     :                 :     :- * ColumnarToRow (3)
-      :     :     :                 :     :  +- CometFilter (2)
-      :     :     :                 :     :     +- CometScan parquet spark_catalog.default.web_returns (1)
-      :     :     :                 :     +- ReusedExchange (4)
-      :     :     :                 +- BroadcastExchange (10)
-      :     :     :                    +- * ColumnarToRow (9)
-      :     :     :                       +- CometFilter (8)
-      :     :     :                          +- CometScan parquet spark_catalog.default.customer_address (7)
-      :     :     +- BroadcastExchange (33)
-      :     :        +- * Filter (32)
-      :     :           +- * HashAggregate (31)
-      :     :              +- Exchange (30)
-      :     :                 +- * HashAggregate (29)
-      :     :                    +- * HashAggregate (28)
-      :     :                       +- Exchange (27)
-      :     :                          +- * HashAggregate (26)
-      :     :                             +- * Project (25)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :                                   :- * Project (22)
-      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (21)
-      :     :                                   :     :- * ColumnarToRow (19)
-      :     :                                   :     :  +- CometFilter (18)
-      :     :                                   :     :     +- CometScan parquet spark_catalog.default.web_returns (17)
-      :     :                                   :     +- ReusedExchange (20)
-      :     :                                   +- ReusedExchange (23)
-      :     +- BroadcastExchange (39)
-      :        +- * ColumnarToRow (38)
-      :           +- CometFilter (37)
-      :              +- CometScan parquet spark_catalog.default.customer (36)
-      +- BroadcastExchange (46)
-         +- * ColumnarToRow (45)
-            +- CometProject (44)
-               +- CometFilter (43)
-                  +- CometScan parquet spark_catalog.default.customer_address (42)
+TakeOrderedAndProject (53)
++- * Project (52)
+   +- * BroadcastHashJoin Inner BuildRight (51)
+      :- * Project (45)
+      :  +- * BroadcastHashJoin Inner BuildRight (44)
+      :     :- * Project (39)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (38)
+      :     :     :- * ColumnarToRow (18)
+      :     :     :  +- CometFilter (17)
+      :     :     :     +- CometHashAggregate (16)
+      :     :     :        +- CometColumnarExchange (15)
+      :     :     :           +- RowToColumnar (14)
+      :     :     :              +- * HashAggregate (13)
+      :     :     :                 +- * Project (12)
+      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :                       :- * Project (6)
+      :     :     :                       :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :     :                       :     :- * ColumnarToRow (3)
+      :     :     :                       :     :  +- CometFilter (2)
+      :     :     :                       :     :     +- CometScan parquet spark_catalog.default.web_returns (1)
+      :     :     :                       :     +- ReusedExchange (4)
+      :     :     :                       +- BroadcastExchange (10)
+      :     :     :                          +- * ColumnarToRow (9)
+      :     :     :                             +- CometFilter (8)
+      :     :     :                                +- CometScan parquet spark_catalog.default.customer_address (7)
+      :     :     +- BroadcastExchange (37)
+      :     :        +- * ColumnarToRow (36)
+      :     :           +- CometFilter (35)
+      :     :              +- CometHashAggregate (34)
+      :     :                 +- CometColumnarExchange (33)
+      :     :                    +- CometHashAggregate (32)
+      :     :                       +- CometHashAggregate (31)
+      :     :                          +- CometColumnarExchange (30)
+      :     :                             +- RowToColumnar (29)
+      :     :                                +- * HashAggregate (28)
+      :     :                                   +- * Project (27)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :                                         :- * Project (24)
+      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (23)
+      :     :                                         :     :- * ColumnarToRow (21)
+      :     :                                         :     :  +- CometFilter (20)
+      :     :                                         :     :     +- CometScan parquet spark_catalog.default.web_returns (19)
+      :     :                                         :     +- ReusedExchange (22)
+      :     :                                         +- ReusedExchange (25)
+      :     +- BroadcastExchange (43)
+      :        +- * ColumnarToRow (42)
+      :           +- CometFilter (41)
+      :              +- CometScan parquet spark_catalog.default.customer (40)
+      +- BroadcastExchange (50)
+         +- * ColumnarToRow (49)
+            +- CometProject (48)
+               +- CometFilter (47)
+                  +- CometScan parquet spark_catalog.default.customer_address (46)
 
 
 (unknown) Scan parquet spark_catalog.default.web_returns
@@ -65,7 +69,7 @@ Condition : (isnotnull(wr_returning_addr_sk#2) AND isnotnull(wr_returning_custom
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 54]
+(4) ReusedExchange [Reuses operator id: 58]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -113,212 +117,216 @@ Functions [1]: [partial_sum(UnscaledValue(wr_return_amt#3))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
-Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 11]
+(15) CometColumnarExchange
+Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
+Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
 Keys [2]: [wr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(wr_return_amt#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(wr_return_amt#3))#11]
-Results [3]: [wr_returning_customer_sk#1 AS ctr_customer_sk#12, ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(wr_return_amt#3))#11,17,2) AS ctr_total_return#14]
 
-(16) Filter [codegen id : 11]
-Input [3]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14]
-Condition : isnotnull(ctr_total_return#14)
+(17) CometFilter
+Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
+Condition : isnotnull(ctr_total_return#13)
+
+(18) ColumnarToRow [codegen id : 10]
+Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
 Output [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#4), dynamicpruningexpression(wr_returned_date_sk#4 IN dynamicpruning#15)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#4), dynamicpruningexpression(wr_returned_date_sk#4 IN dynamicpruning#14)]
 PushedFilters: [IsNotNull(wr_returning_addr_sk)]
 ReadSchema: struct<wr_returning_customer_sk:int,wr_returning_addr_sk:int,wr_return_amt:decimal(7,2)>
 
-(18) CometFilter
+(20) CometFilter
 Input [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 Condition : isnotnull(wr_returning_addr_sk#2)
 
-(19) ColumnarToRow [codegen id : 6]
+(21) ColumnarToRow [codegen id : 6]
 Input [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 
-(20) ReusedExchange [Reuses operator id: 54]
+(22) ReusedExchange [Reuses operator id: 58]
 Output [1]: [d_date_sk#6]
 
-(21) BroadcastHashJoin [codegen id : 6]
+(23) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [wr_returned_date_sk#4]
 Right keys [1]: [d_date_sk#6]
 Join type: Inner
 Join condition: None
 
-(22) Project [codegen id : 6]
+(24) Project [codegen id : 6]
 Output [3]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3]
 Input [5]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4, d_date_sk#6]
 
-(23) ReusedExchange [Reuses operator id: 10]
+(25) ReusedExchange [Reuses operator id: 10]
 Output [2]: [ca_address_sk#7, ca_state#8]
 
-(24) BroadcastHashJoin [codegen id : 6]
+(26) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [wr_returning_addr_sk#2]
 Right keys [1]: [ca_address_sk#7]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
+(27) Project [codegen id : 6]
 Output [3]: [wr_returning_customer_sk#1, wr_return_amt#3, ca_state#8]
 Input [5]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, ca_address_sk#7, ca_state#8]
 
-(26) HashAggregate [codegen id : 6]
+(28) HashAggregate [codegen id : 6]
 Input [3]: [wr_returning_customer_sk#1, wr_return_amt#3, ca_state#8]
 Keys [2]: [wr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [partial_sum(UnscaledValue(wr_return_amt#3))]
-Aggregate Attributes [1]: [sum#16]
-Results [3]: [wr_returning_customer_sk#1, ca_state#8, sum#17]
+Aggregate Attributes [1]: [sum#15]
+Results [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
 
-(27) Exchange
-Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#17]
-Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(29) RowToColumnar
+Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
 
-(28) HashAggregate [codegen id : 7]
-Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#17]
+(30) CometColumnarExchange
+Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
+Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(31) CometHashAggregate
+Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
 Keys [2]: [wr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(wr_return_amt#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(wr_return_amt#3))#11]
-Results [2]: [ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(wr_return_amt#3))#11,17,2) AS ctr_total_return#14]
-
-(29) HashAggregate [codegen id : 7]
-Input [2]: [ctr_state#13, ctr_total_return#14]
-Keys [1]: [ctr_state#13]
-Functions [1]: [partial_avg(ctr_total_return#14)]
-Aggregate Attributes [2]: [sum#18, count#19]
-Results [3]: [ctr_state#13, sum#20, count#21]
-
-(30) Exchange
-Input [3]: [ctr_state#13, sum#20, count#21]
-Arguments: hashpartitioning(ctr_state#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 8]
-Input [3]: [ctr_state#13, sum#20, count#21]
-Keys [1]: [ctr_state#13]
-Functions [1]: [avg(ctr_total_return#14)]
-Aggregate Attributes [1]: [avg(ctr_total_return#14)#22]
-Results [2]: [(avg(ctr_total_return#14)#22 * 1.2) AS (avg(ctr_total_return) * 1.2)#23, ctr_state#13 AS ctr_state#13#24]
-
-(32) Filter [codegen id : 8]
-Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
-Condition : isnotnull((avg(ctr_total_return) * 1.2)#23)
-
-(33) BroadcastExchange
-Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
+
+(32) CometHashAggregate
+Input [2]: [ctr_state#12, ctr_total_return#13]
+Keys [1]: [ctr_state#12]
+Functions [1]: [partial_avg(ctr_total_return#13)]
+
+(33) CometColumnarExchange
+Input [3]: [ctr_state#12, sum#17, count#18]
+Arguments: hashpartitioning(ctr_state#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [3]: [ctr_state#12, sum#17, count#18]
+Keys [1]: [ctr_state#12]
+Functions [1]: [avg(ctr_total_return#13)]
+
+(35) CometFilter
+Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+Condition : isnotnull((avg(ctr_total_return) * 1.2)#19)
+
+(36) ColumnarToRow [codegen id : 7]
+Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+
+(37) BroadcastExchange
+Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
 Arguments: HashedRelationBroadcastMode(List(input[1, string, true]),false), [plan_id=5]
 
-(34) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [ctr_state#13]
-Right keys [1]: [ctr_state#13#24]
+(38) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ctr_state#12]
+Right keys [1]: [ctr_state#12#20]
 Join type: Inner
-Join condition: (cast(ctr_total_return#14 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#23)
+Join condition: (cast(ctr_total_return#13 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#19)
 
-(35) Project [codegen id : 11]
-Output [2]: [ctr_customer_sk#12, ctr_total_return#14]
-Input [5]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14, (avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
+(39) Project [codegen id : 10]
+Output [2]: [ctr_customer_sk#11, ctr_total_return#13]
+Input [5]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13, (avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
+Output [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_current_addr_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_day:int,c_birth_month:int,c_birth_year:int,c_birth_country:string,c_login:string,c_email_address:string,c_last_review_date:int>
 
-(37) CometFilter
-Input [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
-Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_current_addr_sk#27))
+(41) CometFilter
+Input [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
+Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_current_addr_sk#23))
 
-(38) ColumnarToRow [codegen id : 9]
-Input [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
+(42) ColumnarToRow [codegen id : 8]
+Input [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
 
-(39) BroadcastExchange
-Input [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
+(43) BroadcastExchange
+Input [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(40) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [ctr_customer_sk#12]
-Right keys [1]: [c_customer_sk#25]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ctr_customer_sk#11]
+Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 11]
-Output [14]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
-Input [16]: [ctr_customer_sk#12, ctr_total_return#14, c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
+(45) Project [codegen id : 10]
+Output [14]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
+Input [16]: [ctr_customer_sk#11, ctr_total_return#13, c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
 
 (unknown) Scan parquet spark_catalog.default.customer_address
-Output [2]: [ca_address_sk#39, ca_state#40]
+Output [2]: [ca_address_sk#35, ca_state#36]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_state), EqualTo(ca_state,GA), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string>
 
-(43) CometFilter
-Input [2]: [ca_address_sk#39, ca_state#40]
-Condition : ((isnotnull(ca_state#40) AND (ca_state#40 = GA)) AND isnotnull(ca_address_sk#39))
+(47) CometFilter
+Input [2]: [ca_address_sk#35, ca_state#36]
+Condition : ((isnotnull(ca_state#36) AND (ca_state#36 = GA)) AND isnotnull(ca_address_sk#35))
 
-(44) CometProject
-Input [2]: [ca_address_sk#39, ca_state#40]
-Arguments: [ca_address_sk#39], [ca_address_sk#39]
+(48) CometProject
+Input [2]: [ca_address_sk#35, ca_state#36]
+Arguments: [ca_address_sk#35], [ca_address_sk#35]
 
-(45) ColumnarToRow [codegen id : 10]
-Input [1]: [ca_address_sk#39]
+(49) ColumnarToRow [codegen id : 9]
+Input [1]: [ca_address_sk#35]
 
-(46) BroadcastExchange
-Input [1]: [ca_address_sk#39]
+(50) BroadcastExchange
+Input [1]: [ca_address_sk#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(47) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [c_current_addr_sk#27]
-Right keys [1]: [ca_address_sk#39]
+(51) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_current_addr_sk#23]
+Right keys [1]: [ca_address_sk#35]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 11]
-Output [13]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ctr_total_return#14]
-Input [15]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ca_address_sk#39]
+(52) Project [codegen id : 10]
+Output [13]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ctr_total_return#13]
+Input [15]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ca_address_sk#35]
 
-(49) TakeOrderedAndProject
-Input [13]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ctr_total_return#14]
-Arguments: 100, [c_customer_id#26 ASC NULLS FIRST, c_salutation#28 ASC NULLS FIRST, c_first_name#29 ASC NULLS FIRST, c_last_name#30 ASC NULLS FIRST, c_preferred_cust_flag#31 ASC NULLS FIRST, c_birth_day#32 ASC NULLS FIRST, c_birth_month#33 ASC NULLS FIRST, c_birth_year#34 ASC NULLS FIRST, c_birth_country#35 ASC NULLS FIRST, c_login#36 ASC NULLS FIRST, c_email_address#37 ASC NULLS FIRST, c_last_review_date#38 ASC NULLS FIRST, ctr_total_return#14 ASC NULLS FIRST], [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ctr_total_return#14]
+(53) TakeOrderedAndProject
+Input [13]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ctr_total_return#13]
+Arguments: 100, [c_customer_id#22 ASC NULLS FIRST, c_salutation#24 ASC NULLS FIRST, c_first_name#25 ASC NULLS FIRST, c_last_name#26 ASC NULLS FIRST, c_preferred_cust_flag#27 ASC NULLS FIRST, c_birth_day#28 ASC NULLS FIRST, c_birth_month#29 ASC NULLS FIRST, c_birth_year#30 ASC NULLS FIRST, c_birth_country#31 ASC NULLS FIRST, c_login#32 ASC NULLS FIRST, c_email_address#33 ASC NULLS FIRST, c_last_review_date#34 ASC NULLS FIRST, ctr_total_return#13 ASC NULLS FIRST], [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ctr_total_return#13]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = wr_returned_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (54)
-+- * ColumnarToRow (53)
-   +- CometProject (52)
-      +- CometFilter (51)
-         +- CometScan parquet spark_catalog.default.date_dim (50)
+BroadcastExchange (58)
++- * ColumnarToRow (57)
+   +- CometProject (56)
+      +- CometFilter (55)
+         +- CometScan parquet spark_catalog.default.date_dim (54)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_year#41]
+Output [2]: [d_date_sk#6, d_year#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(51) CometFilter
-Input [2]: [d_date_sk#6, d_year#41]
-Condition : ((isnotnull(d_year#41) AND (d_year#41 = 2002)) AND isnotnull(d_date_sk#6))
+(55) CometFilter
+Input [2]: [d_date_sk#6, d_year#37]
+Condition : ((isnotnull(d_year#37) AND (d_year#37 = 2002)) AND isnotnull(d_date_sk#6))
 
-(52) CometProject
-Input [2]: [d_date_sk#6, d_year#41]
+(56) CometProject
+Input [2]: [d_date_sk#6, d_year#37]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(53) ColumnarToRow [codegen id : 1]
+(57) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(54) BroadcastExchange
+(58) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 17 Hosting Expression = wr_returned_date_sk#4 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 19 Hosting Expression = wr_returned_date_sk#4 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt
index c70f33da33..a883ad9d96 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt
@@ -1,54 +1,56 @@
 TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date,ctr_total_return]
-  WholeStageCodegen (11)
+  WholeStageCodegen (10)
     Project [c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date,ctr_total_return]
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
         Project [ctr_total_return,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date]
           BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
             Project [ctr_customer_sk,ctr_total_return]
               BroadcastHashJoin [ctr_state,ctr_state,ctr_total_return,(avg(ctr_total_return) * 1.2)]
-                Filter [ctr_total_return]
-                  HashAggregate [wr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(wr_return_amt)),ctr_customer_sk,ctr_state,ctr_total_return,sum]
-                    InputAdapter
-                      Exchange [wr_returning_customer_sk,ca_state] #1
-                        WholeStageCodegen (3)
-                          HashAggregate [wr_returning_customer_sk,ca_state,wr_return_amt] [sum,sum]
-                            Project [wr_returning_customer_sk,wr_return_amt,ca_state]
-                              BroadcastHashJoin [wr_returning_addr_sk,ca_address_sk]
-                                Project [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt]
-                                  BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [wr_returning_addr_sk,wr_returning_customer_sk]
-                                          CometScan parquet spark_catalog.default.web_returns [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt,wr_returned_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #2
-                                InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (2)
-                                      ColumnarToRow
+                ColumnarToRow
+                  InputAdapter
+                    CometFilter [ctr_total_return]
+                      CometHashAggregate [wr_returning_customer_sk,ca_state,sum]
+                        CometColumnarExchange [wr_returning_customer_sk,ca_state] #1
+                          RowToColumnar
+                            WholeStageCodegen (3)
+                              HashAggregate [wr_returning_customer_sk,ca_state,wr_return_amt] [sum,sum]
+                                Project [wr_returning_customer_sk,wr_return_amt,ca_state]
+                                  BroadcastHashJoin [wr_returning_addr_sk,ca_address_sk]
+                                    Project [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt]
+                                      BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [wr_returning_addr_sk,wr_returning_customer_sk]
+                                              CometScan parquet spark_catalog.default.web_returns [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt,wr_returned_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                         InputAdapter
-                                          CometFilter [ca_address_sk,ca_state]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                          ReusedExchange [d_date_sk] #2
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (2)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ca_address_sk,ca_state]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                 InputAdapter
                   BroadcastExchange #4
-                    WholeStageCodegen (8)
-                      Filter [(avg(ctr_total_return) * 1.2)]
-                        HashAggregate [ctr_state,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),ctr_state,sum,count]
-                          InputAdapter
-                            Exchange [ctr_state] #5
-                              WholeStageCodegen (7)
-                                HashAggregate [ctr_state,ctr_total_return] [sum,count,sum,count]
-                                  HashAggregate [wr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(wr_return_amt)),ctr_state,ctr_total_return,sum]
-                                    InputAdapter
-                                      Exchange [wr_returning_customer_sk,ca_state] #6
+                    WholeStageCodegen (7)
+                      ColumnarToRow
+                        InputAdapter
+                          CometFilter [(avg(ctr_total_return) * 1.2)]
+                            CometHashAggregate [ctr_state,sum,count]
+                              CometColumnarExchange [ctr_state] #5
+                                CometHashAggregate [ctr_state,ctr_total_return]
+                                  CometHashAggregate [wr_returning_customer_sk,ca_state,sum]
+                                    CometColumnarExchange [wr_returning_customer_sk,ca_state] #6
+                                      RowToColumnar
                                         WholeStageCodegen (6)
                                           HashAggregate [wr_returning_customer_sk,ca_state,wr_return_amt] [sum,sum]
                                             Project [wr_returning_customer_sk,wr_return_amt,ca_state]
@@ -66,14 +68,14 @@ TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,c_pre
                                                   ReusedExchange [ca_address_sk,ca_state] #3
             InputAdapter
               BroadcastExchange #7
-                WholeStageCodegen (9)
+                WholeStageCodegen (8)
                   ColumnarToRow
                     InputAdapter
                       CometFilter [c_customer_sk,c_current_addr_sk]
                         CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date]
         InputAdapter
           BroadcastExchange #8
-            WholeStageCodegen (10)
+            WholeStageCodegen (9)
               ColumnarToRow
                 InputAdapter
                   CometProject [ca_address_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt
index 7b1f7bb5db..ccfa5eb025 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt
@@ -1,94 +1,108 @@
 == Physical Plan ==
-* Sort (90)
-+- Exchange (89)
-   +- * Project (88)
-      +- * BroadcastHashJoin Inner BuildRight (87)
-         :- * Project (73)
-         :  +- * BroadcastHashJoin Inner BuildRight (72)
-         :     :- * BroadcastHashJoin Inner BuildRight (58)
-         :     :  :- * Project (44)
-         :     :  :  +- * BroadcastHashJoin Inner BuildRight (43)
-         :     :  :     :- * BroadcastHashJoin Inner BuildRight (29)
-         :     :  :     :  :- * HashAggregate (15)
-         :     :  :     :  :  +- Exchange (14)
-         :     :  :     :  :     +- * HashAggregate (13)
-         :     :  :     :  :        +- * Project (12)
-         :     :  :     :  :           +- * BroadcastHashJoin Inner BuildRight (11)
-         :     :  :     :  :              :- * Project (6)
-         :     :  :     :  :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-         :     :  :     :  :              :     :- * ColumnarToRow (3)
-         :     :  :     :  :              :     :  +- CometFilter (2)
-         :     :  :     :  :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-         :     :  :     :  :              :     +- ReusedExchange (4)
-         :     :  :     :  :              +- BroadcastExchange (10)
-         :     :  :     :  :                 +- * ColumnarToRow (9)
-         :     :  :     :  :                    +- CometFilter (8)
-         :     :  :     :  :                       +- CometScan parquet spark_catalog.default.customer_address (7)
-         :     :  :     :  +- BroadcastExchange (28)
-         :     :  :     :     +- * HashAggregate (27)
-         :     :  :     :        +- Exchange (26)
-         :     :  :     :           +- * HashAggregate (25)
-         :     :  :     :              +- * Project (24)
-         :     :  :     :                 +- * BroadcastHashJoin Inner BuildRight (23)
-         :     :  :     :                    :- * Project (21)
-         :     :  :     :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-         :     :  :     :                    :     :- * ColumnarToRow (18)
-         :     :  :     :                    :     :  +- CometFilter (17)
-         :     :  :     :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (16)
-         :     :  :     :                    :     +- ReusedExchange (19)
-         :     :  :     :                    +- ReusedExchange (22)
-         :     :  :     +- BroadcastExchange (42)
-         :     :  :        +- * HashAggregate (41)
-         :     :  :           +- Exchange (40)
-         :     :  :              +- * HashAggregate (39)
-         :     :  :                 +- * Project (38)
-         :     :  :                    +- * BroadcastHashJoin Inner BuildRight (37)
-         :     :  :                       :- * Project (35)
-         :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (34)
-         :     :  :                       :     :- * ColumnarToRow (32)
-         :     :  :                       :     :  +- CometFilter (31)
-         :     :  :                       :     :     +- CometScan parquet spark_catalog.default.store_sales (30)
-         :     :  :                       :     +- ReusedExchange (33)
-         :     :  :                       +- ReusedExchange (36)
-         :     :  +- BroadcastExchange (57)
-         :     :     +- * HashAggregate (56)
-         :     :        +- Exchange (55)
-         :     :           +- * HashAggregate (54)
-         :     :              +- * Project (53)
-         :     :                 +- * BroadcastHashJoin Inner BuildRight (52)
-         :     :                    :- * Project (50)
-         :     :                    :  +- * BroadcastHashJoin Inner BuildRight (49)
-         :     :                    :     :- * ColumnarToRow (47)
-         :     :                    :     :  +- CometFilter (46)
-         :     :                    :     :     +- CometScan parquet spark_catalog.default.web_sales (45)
-         :     :                    :     +- ReusedExchange (48)
-         :     :                    +- ReusedExchange (51)
-         :     +- BroadcastExchange (71)
-         :        +- * HashAggregate (70)
-         :           +- Exchange (69)
-         :              +- * HashAggregate (68)
-         :                 +- * Project (67)
-         :                    +- * BroadcastHashJoin Inner BuildRight (66)
-         :                       :- * Project (64)
-         :                       :  +- * BroadcastHashJoin Inner BuildRight (63)
-         :                       :     :- * ColumnarToRow (61)
-         :                       :     :  +- CometFilter (60)
-         :                       :     :     +- CometScan parquet spark_catalog.default.web_sales (59)
-         :                       :     +- ReusedExchange (62)
-         :                       +- ReusedExchange (65)
-         +- BroadcastExchange (86)
-            +- * HashAggregate (85)
-               +- Exchange (84)
-                  +- * HashAggregate (83)
-                     +- * Project (82)
-                        +- * BroadcastHashJoin Inner BuildRight (81)
-                           :- * Project (79)
-                           :  +- * BroadcastHashJoin Inner BuildRight (78)
-                           :     :- * ColumnarToRow (76)
-                           :     :  +- CometFilter (75)
-                           :     :     +- CometScan parquet spark_catalog.default.web_sales (74)
-                           :     +- ReusedExchange (77)
-                           +- ReusedExchange (80)
+* ColumnarToRow (104)
++- CometSort (103)
+   +- CometColumnarExchange (102)
+      +- RowToColumnar (101)
+         +- * Project (100)
+            +- * BroadcastHashJoin Inner BuildRight (99)
+               :- * Project (83)
+               :  +- * BroadcastHashJoin Inner BuildRight (82)
+               :     :- * BroadcastHashJoin Inner BuildRight (66)
+               :     :  :- * Project (50)
+               :     :  :  +- * BroadcastHashJoin Inner BuildRight (49)
+               :     :  :     :- * BroadcastHashJoin Inner BuildRight (33)
+               :     :  :     :  :- * ColumnarToRow (17)
+               :     :  :     :  :  +- CometHashAggregate (16)
+               :     :  :     :  :     +- CometColumnarExchange (15)
+               :     :  :     :  :        +- RowToColumnar (14)
+               :     :  :     :  :           +- * HashAggregate (13)
+               :     :  :     :  :              +- * Project (12)
+               :     :  :     :  :                 +- * BroadcastHashJoin Inner BuildRight (11)
+               :     :  :     :  :                    :- * Project (6)
+               :     :  :     :  :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :     :  :     :  :                    :     :- * ColumnarToRow (3)
+               :     :  :     :  :                    :     :  +- CometFilter (2)
+               :     :  :     :  :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :  :     :  :                    :     +- ReusedExchange (4)
+               :     :  :     :  :                    +- BroadcastExchange (10)
+               :     :  :     :  :                       +- * ColumnarToRow (9)
+               :     :  :     :  :                          +- CometFilter (8)
+               :     :  :     :  :                             +- CometScan parquet spark_catalog.default.customer_address (7)
+               :     :  :     :  +- BroadcastExchange (32)
+               :     :  :     :     +- * ColumnarToRow (31)
+               :     :  :     :        +- CometHashAggregate (30)
+               :     :  :     :           +- CometColumnarExchange (29)
+               :     :  :     :              +- RowToColumnar (28)
+               :     :  :     :                 +- * HashAggregate (27)
+               :     :  :     :                    +- * Project (26)
+               :     :  :     :                       +- * BroadcastHashJoin Inner BuildRight (25)
+               :     :  :     :                          :- * Project (23)
+               :     :  :     :                          :  +- * BroadcastHashJoin Inner BuildRight (22)
+               :     :  :     :                          :     :- * ColumnarToRow (20)
+               :     :  :     :                          :     :  +- CometFilter (19)
+               :     :  :     :                          :     :     +- CometScan parquet spark_catalog.default.store_sales (18)
+               :     :  :     :                          :     +- ReusedExchange (21)
+               :     :  :     :                          +- ReusedExchange (24)
+               :     :  :     +- BroadcastExchange (48)
+               :     :  :        +- * ColumnarToRow (47)
+               :     :  :           +- CometHashAggregate (46)
+               :     :  :              +- CometColumnarExchange (45)
+               :     :  :                 +- RowToColumnar (44)
+               :     :  :                    +- * HashAggregate (43)
+               :     :  :                       +- * Project (42)
+               :     :  :                          +- * BroadcastHashJoin Inner BuildRight (41)
+               :     :  :                             :- * Project (39)
+               :     :  :                             :  +- * BroadcastHashJoin Inner BuildRight (38)
+               :     :  :                             :     :- * ColumnarToRow (36)
+               :     :  :                             :     :  +- CometFilter (35)
+               :     :  :                             :     :     +- CometScan parquet spark_catalog.default.store_sales (34)
+               :     :  :                             :     +- ReusedExchange (37)
+               :     :  :                             +- ReusedExchange (40)
+               :     :  +- BroadcastExchange (65)
+               :     :     +- * ColumnarToRow (64)
+               :     :        +- CometHashAggregate (63)
+               :     :           +- CometColumnarExchange (62)
+               :     :              +- RowToColumnar (61)
+               :     :                 +- * HashAggregate (60)
+               :     :                    +- * Project (59)
+               :     :                       +- * BroadcastHashJoin Inner BuildRight (58)
+               :     :                          :- * Project (56)
+               :     :                          :  +- * BroadcastHashJoin Inner BuildRight (55)
+               :     :                          :     :- * ColumnarToRow (53)
+               :     :                          :     :  +- CometFilter (52)
+               :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (51)
+               :     :                          :     +- ReusedExchange (54)
+               :     :                          +- ReusedExchange (57)
+               :     +- BroadcastExchange (81)
+               :        +- * ColumnarToRow (80)
+               :           +- CometHashAggregate (79)
+               :              +- CometColumnarExchange (78)
+               :                 +- RowToColumnar (77)
+               :                    +- * HashAggregate (76)
+               :                       +- * Project (75)
+               :                          +- * BroadcastHashJoin Inner BuildRight (74)
+               :                             :- * Project (72)
+               :                             :  +- * BroadcastHashJoin Inner BuildRight (71)
+               :                             :     :- * ColumnarToRow (69)
+               :                             :     :  +- CometFilter (68)
+               :                             :     :     +- CometScan parquet spark_catalog.default.web_sales (67)
+               :                             :     +- ReusedExchange (70)
+               :                             +- ReusedExchange (73)
+               +- BroadcastExchange (98)
+                  +- * ColumnarToRow (97)
+                     +- CometHashAggregate (96)
+                        +- CometColumnarExchange (95)
+                           +- RowToColumnar (94)
+                              +- * HashAggregate (93)
+                                 +- * Project (92)
+                                    +- * BroadcastHashJoin Inner BuildRight (91)
+                                       :- * Project (89)
+                                       :  +- * BroadcastHashJoin Inner BuildRight (88)
+                                       :     :- * ColumnarToRow (86)
+                                       :     :  +- CometFilter (85)
+                                       :     :     +- CometScan parquet spark_catalog.default.web_sales (84)
+                                       :     +- ReusedExchange (87)
+                                       +- ReusedExchange (90)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -106,7 +120,7 @@ Condition : isnotnull(ss_addr_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [3]: [ss_addr_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 94]
+(4) ReusedExchange [Reuses operator id: 108]
 Output [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -154,389 +168,419 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#10]
 Results [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
 
-(14) Exchange
+(14) RowToColumnar
 Input [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
-Arguments: hashpartitioning(ca_county#9, d_qoy#7, d_year#6, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 24]
+(15) CometColumnarExchange
+Input [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
+Arguments: hashpartitioning(ca_county#9, d_qoy#7, d_year#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
 Keys [3]: [ca_county#9, d_qoy#7, d_year#6]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#12]
-Results [3]: [ca_county#9, d_year#6, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#12,17,2) AS store_sales#13]
+
+(17) ColumnarToRow [codegen id : 24]
+Input [3]: [ca_county#9, d_year#6, store_sales#12]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16]
+Output [3]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#16), dynamicpruningexpression(ss_sold_date_sk#16 IN dynamicpruning#17)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#15), dynamicpruningexpression(ss_sold_date_sk#15 IN dynamicpruning#16)]
 PushedFilters: [IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_addr_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(17) CometFilter
-Input [3]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16]
-Condition : isnotnull(ss_addr_sk#14)
+(19) CometFilter
+Input [3]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15]
+Condition : isnotnull(ss_addr_sk#13)
 
-(18) ColumnarToRow [codegen id : 6]
-Input [3]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16]
+(20) ColumnarToRow [codegen id : 6]
+Input [3]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15]
 
-(19) ReusedExchange [Reuses operator id: 98]
-Output [3]: [d_date_sk#18, d_year#19, d_qoy#20]
+(21) ReusedExchange [Reuses operator id: 112]
+Output [3]: [d_date_sk#17, d_year#18, d_qoy#19]
 
-(20) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#16]
-Right keys [1]: [d_date_sk#18]
+(22) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#15]
+Right keys [1]: [d_date_sk#17]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 6]
-Output [4]: [ss_addr_sk#14, ss_ext_sales_price#15, d_year#19, d_qoy#20]
-Input [6]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16, d_date_sk#18, d_year#19, d_qoy#20]
+(23) Project [codegen id : 6]
+Output [4]: [ss_addr_sk#13, ss_ext_sales_price#14, d_year#18, d_qoy#19]
+Input [6]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15, d_date_sk#17, d_year#18, d_qoy#19]
 
-(22) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#21, ca_county#22]
+(24) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#20, ca_county#21]
 
-(23) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_addr_sk#14]
-Right keys [1]: [ca_address_sk#21]
+(25) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_addr_sk#13]
+Right keys [1]: [ca_address_sk#20]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
-Output [4]: [ss_ext_sales_price#15, d_year#19, d_qoy#20, ca_county#22]
-Input [6]: [ss_addr_sk#14, ss_ext_sales_price#15, d_year#19, d_qoy#20, ca_address_sk#21, ca_county#22]
-
-(25) HashAggregate [codegen id : 6]
-Input [4]: [ss_ext_sales_price#15, d_year#19, d_qoy#20, ca_county#22]
-Keys [3]: [ca_county#22, d_qoy#20, d_year#19]
-Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#15))]
-Aggregate Attributes [1]: [sum#23]
-Results [4]: [ca_county#22, d_qoy#20, d_year#19, sum#24]
-
-(26) Exchange
-Input [4]: [ca_county#22, d_qoy#20, d_year#19, sum#24]
-Arguments: hashpartitioning(ca_county#22, d_qoy#20, d_year#19, 5), ENSURE_REQUIREMENTS, [plan_id=3]
-
-(27) HashAggregate [codegen id : 7]
-Input [4]: [ca_county#22, d_qoy#20, d_year#19, sum#24]
-Keys [3]: [ca_county#22, d_qoy#20, d_year#19]
-Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#15))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#15))#12]
-Results [2]: [ca_county#22, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#15))#12,17,2) AS store_sales#25]
-
-(28) BroadcastExchange
-Input [2]: [ca_county#22, store_sales#25]
+(26) Project [codegen id : 6]
+Output [4]: [ss_ext_sales_price#14, d_year#18, d_qoy#19, ca_county#21]
+Input [6]: [ss_addr_sk#13, ss_ext_sales_price#14, d_year#18, d_qoy#19, ca_address_sk#20, ca_county#21]
+
+(27) HashAggregate [codegen id : 6]
+Input [4]: [ss_ext_sales_price#14, d_year#18, d_qoy#19, ca_county#21]
+Keys [3]: [ca_county#21, d_qoy#19, d_year#18]
+Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#14))]
+Aggregate Attributes [1]: [sum#22]
+Results [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
+
+(28) RowToColumnar
+Input [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
+
+(29) CometColumnarExchange
+Input [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
+Arguments: hashpartitioning(ca_county#21, d_qoy#19, d_year#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
+Input [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
+Keys [3]: [ca_county#21, d_qoy#19, d_year#18]
+Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#14))]
+
+(31) ColumnarToRow [codegen id : 7]
+Input [2]: [ca_county#21, store_sales#24]
+
+(32) BroadcastExchange
+Input [2]: [ca_county#21, store_sales#24]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 24]
+(33) BroadcastHashJoin [codegen id : 24]
 Left keys [1]: [ca_county#9]
-Right keys [1]: [ca_county#22]
+Right keys [1]: [ca_county#21]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
+Output [3]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#28), dynamicpruningexpression(ss_sold_date_sk#28 IN dynamicpruning#29)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#27), dynamicpruningexpression(ss_sold_date_sk#27 IN dynamicpruning#28)]
 PushedFilters: [IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_addr_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(31) CometFilter
-Input [3]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
-Condition : isnotnull(ss_addr_sk#26)
+(35) CometFilter
+Input [3]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27]
+Condition : isnotnull(ss_addr_sk#25)
 
-(32) ColumnarToRow [codegen id : 10]
-Input [3]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
+(36) ColumnarToRow [codegen id : 10]
+Input [3]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27]
 
-(33) ReusedExchange [Reuses operator id: 102]
-Output [3]: [d_date_sk#30, d_year#31, d_qoy#32]
+(37) ReusedExchange [Reuses operator id: 116]
+Output [3]: [d_date_sk#29, d_year#30, d_qoy#31]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ss_sold_date_sk#28]
-Right keys [1]: [d_date_sk#30]
+(38) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ss_sold_date_sk#27]
+Right keys [1]: [d_date_sk#29]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [4]: [ss_addr_sk#26, ss_ext_sales_price#27, d_year#31, d_qoy#32]
-Input [6]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28, d_date_sk#30, d_year#31, d_qoy#32]
+(39) Project [codegen id : 10]
+Output [4]: [ss_addr_sk#25, ss_ext_sales_price#26, d_year#30, d_qoy#31]
+Input [6]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27, d_date_sk#29, d_year#30, d_qoy#31]
 
-(36) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#33, ca_county#34]
+(40) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#32, ca_county#33]
 
-(37) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ss_addr_sk#26]
-Right keys [1]: [ca_address_sk#33]
+(41) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ss_addr_sk#25]
+Right keys [1]: [ca_address_sk#32]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
-Output [4]: [ss_ext_sales_price#27, d_year#31, d_qoy#32, ca_county#34]
-Input [6]: [ss_addr_sk#26, ss_ext_sales_price#27, d_year#31, d_qoy#32, ca_address_sk#33, ca_county#34]
-
-(39) HashAggregate [codegen id : 10]
-Input [4]: [ss_ext_sales_price#27, d_year#31, d_qoy#32, ca_county#34]
-Keys [3]: [ca_county#34, d_qoy#32, d_year#31]
-Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#27))]
-Aggregate Attributes [1]: [sum#35]
-Results [4]: [ca_county#34, d_qoy#32, d_year#31, sum#36]
-
-(40) Exchange
-Input [4]: [ca_county#34, d_qoy#32, d_year#31, sum#36]
-Arguments: hashpartitioning(ca_county#34, d_qoy#32, d_year#31, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(41) HashAggregate [codegen id : 11]
-Input [4]: [ca_county#34, d_qoy#32, d_year#31, sum#36]
-Keys [3]: [ca_county#34, d_qoy#32, d_year#31]
-Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#27))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#27))#12]
-Results [2]: [ca_county#34, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#27))#12,17,2) AS store_sales#37]
-
-(42) BroadcastExchange
-Input [2]: [ca_county#34, store_sales#37]
+(42) Project [codegen id : 10]
+Output [4]: [ss_ext_sales_price#26, d_year#30, d_qoy#31, ca_county#33]
+Input [6]: [ss_addr_sk#25, ss_ext_sales_price#26, d_year#30, d_qoy#31, ca_address_sk#32, ca_county#33]
+
+(43) HashAggregate [codegen id : 10]
+Input [4]: [ss_ext_sales_price#26, d_year#30, d_qoy#31, ca_county#33]
+Keys [3]: [ca_county#33, d_qoy#31, d_year#30]
+Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#26))]
+Aggregate Attributes [1]: [sum#34]
+Results [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
+
+(44) RowToColumnar
+Input [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
+
+(45) CometColumnarExchange
+Input [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
+Arguments: hashpartitioning(ca_county#33, d_qoy#31, d_year#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(46) CometHashAggregate
+Input [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
+Keys [3]: [ca_county#33, d_qoy#31, d_year#30]
+Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#26))]
+
+(47) ColumnarToRow [codegen id : 11]
+Input [2]: [ca_county#33, store_sales#36]
+
+(48) BroadcastExchange
+Input [2]: [ca_county#33, store_sales#36]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ca_county#22]
-Right keys [1]: [ca_county#34]
+(49) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ca_county#21]
+Right keys [1]: [ca_county#33]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 24]
-Output [5]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37]
-Input [7]: [ca_county#9, d_year#6, store_sales#13, ca_county#22, store_sales#25, ca_county#34, store_sales#37]
+(50) Project [codegen id : 24]
+Output [5]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36]
+Input [7]: [ca_county#9, d_year#6, store_sales#12, ca_county#21, store_sales#24, ca_county#33, store_sales#36]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40]
+Output [3]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#40), dynamicpruningexpression(ws_sold_date_sk#40 IN dynamicpruning#41)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#39), dynamicpruningexpression(ws_sold_date_sk#39 IN dynamicpruning#40)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk)]
 ReadSchema: struct<ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(46) CometFilter
-Input [3]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40]
-Condition : isnotnull(ws_bill_addr_sk#38)
+(52) CometFilter
+Input [3]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39]
+Condition : isnotnull(ws_bill_addr_sk#37)
 
-(47) ColumnarToRow [codegen id : 14]
-Input [3]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40]
+(53) ColumnarToRow [codegen id : 14]
+Input [3]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39]
 
-(48) ReusedExchange [Reuses operator id: 94]
-Output [3]: [d_date_sk#42, d_year#43, d_qoy#44]
+(54) ReusedExchange [Reuses operator id: 108]
+Output [3]: [d_date_sk#41, d_year#42, d_qoy#43]
 
-(49) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#40]
-Right keys [1]: [d_date_sk#42]
+(55) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#39]
+Right keys [1]: [d_date_sk#41]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 14]
-Output [4]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, d_year#43, d_qoy#44]
-Input [6]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40, d_date_sk#42, d_year#43, d_qoy#44]
+(56) Project [codegen id : 14]
+Output [4]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, d_year#42, d_qoy#43]
+Input [6]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39, d_date_sk#41, d_year#42, d_qoy#43]
 
-(51) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#45, ca_county#46]
+(57) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#44, ca_county#45]
 
-(52) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_bill_addr_sk#38]
-Right keys [1]: [ca_address_sk#45]
+(58) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_bill_addr_sk#37]
+Right keys [1]: [ca_address_sk#44]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 14]
-Output [4]: [ws_ext_sales_price#39, d_year#43, d_qoy#44, ca_county#46]
-Input [6]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, d_year#43, d_qoy#44, ca_address_sk#45, ca_county#46]
-
-(54) HashAggregate [codegen id : 14]
-Input [4]: [ws_ext_sales_price#39, d_year#43, d_qoy#44, ca_county#46]
-Keys [3]: [ca_county#46, d_qoy#44, d_year#43]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#39))]
-Aggregate Attributes [1]: [sum#47]
-Results [4]: [ca_county#46, d_qoy#44, d_year#43, sum#48]
-
-(55) Exchange
-Input [4]: [ca_county#46, d_qoy#44, d_year#43, sum#48]
-Arguments: hashpartitioning(ca_county#46, d_qoy#44, d_year#43, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(56) HashAggregate [codegen id : 15]
-Input [4]: [ca_county#46, d_qoy#44, d_year#43, sum#48]
-Keys [3]: [ca_county#46, d_qoy#44, d_year#43]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#39))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#39))#49]
-Results [2]: [ca_county#46, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#39))#49,17,2) AS web_sales#50]
-
-(57) BroadcastExchange
-Input [2]: [ca_county#46, web_sales#50]
+(59) Project [codegen id : 14]
+Output [4]: [ws_ext_sales_price#38, d_year#42, d_qoy#43, ca_county#45]
+Input [6]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, d_year#42, d_qoy#43, ca_address_sk#44, ca_county#45]
+
+(60) HashAggregate [codegen id : 14]
+Input [4]: [ws_ext_sales_price#38, d_year#42, d_qoy#43, ca_county#45]
+Keys [3]: [ca_county#45, d_qoy#43, d_year#42]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#38))]
+Aggregate Attributes [1]: [sum#46]
+Results [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
+
+(61) RowToColumnar
+Input [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
+
+(62) CometColumnarExchange
+Input [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
+Arguments: hashpartitioning(ca_county#45, d_qoy#43, d_year#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(63) CometHashAggregate
+Input [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
+Keys [3]: [ca_county#45, d_qoy#43, d_year#42]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#38))]
+
+(64) ColumnarToRow [codegen id : 15]
+Input [2]: [ca_county#45, web_sales#48]
+
+(65) BroadcastExchange
+Input [2]: [ca_county#45, web_sales#48]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(58) BroadcastHashJoin [codegen id : 24]
+(66) BroadcastHashJoin [codegen id : 24]
 Left keys [1]: [ca_county#9]
-Right keys [1]: [ca_county#46]
+Right keys [1]: [ca_county#45]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53]
+Output [3]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk)]
 ReadSchema: struct<ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(60) CometFilter
-Input [3]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53]
-Condition : isnotnull(ws_bill_addr_sk#51)
+(68) CometFilter
+Input [3]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51]
+Condition : isnotnull(ws_bill_addr_sk#49)
 
-(61) ColumnarToRow [codegen id : 18]
-Input [3]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53]
+(69) ColumnarToRow [codegen id : 18]
+Input [3]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51]
 
-(62) ReusedExchange [Reuses operator id: 98]
-Output [3]: [d_date_sk#55, d_year#56, d_qoy#57]
+(70) ReusedExchange [Reuses operator id: 112]
+Output [3]: [d_date_sk#53, d_year#54, d_qoy#55]
 
-(63) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_sold_date_sk#53]
-Right keys [1]: [d_date_sk#55]
+(71) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_sold_date_sk#51]
+Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 18]
-Output [4]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, d_year#56, d_qoy#57]
-Input [6]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56, d_qoy#57]
+(72) Project [codegen id : 18]
+Output [4]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, d_year#54, d_qoy#55]
+Input [6]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54, d_qoy#55]
 
-(65) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#58, ca_county#59]
+(73) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#56, ca_county#57]
 
-(66) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_bill_addr_sk#51]
-Right keys [1]: [ca_address_sk#58]
+(74) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_bill_addr_sk#49]
+Right keys [1]: [ca_address_sk#56]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 18]
-Output [4]: [ws_ext_sales_price#52, d_year#56, d_qoy#57, ca_county#59]
-Input [6]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, d_year#56, d_qoy#57, ca_address_sk#58, ca_county#59]
-
-(68) HashAggregate [codegen id : 18]
-Input [4]: [ws_ext_sales_price#52, d_year#56, d_qoy#57, ca_county#59]
-Keys [3]: [ca_county#59, d_qoy#57, d_year#56]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#52))]
-Aggregate Attributes [1]: [sum#60]
-Results [4]: [ca_county#59, d_qoy#57, d_year#56, sum#61]
-
-(69) Exchange
-Input [4]: [ca_county#59, d_qoy#57, d_year#56, sum#61]
-Arguments: hashpartitioning(ca_county#59, d_qoy#57, d_year#56, 5), ENSURE_REQUIREMENTS, [plan_id=9]
-
-(70) HashAggregate [codegen id : 19]
-Input [4]: [ca_county#59, d_qoy#57, d_year#56, sum#61]
-Keys [3]: [ca_county#59, d_qoy#57, d_year#56]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#52))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#52))#49]
-Results [2]: [ca_county#59, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#52))#49,17,2) AS web_sales#62]
-
-(71) BroadcastExchange
-Input [2]: [ca_county#59, web_sales#62]
+(75) Project [codegen id : 18]
+Output [4]: [ws_ext_sales_price#50, d_year#54, d_qoy#55, ca_county#57]
+Input [6]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, d_year#54, d_qoy#55, ca_address_sk#56, ca_county#57]
+
+(76) HashAggregate [codegen id : 18]
+Input [4]: [ws_ext_sales_price#50, d_year#54, d_qoy#55, ca_county#57]
+Keys [3]: [ca_county#57, d_qoy#55, d_year#54]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#50))]
+Aggregate Attributes [1]: [sum#58]
+Results [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
+
+(77) RowToColumnar
+Input [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
+
+(78) CometColumnarExchange
+Input [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
+Arguments: hashpartitioning(ca_county#57, d_qoy#55, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(79) CometHashAggregate
+Input [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
+Keys [3]: [ca_county#57, d_qoy#55, d_year#54]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#50))]
+
+(80) ColumnarToRow [codegen id : 19]
+Input [2]: [ca_county#57, web_sales#60]
+
+(81) BroadcastExchange
+Input [2]: [ca_county#57, web_sales#60]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=10]
 
-(72) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ca_county#46]
-Right keys [1]: [ca_county#59]
+(82) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ca_county#45]
+Right keys [1]: [ca_county#57]
 Join type: Inner
-Join condition: (CASE WHEN (web_sales#50 > 0.00) THEN (web_sales#62 / web_sales#50) END > CASE WHEN (store_sales#13 > 0.00) THEN (store_sales#25 / store_sales#13) END)
+Join condition: (CASE WHEN (web_sales#48 > 0.00) THEN (web_sales#60 / web_sales#48) END > CASE WHEN (store_sales#12 > 0.00) THEN (store_sales#24 / store_sales#12) END)
 
-(73) Project [codegen id : 24]
-Output [8]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37, ca_county#46, web_sales#50, web_sales#62]
-Input [9]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37, ca_county#46, web_sales#50, ca_county#59, web_sales#62]
+(83) Project [codegen id : 24]
+Output [8]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36, ca_county#45, web_sales#48, web_sales#60]
+Input [9]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36, ca_county#45, web_sales#48, ca_county#57, web_sales#60]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65]
+Output [3]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#65), dynamicpruningexpression(ws_sold_date_sk#65 IN dynamicpruning#66)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#63), dynamicpruningexpression(ws_sold_date_sk#63 IN dynamicpruning#64)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk)]
 ReadSchema: struct<ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(75) CometFilter
-Input [3]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65]
-Condition : isnotnull(ws_bill_addr_sk#63)
+(85) CometFilter
+Input [3]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63]
+Condition : isnotnull(ws_bill_addr_sk#61)
 
-(76) ColumnarToRow [codegen id : 22]
-Input [3]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65]
+(86) ColumnarToRow [codegen id : 22]
+Input [3]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63]
 
-(77) ReusedExchange [Reuses operator id: 102]
-Output [3]: [d_date_sk#67, d_year#68, d_qoy#69]
+(87) ReusedExchange [Reuses operator id: 116]
+Output [3]: [d_date_sk#65, d_year#66, d_qoy#67]
 
-(78) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_sold_date_sk#65]
-Right keys [1]: [d_date_sk#67]
+(88) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_sold_date_sk#63]
+Right keys [1]: [d_date_sk#65]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 22]
-Output [4]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, d_year#68, d_qoy#69]
-Input [6]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65, d_date_sk#67, d_year#68, d_qoy#69]
+(89) Project [codegen id : 22]
+Output [4]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, d_year#66, d_qoy#67]
+Input [6]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63, d_date_sk#65, d_year#66, d_qoy#67]
 
-(80) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#70, ca_county#71]
+(90) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#68, ca_county#69]
 
-(81) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_bill_addr_sk#63]
-Right keys [1]: [ca_address_sk#70]
+(91) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_bill_addr_sk#61]
+Right keys [1]: [ca_address_sk#68]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 22]
-Output [4]: [ws_ext_sales_price#64, d_year#68, d_qoy#69, ca_county#71]
-Input [6]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, d_year#68, d_qoy#69, ca_address_sk#70, ca_county#71]
-
-(83) HashAggregate [codegen id : 22]
-Input [4]: [ws_ext_sales_price#64, d_year#68, d_qoy#69, ca_county#71]
-Keys [3]: [ca_county#71, d_qoy#69, d_year#68]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#64))]
-Aggregate Attributes [1]: [sum#72]
-Results [4]: [ca_county#71, d_qoy#69, d_year#68, sum#73]
-
-(84) Exchange
-Input [4]: [ca_county#71, d_qoy#69, d_year#68, sum#73]
-Arguments: hashpartitioning(ca_county#71, d_qoy#69, d_year#68, 5), ENSURE_REQUIREMENTS, [plan_id=11]
-
-(85) HashAggregate [codegen id : 23]
-Input [4]: [ca_county#71, d_qoy#69, d_year#68, sum#73]
-Keys [3]: [ca_county#71, d_qoy#69, d_year#68]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#64))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#64))#49]
-Results [2]: [ca_county#71, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#64))#49,17,2) AS web_sales#74]
-
-(86) BroadcastExchange
-Input [2]: [ca_county#71, web_sales#74]
+(92) Project [codegen id : 22]
+Output [4]: [ws_ext_sales_price#62, d_year#66, d_qoy#67, ca_county#69]
+Input [6]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, d_year#66, d_qoy#67, ca_address_sk#68, ca_county#69]
+
+(93) HashAggregate [codegen id : 22]
+Input [4]: [ws_ext_sales_price#62, d_year#66, d_qoy#67, ca_county#69]
+Keys [3]: [ca_county#69, d_qoy#67, d_year#66]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#62))]
+Aggregate Attributes [1]: [sum#70]
+Results [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
+
+(94) RowToColumnar
+Input [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
+
+(95) CometColumnarExchange
+Input [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
+Arguments: hashpartitioning(ca_county#69, d_qoy#67, d_year#66, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+
+(96) CometHashAggregate
+Input [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
+Keys [3]: [ca_county#69, d_qoy#67, d_year#66]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#62))]
+
+(97) ColumnarToRow [codegen id : 23]
+Input [2]: [ca_county#69, web_sales#72]
+
+(98) BroadcastExchange
+Input [2]: [ca_county#69, web_sales#72]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=12]
 
-(87) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ca_county#46]
-Right keys [1]: [ca_county#71]
+(99) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ca_county#45]
+Right keys [1]: [ca_county#69]
 Join type: Inner
-Join condition: (CASE WHEN (web_sales#62 > 0.00) THEN (web_sales#74 / web_sales#62) END > CASE WHEN (store_sales#25 > 0.00) THEN (store_sales#37 / store_sales#25) END)
+Join condition: (CASE WHEN (web_sales#60 > 0.00) THEN (web_sales#72 / web_sales#60) END > CASE WHEN (store_sales#24 > 0.00) THEN (store_sales#36 / store_sales#24) END)
+
+(100) Project [codegen id : 24]
+Output [6]: [ca_county#9, d_year#6, (web_sales#60 / web_sales#48) AS web_q1_q2_increase#73, (store_sales#24 / store_sales#12) AS store_q1_q2_increase#74, (web_sales#72 / web_sales#60) AS web_q2_q3_increase#75, (store_sales#36 / store_sales#24) AS store_q2_q3_increase#76]
+Input [10]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36, ca_county#45, web_sales#48, web_sales#60, ca_county#69, web_sales#72]
 
-(88) Project [codegen id : 24]
-Output [6]: [ca_county#9, d_year#6, (web_sales#62 / web_sales#50) AS web_q1_q2_increase#75, (store_sales#25 / store_sales#13) AS store_q1_q2_increase#76, (web_sales#74 / web_sales#62) AS web_q2_q3_increase#77, (store_sales#37 / store_sales#25) AS store_q2_q3_increase#78]
-Input [10]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37, ca_county#46, web_sales#50, web_sales#62, ca_county#71, web_sales#74]
+(101) RowToColumnar
+Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
 
-(89) Exchange
-Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#75, store_q1_q2_increase#76, web_q2_q3_increase#77, store_q2_q3_increase#78]
-Arguments: rangepartitioning(ca_county#9 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=13]
+(102) CometColumnarExchange
+Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
+Arguments: rangepartitioning(ca_county#9 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
 
-(90) Sort [codegen id : 25]
-Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#75, store_q1_q2_increase#76, web_q2_q3_increase#77, store_q2_q3_increase#78]
-Arguments: [ca_county#9 ASC NULLS FIRST], true, 0
+(103) CometSort
+Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
+Arguments: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76], [ca_county#9 ASC NULLS FIRST]
+
+(104) ColumnarToRow [codegen id : 25]
+Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (94)
-+- * ColumnarToRow (93)
-   +- CometFilter (92)
-      +- CometScan parquet spark_catalog.default.date_dim (91)
+BroadcastExchange (108)
++- * ColumnarToRow (107)
+   +- CometFilter (106)
+      +- CometScan parquet spark_catalog.default.date_dim (105)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -546,71 +590,71 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,1), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(92) CometFilter
+(106) CometFilter
 Input [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 Condition : ((((isnotnull(d_qoy#7) AND isnotnull(d_year#6)) AND (d_qoy#7 = 1)) AND (d_year#6 = 2000)) AND isnotnull(d_date_sk#5))
 
-(93) ColumnarToRow [codegen id : 1]
+(107) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 
-(94) BroadcastExchange
+(108) BroadcastExchange
 Input [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=14]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = ss_sold_date_sk#16 IN dynamicpruning#17
-BroadcastExchange (98)
-+- * ColumnarToRow (97)
-   +- CometFilter (96)
-      +- CometScan parquet spark_catalog.default.date_dim (95)
+Subquery:2 Hosting operator id = 18 Hosting Expression = ss_sold_date_sk#15 IN dynamicpruning#16
+BroadcastExchange (112)
++- * ColumnarToRow (111)
+   +- CometFilter (110)
+      +- CometScan parquet spark_catalog.default.date_dim (109)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#18, d_year#19, d_qoy#20]
+Output [3]: [d_date_sk#17, d_year#18, d_qoy#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(96) CometFilter
-Input [3]: [d_date_sk#18, d_year#19, d_qoy#20]
-Condition : ((((isnotnull(d_qoy#20) AND isnotnull(d_year#19)) AND (d_qoy#20 = 2)) AND (d_year#19 = 2000)) AND isnotnull(d_date_sk#18))
+(110) CometFilter
+Input [3]: [d_date_sk#17, d_year#18, d_qoy#19]
+Condition : ((((isnotnull(d_qoy#19) AND isnotnull(d_year#18)) AND (d_qoy#19 = 2)) AND (d_year#18 = 2000)) AND isnotnull(d_date_sk#17))
 
-(97) ColumnarToRow [codegen id : 1]
-Input [3]: [d_date_sk#18, d_year#19, d_qoy#20]
+(111) ColumnarToRow [codegen id : 1]
+Input [3]: [d_date_sk#17, d_year#18, d_qoy#19]
 
-(98) BroadcastExchange
-Input [3]: [d_date_sk#18, d_year#19, d_qoy#20]
+(112) BroadcastExchange
+Input [3]: [d_date_sk#17, d_year#18, d_qoy#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=15]
 
-Subquery:3 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#28 IN dynamicpruning#29
-BroadcastExchange (102)
-+- * ColumnarToRow (101)
-   +- CometFilter (100)
-      +- CometScan parquet spark_catalog.default.date_dim (99)
+Subquery:3 Hosting operator id = 34 Hosting Expression = ss_sold_date_sk#27 IN dynamicpruning#28
+BroadcastExchange (116)
++- * ColumnarToRow (115)
+   +- CometFilter (114)
+      +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#30, d_year#31, d_qoy#32]
+Output [3]: [d_date_sk#29, d_year#30, d_qoy#31]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,3), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(100) CometFilter
-Input [3]: [d_date_sk#30, d_year#31, d_qoy#32]
-Condition : ((((isnotnull(d_qoy#32) AND isnotnull(d_year#31)) AND (d_qoy#32 = 3)) AND (d_year#31 = 2000)) AND isnotnull(d_date_sk#30))
+(114) CometFilter
+Input [3]: [d_date_sk#29, d_year#30, d_qoy#31]
+Condition : ((((isnotnull(d_qoy#31) AND isnotnull(d_year#30)) AND (d_qoy#31 = 3)) AND (d_year#30 = 2000)) AND isnotnull(d_date_sk#29))
 
-(101) ColumnarToRow [codegen id : 1]
-Input [3]: [d_date_sk#30, d_year#31, d_qoy#32]
+(115) ColumnarToRow [codegen id : 1]
+Input [3]: [d_date_sk#29, d_year#30, d_qoy#31]
 
-(102) BroadcastExchange
-Input [3]: [d_date_sk#30, d_year#31, d_qoy#32]
+(116) BroadcastExchange
+Input [3]: [d_date_sk#29, d_year#30, d_qoy#31]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=16]
 
-Subquery:4 Hosting operator id = 45 Hosting Expression = ws_sold_date_sk#40 IN dynamicpruning#4
+Subquery:4 Hosting operator id = 51 Hosting Expression = ws_sold_date_sk#39 IN dynamicpruning#4
 
-Subquery:5 Hosting operator id = 59 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#17
+Subquery:5 Hosting operator id = 67 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#16
 
-Subquery:6 Hosting operator id = 74 Hosting Expression = ws_sold_date_sk#65 IN dynamicpruning#29
+Subquery:6 Hosting operator id = 84 Hosting Expression = ws_sold_date_sk#63 IN dynamicpruning#28
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt
index f4bf6a89d0..925a4a7f30 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt
@@ -1,159 +1,173 @@
 WholeStageCodegen (25)
-  Sort [ca_county]
+  ColumnarToRow
     InputAdapter
-      Exchange [ca_county] #1
-        WholeStageCodegen (24)
-          Project [ca_county,d_year,web_sales,web_sales,store_sales,store_sales,web_sales,store_sales]
-            BroadcastHashJoin [ca_county,ca_county,web_sales,web_sales,store_sales,store_sales]
-              Project [ca_county,d_year,store_sales,store_sales,store_sales,ca_county,web_sales,web_sales]
+      CometSort [ca_county]
+        CometColumnarExchange [ca_county] #1
+          RowToColumnar
+            WholeStageCodegen (24)
+              Project [ca_county,d_year,web_sales,web_sales,store_sales,store_sales,web_sales,store_sales]
                 BroadcastHashJoin [ca_county,ca_county,web_sales,web_sales,store_sales,store_sales]
-                  BroadcastHashJoin [ca_county,ca_county]
-                    Project [ca_county,d_year,store_sales,store_sales,store_sales]
+                  Project [ca_county,d_year,store_sales,store_sales,store_sales,ca_county,web_sales,web_sales]
+                    BroadcastHashJoin [ca_county,ca_county,web_sales,web_sales,store_sales,store_sales]
                       BroadcastHashJoin [ca_county,ca_county]
-                        BroadcastHashJoin [ca_county,ca_county]
-                          HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ss_ext_sales_price)),store_sales,sum]
-                            InputAdapter
-                              Exchange [ca_county,d_qoy,d_year] #2
-                                WholeStageCodegen (3)
-                                  HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
-                                    Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
-                                      BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                        Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
-                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_addr_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
+                        Project [ca_county,d_year,store_sales,store_sales,store_sales]
+                          BroadcastHashJoin [ca_county,ca_county]
+                            BroadcastHashJoin [ca_county,ca_county]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometHashAggregate [ca_county,d_qoy,d_year,sum]
+                                    CometColumnarExchange [ca_county,d_qoy,d_year] #2
+                                      RowToColumnar
+                                        WholeStageCodegen (3)
+                                          HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
+                                            Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
+                                              BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [ss_addr_sk]
+                                                          CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #1
+                                                              BroadcastExchange #3
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometFilter [d_qoy,d_year,d_date_sk]
+                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                                                InputAdapter
+                                                  BroadcastExchange #4
+                                                    WholeStageCodegen (2)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [ca_address_sk,ca_county]
+                                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (7)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [ca_county,d_qoy,d_year,sum]
+                                          CometColumnarExchange [ca_county,d_qoy,d_year] #6
+                                            RowToColumnar
+                                              WholeStageCodegen (6)
+                                                HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
+                                                  Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
+                                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                      Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
+                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                                           ColumnarToRow
                                                             InputAdapter
-                                                              CometFilter [d_qoy,d_year,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
-                                        InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
+                                                              CometFilter [ss_addr_sk]
+                                                                CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                                  SubqueryBroadcast [d_date_sk] #2
+                                                                    BroadcastExchange #7
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [d_qoy,d_year,d_date_sk]
+                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                                          InputAdapter
+                                                            ReusedExchange [d_date_sk,d_year,d_qoy] #7
+                                                      InputAdapter
+                                                        ReusedExchange [ca_address_sk,ca_county] #4
+                            InputAdapter
+                              BroadcastExchange #8
+                                WholeStageCodegen (11)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometHashAggregate [ca_county,d_qoy,d_year,sum]
+                                        CometColumnarExchange [ca_county,d_qoy,d_year] #9
+                                          RowToColumnar
+                                            WholeStageCodegen (10)
+                                              HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
+                                                Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
+                                                  BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                    Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
+                                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [ss_addr_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #3
+                                                                  BroadcastExchange #10
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometFilter [d_qoy,d_year,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                                        InputAdapter
+                                                          ReusedExchange [d_date_sk,d_year,d_qoy] #10
+                                                    InputAdapter
+                                                      ReusedExchange [ca_address_sk,ca_county] #4
+                        InputAdapter
+                          BroadcastExchange #11
+                            WholeStageCodegen (15)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometHashAggregate [ca_county,d_qoy,d_year,sum]
+                                    CometColumnarExchange [ca_county,d_qoy,d_year] #12
+                                      RowToColumnar
+                                        WholeStageCodegen (14)
+                                          HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
+                                            Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
+                                              BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                                Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [ws_bill_addr_sk]
+                                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk,d_year,d_qoy] #3
                                                 InputAdapter
-                                                  CometFilter [ca_address_sk,ca_county]
-                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
-                          InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (7)
-                                HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ss_ext_sales_price)),store_sales,sum]
-                                  InputAdapter
-                                    Exchange [ca_county,d_qoy,d_year] #6
-                                      WholeStageCodegen (6)
-                                        HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
-                                          Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
-                                            BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                              Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
-                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                  ReusedExchange [ca_address_sk,ca_county] #4
+                      InputAdapter
+                        BroadcastExchange #13
+                          WholeStageCodegen (19)
+                            ColumnarToRow
+                              InputAdapter
+                                CometHashAggregate [ca_county,d_qoy,d_year,sum]
+                                  CometColumnarExchange [ca_county,d_qoy,d_year] #14
+                                    RowToColumnar
+                                      WholeStageCodegen (18)
+                                        HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
+                                          Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
+                                            BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                              Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
+                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [ss_addr_sk]
-                                                        CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                          SubqueryBroadcast [d_date_sk] #2
-                                                            BroadcastExchange #7
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [d_qoy,d_year,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                                      CometFilter [ws_bill_addr_sk]
+                                                        CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                          ReusedSubquery [d_date_sk] #2
                                                   InputAdapter
                                                     ReusedExchange [d_date_sk,d_year,d_qoy] #7
                                               InputAdapter
                                                 ReusedExchange [ca_address_sk,ca_county] #4
-                        InputAdapter
-                          BroadcastExchange #8
-                            WholeStageCodegen (11)
-                              HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ss_ext_sales_price)),store_sales,sum]
-                                InputAdapter
-                                  Exchange [ca_county,d_qoy,d_year] #9
-                                    WholeStageCodegen (10)
-                                      HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
-                                        Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
-                                          BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                            Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
-                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ss_addr_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #3
-                                                          BroadcastExchange #10
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [d_qoy,d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk,d_year,d_qoy] #10
-                                            InputAdapter
-                                              ReusedExchange [ca_address_sk,ca_county] #4
-                    InputAdapter
-                      BroadcastExchange #11
-                        WholeStageCodegen (15)
-                          HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ws_ext_sales_price)),web_sales,sum]
-                            InputAdapter
-                              Exchange [ca_county,d_qoy,d_year] #12
-                                WholeStageCodegen (14)
-                                  HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
-                                    Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
-                                      BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                        Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
-                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_bill_addr_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
-                                        InputAdapter
-                                          ReusedExchange [ca_address_sk,ca_county] #4
                   InputAdapter
-                    BroadcastExchange #13
-                      WholeStageCodegen (19)
-                        HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ws_ext_sales_price)),web_sales,sum]
+                    BroadcastExchange #15
+                      WholeStageCodegen (23)
+                        ColumnarToRow
                           InputAdapter
-                            Exchange [ca_county,d_qoy,d_year] #14
-                              WholeStageCodegen (18)
-                                HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
-                                  Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
-                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                      Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_addr_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #2
+                            CometHashAggregate [ca_county,d_qoy,d_year,sum]
+                              CometColumnarExchange [ca_county,d_qoy,d_year] #16
+                                RowToColumnar
+                                  WholeStageCodegen (22)
+                                    HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
+                                      Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
+                                        BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                          Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
+                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ws_bill_addr_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #3
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk,d_year,d_qoy] #10
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_year,d_qoy] #7
-                                      InputAdapter
-                                        ReusedExchange [ca_address_sk,ca_county] #4
-              InputAdapter
-                BroadcastExchange #15
-                  WholeStageCodegen (23)
-                    HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ws_ext_sales_price)),web_sales,sum]
-                      InputAdapter
-                        Exchange [ca_county,d_qoy,d_year] #16
-                          WholeStageCodegen (22)
-                            HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
-                              Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
-                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                  Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_addr_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year,d_qoy] #10
-                                  InputAdapter
-                                    ReusedExchange [ca_address_sk,ca_county] #4
+                                            ReusedExchange [ca_address_sk,ca_county] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt
index e3c659e278..c9ff159239 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt
@@ -1,33 +1,37 @@
 == Physical Plan ==
-* HashAggregate (29)
-+- Exchange (28)
-   +- * HashAggregate (27)
-      +- * Project (26)
-         +- * BroadcastHashJoin Inner BuildRight (25)
-            :- * Project (23)
-            :  +- * BroadcastHashJoin Inner BuildRight (22)
-            :     :- * Project (10)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-            :     :     :- * ColumnarToRow (3)
-            :     :     :  +- CometFilter (2)
-            :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-            :     :     +- BroadcastExchange (8)
-            :     :        +- * ColumnarToRow (7)
-            :     :           +- CometProject (6)
-            :     :              +- CometFilter (5)
-            :     :                 +- CometScan parquet spark_catalog.default.item (4)
-            :     +- BroadcastExchange (21)
-            :        +- * Filter (20)
-            :           +- * HashAggregate (19)
-            :              +- Exchange (18)
-            :                 +- * HashAggregate (17)
-            :                    +- * Project (16)
-            :                       +- * BroadcastHashJoin Inner BuildRight (15)
-            :                          :- * ColumnarToRow (13)
-            :                          :  +- CometFilter (12)
-            :                          :     +- CometScan parquet spark_catalog.default.catalog_sales (11)
-            :                          +- ReusedExchange (14)
-            +- ReusedExchange (24)
+* ColumnarToRow (33)
++- CometHashAggregate (32)
+   +- CometColumnarExchange (31)
+      +- RowToColumnar (30)
+         +- * HashAggregate (29)
+            +- * Project (28)
+               +- * BroadcastHashJoin Inner BuildRight (27)
+                  :- * Project (25)
+                  :  +- * BroadcastHashJoin Inner BuildRight (24)
+                  :     :- * Project (10)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                  :     :     :- * ColumnarToRow (3)
+                  :     :     :  +- CometFilter (2)
+                  :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                  :     :     +- BroadcastExchange (8)
+                  :     :        +- * ColumnarToRow (7)
+                  :     :           +- CometProject (6)
+                  :     :              +- CometFilter (5)
+                  :     :                 +- CometScan parquet spark_catalog.default.item (4)
+                  :     +- BroadcastExchange (23)
+                  :        +- * ColumnarToRow (22)
+                  :           +- CometFilter (21)
+                  :              +- CometHashAggregate (20)
+                  :                 +- CometColumnarExchange (19)
+                  :                    +- RowToColumnar (18)
+                  :                       +- * HashAggregate (17)
+                  :                          +- * Project (16)
+                  :                             +- * BroadcastHashJoin Inner BuildRight (15)
+                  :                                :- * ColumnarToRow (13)
+                  :                                :  +- CometFilter (12)
+                  :                                :     +- CometScan parquet spark_catalog.default.catalog_sales (11)
+                  :                                +- ReusedExchange (14)
+                  +- ReusedExchange (26)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -92,7 +96,7 @@ Condition : isnotnull(cs_item_sk#7)
 (13) ColumnarToRow [codegen id : 3]
 Input [3]: [cs_item_sk#7, cs_ext_discount_amt#8, cs_sold_date_sk#9]
 
-(14) ReusedExchange [Reuses operator id: 34]
+(14) ReusedExchange [Reuses operator id: 38]
 Output [1]: [d_date_sk#11]
 
 (15) BroadcastHashJoin [codegen id : 3]
@@ -112,96 +116,104 @@ Functions [1]: [partial_avg(UnscaledValue(cs_ext_discount_amt#8))]
 Aggregate Attributes [2]: [sum#12, count#13]
 Results [3]: [cs_item_sk#7, sum#14, count#15]
 
-(18) Exchange
+(18) RowToColumnar
 Input [3]: [cs_item_sk#7, sum#14, count#15]
-Arguments: hashpartitioning(cs_item_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(19) HashAggregate [codegen id : 4]
+(19) CometColumnarExchange
+Input [3]: [cs_item_sk#7, sum#14, count#15]
+Arguments: hashpartitioning(cs_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(20) CometHashAggregate
 Input [3]: [cs_item_sk#7, sum#14, count#15]
 Keys [1]: [cs_item_sk#7]
 Functions [1]: [avg(UnscaledValue(cs_ext_discount_amt#8))]
-Aggregate Attributes [1]: [avg(UnscaledValue(cs_ext_discount_amt#8))#16]
-Results [2]: [(1.3 * cast((avg(UnscaledValue(cs_ext_discount_amt#8))#16 / 100.0) as decimal(11,6))) AS (1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
 
-(20) Filter [codegen id : 4]
-Input [2]: [(1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
-Condition : isnotnull((1.3 * avg(cs_ext_discount_amt))#17)
+(21) CometFilter
+Input [2]: [(1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
+Condition : isnotnull((1.3 * avg(cs_ext_discount_amt))#16)
+
+(22) ColumnarToRow [codegen id : 4]
+Input [2]: [(1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
 
-(21) BroadcastExchange
-Input [2]: [(1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
+(23) BroadcastExchange
+Input [2]: [(1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint)),false), [plan_id=3]
 
-(22) BroadcastHashJoin [codegen id : 6]
+(24) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [i_item_sk#5]
 Right keys [1]: [cs_item_sk#7]
 Join type: Inner
-Join condition: (cast(cs_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(cs_ext_discount_amt))#17)
+Join condition: (cast(cs_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(cs_ext_discount_amt))#16)
 
-(23) Project [codegen id : 6]
+(25) Project [codegen id : 6]
 Output [2]: [cs_ext_discount_amt#2, cs_sold_date_sk#3]
-Input [5]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, i_item_sk#5, (1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
+Input [5]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, i_item_sk#5, (1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
 
-(24) ReusedExchange [Reuses operator id: 34]
-Output [1]: [d_date_sk#18]
+(26) ReusedExchange [Reuses operator id: 38]
+Output [1]: [d_date_sk#17]
 
-(25) BroadcastHashJoin [codegen id : 6]
+(27) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_sold_date_sk#3]
-Right keys [1]: [d_date_sk#18]
+Right keys [1]: [d_date_sk#17]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
+(28) Project [codegen id : 6]
 Output [1]: [cs_ext_discount_amt#2]
-Input [3]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, d_date_sk#18]
+Input [3]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, d_date_sk#17]
 
-(27) HashAggregate [codegen id : 6]
+(29) HashAggregate [codegen id : 6]
 Input [1]: [cs_ext_discount_amt#2]
 Keys: []
 Functions [1]: [partial_sum(UnscaledValue(cs_ext_discount_amt#2))]
-Aggregate Attributes [1]: [sum#19]
-Results [1]: [sum#20]
+Aggregate Attributes [1]: [sum#18]
+Results [1]: [sum#19]
 
-(28) Exchange
-Input [1]: [sum#20]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
+(30) RowToColumnar
+Input [1]: [sum#19]
 
-(29) HashAggregate [codegen id : 7]
-Input [1]: [sum#20]
+(31) CometColumnarExchange
+Input [1]: [sum#19]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(32) CometHashAggregate
+Input [1]: [sum#19]
 Keys: []
 Functions [1]: [sum(UnscaledValue(cs_ext_discount_amt#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_discount_amt#2))#21]
-Results [1]: [MakeDecimal(sum(UnscaledValue(cs_ext_discount_amt#2))#21,17,2) AS excess discount amount#22]
+
+(33) ColumnarToRow [codegen id : 7]
+Input [1]: [excess discount amount#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (34)
-+- * ColumnarToRow (33)
-   +- CometProject (32)
-      +- CometFilter (31)
-         +- CometScan parquet spark_catalog.default.date_dim (30)
+BroadcastExchange (38)
++- * ColumnarToRow (37)
+   +- CometProject (36)
+      +- CometFilter (35)
+         +- CometScan parquet spark_catalog.default.date_dim (34)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#18, d_date#23]
+Output [2]: [d_date_sk#17, d_date#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), LessThanOrEqual(d_date,2000-04-26), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(31) CometFilter
-Input [2]: [d_date_sk#18, d_date#23]
-Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2000-01-27)) AND (d_date#23 <= 2000-04-26)) AND isnotnull(d_date_sk#18))
+(35) CometFilter
+Input [2]: [d_date_sk#17, d_date#21]
+Condition : (((isnotnull(d_date#21) AND (d_date#21 >= 2000-01-27)) AND (d_date#21 <= 2000-04-26)) AND isnotnull(d_date_sk#17))
 
-(32) CometProject
-Input [2]: [d_date_sk#18, d_date#23]
-Arguments: [d_date_sk#18], [d_date_sk#18]
+(36) CometProject
+Input [2]: [d_date_sk#17, d_date#21]
+Arguments: [d_date_sk#17], [d_date_sk#17]
 
-(33) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#18]
+(37) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#17]
 
-(34) BroadcastExchange
-Input [1]: [d_date_sk#18]
+(38) BroadcastExchange
+Input [1]: [d_date_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
 Subquery:2 Hosting operator id = 11 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt
index 146a33fdd2..035779c3f6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt
@@ -1,52 +1,56 @@
 WholeStageCodegen (7)
-  HashAggregate [sum] [sum(UnscaledValue(cs_ext_discount_amt)),excess discount amount,sum]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (6)
-          HashAggregate [cs_ext_discount_amt] [sum,sum]
-            Project [cs_ext_discount_amt]
-              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                Project [cs_ext_discount_amt,cs_sold_date_sk]
-                  BroadcastHashJoin [i_item_sk,cs_item_sk,cs_ext_discount_amt,(1.3 * avg(cs_ext_discount_amt))]
-                    Project [cs_ext_discount_amt,cs_sold_date_sk,i_item_sk]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cs_item_sk,cs_ext_discount_amt]
-                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
-                                SubqueryBroadcast [d_date_sk] #1
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [d_date_sk]
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+      CometHashAggregate [sum]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (6)
+              HashAggregate [cs_ext_discount_amt] [sum,sum]
+                Project [cs_ext_discount_amt]
+                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                    Project [cs_ext_discount_amt,cs_sold_date_sk]
+                      BroadcastHashJoin [i_item_sk,cs_item_sk,cs_ext_discount_amt,(1.3 * avg(cs_ext_discount_amt))]
+                        Project [cs_ext_discount_amt,cs_sold_date_sk,i_item_sk]
+                          BroadcastHashJoin [cs_item_sk,i_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [cs_item_sk,cs_ext_discount_amt]
+                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_date,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                            InputAdapter
+                              BroadcastExchange #3
+                                WholeStageCodegen (1)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [i_item_sk]
+                                        CometFilter [i_manufact_id,i_item_sk]
+                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
                         InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (1)
+                          BroadcastExchange #4
+                            WholeStageCodegen (4)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [i_item_sk]
-                                    CometFilter [i_manufact_id,i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
+                                  CometFilter [(1.3 * avg(cs_ext_discount_amt))]
+                                    CometHashAggregate [cs_item_sk,sum,count]
+                                      CometColumnarExchange [cs_item_sk] #5
+                                        RowToColumnar
+                                          WholeStageCodegen (3)
+                                            HashAggregate [cs_item_sk,cs_ext_discount_amt] [sum,count,sum,count]
+                                              Project [cs_item_sk,cs_ext_discount_amt]
+                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [cs_item_sk]
+                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
+                                                          ReusedSubquery [d_date_sk] #1
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk] #2
                     InputAdapter
-                      BroadcastExchange #4
-                        WholeStageCodegen (4)
-                          Filter [(1.3 * avg(cs_ext_discount_amt))]
-                            HashAggregate [cs_item_sk,sum,count] [avg(UnscaledValue(cs_ext_discount_amt)),(1.3 * avg(cs_ext_discount_amt)),sum,count]
-                              InputAdapter
-                                Exchange [cs_item_sk] #5
-                                  WholeStageCodegen (3)
-                                    HashAggregate [cs_item_sk,cs_ext_discount_amt] [sum,count,sum,count]
-                                      Project [cs_item_sk,cs_ext_discount_amt]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #2
-                InputAdapter
-                  ReusedExchange [d_date_sk] #2
+                      ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
index d7dda8078a..3249f9fa01 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
@@ -1,67 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (63)
-+- * HashAggregate (62)
-   +- Exchange (61)
-      +- * HashAggregate (60)
-         +- Union (59)
-            :- * HashAggregate (28)
-            :  +- Exchange (27)
-            :     +- * HashAggregate (26)
-            :        +- * Project (25)
-            :           +- * BroadcastHashJoin Inner BuildRight (24)
-            :              :- * Project (13)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (12)
-            :              :     :- * Project (6)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-            :              :     :     :- * ColumnarToRow (3)
-            :              :     :     :  +- CometFilter (2)
-            :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :              :     :     +- ReusedExchange (4)
-            :              :     +- BroadcastExchange (11)
-            :              :        +- * ColumnarToRow (10)
-            :              :           +- CometProject (9)
-            :              :              +- CometFilter (8)
-            :              :                 +- CometScan parquet spark_catalog.default.customer_address (7)
-            :              +- BroadcastExchange (23)
-            :                 +- * BroadcastHashJoin LeftSemi BuildRight (22)
-            :                    :- * ColumnarToRow (16)
-            :                    :  +- CometFilter (15)
-            :                    :     +- CometScan parquet spark_catalog.default.item (14)
-            :                    +- BroadcastExchange (21)
-            :                       +- * ColumnarToRow (20)
-            :                          +- CometProject (19)
-            :                             +- CometFilter (18)
-            :                                +- CometScan parquet spark_catalog.default.item (17)
-            :- * HashAggregate (43)
-            :  +- Exchange (42)
-            :     +- * HashAggregate (41)
-            :        +- * Project (40)
-            :           +- * BroadcastHashJoin Inner BuildRight (39)
-            :              :- * Project (37)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (36)
-            :              :     :- * Project (34)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (33)
-            :              :     :     :- * ColumnarToRow (31)
-            :              :     :     :  +- CometFilter (30)
-            :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (29)
-            :              :     :     +- ReusedExchange (32)
-            :              :     +- ReusedExchange (35)
-            :              +- ReusedExchange (38)
-            +- * HashAggregate (58)
-               +- Exchange (57)
-                  +- * HashAggregate (56)
-                     +- * Project (55)
-                        +- * BroadcastHashJoin Inner BuildRight (54)
-                           :- * Project (52)
-                           :  +- * BroadcastHashJoin Inner BuildRight (51)
-                           :     :- * Project (49)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (48)
-                           :     :     :- * ColumnarToRow (46)
-                           :     :     :  +- CometFilter (45)
-                           :     :     :     +- CometScan parquet spark_catalog.default.web_sales (44)
-                           :     :     +- ReusedExchange (47)
-                           :     +- ReusedExchange (50)
-                           +- ReusedExchange (53)
+* ColumnarToRow (67)
++- CometTakeOrderedAndProject (66)
+   +- CometHashAggregate (65)
+      +- CometColumnarExchange (64)
+         +- CometHashAggregate (63)
+            +- CometUnion (62)
+               :- CometHashAggregate (29)
+               :  +- CometColumnarExchange (28)
+               :     +- RowToColumnar (27)
+               :        +- * HashAggregate (26)
+               :           +- * Project (25)
+               :              +- * BroadcastHashJoin Inner BuildRight (24)
+               :                 :- * Project (13)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :                 :     :- * Project (6)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :                 :     :     :- * ColumnarToRow (3)
+               :                 :     :     :  +- CometFilter (2)
+               :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                 :     :     +- ReusedExchange (4)
+               :                 :     +- BroadcastExchange (11)
+               :                 :        +- * ColumnarToRow (10)
+               :                 :           +- CometProject (9)
+               :                 :              +- CometFilter (8)
+               :                 :                 +- CometScan parquet spark_catalog.default.customer_address (7)
+               :                 +- BroadcastExchange (23)
+               :                    +- * BroadcastHashJoin LeftSemi BuildRight (22)
+               :                       :- * ColumnarToRow (16)
+               :                       :  +- CometFilter (15)
+               :                       :     +- CometScan parquet spark_catalog.default.item (14)
+               :                       +- BroadcastExchange (21)
+               :                          +- * ColumnarToRow (20)
+               :                             +- CometProject (19)
+               :                                +- CometFilter (18)
+               :                                   +- CometScan parquet spark_catalog.default.item (17)
+               :- CometHashAggregate (45)
+               :  +- CometColumnarExchange (44)
+               :     +- RowToColumnar (43)
+               :        +- * HashAggregate (42)
+               :           +- * Project (41)
+               :              +- * BroadcastHashJoin Inner BuildRight (40)
+               :                 :- * Project (38)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (37)
+               :                 :     :- * Project (35)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+               :                 :     :     :- * ColumnarToRow (32)
+               :                 :     :     :  +- CometFilter (31)
+               :                 :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
+               :                 :     :     +- ReusedExchange (33)
+               :                 :     +- ReusedExchange (36)
+               :                 +- ReusedExchange (39)
+               +- CometHashAggregate (61)
+                  +- CometColumnarExchange (60)
+                     +- RowToColumnar (59)
+                        +- * HashAggregate (58)
+                           +- * Project (57)
+                              +- * BroadcastHashJoin Inner BuildRight (56)
+                                 :- * Project (54)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (53)
+                                 :     :- * Project (51)
+                                 :     :  +- * BroadcastHashJoin Inner BuildRight (50)
+                                 :     :     :- * ColumnarToRow (48)
+                                 :     :     :  +- CometFilter (47)
+                                 :     :     :     +- CometScan parquet spark_catalog.default.web_sales (46)
+                                 :     :     +- ReusedExchange (49)
+                                 :     +- ReusedExchange (52)
+                                 +- ReusedExchange (55)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -79,7 +83,7 @@ Condition : (isnotnull(ss_addr_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_addr_sk#2, ss_ext_sales_price#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 68]
+(4) ReusedExchange [Reuses operator id: 72]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -187,219 +191,224 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#3))]
 Aggregate Attributes [1]: [sum#13]
 Results [2]: [i_manufact_id#10, sum#14]
 
-(27) Exchange
+(27) RowToColumnar
 Input [2]: [i_manufact_id#10, sum#14]
-Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 6]
+(28) CometColumnarExchange
+Input [2]: [i_manufact_id#10, sum#14]
+Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [2]: [i_manufact_id#10, sum#14]
 Keys [1]: [i_manufact_id#10]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#3))#15]
-Results [2]: [i_manufact_id#10, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#15,17,2) AS total_sales#16]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+Output [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#20), dynamicpruningexpression(cs_sold_date_sk#20 IN dynamicpruning#21)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#18), dynamicpruningexpression(cs_sold_date_sk#18 IN dynamicpruning#19)]
 PushedFilters: [IsNotNull(cs_bill_addr_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_addr_sk:int,cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(30) CometFilter
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
-Condition : (isnotnull(cs_bill_addr_sk#17) AND isnotnull(cs_item_sk#18))
+(31) CometFilter
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+Condition : (isnotnull(cs_bill_addr_sk#15) AND isnotnull(cs_item_sk#16))
 
-(31) ColumnarToRow [codegen id : 11]
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+(32) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
 
-(32) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#22]
+(33) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#20]
 
-(33) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_sold_date_sk#20]
-Right keys [1]: [d_date_sk#22]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#18]
+Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 11]
-Output [3]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19]
-Input [5]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20, d_date_sk#22]
+(35) Project [codegen id : 10]
+Output [3]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17]
+Input [5]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18, d_date_sk#20]
 
-(35) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#23]
+(36) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#21]
 
-(36) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_bill_addr_sk#17]
-Right keys [1]: [ca_address_sk#23]
+(37) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_bill_addr_sk#15]
+Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 11]
-Output [2]: [cs_item_sk#18, cs_ext_sales_price#19]
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, ca_address_sk#23]
+(38) Project [codegen id : 10]
+Output [2]: [cs_item_sk#16, cs_ext_sales_price#17]
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, ca_address_sk#21]
 
-(38) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#24, i_manufact_id#25]
+(39) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#22, i_manufact_id#23]
 
-(39) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_item_sk#18]
-Right keys [1]: [i_item_sk#24]
+(40) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_item_sk#16]
+Right keys [1]: [i_item_sk#22]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 11]
-Output [2]: [cs_ext_sales_price#19, i_manufact_id#25]
-Input [4]: [cs_item_sk#18, cs_ext_sales_price#19, i_item_sk#24, i_manufact_id#25]
+(41) Project [codegen id : 10]
+Output [2]: [cs_ext_sales_price#17, i_manufact_id#23]
+Input [4]: [cs_item_sk#16, cs_ext_sales_price#17, i_item_sk#22, i_manufact_id#23]
+
+(42) HashAggregate [codegen id : 10]
+Input [2]: [cs_ext_sales_price#17, i_manufact_id#23]
+Keys [1]: [i_manufact_id#23]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#17))]
+Aggregate Attributes [1]: [sum#24]
+Results [2]: [i_manufact_id#23, sum#25]
 
-(41) HashAggregate [codegen id : 11]
-Input [2]: [cs_ext_sales_price#19, i_manufact_id#25]
-Keys [1]: [i_manufact_id#25]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#19))]
-Aggregate Attributes [1]: [sum#26]
-Results [2]: [i_manufact_id#25, sum#27]
+(43) RowToColumnar
+Input [2]: [i_manufact_id#23, sum#25]
 
-(42) Exchange
-Input [2]: [i_manufact_id#25, sum#27]
-Arguments: hashpartitioning(i_manufact_id#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(44) CometColumnarExchange
+Input [2]: [i_manufact_id#23, sum#25]
+Arguments: hashpartitioning(i_manufact_id#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(43) HashAggregate [codegen id : 12]
-Input [2]: [i_manufact_id#25, sum#27]
-Keys [1]: [i_manufact_id#25]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#19))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#19))#28]
-Results [2]: [i_manufact_id#25, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#19))#28,17,2) AS total_sales#29]
+(45) CometHashAggregate
+Input [2]: [i_manufact_id#23, sum#25]
+Keys [1]: [i_manufact_id#23]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#17))]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+Output [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#29), dynamicpruningexpression(ws_sold_date_sk#29 IN dynamicpruning#30)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk), IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(45) CometFilter
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
-Condition : (isnotnull(ws_bill_addr_sk#31) AND isnotnull(ws_item_sk#30))
+(47) CometFilter
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+Condition : (isnotnull(ws_bill_addr_sk#27) AND isnotnull(ws_item_sk#26))
 
-(46) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+(48) ColumnarToRow [codegen id : 15]
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
 
-(47) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#35]
+(49) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#31]
 
-(48) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#33]
-Right keys [1]: [d_date_sk#35]
+(50) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_sold_date_sk#29]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 17]
-Output [3]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32]
-Input [5]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33, d_date_sk#35]
+(51) Project [codegen id : 15]
+Output [3]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28]
+Input [5]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29, d_date_sk#31]
 
-(50) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#36]
+(52) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#32]
 
-(51) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_bill_addr_sk#31]
-Right keys [1]: [ca_address_sk#36]
+(53) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_bill_addr_sk#27]
+Right keys [1]: [ca_address_sk#32]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 17]
-Output [2]: [ws_item_sk#30, ws_ext_sales_price#32]
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ca_address_sk#36]
+(54) Project [codegen id : 15]
+Output [2]: [ws_item_sk#26, ws_ext_sales_price#28]
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ca_address_sk#32]
 
-(53) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#37, i_manufact_id#38]
+(55) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#33, i_manufact_id#34]
 
-(54) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_item_sk#30]
-Right keys [1]: [i_item_sk#37]
+(56) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_item_sk#26]
+Right keys [1]: [i_item_sk#33]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 17]
-Output [2]: [ws_ext_sales_price#32, i_manufact_id#38]
-Input [4]: [ws_item_sk#30, ws_ext_sales_price#32, i_item_sk#37, i_manufact_id#38]
+(57) Project [codegen id : 15]
+Output [2]: [ws_ext_sales_price#28, i_manufact_id#34]
+Input [4]: [ws_item_sk#26, ws_ext_sales_price#28, i_item_sk#33, i_manufact_id#34]
 
-(56) HashAggregate [codegen id : 17]
-Input [2]: [ws_ext_sales_price#32, i_manufact_id#38]
-Keys [1]: [i_manufact_id#38]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#32))]
-Aggregate Attributes [1]: [sum#39]
-Results [2]: [i_manufact_id#38, sum#40]
+(58) HashAggregate [codegen id : 15]
+Input [2]: [ws_ext_sales_price#28, i_manufact_id#34]
+Keys [1]: [i_manufact_id#34]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#28))]
+Aggregate Attributes [1]: [sum#35]
+Results [2]: [i_manufact_id#34, sum#36]
 
-(57) Exchange
-Input [2]: [i_manufact_id#38, sum#40]
-Arguments: hashpartitioning(i_manufact_id#38, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(59) RowToColumnar
+Input [2]: [i_manufact_id#34, sum#36]
 
-(58) HashAggregate [codegen id : 18]
-Input [2]: [i_manufact_id#38, sum#40]
-Keys [1]: [i_manufact_id#38]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#32))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#32))#41]
-Results [2]: [i_manufact_id#38, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#32))#41,17,2) AS total_sales#42]
+(60) CometColumnarExchange
+Input [2]: [i_manufact_id#34, sum#36]
+Arguments: hashpartitioning(i_manufact_id#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(59) Union
+(61) CometHashAggregate
+Input [2]: [i_manufact_id#34, sum#36]
+Keys [1]: [i_manufact_id#34]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#28))]
 
-(60) HashAggregate [codegen id : 19]
-Input [2]: [i_manufact_id#10, total_sales#16]
+(62) CometUnion
+Child 0 Input [2]: [i_manufact_id#10, total_sales#37]
+Child 1 Input [2]: [i_manufact_id#23, total_sales#38]
+Child 2 Input [2]: [i_manufact_id#34, total_sales#39]
+
+(63) CometHashAggregate
+Input [2]: [i_manufact_id#10, total_sales#37]
 Keys [1]: [i_manufact_id#10]
-Functions [1]: [partial_sum(total_sales#16)]
-Aggregate Attributes [2]: [sum#43, isEmpty#44]
-Results [3]: [i_manufact_id#10, sum#45, isEmpty#46]
+Functions [1]: [partial_sum(total_sales#37)]
 
-(61) Exchange
-Input [3]: [i_manufact_id#10, sum#45, isEmpty#46]
-Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(64) CometColumnarExchange
+Input [3]: [i_manufact_id#10, sum#40, isEmpty#41]
+Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(62) HashAggregate [codegen id : 20]
-Input [3]: [i_manufact_id#10, sum#45, isEmpty#46]
+(65) CometHashAggregate
+Input [3]: [i_manufact_id#10, sum#40, isEmpty#41]
 Keys [1]: [i_manufact_id#10]
-Functions [1]: [sum(total_sales#16)]
-Aggregate Attributes [1]: [sum(total_sales#16)#47]
-Results [2]: [i_manufact_id#10, sum(total_sales#16)#47 AS total_sales#48]
+Functions [1]: [sum(total_sales#37)]
+
+(66) CometTakeOrderedAndProject
+Input [2]: [i_manufact_id#10, total_sales#42]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_sales#42 ASC NULLS FIRST], output=[i_manufact_id#10,total_sales#42]), 100, [total_sales#42 ASC NULLS FIRST], [i_manufact_id#10, total_sales#42]
 
-(63) TakeOrderedAndProject
-Input [2]: [i_manufact_id#10, total_sales#48]
-Arguments: 100, [total_sales#48 ASC NULLS FIRST], [i_manufact_id#10, total_sales#48]
+(67) ColumnarToRow [codegen id : 16]
+Input [2]: [i_manufact_id#10, total_sales#42]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (68)
-+- * ColumnarToRow (67)
-   +- CometProject (66)
-      +- CometFilter (65)
-         +- CometScan parquet spark_catalog.default.date_dim (64)
+BroadcastExchange (72)
++- * ColumnarToRow (71)
+   +- CometProject (70)
+      +- CometFilter (69)
+         +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#6, d_year#49, d_moy#50]
+Output [3]: [d_date_sk#6, d_year#43, d_moy#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,5), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(65) CometFilter
-Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
-Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 1998)) AND (d_moy#50 = 5)) AND isnotnull(d_date_sk#6))
+(69) CometFilter
+Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
+Condition : ((((isnotnull(d_year#43) AND isnotnull(d_moy#44)) AND (d_year#43 = 1998)) AND (d_moy#44 = 5)) AND isnotnull(d_date_sk#6))
 
-(66) CometProject
-Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
+(70) CometProject
+Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(67) ColumnarToRow [codegen id : 1]
+(71) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(68) BroadcastExchange
+(72) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 29 Hosting Expression = cs_sold_date_sk#20 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 44 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#29 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt
index 4ab82379ff..9dd28b41bf 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt
@@ -1,105 +1,101 @@
-TakeOrderedAndProject [total_sales,i_manufact_id]
-  WholeStageCodegen (20)
-    HashAggregate [i_manufact_id,sum,isEmpty] [sum(total_sales),total_sales,sum,isEmpty]
-      InputAdapter
-        Exchange [i_manufact_id] #1
-          WholeStageCodegen (19)
-            HashAggregate [i_manufact_id,total_sales] [sum,isEmpty,sum,isEmpty]
-              InputAdapter
-                Union
-                  WholeStageCodegen (6)
-                    HashAggregate [i_manufact_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_manufact_id] #2
-                          WholeStageCodegen (5)
-                            HashAggregate [i_manufact_id,ss_ext_sales_price] [sum,sum]
-                              Project [ss_ext_sales_price,i_manufact_id]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                      Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_addr_sk,ss_item_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (16)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [total_sales,i_manufact_id]
+        CometHashAggregate [i_manufact_id,sum,isEmpty]
+          CometColumnarExchange [i_manufact_id] #1
+            CometHashAggregate [i_manufact_id,total_sales]
+              CometUnion
+                CometHashAggregate [i_manufact_id,sum]
+                  CometColumnarExchange [i_manufact_id] #2
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [i_manufact_id,ss_ext_sales_price] [sum,sum]
+                          Project [ss_ext_sales_price,i_manufact_id]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              Project [ss_item_sk,ss_ext_sales_price]
+                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                  Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_addr_sk,ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_year,d_moy,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                  InputAdapter
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
                                           InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                            CometProject [ca_address_sk]
+                                              CometFilter [ca_gmt_offset,ca_address_sk]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (4)
+                                    BroadcastHashJoin [i_manufact_id,i_manufact_id]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
                                       InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (2)
+                                        BroadcastExchange #6
+                                          WholeStageCodegen (3)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [ca_address_sk]
-                                                  CometFilter [ca_gmt_offset,ca_address_sk]
-                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                                  InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (4)
-                                        BroadcastHashJoin [i_manufact_id,i_manufact_id]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [i_item_sk]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (3)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [i_manufact_id]
-                                                      CometFilter [i_category]
-                                                        CometScan parquet spark_catalog.default.item [i_category,i_manufact_id]
-                  WholeStageCodegen (12)
-                    HashAggregate [i_manufact_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_manufact_id] #7
-                          WholeStageCodegen (11)
-                            HashAggregate [i_manufact_id,cs_ext_sales_price] [sum,sum]
-                              Project [cs_ext_sales_price,i_manufact_id]
-                                BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                  Project [cs_item_sk,cs_ext_sales_price]
-                                    BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
-                                      Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_bill_addr_sk,cs_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                                CometProject [i_manufact_id]
+                                                  CometFilter [i_category]
+                                                    CometScan parquet spark_catalog.default.item [i_category,i_manufact_id]
+                CometHashAggregate [i_manufact_id,sum]
+                  CometColumnarExchange [i_manufact_id] #7
+                    RowToColumnar
+                      WholeStageCodegen (10)
+                        HashAggregate [i_manufact_id,cs_ext_sales_price] [sum,sum]
+                          Project [cs_ext_sales_price,i_manufact_id]
+                            BroadcastHashJoin [cs_item_sk,i_item_sk]
+                              Project [cs_item_sk,cs_ext_sales_price]
+                                BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
+                                  Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [cs_bill_addr_sk,cs_item_sk]
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        ReusedExchange [ca_address_sk] #4
+                                        ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    ReusedExchange [i_item_sk,i_manufact_id] #5
-                  WholeStageCodegen (18)
-                    HashAggregate [i_manufact_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_manufact_id] #8
-                          WholeStageCodegen (17)
-                            HashAggregate [i_manufact_id,ws_ext_sales_price] [sum,sum]
-                              Project [ws_ext_sales_price,i_manufact_id]
-                                BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                  Project [ws_item_sk,ws_ext_sales_price]
-                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                      Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_addr_sk,ws_item_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                    ReusedExchange [ca_address_sk] #4
+                              InputAdapter
+                                ReusedExchange [i_item_sk,i_manufact_id] #5
+                CometHashAggregate [i_manufact_id,sum]
+                  CometColumnarExchange [i_manufact_id] #8
+                    RowToColumnar
+                      WholeStageCodegen (15)
+                        HashAggregate [i_manufact_id,ws_ext_sales_price] [sum,sum]
+                          Project [ws_ext_sales_price,i_manufact_id]
+                            BroadcastHashJoin [ws_item_sk,i_item_sk]
+                              Project [ws_item_sk,ws_ext_sales_price]
+                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                  Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_addr_sk,ws_item_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        ReusedExchange [ca_address_sk] #4
+                                        ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    ReusedExchange [i_item_sk,i_manufact_id] #5
+                                    ReusedExchange [ca_address_sk] #4
+                              InputAdapter
+                                ReusedExchange [i_item_sk,i_manufact_id] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt
index 64f2b3c312..d2ff5ebe98 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt
@@ -1,36 +1,40 @@
 == Physical Plan ==
-* Sort (32)
-+- Exchange (31)
-   +- * Project (30)
-      +- * BroadcastHashJoin Inner BuildRight (29)
-         :- * Filter (24)
-         :  +- * HashAggregate (23)
-         :     +- Exchange (22)
-         :        +- * HashAggregate (21)
-         :           +- * Project (20)
-         :              +- * BroadcastHashJoin Inner BuildRight (19)
-         :                 :- * Project (13)
-         :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
-         :                 :     :- * Project (6)
-         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-         :                 :     :     :- * ColumnarToRow (3)
-         :                 :     :     :  +- CometFilter (2)
-         :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-         :                 :     :     +- ReusedExchange (4)
-         :                 :     +- BroadcastExchange (11)
-         :                 :        +- * ColumnarToRow (10)
-         :                 :           +- CometProject (9)
-         :                 :              +- CometFilter (8)
-         :                 :                 +- CometScan parquet spark_catalog.default.store (7)
-         :                 +- BroadcastExchange (18)
-         :                    +- * ColumnarToRow (17)
-         :                       +- CometProject (16)
-         :                          +- CometFilter (15)
-         :                             +- CometScan parquet spark_catalog.default.household_demographics (14)
-         +- BroadcastExchange (28)
-            +- * ColumnarToRow (27)
-               +- CometFilter (26)
-                  +- CometScan parquet spark_catalog.default.customer (25)
+* ColumnarToRow (36)
++- CometSort (35)
+   +- CometColumnarExchange (34)
+      +- RowToColumnar (33)
+         +- * Project (32)
+            +- * BroadcastHashJoin Inner BuildRight (31)
+               :- * ColumnarToRow (26)
+               :  +- CometFilter (25)
+               :     +- CometHashAggregate (24)
+               :        +- CometColumnarExchange (23)
+               :           +- RowToColumnar (22)
+               :              +- * HashAggregate (21)
+               :                 +- * Project (20)
+               :                    +- * BroadcastHashJoin Inner BuildRight (19)
+               :                       :- * Project (13)
+               :                       :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :                       :     :- * Project (6)
+               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :                       :     :     :- * ColumnarToRow (3)
+               :                       :     :     :  +- CometFilter (2)
+               :                       :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                       :     :     +- ReusedExchange (4)
+               :                       :     +- BroadcastExchange (11)
+               :                       :        +- * ColumnarToRow (10)
+               :                       :           +- CometProject (9)
+               :                       :              +- CometFilter (8)
+               :                       :                 +- CometScan parquet spark_catalog.default.store (7)
+               :                       +- BroadcastExchange (18)
+               :                          +- * ColumnarToRow (17)
+               :                             +- CometProject (16)
+               :                                +- CometFilter (15)
+               :                                   +- CometScan parquet spark_catalog.default.household_demographics (14)
+               +- BroadcastExchange (30)
+                  +- * ColumnarToRow (29)
+                     +- CometFilter (28)
+                        +- CometScan parquet spark_catalog.default.customer (27)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -48,7 +52,7 @@ Condition : ((isnotnull(ss_store_sk#3) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 37]
+(4) ReusedExchange [Reuses operator id: 41]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -132,86 +136,96 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#14]
 Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 
-(22) Exchange
+(22) RowToColumnar
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) HashAggregate [codegen id : 6]
+(23) CometColumnarExchange
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(24) CometHashAggregate
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 Keys [2]: [ss_ticket_number#4, ss_customer_sk#1]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#16]
-Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count(1)#16 AS cnt#17]
 
-(24) Filter [codegen id : 6]
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17]
-Condition : ((cnt#17 >= 15) AND (cnt#17 <= 20))
+(25) CometFilter
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
+Condition : ((cnt#16 >= 15) AND (cnt#16 <= 20))
+
+(26) ColumnarToRow [codegen id : 6]
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+Output [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string>
 
-(26) CometFilter
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
-Condition : isnotnull(c_customer_sk#18)
+(28) CometFilter
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+Condition : isnotnull(c_customer_sk#17)
 
-(27) ColumnarToRow [codegen id : 5]
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(29) ColumnarToRow [codegen id : 5]
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 
-(28) BroadcastExchange
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(30) BroadcastExchange
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 6]
+(31) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#18]
+Right keys [1]: [c_customer_sk#17]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17, c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(32) Project [codegen id : 6]
+Output [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16, c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+
+(33) RowToColumnar
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+
+(34) CometColumnarExchange
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Arguments: rangepartitioning(c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(31) Exchange
-Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Arguments: rangepartitioning(c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(35) CometSort
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Arguments: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16], [c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST]
 
-(32) Sort [codegen id : 7]
-Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Arguments: [c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST], true, 0
+(36) ColumnarToRow [codegen id : 7]
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (41)
++- * ColumnarToRow (40)
+   +- CometProject (39)
+      +- CometFilter (38)
+         +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#23, d_dom#24]
+Output [3]: [d_date_sk#7, d_year#22, d_dom#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(And(GreaterThanOrEqual(d_dom,1),LessThanOrEqual(d_dom,3)),And(GreaterThanOrEqual(d_dom,25),LessThanOrEqual(d_dom,28))), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(34) CometFilter
-Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
-Condition : (((((d_dom#24 >= 1) AND (d_dom#24 <= 3)) OR ((d_dom#24 >= 25) AND (d_dom#24 <= 28))) AND d_year#23 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
+(38) CometFilter
+Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
+Condition : (((((d_dom#23 >= 1) AND (d_dom#23 <= 3)) OR ((d_dom#23 >= 25) AND (d_dom#23 <= 28))) AND d_year#22 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
 
-(35) CometProject
-Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
+(39) CometProject
+Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(36) ColumnarToRow [codegen id : 1]
+(40) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(37) BroadcastExchange
+(41) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt
index 80405a784d..eed22a0307 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt
@@ -1,56 +1,60 @@
 WholeStageCodegen (7)
-  Sort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag]
+  ColumnarToRow
     InputAdapter
-      Exchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag] #1
-        WholeStageCodegen (6)
-          Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
-            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-              Filter [cnt]
-                HashAggregate [ss_ticket_number,ss_customer_sk,count] [count(1),cnt,count]
-                  InputAdapter
-                    Exchange [ss_ticket_number,ss_customer_sk] #2
-                      WholeStageCodegen (4)
-                        HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
-                          Project [ss_customer_sk,ss_ticket_number]
-                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                              Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
-                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_dom,d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                  InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+      CometSort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag]
+        CometColumnarExchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag] #1
+          RowToColumnar
+            WholeStageCodegen (6)
+              Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
+                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [cnt]
+                        CometHashAggregate [ss_ticket_number,ss_customer_sk,count]
+                          CometColumnarExchange [ss_ticket_number,ss_customer_sk] #2
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
+                                  Project [ss_customer_sk,ss_ticket_number]
+                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                      Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
+                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                          Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_dom,d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
                                           InputAdapter
-                                            CometProject [s_store_sk]
-                                              CometFilter [s_county,s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (3)
-                                    ColumnarToRow
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [s_store_sk]
+                                                      CometFilter [s_county,s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
                                       InputAdapter
-                                        CometProject [hd_demo_sk]
-                                          CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
-                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
-              InputAdapter
-                BroadcastExchange #6
-                  WholeStageCodegen (5)
-                    ColumnarToRow
-                      InputAdapter
-                        CometFilter [c_customer_sk]
-                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (3)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [hd_demo_sk]
+                                                  CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
+                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
+                  InputAdapter
+                    BroadcastExchange #6
+                      WholeStageCodegen (5)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [c_customer_sk]
+                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt
index de7514efce..4d8be2c63a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt
@@ -1,46 +1,48 @@
 == Physical Plan ==
-TakeOrderedAndProject (42)
-+- * HashAggregate (41)
-   +- Exchange (40)
-      +- * HashAggregate (39)
-         +- * Project (38)
-            +- * BroadcastHashJoin Inner BuildRight (37)
-               :- * Project (32)
-               :  +- * BroadcastHashJoin Inner BuildRight (31)
-               :     :- * Project (26)
-               :     :  +- * Filter (25)
-               :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
-               :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
-               :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-               :     :        :  :  :- * ColumnarToRow (3)
-               :     :        :  :  :  +- CometFilter (2)
-               :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-               :     :        :  :  +- BroadcastExchange (9)
-               :     :        :  :     +- * Project (8)
-               :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :        :  :           :- * ColumnarToRow (5)
-               :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-               :     :        :  :           +- ReusedExchange (6)
-               :     :        :  +- BroadcastExchange (16)
-               :     :        :     +- * Project (15)
-               :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :        :           :- * ColumnarToRow (12)
-               :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-               :     :        :           +- ReusedExchange (13)
-               :     :        +- BroadcastExchange (23)
-               :     :           +- * Project (22)
-               :     :              +- * BroadcastHashJoin Inner BuildRight (21)
-               :     :                 :- * ColumnarToRow (19)
-               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-               :     :                 +- ReusedExchange (20)
-               :     +- BroadcastExchange (30)
-               :        +- * ColumnarToRow (29)
-               :           +- CometFilter (28)
-               :              +- CometScan parquet spark_catalog.default.customer_address (27)
-               +- BroadcastExchange (36)
-                  +- * ColumnarToRow (35)
-                     +- CometFilter (34)
-                        +- CometScan parquet spark_catalog.default.customer_demographics (33)
+* ColumnarToRow (44)
++- CometTakeOrderedAndProject (43)
+   +- CometHashAggregate (42)
+      +- CometColumnarExchange (41)
+         +- RowToColumnar (40)
+            +- * HashAggregate (39)
+               +- * Project (38)
+                  +- * BroadcastHashJoin Inner BuildRight (37)
+                     :- * Project (32)
+                     :  +- * BroadcastHashJoin Inner BuildRight (31)
+                     :     :- * Project (26)
+                     :     :  +- * Filter (25)
+                     :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
+                     :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
+                     :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+                     :     :        :  :  :- * ColumnarToRow (3)
+                     :     :        :  :  :  +- CometFilter (2)
+                     :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+                     :     :        :  :  +- BroadcastExchange (9)
+                     :     :        :  :     +- * Project (8)
+                     :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+                     :     :        :  :           :- * ColumnarToRow (5)
+                     :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+                     :     :        :  :           +- ReusedExchange (6)
+                     :     :        :  +- BroadcastExchange (16)
+                     :     :        :     +- * Project (15)
+                     :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :        :           :- * ColumnarToRow (12)
+                     :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+                     :     :        :           +- ReusedExchange (13)
+                     :     :        +- BroadcastExchange (23)
+                     :     :           +- * Project (22)
+                     :     :              +- * BroadcastHashJoin Inner BuildRight (21)
+                     :     :                 :- * ColumnarToRow (19)
+                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+                     :     :                 +- ReusedExchange (20)
+                     :     +- BroadcastExchange (30)
+                     :        +- * ColumnarToRow (29)
+                     :           +- CometFilter (28)
+                     :              +- CometScan parquet spark_catalog.default.customer_address (27)
+                     +- BroadcastExchange (36)
+                        +- * ColumnarToRow (35)
+                           +- CometFilter (34)
+                              +- CometScan parquet spark_catalog.default.customer_demographics (33)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -67,7 +69,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#6, ss_sold_date_sk#7]
 
-(6) ReusedExchange [Reuses operator id: 47]
+(6) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#9]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -100,7 +102,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#10, ws_sold_date_sk#11]
 
-(13) ReusedExchange [Reuses operator id: 47]
+(13) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#13]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -133,7 +135,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#14, cs_sold_date_sk#15]
 
-(20) ReusedExchange [Reuses operator id: 47]
+(20) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#17]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -227,50 +229,54 @@ Functions [10]: [partial_count(1), partial_min(cd_dep_count#23), partial_max(cd_
 Aggregate Attributes [13]: [count#26, min#27, max#28, sum#29, count#30, min#31, max#32, sum#33, count#34, min#35, max#36, sum#37, count#38]
 Results [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
 
-(40) Exchange
+(40) RowToColumnar
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
-Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) HashAggregate [codegen id : 10]
+(41) CometColumnarExchange
+Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
+Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometHashAggregate
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
 Keys [6]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25]
 Functions [10]: [count(1), min(cd_dep_count#23), max(cd_dep_count#23), avg(cd_dep_count#23), min(cd_dep_employed_count#24), max(cd_dep_employed_count#24), avg(cd_dep_employed_count#24), min(cd_dep_college_count#25), max(cd_dep_college_count#25), avg(cd_dep_college_count#25)]
-Aggregate Attributes [10]: [count(1)#52, min(cd_dep_count#23)#53, max(cd_dep_count#23)#54, avg(cd_dep_count#23)#55, min(cd_dep_employed_count#24)#56, max(cd_dep_employed_count#24)#57, avg(cd_dep_employed_count#24)#58, min(cd_dep_college_count#25)#59, max(cd_dep_college_count#25)#60, avg(cd_dep_college_count#25)#61]
-Results [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, count(1)#52 AS cnt1#62, min(cd_dep_count#23)#53 AS min(cd_dep_count)#63, max(cd_dep_count#23)#54 AS max(cd_dep_count)#64, avg(cd_dep_count#23)#55 AS avg(cd_dep_count)#65, cd_dep_employed_count#24, count(1)#52 AS cnt2#66, min(cd_dep_employed_count#24)#56 AS min(cd_dep_employed_count)#67, max(cd_dep_employed_count#24)#57 AS max(cd_dep_employed_count)#68, avg(cd_dep_employed_count#24)#58 AS avg(cd_dep_employed_count)#69, cd_dep_college_count#25, count(1)#52 AS cnt3#70, min(cd_dep_college_count#25)#59 AS min(cd_dep_college_count)#71, max(cd_dep_college_count#25)#60 AS max(cd_dep_college_count)#72, avg(cd_dep_college_count#25)#61 AS avg(cd_dep_college_count)#73, cd_dep_count#23]
 
-(42) TakeOrderedAndProject
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#62, min(cd_dep_count)#63, max(cd_dep_count)#64, avg(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, min(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, avg(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, min(cd_dep_college_count)#71, max(cd_dep_college_count)#72, avg(cd_dep_college_count)#73, cd_dep_count#23]
-Arguments: 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#62, min(cd_dep_count)#63, max(cd_dep_count)#64, avg(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, min(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, avg(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, min(cd_dep_college_count)#71, max(cd_dep_college_count)#72, avg(cd_dep_college_count)#73]
+(43) CometTakeOrderedAndProject
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#52, min(cd_dep_count)#53, max(cd_dep_count)#54, avg(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, min(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, avg(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, min(cd_dep_college_count)#61, max(cd_dep_college_count)#62, avg(cd_dep_college_count)#63, cd_dep_count#23]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_state#19 ASC NULLS FIRST,cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_dep_count#23 ASC NULLS FIRST,cd_dep_employed_count#24 ASC NULLS FIRST,cd_dep_college_count#25 ASC NULLS FIRST], output=[ca_state#19,cd_gender#21,cd_marital_status#22,cnt1#52,min(cd_dep_count)#53,max(cd_dep_count)#54,avg(cd_dep_count)#55,cd_dep_employed_count#24,cnt2#56,min(cd_dep_employed_count)#57,max(cd_dep_employed_count)#58,avg(cd_dep_employed_count)#59,cd_dep_college_count#25,cnt3#60,min(cd_dep_college_count)#61,max(cd_dep_college_count)#62,avg(cd_dep_college_count)#63]), 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#52, min(cd_dep_count)#53, max(cd_dep_count)#54, avg(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, min(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, avg(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, min(cd_dep_college_count)#61, max(cd_dep_college_count)#62, avg(cd_dep_college_count)#63]
+
+(44) ColumnarToRow [codegen id : 10]
+Input [17]: [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#52, min(cd_dep_count)#53, max(cd_dep_count)#54, avg(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, min(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, avg(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, min(cd_dep_college_count)#61, max(cd_dep_college_count)#62, avg(cd_dep_college_count)#63]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#9, d_year#74, d_qoy#75]
+Output [3]: [d_date_sk#9, d_year#64, d_qoy#65]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_qoy), EqualTo(d_year,2002), LessThan(d_qoy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(44) CometFilter
-Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
-Condition : ((((isnotnull(d_year#74) AND isnotnull(d_qoy#75)) AND (d_year#74 = 2002)) AND (d_qoy#75 < 4)) AND isnotnull(d_date_sk#9))
+(46) CometFilter
+Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
+Condition : ((((isnotnull(d_year#64) AND isnotnull(d_qoy#65)) AND (d_year#64 = 2002)) AND (d_qoy#65 < 4)) AND isnotnull(d_date_sk#9))
 
-(45) CometProject
-Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
+(47) CometProject
+Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(46) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt
index ea0ef274ea..c2b0d7dde1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt
@@ -1,74 +1,76 @@
-TakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),cnt2,min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),cnt3,min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count)]
-  WholeStageCodegen (10)
-    HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count] [count(1),min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count),cnt1,min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),cnt2,min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),cnt3,min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count),count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
-      InputAdapter
-        Exchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-          WholeStageCodegen (9)
-            HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,min,max,sum,count,min,max,sum,count,min,max,sum,count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
-              Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                  Project [c_current_cdemo_sk,ca_state]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [c_current_cdemo_sk,c_current_addr_sk]
-                        Filter [exists,exists]
-                          BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                            BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                ColumnarToRow
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),cnt2,min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),cnt3,min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count)]
+        CometHashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
+          CometColumnarExchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+            RowToColumnar
+              WholeStageCodegen (9)
+                HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,min,max,sum,count,min,max,sum,count,min,max,sum,count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
+                  Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                      Project [c_current_cdemo_sk,ca_state]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [c_current_cdemo_sk,c_current_addr_sk]
+                            Filter [exists,exists]
+                              BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                                BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                    InputAdapter
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (2)
+                                          Project [ss_customer_sk]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_qoy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (4)
+                                        Project [ws_bill_customer_sk]
+                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk] #3
                                 InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (2)
-                                      Project [ss_customer_sk]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (6)
+                                      Project [cs_ship_customer_sk]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_qoy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                           InputAdapter
                                             ReusedExchange [d_date_sk] #3
-                              InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (4)
-                                    Project [ws_bill_customer_sk]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                            InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (6)
-                                  Project [cs_ship_customer_sk]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                          InputAdapter
+                            BroadcastExchange #6
+                              WholeStageCodegen (7)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (7)
+                        BroadcastExchange #7
+                          WholeStageCodegen (8)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ca_address_sk]
-                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                  InputAdapter
-                    BroadcastExchange #7
-                      WholeStageCodegen (8)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cd_demo_sk]
-                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [cd_demo_sk]
+                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt
index bb2a1b1a5c..a71f17fb59 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt
@@ -1,32 +1,34 @@
 == Physical Plan ==
-TakeOrderedAndProject (28)
-+- * Project (27)
-   +- Window (26)
-      +- * Sort (25)
-         +- Exchange (24)
-            +- * HashAggregate (23)
-               +- Exchange (22)
-                  +- * HashAggregate (21)
-                     +- * Expand (20)
-                        +- * Project (19)
-                           +- * BroadcastHashJoin Inner BuildRight (18)
-                              :- * Project (12)
-                              :  +- * BroadcastHashJoin Inner BuildRight (11)
-                              :     :- * Project (6)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                              :     :     :- * ColumnarToRow (3)
-                              :     :     :  +- CometFilter (2)
-                              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     :     +- ReusedExchange (4)
-                              :     +- BroadcastExchange (10)
-                              :        +- * ColumnarToRow (9)
-                              :           +- CometFilter (8)
-                              :              +- CometScan parquet spark_catalog.default.item (7)
-                              +- BroadcastExchange (17)
-                                 +- * ColumnarToRow (16)
-                                    +- CometProject (15)
-                                       +- CometFilter (14)
-                                          +- CometScan parquet spark_catalog.default.store (13)
+TakeOrderedAndProject (30)
++- * Project (29)
+   +- Window (28)
+      +- * ColumnarToRow (27)
+         +- CometSort (26)
+            +- CometColumnarExchange (25)
+               +- CometHashAggregate (24)
+                  +- CometColumnarExchange (23)
+                     +- RowToColumnar (22)
+                        +- * HashAggregate (21)
+                           +- * Expand (20)
+                              +- * Project (19)
+                                 +- * BroadcastHashJoin Inner BuildRight (18)
+                                    :- * Project (12)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (11)
+                                    :     :- * Project (6)
+                                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                                    :     :     :- * ColumnarToRow (3)
+                                    :     :     :  +- CometFilter (2)
+                                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                                    :     :     +- ReusedExchange (4)
+                                    :     +- BroadcastExchange (10)
+                                    :        +- * ColumnarToRow (9)
+                                    :           +- CometFilter (8)
+                                    :              +- CometScan parquet spark_catalog.default.item (7)
+                                    +- BroadcastExchange (17)
+                                       +- * ColumnarToRow (16)
+                                          +- CometProject (15)
+                                             +- CometFilter (14)
+                                                +- CometScan parquet spark_catalog.default.store (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -44,7 +46,7 @@ Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_store_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_ext_sales_price#3, ss_net_profit#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 33]
+(4) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -128,66 +130,70 @@ Functions [2]: [partial_sum(UnscaledValue(ss_net_profit#4)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#16, sum#17]
 Results [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
 
-(22) Exchange
+(22) RowToColumnar
 Input [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
-Arguments: hashpartitioning(i_category#13, i_class#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) HashAggregate [codegen id : 5]
+(23) CometColumnarExchange
+Input [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
+Arguments: hashpartitioning(i_category#13, i_class#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(24) CometHashAggregate
 Input [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
 Keys [3]: [i_category#13, i_class#14, spark_grouping_id#15]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#20, sum(UnscaledValue(ss_ext_sales_price#3))#21]
-Results [7]: [(MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#20,17,2) / MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#21,17,2)) AS gross_margin#22, i_category#13, i_class#14, (cast((shiftright(spark_grouping_id#15, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#15, 0) & 1) as tinyint)) AS lochierarchy#23, (MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#20,17,2) / MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#21,17,2)) AS _w0#24, (cast((shiftright(spark_grouping_id#15, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#15, 0) & 1) as tinyint)) AS _w1#25, CASE WHEN (cast((shiftright(spark_grouping_id#15, 0) & 1) as tinyint) = 0) THEN i_category#13 END AS _w2#26]
 
-(24) Exchange
-Input [7]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26]
-Arguments: hashpartitioning(_w1#25, _w2#26, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(25) CometColumnarExchange
+Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
+Arguments: hashpartitioning(_w1#23, _w2#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(26) CometSort
+Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
+Arguments: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24], [_w1#23 ASC NULLS FIRST, _w2#24 ASC NULLS FIRST, _w0#22 ASC NULLS FIRST]
 
-(25) Sort [codegen id : 6]
-Input [7]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26]
-Arguments: [_w1#25 ASC NULLS FIRST, _w2#26 ASC NULLS FIRST, _w0#24 ASC NULLS FIRST], false, 0
+(27) ColumnarToRow [codegen id : 5]
+Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
 
-(26) Window
-Input [7]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26]
-Arguments: [rank(_w0#24) windowspecdefinition(_w1#25, _w2#26, _w0#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#27], [_w1#25, _w2#26], [_w0#24 ASC NULLS FIRST]
+(28) Window
+Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
+Arguments: [rank(_w0#22) windowspecdefinition(_w1#23, _w2#24, _w0#22 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#25], [_w1#23, _w2#24], [_w0#22 ASC NULLS FIRST]
 
-(27) Project [codegen id : 7]
-Output [5]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, rank_within_parent#27]
-Input [8]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26, rank_within_parent#27]
+(29) Project [codegen id : 6]
+Output [5]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, rank_within_parent#25]
+Input [8]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24, rank_within_parent#25]
 
-(28) TakeOrderedAndProject
-Input [5]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, rank_within_parent#27]
-Arguments: 100, [lochierarchy#23 DESC NULLS LAST, CASE WHEN (lochierarchy#23 = 0) THEN i_category#13 END ASC NULLS FIRST, rank_within_parent#27 ASC NULLS FIRST], [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, rank_within_parent#27]
+(30) TakeOrderedAndProject
+Input [5]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, rank_within_parent#25]
+Arguments: 100, [lochierarchy#21 DESC NULLS LAST, CASE WHEN (lochierarchy#21 = 0) THEN i_category#13 END ASC NULLS FIRST, rank_within_parent#25 ASC NULLS FIRST], [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, rank_within_parent#25]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (33)
-+- * ColumnarToRow (32)
-   +- CometProject (31)
-      +- CometFilter (30)
-         +- CometScan parquet spark_catalog.default.date_dim (29)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_year#28]
+Output [2]: [d_date_sk#7, d_year#26]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(30) CometFilter
-Input [2]: [d_date_sk#7, d_year#28]
-Condition : ((isnotnull(d_year#28) AND (d_year#28 = 2001)) AND isnotnull(d_date_sk#7))
+(32) CometFilter
+Input [2]: [d_date_sk#7, d_year#26]
+Condition : ((isnotnull(d_year#26) AND (d_year#26 = 2001)) AND isnotnull(d_date_sk#7))
 
-(31) CometProject
-Input [2]: [d_date_sk#7, d_year#28]
+(33) CometProject
+Input [2]: [d_date_sk#7, d_year#26]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(32) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(33) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt
index 7eeb607c3b..e9e6131a9e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,gross_margin,i_class]
-  WholeStageCodegen (7)
+  WholeStageCodegen (6)
     Project [gross_margin,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [_w0,_w1,_w2]
-          WholeStageCodegen (6)
-            Sort [_w1,_w2,_w0]
+          WholeStageCodegen (5)
+            ColumnarToRow
               InputAdapter
-                Exchange [_w1,_w2] #1
-                  WholeStageCodegen (5)
-                    HashAggregate [i_category,i_class,spark_grouping_id,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),gross_margin,lochierarchy,_w0,_w1,_w2,sum,sum]
-                      InputAdapter
-                        Exchange [i_category,i_class,spark_grouping_id] #2
+                CometSort [_w1,_w2,_w0]
+                  CometColumnarExchange [_w1,_w2] #1
+                    CometHashAggregate [i_category,i_class,spark_grouping_id,sum,sum]
+                      CometColumnarExchange [i_category,i_class,spark_grouping_id] #2
+                        RowToColumnar
                           WholeStageCodegen (4)
                             HashAggregate [i_category,i_class,spark_grouping_id,ss_net_profit,ss_ext_sales_price] [sum,sum,sum,sum]
                               Expand [ss_ext_sales_price,ss_net_profit,i_category,i_class]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt
index d13ff264cd..06405034bc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt
@@ -1,29 +1,31 @@
 == Physical Plan ==
-TakeOrderedAndProject (25)
-+- * HashAggregate (24)
-   +- Exchange (23)
-      +- * HashAggregate (22)
-         +- * Project (21)
-            +- * BroadcastHashJoin Inner BuildLeft (20)
-               :- BroadcastExchange (15)
-               :  +- * Project (14)
-               :     +- * BroadcastHashJoin Inner BuildRight (13)
-               :        :- * Project (11)
-               :        :  +- * BroadcastHashJoin Inner BuildRight (10)
-               :        :     :- * ColumnarToRow (4)
-               :        :     :  +- CometProject (3)
-               :        :     :     +- CometFilter (2)
-               :        :     :        +- CometScan parquet spark_catalog.default.item (1)
-               :        :     +- BroadcastExchange (9)
-               :        :        +- * ColumnarToRow (8)
-               :        :           +- CometProject (7)
-               :        :              +- CometFilter (6)
-               :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
-               :        +- ReusedExchange (12)
-               +- * ColumnarToRow (19)
-                  +- CometProject (18)
-                     +- CometFilter (17)
-                        +- CometScan parquet spark_catalog.default.catalog_sales (16)
+* ColumnarToRow (27)
++- CometTakeOrderedAndProject (26)
+   +- CometHashAggregate (25)
+      +- CometColumnarExchange (24)
+         +- RowToColumnar (23)
+            +- * HashAggregate (22)
+               +- * Project (21)
+                  +- * BroadcastHashJoin Inner BuildLeft (20)
+                     :- BroadcastExchange (15)
+                     :  +- * Project (14)
+                     :     +- * BroadcastHashJoin Inner BuildRight (13)
+                     :        :- * Project (11)
+                     :        :  +- * BroadcastHashJoin Inner BuildRight (10)
+                     :        :     :- * ColumnarToRow (4)
+                     :        :     :  +- CometProject (3)
+                     :        :     :     +- CometFilter (2)
+                     :        :     :        +- CometScan parquet spark_catalog.default.item (1)
+                     :        :     +- BroadcastExchange (9)
+                     :        :        +- * ColumnarToRow (8)
+                     :        :           +- CometProject (7)
+                     :        :              +- CometFilter (6)
+                     :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
+                     :        +- ReusedExchange (12)
+                     +- * ColumnarToRow (19)
+                        +- CometProject (18)
+                           +- CometFilter (17)
+                              +- CometScan parquet spark_catalog.default.catalog_sales (16)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -77,7 +79,7 @@ Join condition: None
 Output [5]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_date_sk#8]
 Input [6]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_item_sk#6, inv_date_sk#8]
 
-(12) ReusedExchange [Reuses operator id: 30]
+(12) ReusedExchange [Reuses operator id: 32]
 Output [1]: [d_date_sk#10]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -129,29 +131,33 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(23) Exchange
+(23) RowToColumnar
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(24) HashAggregate [codegen id : 5]
+(24) CometColumnarExchange
+Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(25) CometHashAggregate
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Keys [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(25) TakeOrderedAndProject
+(26) CometTakeOrderedAndProject
+Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#2 ASC NULLS FIRST], output=[i_item_id#2,i_item_desc#3,i_current_price#4]), 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
+
+(27) ColumnarToRow [codegen id : 5]
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = inv_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (30)
-+- * ColumnarToRow (29)
-   +- CometProject (28)
-      +- CometFilter (27)
-         +- CometScan parquet spark_catalog.default.date_dim (26)
+BroadcastExchange (32)
++- * ColumnarToRow (31)
+   +- CometProject (30)
+      +- CometFilter (29)
+         +- CometScan parquet spark_catalog.default.date_dim (28)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -161,18 +167,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-01), LessThanOrEqual(d_date,2000-04-01), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(27) CometFilter
+(29) CometFilter
 Input [2]: [d_date_sk#10, d_date#13]
 Condition : (((isnotnull(d_date#13) AND (d_date#13 >= 2000-02-01)) AND (d_date#13 <= 2000-04-01)) AND isnotnull(d_date_sk#10))
 
-(28) CometProject
+(30) CometProject
 Input [2]: [d_date_sk#10, d_date#13]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(29) ColumnarToRow [codegen id : 1]
+(31) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(30) BroadcastExchange
+(32) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt
index 65bb06348b..3f84fa0598 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt
@@ -1,44 +1,46 @@
-TakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
-  WholeStageCodegen (5)
-    HashAggregate [i_item_id,i_item_desc,i_current_price]
-      InputAdapter
-        Exchange [i_item_id,i_item_desc,i_current_price] #1
-          WholeStageCodegen (4)
-            HashAggregate [i_item_id,i_item_desc,i_current_price]
-              Project [i_item_id,i_item_desc,i_current_price]
-                BroadcastHashJoin [i_item_sk,cs_item_sk]
-                  InputAdapter
-                    BroadcastExchange #2
-                      WholeStageCodegen (3)
-                        Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                          BroadcastHashJoin [inv_date_sk,d_date_sk]
-                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
-                              BroadcastHashJoin [i_item_sk,inv_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                                      CometFilter [i_current_price,i_manufact_id,i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
+        CometHashAggregate [i_item_id,i_item_desc,i_current_price]
+          CometColumnarExchange [i_item_id,i_item_desc,i_current_price] #1
+            RowToColumnar
+              WholeStageCodegen (4)
+                HashAggregate [i_item_id,i_item_desc,i_current_price]
+                  Project [i_item_id,i_item_desc,i_current_price]
+                    BroadcastHashJoin [i_item_sk,cs_item_sk]
+                      InputAdapter
+                        BroadcastExchange #2
+                          WholeStageCodegen (3)
+                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                              BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
+                                  BroadcastHashJoin [i_item_sk,inv_item_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                                          CometFilter [i_current_price,i_manufact_id,i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [inv_item_sk,inv_date_sk]
+                                                CometFilter [inv_quantity_on_hand,inv_item_sk]
+                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #4
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_date,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [inv_item_sk,inv_date_sk]
-                                            CometFilter [inv_quantity_on_hand,inv_item_sk]
-                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #4
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_date,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                            InputAdapter
-                              ReusedExchange [d_date_sk] #4
-                  ColumnarToRow
-                    InputAdapter
-                      CometProject [cs_item_sk]
-                        CometFilter [cs_item_sk]
-                          CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                  ReusedExchange [d_date_sk] #4
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [cs_item_sk]
+                            CometFilter [cs_item_sk]
+                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt
index 87d960592d..d42b2f1bf6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt
@@ -1,51 +1,59 @@
 == Physical Plan ==
-* HashAggregate (47)
-+- Exchange (46)
-   +- * HashAggregate (45)
-      +- * Project (44)
-         +- * BroadcastHashJoin LeftSemi BuildRight (43)
-            :- * BroadcastHashJoin LeftSemi BuildRight (29)
-            :  :- * HashAggregate (15)
-            :  :  +- Exchange (14)
-            :  :     +- * HashAggregate (13)
-            :  :        +- * Project (12)
-            :  :           +- * BroadcastHashJoin Inner BuildRight (11)
-            :  :              :- * Project (6)
-            :  :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-            :  :              :     :- * ColumnarToRow (3)
-            :  :              :     :  +- CometFilter (2)
-            :  :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :  :              :     +- ReusedExchange (4)
-            :  :              +- BroadcastExchange (10)
-            :  :                 +- * ColumnarToRow (9)
-            :  :                    +- CometFilter (8)
-            :  :                       +- CometScan parquet spark_catalog.default.customer (7)
-            :  +- BroadcastExchange (28)
-            :     +- * HashAggregate (27)
-            :        +- Exchange (26)
-            :           +- * HashAggregate (25)
-            :              +- * Project (24)
-            :                 +- * BroadcastHashJoin Inner BuildRight (23)
-            :                    :- * Project (21)
-            :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-            :                    :     :- * ColumnarToRow (18)
-            :                    :     :  +- CometFilter (17)
-            :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (16)
-            :                    :     +- ReusedExchange (19)
-            :                    +- ReusedExchange (22)
-            +- BroadcastExchange (42)
-               +- * HashAggregate (41)
-                  +- Exchange (40)
-                     +- * HashAggregate (39)
-                        +- * Project (38)
-                           +- * BroadcastHashJoin Inner BuildRight (37)
-                              :- * Project (35)
-                              :  +- * BroadcastHashJoin Inner BuildRight (34)
-                              :     :- * ColumnarToRow (32)
-                              :     :  +- CometFilter (31)
-                              :     :     +- CometScan parquet spark_catalog.default.web_sales (30)
-                              :     +- ReusedExchange (33)
-                              +- ReusedExchange (36)
+* ColumnarToRow (55)
++- CometHashAggregate (54)
+   +- CometColumnarExchange (53)
+      +- RowToColumnar (52)
+         +- * HashAggregate (51)
+            +- * Project (50)
+               +- * BroadcastHashJoin LeftSemi BuildRight (49)
+                  :- * BroadcastHashJoin LeftSemi BuildRight (33)
+                  :  :- * ColumnarToRow (17)
+                  :  :  +- CometHashAggregate (16)
+                  :  :     +- CometColumnarExchange (15)
+                  :  :        +- RowToColumnar (14)
+                  :  :           +- * HashAggregate (13)
+                  :  :              +- * Project (12)
+                  :  :                 +- * BroadcastHashJoin Inner BuildRight (11)
+                  :  :                    :- * Project (6)
+                  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+                  :  :                    :     :- * ColumnarToRow (3)
+                  :  :                    :     :  +- CometFilter (2)
+                  :  :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :  :                    :     +- ReusedExchange (4)
+                  :  :                    +- BroadcastExchange (10)
+                  :  :                       +- * ColumnarToRow (9)
+                  :  :                          +- CometFilter (8)
+                  :  :                             +- CometScan parquet spark_catalog.default.customer (7)
+                  :  +- BroadcastExchange (32)
+                  :     +- * ColumnarToRow (31)
+                  :        +- CometHashAggregate (30)
+                  :           +- CometColumnarExchange (29)
+                  :              +- RowToColumnar (28)
+                  :                 +- * HashAggregate (27)
+                  :                    +- * Project (26)
+                  :                       +- * BroadcastHashJoin Inner BuildRight (25)
+                  :                          :- * Project (23)
+                  :                          :  +- * BroadcastHashJoin Inner BuildRight (22)
+                  :                          :     :- * ColumnarToRow (20)
+                  :                          :     :  +- CometFilter (19)
+                  :                          :     :     +- CometScan parquet spark_catalog.default.catalog_sales (18)
+                  :                          :     +- ReusedExchange (21)
+                  :                          +- ReusedExchange (24)
+                  +- BroadcastExchange (48)
+                     +- * ColumnarToRow (47)
+                        +- CometHashAggregate (46)
+                           +- CometColumnarExchange (45)
+                              +- RowToColumnar (44)
+                                 +- * HashAggregate (43)
+                                    +- * Project (42)
+                                       +- * BroadcastHashJoin Inner BuildRight (41)
+                                          :- * Project (39)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (38)
+                                          :     :- * ColumnarToRow (36)
+                                          :     :  +- CometFilter (35)
+                                          :     :     +- CometScan parquet spark_catalog.default.web_sales (34)
+                                          :     +- ReusedExchange (37)
+                                          +- ReusedExchange (40)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -63,7 +71,7 @@ Condition : isnotnull(ss_customer_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_customer_sk#1, ss_sold_date_sk#2]
 
-(4) ReusedExchange [Reuses operator id: 52]
+(4) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#4, d_date#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -111,16 +119,20 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
-Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 12]
+(15) CometColumnarExchange
+Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
+Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Keys [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
+
+(17) ColumnarToRow [codegen id : 12]
+Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
@@ -130,62 +142,66 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#10), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int>
 
-(17) CometFilter
+(19) CometFilter
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 Condition : isnotnull(cs_bill_customer_sk#9)
 
-(18) ColumnarToRow [codegen id : 6]
+(20) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 
-(19) ReusedExchange [Reuses operator id: 52]
+(21) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#12, d_date#13]
 
-(20) BroadcastHashJoin [codegen id : 6]
+(22) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_sold_date_sk#10]
 Right keys [1]: [d_date_sk#12]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 6]
+(23) Project [codegen id : 6]
 Output [2]: [cs_bill_customer_sk#9, d_date#13]
 Input [4]: [cs_bill_customer_sk#9, cs_sold_date_sk#10, d_date_sk#12, d_date#13]
 
-(22) ReusedExchange [Reuses operator id: 10]
+(24) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(23) BroadcastHashJoin [codegen id : 6]
+(25) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_bill_customer_sk#9]
 Right keys [1]: [c_customer_sk#14]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
+(26) Project [codegen id : 6]
 Output [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Input [5]: [cs_bill_customer_sk#9, d_date#13, c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(25) HashAggregate [codegen id : 6]
+(27) HashAggregate [codegen id : 6]
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(26) Exchange
+(28) RowToColumnar
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
-Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(27) HashAggregate [codegen id : 7]
+(29) CometColumnarExchange
+Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
+Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(28) BroadcastExchange
+(31) ColumnarToRow [codegen id : 7]
+Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
+
+(32) BroadcastExchange
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 12]
+(33) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#16, ), isnull(c_last_name#16), coalesce(c_first_name#15, ), isnull(c_first_name#15), coalesce(d_date#13, 1970-01-01), isnull(d_date#13)]
 Join type: LeftSemi
@@ -199,123 +215,131 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#18), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int>
 
-(31) CometFilter
+(35) CometFilter
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 Condition : isnotnull(ws_bill_customer_sk#17)
 
-(32) ColumnarToRow [codegen id : 10]
+(36) ColumnarToRow [codegen id : 10]
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 
-(33) ReusedExchange [Reuses operator id: 52]
+(37) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#20, d_date#21]
 
-(34) BroadcastHashJoin [codegen id : 10]
+(38) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_sold_date_sk#18]
 Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
+(39) Project [codegen id : 10]
 Output [2]: [ws_bill_customer_sk#17, d_date#21]
 Input [4]: [ws_bill_customer_sk#17, ws_sold_date_sk#18, d_date_sk#20, d_date#21]
 
-(36) ReusedExchange [Reuses operator id: 10]
+(40) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(37) BroadcastHashJoin [codegen id : 10]
+(41) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_bill_customer_sk#17]
 Right keys [1]: [c_customer_sk#22]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
+(42) Project [codegen id : 10]
 Output [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Input [5]: [ws_bill_customer_sk#17, d_date#21, c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(39) HashAggregate [codegen id : 10]
+(43) HashAggregate [codegen id : 10]
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(40) Exchange
+(44) RowToColumnar
+Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
+
+(45) CometColumnarExchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(41) HashAggregate [codegen id : 11]
+(46) CometHashAggregate
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(42) BroadcastExchange
+(47) ColumnarToRow [codegen id : 11]
+Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
+
+(48) BroadcastExchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 12]
+(49) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#24, ), isnull(c_last_name#24), coalesce(c_first_name#23, ), isnull(c_first_name#23), coalesce(d_date#21, 1970-01-01), isnull(d_date#21)]
 Join type: LeftSemi
 Join condition: None
 
-(44) Project [codegen id : 12]
+(50) Project [codegen id : 12]
 Output: []
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(45) HashAggregate [codegen id : 12]
+(51) HashAggregate [codegen id : 12]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#25]
 Results [1]: [count#26]
 
-(46) Exchange
+(52) RowToColumnar
 Input [1]: [count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(47) HashAggregate [codegen id : 13]
+(53) CometColumnarExchange
+Input [1]: [count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(54) CometHashAggregate
 Input [1]: [count#26]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#27]
-Results [1]: [count(1)#27 AS count(1)#28]
+
+(55) ColumnarToRow [codegen id : 13]
+Input [1]: [count(1)#27]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#2 IN dynamicpruning#3
-BroadcastExchange (52)
-+- * ColumnarToRow (51)
-   +- CometProject (50)
-      +- CometFilter (49)
-         +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (60)
++- * ColumnarToRow (59)
+   +- CometProject (58)
+      +- CometFilter (57)
+         +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
+Output [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(49) CometFilter
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
-Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1200)) AND (d_month_seq#29 <= 1211)) AND isnotnull(d_date_sk#4))
+(57) CometFilter
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
+Condition : (((isnotnull(d_month_seq#28) AND (d_month_seq#28 >= 1200)) AND (d_month_seq#28 <= 1211)) AND isnotnull(d_date_sk#4))
 
-(50) CometProject
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
+(58) CometProject
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
 Arguments: [d_date_sk#4, d_date#5], [d_date_sk#4, d_date#5]
 
-(51) ColumnarToRow [codegen id : 1]
+(59) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#4, d_date#5]
 
-(52) BroadcastExchange
+(60) BroadcastExchange
 Input [2]: [d_date_sk#4, d_date#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
+Subquery:2 Hosting operator id = 18 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
 
-Subquery:3 Hosting operator id = 30 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
+Subquery:3 Hosting operator id = 34 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt
index 315afe6602..28771f9d42 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt
@@ -1,81 +1,89 @@
 WholeStageCodegen (13)
-  HashAggregate [count] [count(1),count(1),count]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (12)
-          HashAggregate [count,count]
-            Project
-              BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                  HashAggregate [c_last_name,c_first_name,d_date]
-                    InputAdapter
-                      Exchange [c_last_name,c_first_name,d_date] #2
-                        WholeStageCodegen (3)
-                          HashAggregate [c_last_name,c_first_name,d_date]
-                            Project [c_last_name,c_first_name,d_date]
-                              BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                Project [ss_customer_sk,d_date]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_customer_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
+      CometHashAggregate [count]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (12)
+              HashAggregate [count,count]
+                Project
+                  BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                    BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                      ColumnarToRow
+                        InputAdapter
+                          CometHashAggregate [c_last_name,c_first_name,d_date]
+                            CometColumnarExchange [c_last_name,c_first_name,d_date] #2
+                              RowToColumnar
+                                WholeStageCodegen (3)
+                                  HashAggregate [c_last_name,c_first_name,d_date]
+                                    Project [c_last_name,c_first_name,d_date]
+                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                        Project [ss_customer_sk,d_date]
+                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_customer_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk,d_date]
+                                                                CometFilter [d_month_seq,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk,d_date] #3
+                                        InputAdapter
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [c_customer_sk]
+                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
+                      InputAdapter
+                        BroadcastExchange #5
+                          WholeStageCodegen (7)
+                            ColumnarToRow
+                              InputAdapter
+                                CometHashAggregate [c_last_name,c_first_name,d_date]
+                                  CometColumnarExchange [c_last_name,c_first_name,d_date] #6
+                                    RowToColumnar
+                                      WholeStageCodegen (6)
+                                        HashAggregate [c_last_name,c_first_name,d_date]
+                                          Project [c_last_name,c_first_name,d_date]
+                                            BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                              Project [cs_bill_customer_sk,d_date]
+                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometProject [d_date_sk,d_date]
-                                                        CometFilter [d_month_seq,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk,d_date] #3
-                                InputAdapter
-                                  BroadcastExchange #4
-                                    WholeStageCodegen (2)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
-                  InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (7)
-                        HashAggregate [c_last_name,c_first_name,d_date]
-                          InputAdapter
-                            Exchange [c_last_name,c_first_name,d_date] #6
-                              WholeStageCodegen (6)
-                                HashAggregate [c_last_name,c_first_name,d_date]
-                                  Project [c_last_name,c_first_name,d_date]
-                                    BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                      Project [cs_bill_customer_sk,d_date]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
+                                                      CometFilter [cs_bill_customer_sk]
+                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
+                                                          ReusedSubquery [d_date_sk] #1
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk,d_date] #3
+                                              InputAdapter
+                                                ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (11)
+                          ColumnarToRow
+                            InputAdapter
+                              CometHashAggregate [c_last_name,c_first_name,d_date]
+                                CometColumnarExchange [c_last_name,c_first_name,d_date] #8
+                                  RowToColumnar
+                                    WholeStageCodegen (10)
+                                      HashAggregate [c_last_name,c_first_name,d_date]
+                                        Project [c_last_name,c_first_name,d_date]
+                                          BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                                            Project [ws_bill_customer_sk,d_date]
+                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
+                                                InputAdapter
+                                                  ReusedExchange [d_date_sk,d_date] #3
                                             InputAdapter
-                                              CometFilter [cs_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk,d_date] #3
-                                      InputAdapter
-                                        ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
-                InputAdapter
-                  BroadcastExchange #7
-                    WholeStageCodegen (11)
-                      HashAggregate [c_last_name,c_first_name,d_date]
-                        InputAdapter
-                          Exchange [c_last_name,c_first_name,d_date] #8
-                            WholeStageCodegen (10)
-                              HashAggregate [c_last_name,c_first_name,d_date]
-                                Project [c_last_name,c_first_name,d_date]
-                                  BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                                    Project [ws_bill_customer_sk,d_date]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ws_bill_customer_sk]
-                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk,d_date] #3
-                                    InputAdapter
-                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                                              ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt
index e10ff3340d..11adf85554 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt
@@ -1,48 +1,54 @@
 == Physical Plan ==
-* Sort (44)
-+- Exchange (43)
-   +- * BroadcastHashJoin Inner BuildRight (42)
-      :- * Project (23)
-      :  +- * Filter (22)
-      :     +- * HashAggregate (21)
-      :        +- Exchange (20)
-      :           +- * HashAggregate (19)
-      :              +- * Project (18)
-      :                 +- * BroadcastHashJoin Inner BuildRight (17)
-      :                    :- * Project (15)
-      :                    :  +- * BroadcastHashJoin Inner BuildRight (14)
-      :                    :     :- * Project (9)
-      :                    :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :                    :     :     :- * ColumnarToRow (3)
-      :                    :     :     :  +- CometFilter (2)
-      :                    :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-      :                    :     :     +- BroadcastExchange (7)
-      :                    :     :        +- * ColumnarToRow (6)
-      :                    :     :           +- CometFilter (5)
-      :                    :     :              +- CometScan parquet spark_catalog.default.item (4)
-      :                    :     +- BroadcastExchange (13)
-      :                    :        +- * ColumnarToRow (12)
-      :                    :           +- CometFilter (11)
-      :                    :              +- CometScan parquet spark_catalog.default.warehouse (10)
-      :                    +- ReusedExchange (16)
-      +- BroadcastExchange (41)
-         +- * Project (40)
-            +- * Filter (39)
-               +- * HashAggregate (38)
-                  +- Exchange (37)
-                     +- * HashAggregate (36)
-                        +- * Project (35)
-                           +- * BroadcastHashJoin Inner BuildRight (34)
-                              :- * Project (32)
-                              :  +- * BroadcastHashJoin Inner BuildRight (31)
-                              :     :- * Project (29)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (28)
-                              :     :     :- * ColumnarToRow (26)
-                              :     :     :  +- CometFilter (25)
-                              :     :     :     +- CometScan parquet spark_catalog.default.inventory (24)
-                              :     :     +- ReusedExchange (27)
-                              :     +- ReusedExchange (30)
-                              +- ReusedExchange (33)
+* ColumnarToRow (50)
++- CometSort (49)
+   +- CometColumnarExchange (48)
+      +- RowToColumnar (47)
+         +- * BroadcastHashJoin Inner BuildRight (46)
+            :- * Project (25)
+            :  +- * Filter (24)
+            :     +- * HashAggregate (23)
+            :        +- * ColumnarToRow (22)
+            :           +- CometColumnarExchange (21)
+            :              +- RowToColumnar (20)
+            :                 +- * HashAggregate (19)
+            :                    +- * Project (18)
+            :                       +- * BroadcastHashJoin Inner BuildRight (17)
+            :                          :- * Project (15)
+            :                          :  +- * BroadcastHashJoin Inner BuildRight (14)
+            :                          :     :- * Project (9)
+            :                          :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+            :                          :     :     :- * ColumnarToRow (3)
+            :                          :     :     :  +- CometFilter (2)
+            :                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+            :                          :     :     +- BroadcastExchange (7)
+            :                          :     :        +- * ColumnarToRow (6)
+            :                          :     :           +- CometFilter (5)
+            :                          :     :              +- CometScan parquet spark_catalog.default.item (4)
+            :                          :     +- BroadcastExchange (13)
+            :                          :        +- * ColumnarToRow (12)
+            :                          :           +- CometFilter (11)
+            :                          :              +- CometScan parquet spark_catalog.default.warehouse (10)
+            :                          +- ReusedExchange (16)
+            +- BroadcastExchange (45)
+               +- * Project (44)
+                  +- * Filter (43)
+                     +- * HashAggregate (42)
+                        +- * ColumnarToRow (41)
+                           +- CometColumnarExchange (40)
+                              +- RowToColumnar (39)
+                                 +- * HashAggregate (38)
+                                    +- * Project (37)
+                                       +- * BroadcastHashJoin Inner BuildRight (36)
+                                          :- * Project (34)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (33)
+                                          :     :- * Project (31)
+                                          :     :  +- * BroadcastHashJoin Inner BuildRight (30)
+                                          :     :     :- * ColumnarToRow (28)
+                                          :     :     :  +- CometFilter (27)
+                                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (26)
+                                          :     :     +- ReusedExchange (29)
+                                          :     +- ReusedExchange (32)
+                                          +- ReusedExchange (35)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -116,7 +122,7 @@ Join condition: None
 Output [5]: [inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 Input [6]: [inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 
-(16) ReusedExchange [Reuses operator id: 49]
+(16) ReusedExchange [Reuses operator id: 55]
 Output [2]: [d_date_sk#9, d_moy#10]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -136,22 +142,28 @@ Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#3 as double)), par
 Aggregate Attributes [5]: [n#11, avg#12, m2#13, sum#14, count#15]
 Results [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 
-(20) Exchange
+(20) RowToColumnar
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
-Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 10]
+(21) CometColumnarExchange
+Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
+Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) ColumnarToRow [codegen id : 10]
+Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
+
+(23) HashAggregate [codegen id : 10]
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 Keys [4]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double)), avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double))#21, avg(inv_quantity_on_hand#3)#22]
 Results [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stddev_samp(cast(inv_quantity_on_hand#3 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#3)#22 AS mean#24]
 
-(22) Filter [codegen id : 10]
+(24) Filter [codegen id : 10]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 Condition : CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END
 
-(23) Project [codegen id : 10]
+(25) Project [codegen id : 10]
 Output [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#25]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 
@@ -163,104 +175,116 @@ PartitionFilters: [isnotnull(inv_date_sk#29), dynamicpruningexpression(inv_date_
 PushedFilters: [IsNotNull(inv_item_sk), IsNotNull(inv_warehouse_sk)]
 ReadSchema: struct<inv_item_sk:int,inv_warehouse_sk:int,inv_quantity_on_hand:int>
 
-(25) CometFilter
+(27) CometFilter
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 Condition : (isnotnull(inv_item_sk#26) AND isnotnull(inv_warehouse_sk#27))
 
-(26) ColumnarToRow [codegen id : 8]
+(28) ColumnarToRow [codegen id : 8]
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 
-(27) ReusedExchange [Reuses operator id: 7]
+(29) ReusedExchange [Reuses operator id: 7]
 Output [1]: [i_item_sk#31]
 
-(28) BroadcastHashJoin [codegen id : 8]
+(30) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_item_sk#26]
 Right keys [1]: [i_item_sk#31]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 8]
+(31) Project [codegen id : 8]
 Output [4]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 Input [5]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 
-(30) ReusedExchange [Reuses operator id: 13]
+(32) ReusedExchange [Reuses operator id: 13]
 Output [2]: [w_warehouse_sk#32, w_warehouse_name#33]
 
-(31) BroadcastHashJoin [codegen id : 8]
+(33) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_warehouse_sk#27]
 Right keys [1]: [w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 8]
+(34) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 Input [6]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 
-(33) ReusedExchange [Reuses operator id: 54]
+(35) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#34, d_moy#35]
 
-(34) BroadcastHashJoin [codegen id : 8]
+(36) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_date_sk#29]
 Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
+(37) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Input [7]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_date_sk#34, d_moy#35]
 
-(36) HashAggregate [codegen id : 8]
+(38) HashAggregate [codegen id : 8]
 Input [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#28 as double)), partial_avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [5]: [n#36, avg#37, m2#38, sum#39, count#40]
 Results [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 
-(37) Exchange
+(39) RowToColumnar
+Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
+
+(40) CometColumnarExchange
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(38) HashAggregate [codegen id : 9]
+(41) ColumnarToRow [codegen id : 9]
+Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
+
+(42) HashAggregate [codegen id : 9]
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double)), avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double))#21, avg(inv_quantity_on_hand#28)#22]
 Results [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stddev_samp(cast(inv_quantity_on_hand#28 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#28)#22 AS mean#24]
 
-(39) Filter [codegen id : 9]
+(43) Filter [codegen id : 9]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 Condition : CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END
 
-(40) Project [codegen id : 9]
+(44) Project [codegen id : 9]
 Output [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#24 AS mean#46, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#47]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 
-(41) BroadcastExchange
+(45) BroadcastExchange
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
-(42) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 10]
 Left keys [2]: [i_item_sk#6, w_warehouse_sk#7]
 Right keys [2]: [i_item_sk#31, w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(43) Exchange
+(47) RowToColumnar
+Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
+
+(48) CometColumnarExchange
+Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
+Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(49) CometSort
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+Arguments: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47], [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST]
 
-(44) Sort [codegen id : 11]
+(50) ColumnarToRow [codegen id : 11]
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (55)
++- * ColumnarToRow (54)
+   +- CometProject (53)
+      +- CometFilter (52)
+         +- CometScan parquet spark_catalog.default.date_dim (51)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -270,27 +294,27 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,1), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(46) CometFilter
+(52) CometFilter
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Condition : ((((isnotnull(d_year#48) AND isnotnull(d_moy#10)) AND (d_year#48 = 2001)) AND (d_moy#10 = 1)) AND isnotnull(d_date_sk#9))
 
-(47) CometProject
+(53) CometProject
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Arguments: [d_date_sk#9, d_moy#10], [d_date_sk#9, d_moy#10]
 
-(48) ColumnarToRow [codegen id : 1]
+(54) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_moy#10]
 
-(49) BroadcastExchange
+(55) BroadcastExchange
 Input [2]: [d_date_sk#9, d_moy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 24 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
-BroadcastExchange (54)
-+- * ColumnarToRow (53)
-   +- CometProject (52)
-      +- CometFilter (51)
-         +- CometScan parquet spark_catalog.default.date_dim (50)
+Subquery:2 Hosting operator id = 26 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
+BroadcastExchange (60)
++- * ColumnarToRow (59)
+   +- CometProject (58)
+      +- CometFilter (57)
+         +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -300,18 +324,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(51) CometFilter
+(57) CometFilter
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#35)) AND (d_year#49 = 2001)) AND (d_moy#35 = 2)) AND isnotnull(d_date_sk#34))
 
-(52) CometProject
+(58) CometProject
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Arguments: [d_date_sk#34, d_moy#35], [d_date_sk#34, d_moy#35]
 
-(53) ColumnarToRow [codegen id : 1]
+(59) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#34, d_moy#35]
 
-(54) BroadcastExchange
+(60) BroadcastExchange
 Input [2]: [d_date_sk#34, d_moy#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt
index 002266e76e..0dc072692c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt
@@ -1,81 +1,87 @@
 WholeStageCodegen (11)
-  Sort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
+  ColumnarToRow
     InputAdapter
-      Exchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
-        WholeStageCodegen (10)
-          BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
-            Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-              Filter [mean,stdev]
-                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                  InputAdapter
-                    Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
-                      WholeStageCodegen (4)
-                        HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                          Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                            BroadcastHashJoin [inv_date_sk,d_date_sk]
-                              Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                  Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                    BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [inv_item_sk,inv_warehouse_sk]
-                                            CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
+      CometSort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
+        CometColumnarExchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
+          RowToColumnar
+            WholeStageCodegen (10)
+              BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
+                Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+                  Filter [mean,stdev]
+                    HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                      ColumnarToRow
+                        InputAdapter
+                          CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                                  Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                                    BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                      Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                          Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                            BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [inv_item_sk,inv_warehouse_sk]
+                                                    CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk,d_moy]
+                                                                  CometFilter [d_year,d_moy,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #4
                                                   WholeStageCodegen (1)
                                                     ColumnarToRow
                                                       InputAdapter
-                                                        CometProject [d_date_sk,d_moy]
-                                                          CometFilter [d_year,d_moy,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [i_item_sk]
-                                                  CometScan parquet spark_catalog.default.item [i_item_sk]
-                                  InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+                                                        CometFilter [i_item_sk]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk]
                                           InputAdapter
-                                            CometFilter [w_warehouse_sk]
-                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [w_warehouse_sk]
+                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_moy] #3
+                InputAdapter
+                  BroadcastExchange #6
+                    WholeStageCodegen (9)
+                      Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+                        Filter [mean,stdev]
+                          HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                            ColumnarToRow
                               InputAdapter
-                                ReusedExchange [d_date_sk,d_moy] #3
-            InputAdapter
-              BroadcastExchange #6
-                WholeStageCodegen (9)
-                  Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-                    Filter [mean,stdev]
-                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                        InputAdapter
-                          Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
-                            WholeStageCodegen (8)
-                              HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                                Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                                  BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                    Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                        Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                          BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [inv_item_sk,inv_warehouse_sk]
-                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #2
-                                                      BroadcastExchange #8
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk,d_moy]
-                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
+                                  RowToColumnar
+                                    WholeStageCodegen (8)
+                                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                                        Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                                          BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                            Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                              BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                                Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                                  BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [inv_item_sk,inv_warehouse_sk]
+                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #2
+                                                              BroadcastExchange #8
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk,d_moy]
+                                                                        CometFilter [d_year,d_moy,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                    InputAdapter
+                                                      ReusedExchange [i_item_sk] #4
+                                                InputAdapter
+                                                  ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
                                             InputAdapter
-                                              ReusedExchange [i_item_sk] #4
-                                        InputAdapter
-                                          ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk,d_moy] #8
+                                              ReusedExchange [d_date_sk,d_moy] #8
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt
index 98e8bc4642..cf500fbd99 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt
@@ -1,48 +1,54 @@
 == Physical Plan ==
-* Sort (44)
-+- Exchange (43)
-   +- * BroadcastHashJoin Inner BuildRight (42)
-      :- * Project (23)
-      :  +- * Filter (22)
-      :     +- * HashAggregate (21)
-      :        +- Exchange (20)
-      :           +- * HashAggregate (19)
-      :              +- * Project (18)
-      :                 +- * BroadcastHashJoin Inner BuildRight (17)
-      :                    :- * Project (15)
-      :                    :  +- * BroadcastHashJoin Inner BuildRight (14)
-      :                    :     :- * Project (9)
-      :                    :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :                    :     :     :- * ColumnarToRow (3)
-      :                    :     :     :  +- CometFilter (2)
-      :                    :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-      :                    :     :     +- BroadcastExchange (7)
-      :                    :     :        +- * ColumnarToRow (6)
-      :                    :     :           +- CometFilter (5)
-      :                    :     :              +- CometScan parquet spark_catalog.default.item (4)
-      :                    :     +- BroadcastExchange (13)
-      :                    :        +- * ColumnarToRow (12)
-      :                    :           +- CometFilter (11)
-      :                    :              +- CometScan parquet spark_catalog.default.warehouse (10)
-      :                    +- ReusedExchange (16)
-      +- BroadcastExchange (41)
-         +- * Project (40)
-            +- * Filter (39)
-               +- * HashAggregate (38)
-                  +- Exchange (37)
-                     +- * HashAggregate (36)
-                        +- * Project (35)
-                           +- * BroadcastHashJoin Inner BuildRight (34)
-                              :- * Project (32)
-                              :  +- * BroadcastHashJoin Inner BuildRight (31)
-                              :     :- * Project (29)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (28)
-                              :     :     :- * ColumnarToRow (26)
-                              :     :     :  +- CometFilter (25)
-                              :     :     :     +- CometScan parquet spark_catalog.default.inventory (24)
-                              :     :     +- ReusedExchange (27)
-                              :     +- ReusedExchange (30)
-                              +- ReusedExchange (33)
+* ColumnarToRow (50)
++- CometSort (49)
+   +- CometColumnarExchange (48)
+      +- RowToColumnar (47)
+         +- * BroadcastHashJoin Inner BuildRight (46)
+            :- * Project (25)
+            :  +- * Filter (24)
+            :     +- * HashAggregate (23)
+            :        +- * ColumnarToRow (22)
+            :           +- CometColumnarExchange (21)
+            :              +- RowToColumnar (20)
+            :                 +- * HashAggregate (19)
+            :                    +- * Project (18)
+            :                       +- * BroadcastHashJoin Inner BuildRight (17)
+            :                          :- * Project (15)
+            :                          :  +- * BroadcastHashJoin Inner BuildRight (14)
+            :                          :     :- * Project (9)
+            :                          :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+            :                          :     :     :- * ColumnarToRow (3)
+            :                          :     :     :  +- CometFilter (2)
+            :                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+            :                          :     :     +- BroadcastExchange (7)
+            :                          :     :        +- * ColumnarToRow (6)
+            :                          :     :           +- CometFilter (5)
+            :                          :     :              +- CometScan parquet spark_catalog.default.item (4)
+            :                          :     +- BroadcastExchange (13)
+            :                          :        +- * ColumnarToRow (12)
+            :                          :           +- CometFilter (11)
+            :                          :              +- CometScan parquet spark_catalog.default.warehouse (10)
+            :                          +- ReusedExchange (16)
+            +- BroadcastExchange (45)
+               +- * Project (44)
+                  +- * Filter (43)
+                     +- * HashAggregate (42)
+                        +- * ColumnarToRow (41)
+                           +- CometColumnarExchange (40)
+                              +- RowToColumnar (39)
+                                 +- * HashAggregate (38)
+                                    +- * Project (37)
+                                       +- * BroadcastHashJoin Inner BuildRight (36)
+                                          :- * Project (34)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (33)
+                                          :     :- * Project (31)
+                                          :     :  +- * BroadcastHashJoin Inner BuildRight (30)
+                                          :     :     :- * ColumnarToRow (28)
+                                          :     :     :  +- CometFilter (27)
+                                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (26)
+                                          :     :     +- ReusedExchange (29)
+                                          :     +- ReusedExchange (32)
+                                          +- ReusedExchange (35)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -116,7 +122,7 @@ Join condition: None
 Output [5]: [inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 Input [6]: [inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 
-(16) ReusedExchange [Reuses operator id: 49]
+(16) ReusedExchange [Reuses operator id: 55]
 Output [2]: [d_date_sk#9, d_moy#10]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -136,22 +142,28 @@ Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#3 as double)), par
 Aggregate Attributes [5]: [n#11, avg#12, m2#13, sum#14, count#15]
 Results [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 
-(20) Exchange
+(20) RowToColumnar
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
-Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 10]
+(21) CometColumnarExchange
+Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
+Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) ColumnarToRow [codegen id : 10]
+Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
+
+(23) HashAggregate [codegen id : 10]
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 Keys [4]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double)), avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double))#21, avg(inv_quantity_on_hand#3)#22]
 Results [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stddev_samp(cast(inv_quantity_on_hand#3 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#3)#22 AS mean#24]
 
-(22) Filter [codegen id : 10]
+(24) Filter [codegen id : 10]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 Condition : (CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END AND CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.5) END)
 
-(23) Project [codegen id : 10]
+(25) Project [codegen id : 10]
 Output [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#25]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 
@@ -163,104 +175,116 @@ PartitionFilters: [isnotnull(inv_date_sk#29), dynamicpruningexpression(inv_date_
 PushedFilters: [IsNotNull(inv_item_sk), IsNotNull(inv_warehouse_sk)]
 ReadSchema: struct<inv_item_sk:int,inv_warehouse_sk:int,inv_quantity_on_hand:int>
 
-(25) CometFilter
+(27) CometFilter
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 Condition : (isnotnull(inv_item_sk#26) AND isnotnull(inv_warehouse_sk#27))
 
-(26) ColumnarToRow [codegen id : 8]
+(28) ColumnarToRow [codegen id : 8]
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 
-(27) ReusedExchange [Reuses operator id: 7]
+(29) ReusedExchange [Reuses operator id: 7]
 Output [1]: [i_item_sk#31]
 
-(28) BroadcastHashJoin [codegen id : 8]
+(30) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_item_sk#26]
 Right keys [1]: [i_item_sk#31]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 8]
+(31) Project [codegen id : 8]
 Output [4]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 Input [5]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 
-(30) ReusedExchange [Reuses operator id: 13]
+(32) ReusedExchange [Reuses operator id: 13]
 Output [2]: [w_warehouse_sk#32, w_warehouse_name#33]
 
-(31) BroadcastHashJoin [codegen id : 8]
+(33) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_warehouse_sk#27]
 Right keys [1]: [w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 8]
+(34) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 Input [6]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 
-(33) ReusedExchange [Reuses operator id: 54]
+(35) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#34, d_moy#35]
 
-(34) BroadcastHashJoin [codegen id : 8]
+(36) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_date_sk#29]
 Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
+(37) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Input [7]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_date_sk#34, d_moy#35]
 
-(36) HashAggregate [codegen id : 8]
+(38) HashAggregate [codegen id : 8]
 Input [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#28 as double)), partial_avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [5]: [n#36, avg#37, m2#38, sum#39, count#40]
 Results [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 
-(37) Exchange
+(39) RowToColumnar
+Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
+
+(40) CometColumnarExchange
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(38) HashAggregate [codegen id : 9]
+(41) ColumnarToRow [codegen id : 9]
+Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
+
+(42) HashAggregate [codegen id : 9]
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double)), avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double))#21, avg(inv_quantity_on_hand#28)#22]
 Results [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stddev_samp(cast(inv_quantity_on_hand#28 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#28)#22 AS mean#24]
 
-(39) Filter [codegen id : 9]
+(43) Filter [codegen id : 9]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 Condition : CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END
 
-(40) Project [codegen id : 9]
+(44) Project [codegen id : 9]
 Output [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#24 AS mean#46, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#47]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 
-(41) BroadcastExchange
+(45) BroadcastExchange
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
-(42) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 10]
 Left keys [2]: [i_item_sk#6, w_warehouse_sk#7]
 Right keys [2]: [i_item_sk#31, w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(43) Exchange
+(47) RowToColumnar
+Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
+
+(48) CometColumnarExchange
+Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
+Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(49) CometSort
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+Arguments: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47], [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST]
 
-(44) Sort [codegen id : 11]
+(50) ColumnarToRow [codegen id : 11]
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (55)
++- * ColumnarToRow (54)
+   +- CometProject (53)
+      +- CometFilter (52)
+         +- CometScan parquet spark_catalog.default.date_dim (51)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -270,27 +294,27 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,1), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(46) CometFilter
+(52) CometFilter
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Condition : ((((isnotnull(d_year#48) AND isnotnull(d_moy#10)) AND (d_year#48 = 2001)) AND (d_moy#10 = 1)) AND isnotnull(d_date_sk#9))
 
-(47) CometProject
+(53) CometProject
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Arguments: [d_date_sk#9, d_moy#10], [d_date_sk#9, d_moy#10]
 
-(48) ColumnarToRow [codegen id : 1]
+(54) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_moy#10]
 
-(49) BroadcastExchange
+(55) BroadcastExchange
 Input [2]: [d_date_sk#9, d_moy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 24 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
-BroadcastExchange (54)
-+- * ColumnarToRow (53)
-   +- CometProject (52)
-      +- CometFilter (51)
-         +- CometScan parquet spark_catalog.default.date_dim (50)
+Subquery:2 Hosting operator id = 26 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
+BroadcastExchange (60)
++- * ColumnarToRow (59)
+   +- CometProject (58)
+      +- CometFilter (57)
+         +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -300,18 +324,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(51) CometFilter
+(57) CometFilter
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#35)) AND (d_year#49 = 2001)) AND (d_moy#35 = 2)) AND isnotnull(d_date_sk#34))
 
-(52) CometProject
+(58) CometProject
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Arguments: [d_date_sk#34, d_moy#35], [d_date_sk#34, d_moy#35]
 
-(53) ColumnarToRow [codegen id : 1]
+(59) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#34, d_moy#35]
 
-(54) BroadcastExchange
+(60) BroadcastExchange
 Input [2]: [d_date_sk#34, d_moy#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt
index 002266e76e..0dc072692c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt
@@ -1,81 +1,87 @@
 WholeStageCodegen (11)
-  Sort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
+  ColumnarToRow
     InputAdapter
-      Exchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
-        WholeStageCodegen (10)
-          BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
-            Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-              Filter [mean,stdev]
-                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                  InputAdapter
-                    Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
-                      WholeStageCodegen (4)
-                        HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                          Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                            BroadcastHashJoin [inv_date_sk,d_date_sk]
-                              Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                  Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                    BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [inv_item_sk,inv_warehouse_sk]
-                                            CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
+      CometSort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
+        CometColumnarExchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
+          RowToColumnar
+            WholeStageCodegen (10)
+              BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
+                Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+                  Filter [mean,stdev]
+                    HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                      ColumnarToRow
+                        InputAdapter
+                          CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                                  Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                                    BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                      Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                          Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                            BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [inv_item_sk,inv_warehouse_sk]
+                                                    CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk,d_moy]
+                                                                  CometFilter [d_year,d_moy,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #4
                                                   WholeStageCodegen (1)
                                                     ColumnarToRow
                                                       InputAdapter
-                                                        CometProject [d_date_sk,d_moy]
-                                                          CometFilter [d_year,d_moy,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [i_item_sk]
-                                                  CometScan parquet spark_catalog.default.item [i_item_sk]
-                                  InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+                                                        CometFilter [i_item_sk]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk]
                                           InputAdapter
-                                            CometFilter [w_warehouse_sk]
-                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [w_warehouse_sk]
+                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_moy] #3
+                InputAdapter
+                  BroadcastExchange #6
+                    WholeStageCodegen (9)
+                      Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+                        Filter [mean,stdev]
+                          HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                            ColumnarToRow
                               InputAdapter
-                                ReusedExchange [d_date_sk,d_moy] #3
-            InputAdapter
-              BroadcastExchange #6
-                WholeStageCodegen (9)
-                  Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-                    Filter [mean,stdev]
-                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                        InputAdapter
-                          Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
-                            WholeStageCodegen (8)
-                              HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                                Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                                  BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                    Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                        Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                          BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [inv_item_sk,inv_warehouse_sk]
-                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #2
-                                                      BroadcastExchange #8
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk,d_moy]
-                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
+                                  RowToColumnar
+                                    WholeStageCodegen (8)
+                                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                                        Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                                          BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                            Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                              BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                                Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                                  BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [inv_item_sk,inv_warehouse_sk]
+                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #2
+                                                              BroadcastExchange #8
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk,d_moy]
+                                                                        CometFilter [d_year,d_moy,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                    InputAdapter
+                                                      ReusedExchange [i_item_sk] #4
+                                                InputAdapter
+                                                  ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
                                             InputAdapter
-                                              ReusedExchange [i_item_sk] #4
-                                        InputAdapter
-                                          ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk,d_moy] #8
+                                              ReusedExchange [d_date_sk,d_moy] #8
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt
index 9b2bb49916..092603e845 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt
@@ -1,112 +1,124 @@
 == Physical Plan ==
-TakeOrderedAndProject (108)
-+- * Project (107)
-   +- * BroadcastHashJoin Inner BuildRight (106)
-      :- * Project (89)
-      :  +- * BroadcastHashJoin Inner BuildRight (88)
-      :     :- * Project (70)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (69)
-      :     :     :- * Project (52)
-      :     :     :  +- * BroadcastHashJoin Inner BuildRight (51)
-      :     :     :     :- * BroadcastHashJoin Inner BuildRight (33)
-      :     :     :     :  :- * Filter (16)
-      :     :     :     :  :  +- * HashAggregate (15)
-      :     :     :     :  :     +- Exchange (14)
-      :     :     :     :  :        +- * HashAggregate (13)
-      :     :     :     :  :           +- * Project (12)
-      :     :     :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :     :  :                 :- * Project (9)
-      :     :     :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :     :     :  :                 :     :- * ColumnarToRow (3)
-      :     :     :     :  :                 :     :  +- CometFilter (2)
-      :     :     :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :     :     :  :                 :     +- BroadcastExchange (7)
-      :     :     :     :  :                 :        +- * ColumnarToRow (6)
-      :     :     :     :  :                 :           +- CometFilter (5)
-      :     :     :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :     :     :  :                 +- ReusedExchange (10)
-      :     :     :     :  +- BroadcastExchange (32)
-      :     :     :     :     +- * HashAggregate (31)
-      :     :     :     :        +- Exchange (30)
-      :     :     :     :           +- * HashAggregate (29)
-      :     :     :     :              +- * Project (28)
-      :     :     :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
-      :     :     :     :                    :- * Project (25)
-      :     :     :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :     :     :                    :     :- * ColumnarToRow (19)
-      :     :     :     :                    :     :  +- CometFilter (18)
-      :     :     :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
-      :     :     :     :                    :     +- BroadcastExchange (23)
-      :     :     :     :                    :        +- * ColumnarToRow (22)
-      :     :     :     :                    :           +- CometFilter (21)
-      :     :     :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
-      :     :     :     :                    +- ReusedExchange (26)
-      :     :     :     +- BroadcastExchange (50)
-      :     :     :        +- * Filter (49)
-      :     :     :           +- * HashAggregate (48)
-      :     :     :              +- Exchange (47)
-      :     :     :                 +- * HashAggregate (46)
-      :     :     :                    +- * Project (45)
-      :     :     :                       +- * BroadcastHashJoin Inner BuildRight (44)
-      :     :     :                          :- * Project (42)
-      :     :     :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
-      :     :     :                          :     :- * ColumnarToRow (36)
-      :     :     :                          :     :  +- CometFilter (35)
-      :     :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
-      :     :     :                          :     +- BroadcastExchange (40)
-      :     :     :                          :        +- * ColumnarToRow (39)
-      :     :     :                          :           +- CometFilter (38)
-      :     :     :                          :              +- CometScan parquet spark_catalog.default.catalog_sales (37)
-      :     :     :                          +- ReusedExchange (43)
-      :     :     +- BroadcastExchange (68)
-      :     :        +- * HashAggregate (67)
-      :     :           +- Exchange (66)
-      :     :              +- * HashAggregate (65)
-      :     :                 +- * Project (64)
-      :     :                    +- * BroadcastHashJoin Inner BuildRight (63)
-      :     :                       :- * Project (61)
-      :     :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
-      :     :                       :     :- * ColumnarToRow (55)
-      :     :                       :     :  +- CometFilter (54)
-      :     :                       :     :     +- CometScan parquet spark_catalog.default.customer (53)
-      :     :                       :     +- BroadcastExchange (59)
-      :     :                       :        +- * ColumnarToRow (58)
-      :     :                       :           +- CometFilter (57)
-      :     :                       :              +- CometScan parquet spark_catalog.default.catalog_sales (56)
-      :     :                       +- ReusedExchange (62)
-      :     +- BroadcastExchange (87)
-      :        +- * Filter (86)
-      :           +- * HashAggregate (85)
-      :              +- Exchange (84)
-      :                 +- * HashAggregate (83)
-      :                    +- * Project (82)
-      :                       +- * BroadcastHashJoin Inner BuildRight (81)
-      :                          :- * Project (79)
-      :                          :  +- * BroadcastHashJoin Inner BuildRight (78)
-      :                          :     :- * ColumnarToRow (73)
-      :                          :     :  +- CometFilter (72)
-      :                          :     :     +- CometScan parquet spark_catalog.default.customer (71)
-      :                          :     +- BroadcastExchange (77)
-      :                          :        +- * ColumnarToRow (76)
-      :                          :           +- CometFilter (75)
-      :                          :              +- CometScan parquet spark_catalog.default.web_sales (74)
-      :                          +- ReusedExchange (80)
-      +- BroadcastExchange (105)
-         +- * HashAggregate (104)
-            +- Exchange (103)
-               +- * HashAggregate (102)
-                  +- * Project (101)
-                     +- * BroadcastHashJoin Inner BuildRight (100)
-                        :- * Project (98)
-                        :  +- * BroadcastHashJoin Inner BuildRight (97)
-                        :     :- * ColumnarToRow (92)
-                        :     :  +- CometFilter (91)
-                        :     :     +- CometScan parquet spark_catalog.default.customer (90)
-                        :     +- BroadcastExchange (96)
-                        :        +- * ColumnarToRow (95)
-                        :           +- CometFilter (94)
-                        :              +- CometScan parquet spark_catalog.default.web_sales (93)
-                        +- ReusedExchange (99)
+TakeOrderedAndProject (120)
++- * Project (119)
+   +- * BroadcastHashJoin Inner BuildRight (118)
+      :- * Project (99)
+      :  +- * BroadcastHashJoin Inner BuildRight (98)
+      :     :- * Project (78)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (77)
+      :     :     :- * Project (58)
+      :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
+      :     :     :     :- * BroadcastHashJoin Inner BuildRight (37)
+      :     :     :     :  :- * ColumnarToRow (18)
+      :     :     :     :  :  +- CometFilter (17)
+      :     :     :     :  :     +- CometHashAggregate (16)
+      :     :     :     :  :        +- CometColumnarExchange (15)
+      :     :     :     :  :           +- RowToColumnar (14)
+      :     :     :     :  :              +- * HashAggregate (13)
+      :     :     :     :  :                 +- * Project (12)
+      :     :     :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :     :  :                       :- * Project (9)
+      :     :     :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :     :     :  :                       :     :- * ColumnarToRow (3)
+      :     :     :     :  :                       :     :  +- CometFilter (2)
+      :     :     :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :     :     :  :                       :     +- BroadcastExchange (7)
+      :     :     :     :  :                       :        +- * ColumnarToRow (6)
+      :     :     :     :  :                       :           +- CometFilter (5)
+      :     :     :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :     :     :  :                       +- ReusedExchange (10)
+      :     :     :     :  +- BroadcastExchange (36)
+      :     :     :     :     +- * ColumnarToRow (35)
+      :     :     :     :        +- CometHashAggregate (34)
+      :     :     :     :           +- CometColumnarExchange (33)
+      :     :     :     :              +- RowToColumnar (32)
+      :     :     :     :                 +- * HashAggregate (31)
+      :     :     :     :                    +- * Project (30)
+      :     :     :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :     :     :                          :- * Project (27)
+      :     :     :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :     :     :                          :     :- * ColumnarToRow (21)
+      :     :     :     :                          :     :  +- CometFilter (20)
+      :     :     :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
+      :     :     :     :                          :     +- BroadcastExchange (25)
+      :     :     :     :                          :        +- * ColumnarToRow (24)
+      :     :     :     :                          :           +- CometFilter (23)
+      :     :     :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
+      :     :     :     :                          +- ReusedExchange (28)
+      :     :     :     +- BroadcastExchange (56)
+      :     :     :        +- * ColumnarToRow (55)
+      :     :     :           +- CometFilter (54)
+      :     :     :              +- CometHashAggregate (53)
+      :     :     :                 +- CometColumnarExchange (52)
+      :     :     :                    +- RowToColumnar (51)
+      :     :     :                       +- * HashAggregate (50)
+      :     :     :                          +- * Project (49)
+      :     :     :                             +- * BroadcastHashJoin Inner BuildRight (48)
+      :     :     :                                :- * Project (46)
+      :     :     :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
+      :     :     :                                :     :- * ColumnarToRow (40)
+      :     :     :                                :     :  +- CometFilter (39)
+      :     :     :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
+      :     :     :                                :     +- BroadcastExchange (44)
+      :     :     :                                :        +- * ColumnarToRow (43)
+      :     :     :                                :           +- CometFilter (42)
+      :     :     :                                :              +- CometScan parquet spark_catalog.default.catalog_sales (41)
+      :     :     :                                +- ReusedExchange (47)
+      :     :     +- BroadcastExchange (76)
+      :     :        +- * ColumnarToRow (75)
+      :     :           +- CometHashAggregate (74)
+      :     :              +- CometColumnarExchange (73)
+      :     :                 +- RowToColumnar (72)
+      :     :                    +- * HashAggregate (71)
+      :     :                       +- * Project (70)
+      :     :                          +- * BroadcastHashJoin Inner BuildRight (69)
+      :     :                             :- * Project (67)
+      :     :                             :  +- * BroadcastHashJoin Inner BuildRight (66)
+      :     :                             :     :- * ColumnarToRow (61)
+      :     :                             :     :  +- CometFilter (60)
+      :     :                             :     :     +- CometScan parquet spark_catalog.default.customer (59)
+      :     :                             :     +- BroadcastExchange (65)
+      :     :                             :        +- * ColumnarToRow (64)
+      :     :                             :           +- CometFilter (63)
+      :     :                             :              +- CometScan parquet spark_catalog.default.catalog_sales (62)
+      :     :                             +- ReusedExchange (68)
+      :     +- BroadcastExchange (97)
+      :        +- * ColumnarToRow (96)
+      :           +- CometFilter (95)
+      :              +- CometHashAggregate (94)
+      :                 +- CometColumnarExchange (93)
+      :                    +- RowToColumnar (92)
+      :                       +- * HashAggregate (91)
+      :                          +- * Project (90)
+      :                             +- * BroadcastHashJoin Inner BuildRight (89)
+      :                                :- * Project (87)
+      :                                :  +- * BroadcastHashJoin Inner BuildRight (86)
+      :                                :     :- * ColumnarToRow (81)
+      :                                :     :  +- CometFilter (80)
+      :                                :     :     +- CometScan parquet spark_catalog.default.customer (79)
+      :                                :     +- BroadcastExchange (85)
+      :                                :        +- * ColumnarToRow (84)
+      :                                :           +- CometFilter (83)
+      :                                :              +- CometScan parquet spark_catalog.default.web_sales (82)
+      :                                +- ReusedExchange (88)
+      +- BroadcastExchange (117)
+         +- * ColumnarToRow (116)
+            +- CometHashAggregate (115)
+               +- CometColumnarExchange (114)
+                  +- RowToColumnar (113)
+                     +- * HashAggregate (112)
+                        +- * Project (111)
+                           +- * BroadcastHashJoin Inner BuildRight (110)
+                              :- * Project (108)
+                              :  +- * BroadcastHashJoin Inner BuildRight (107)
+                              :     :- * ColumnarToRow (102)
+                              :     :  +- CometFilter (101)
+                              :     :     +- CometScan parquet spark_catalog.default.customer (100)
+                              :     +- BroadcastExchange (106)
+                              :        +- * ColumnarToRow (105)
+                              :           +- CometFilter (104)
+                              :              +- CometScan parquet spark_catalog.default.web_sales (103)
+                              +- ReusedExchange (109)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -152,7 +164,7 @@ Join condition: None
 Output [12]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_ext_discount_amt#10, ss_ext_sales_price#11, ss_ext_wholesale_cost#12, ss_ext_list_price#13, ss_sold_date_sk#14]
 Input [14]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_customer_sk#9, ss_ext_discount_amt#10, ss_ext_sales_price#11, ss_ext_wholesale_cost#12, ss_ext_list_price#13, ss_sold_date_sk#14]
 
-(10) ReusedExchange [Reuses operator id: 112]
+(10) ReusedExchange [Reuses operator id: 124]
 Output [2]: [d_date_sk#16, d_year#17]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -172,476 +184,500 @@ Functions [1]: [partial_sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12)
 Aggregate Attributes [2]: [sum#18, isEmpty#19]
 Results [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
 
-(14) Exchange
+(14) RowToColumnar
 Input [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 24]
+(15) CometColumnarExchange
+Input [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
 Keys [8]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17]
 Functions [1]: [sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12) - ss_ext_discount_amt#10) + ss_ext_sales_price#11) / 2))]
-Aggregate Attributes [1]: [sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12) - ss_ext_discount_amt#10) + ss_ext_sales_price#11) / 2))#22]
-Results [2]: [c_customer_id#2 AS customer_id#23, sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12) - ss_ext_discount_amt#10) + ss_ext_sales_price#11) / 2))#22 AS year_total#24]
 
-(16) Filter [codegen id : 24]
-Input [2]: [customer_id#23, year_total#24]
-Condition : (isnotnull(year_total#24) AND (year_total#24 > 0.000000))
+(17) CometFilter
+Input [2]: [customer_id#22, year_total#23]
+Condition : (isnotnull(year_total#23) AND (year_total#23 > 0.000000))
+
+(18) ColumnarToRow [codegen id : 24]
+Input [2]: [customer_id#22, year_total#23]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32]
+Output [8]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(18) CometFilter
-Input [8]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32]
-Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_customer_id#26))
+(20) CometFilter
+Input [8]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31]
+Condition : (isnotnull(c_customer_sk#24) AND isnotnull(c_customer_id#25))
 
-(19) ColumnarToRow [codegen id : 6]
-Input [8]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32]
+(21) ColumnarToRow [codegen id : 6]
+Input [8]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
+Output [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#38), dynamicpruningexpression(ss_sold_date_sk#38 IN dynamicpruning#39)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#37), dynamicpruningexpression(ss_sold_date_sk#37 IN dynamicpruning#38)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_discount_amt:decimal(7,2),ss_ext_sales_price:decimal(7,2),ss_ext_wholesale_cost:decimal(7,2),ss_ext_list_price:decimal(7,2)>
 
-(21) CometFilter
-Input [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
-Condition : isnotnull(ss_customer_sk#33)
+(23) CometFilter
+Input [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
+Condition : isnotnull(ss_customer_sk#32)
 
-(22) ColumnarToRow [codegen id : 4]
-Input [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
+(24) ColumnarToRow [codegen id : 4]
+Input [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
 
-(23) BroadcastExchange
-Input [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
+(25) BroadcastExchange
+Input [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#25]
-Right keys [1]: [ss_customer_sk#33]
+(26) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#24]
+Right keys [1]: [ss_customer_sk#32]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
-Output [12]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
-Input [14]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
+(27) Project [codegen id : 6]
+Output [12]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
+Input [14]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
 
-(26) ReusedExchange [Reuses operator id: 116]
-Output [2]: [d_date_sk#40, d_year#41]
+(28) ReusedExchange [Reuses operator id: 128]
+Output [2]: [d_date_sk#39, d_year#40]
 
-(27) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#38]
-Right keys [1]: [d_date_sk#40]
+(29) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#37]
+Right keys [1]: [d_date_sk#39]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
-Output [12]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, d_year#41]
-Input [14]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38, d_date_sk#40, d_year#41]
-
-(29) HashAggregate [codegen id : 6]
-Input [12]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, d_year#41]
-Keys [8]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41]
-Functions [1]: [partial_sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))]
-Aggregate Attributes [2]: [sum#42, isEmpty#43]
-Results [10]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, sum#44, isEmpty#45]
-
-(30) Exchange
-Input [10]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, sum#44, isEmpty#45]
-Arguments: hashpartitioning(c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 7]
-Input [10]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, sum#44, isEmpty#45]
-Keys [8]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41]
-Functions [1]: [sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))]
-Aggregate Attributes [1]: [sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))#22]
-Results [8]: [c_customer_id#26 AS customer_id#46, c_first_name#27 AS customer_first_name#47, c_last_name#28 AS customer_last_name#48, c_preferred_cust_flag#29 AS customer_preferred_cust_flag#49, c_birth_country#30 AS customer_birth_country#50, c_login#31 AS customer_login#51, c_email_address#32 AS customer_email_address#52, sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))#22 AS year_total#53]
-
-(32) BroadcastExchange
-Input [8]: [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53]
+(30) Project [codegen id : 6]
+Output [12]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, d_year#40]
+Input [14]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37, d_date_sk#39, d_year#40]
+
+(31) HashAggregate [codegen id : 6]
+Input [12]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, d_year#40]
+Keys [8]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40]
+Functions [1]: [partial_sum(((((ss_ext_list_price#36 - ss_ext_wholesale_cost#35) - ss_ext_discount_amt#33) + ss_ext_sales_price#34) / 2))]
+Aggregate Attributes [2]: [sum#41, isEmpty#42]
+Results [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
+
+(32) RowToColumnar
+Input [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
+
+(33) CometColumnarExchange
+Input [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
+Arguments: hashpartitioning(c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
+Keys [8]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40]
+Functions [1]: [sum(((((ss_ext_list_price#36 - ss_ext_wholesale_cost#35) - ss_ext_discount_amt#33) + ss_ext_sales_price#34) / 2))]
+
+(35) ColumnarToRow [codegen id : 7]
+Input [8]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52]
+
+(36) BroadcastExchange
+Input [8]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#23]
-Right keys [1]: [customer_id#46]
+(37) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#22]
+Right keys [1]: [customer_id#45]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61]
+Output [8]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(35) CometFilter
-Input [8]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61]
-Condition : (isnotnull(c_customer_sk#54) AND isnotnull(c_customer_id#55))
+(39) CometFilter
+Input [8]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60]
+Condition : (isnotnull(c_customer_sk#53) AND isnotnull(c_customer_id#54))
 
-(36) ColumnarToRow [codegen id : 10]
-Input [8]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61]
+(40) ColumnarToRow [codegen id : 10]
+Input [8]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
+Output [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#67), dynamicpruningexpression(cs_sold_date_sk#67 IN dynamicpruning#68)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#66), dynamicpruningexpression(cs_sold_date_sk#66 IN dynamicpruning#67)]
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_ext_discount_amt:decimal(7,2),cs_ext_sales_price:decimal(7,2),cs_ext_wholesale_cost:decimal(7,2),cs_ext_list_price:decimal(7,2)>
 
-(38) CometFilter
-Input [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
-Condition : isnotnull(cs_bill_customer_sk#62)
+(42) CometFilter
+Input [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
+Condition : isnotnull(cs_bill_customer_sk#61)
 
-(39) ColumnarToRow [codegen id : 8]
-Input [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
+(43) ColumnarToRow [codegen id : 8]
+Input [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
 
-(40) BroadcastExchange
-Input [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
+(44) BroadcastExchange
+Input [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#54]
-Right keys [1]: [cs_bill_customer_sk#62]
+(45) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#53]
+Right keys [1]: [cs_bill_customer_sk#61]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
-Output [12]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
-Input [14]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
+(46) Project [codegen id : 10]
+Output [12]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
+Input [14]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
 
-(43) ReusedExchange [Reuses operator id: 112]
-Output [2]: [d_date_sk#69, d_year#70]
+(47) ReusedExchange [Reuses operator id: 124]
+Output [2]: [d_date_sk#68, d_year#69]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#67]
-Right keys [1]: [d_date_sk#69]
+(48) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#66]
+Right keys [1]: [d_date_sk#68]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [12]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, d_year#70]
-Input [14]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67, d_date_sk#69, d_year#70]
-
-(46) HashAggregate [codegen id : 10]
-Input [12]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, d_year#70]
-Keys [8]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70]
-Functions [1]: [partial_sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))]
-Aggregate Attributes [2]: [sum#71, isEmpty#72]
-Results [10]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, sum#73, isEmpty#74]
-
-(47) Exchange
-Input [10]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, sum#73, isEmpty#74]
-Arguments: hashpartitioning(c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(48) HashAggregate [codegen id : 11]
-Input [10]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, sum#73, isEmpty#74]
-Keys [8]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70]
-Functions [1]: [sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))]
-Aggregate Attributes [1]: [sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))#75]
-Results [2]: [c_customer_id#55 AS customer_id#76, sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))#75 AS year_total#77]
-
-(49) Filter [codegen id : 11]
-Input [2]: [customer_id#76, year_total#77]
-Condition : (isnotnull(year_total#77) AND (year_total#77 > 0.000000))
-
-(50) BroadcastExchange
-Input [2]: [customer_id#76, year_total#77]
+(49) Project [codegen id : 10]
+Output [12]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, d_year#69]
+Input [14]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66, d_date_sk#68, d_year#69]
+
+(50) HashAggregate [codegen id : 10]
+Input [12]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, d_year#69]
+Keys [8]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69]
+Functions [1]: [partial_sum(((((cs_ext_list_price#65 - cs_ext_wholesale_cost#64) - cs_ext_discount_amt#62) + cs_ext_sales_price#63) / 2))]
+Aggregate Attributes [2]: [sum#70, isEmpty#71]
+Results [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
+
+(51) RowToColumnar
+Input [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
+
+(52) CometColumnarExchange
+Input [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
+Arguments: hashpartitioning(c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(53) CometHashAggregate
+Input [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
+Keys [8]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69]
+Functions [1]: [sum(((((cs_ext_list_price#65 - cs_ext_wholesale_cost#64) - cs_ext_discount_amt#62) + cs_ext_sales_price#63) / 2))]
+
+(54) CometFilter
+Input [2]: [customer_id#74, year_total#75]
+Condition : (isnotnull(year_total#75) AND (year_total#75 > 0.000000))
+
+(55) ColumnarToRow [codegen id : 11]
+Input [2]: [customer_id#74, year_total#75]
+
+(56) BroadcastExchange
+Input [2]: [customer_id#74, year_total#75]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(51) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#23]
-Right keys [1]: [customer_id#76]
+(57) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#22]
+Right keys [1]: [customer_id#74]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 24]
-Output [11]: [customer_id#23, year_total#24, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53, year_total#77]
-Input [12]: [customer_id#23, year_total#24, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53, customer_id#76, year_total#77]
+(58) Project [codegen id : 24]
+Output [11]: [customer_id#22, year_total#23, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52, year_total#75]
+Input [12]: [customer_id#22, year_total#23, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52, customer_id#74, year_total#75]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85]
+Output [8]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(54) CometFilter
-Input [8]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85]
-Condition : (isnotnull(c_customer_sk#78) AND isnotnull(c_customer_id#79))
+(60) CometFilter
+Input [8]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83]
+Condition : (isnotnull(c_customer_sk#76) AND isnotnull(c_customer_id#77))
 
-(55) ColumnarToRow [codegen id : 14]
-Input [8]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85]
+(61) ColumnarToRow [codegen id : 14]
+Input [8]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
+Output [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#91), dynamicpruningexpression(cs_sold_date_sk#91 IN dynamicpruning#92)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#89), dynamicpruningexpression(cs_sold_date_sk#89 IN dynamicpruning#90)]
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_ext_discount_amt:decimal(7,2),cs_ext_sales_price:decimal(7,2),cs_ext_wholesale_cost:decimal(7,2),cs_ext_list_price:decimal(7,2)>
 
-(57) CometFilter
-Input [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
-Condition : isnotnull(cs_bill_customer_sk#86)
+(63) CometFilter
+Input [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
+Condition : isnotnull(cs_bill_customer_sk#84)
 
-(58) ColumnarToRow [codegen id : 12]
-Input [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
+(64) ColumnarToRow [codegen id : 12]
+Input [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
 
-(59) BroadcastExchange
-Input [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
+(65) BroadcastExchange
+Input [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#78]
-Right keys [1]: [cs_bill_customer_sk#86]
+(66) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#76]
+Right keys [1]: [cs_bill_customer_sk#84]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 14]
-Output [12]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
-Input [14]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
+(67) Project [codegen id : 14]
+Output [12]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
+Input [14]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
 
-(62) ReusedExchange [Reuses operator id: 116]
-Output [2]: [d_date_sk#93, d_year#94]
+(68) ReusedExchange [Reuses operator id: 128]
+Output [2]: [d_date_sk#91, d_year#92]
 
-(63) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [cs_sold_date_sk#91]
-Right keys [1]: [d_date_sk#93]
+(69) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [cs_sold_date_sk#89]
+Right keys [1]: [d_date_sk#91]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 14]
-Output [12]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, d_year#94]
-Input [14]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91, d_date_sk#93, d_year#94]
-
-(65) HashAggregate [codegen id : 14]
-Input [12]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, d_year#94]
-Keys [8]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94]
-Functions [1]: [partial_sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))]
-Aggregate Attributes [2]: [sum#95, isEmpty#96]
-Results [10]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, sum#97, isEmpty#98]
-
-(66) Exchange
-Input [10]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, sum#97, isEmpty#98]
-Arguments: hashpartitioning(c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(67) HashAggregate [codegen id : 15]
-Input [10]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, sum#97, isEmpty#98]
-Keys [8]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94]
-Functions [1]: [sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))]
-Aggregate Attributes [1]: [sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))#75]
-Results [2]: [c_customer_id#79 AS customer_id#99, sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))#75 AS year_total#100]
-
-(68) BroadcastExchange
-Input [2]: [customer_id#99, year_total#100]
+(70) Project [codegen id : 14]
+Output [12]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, d_year#92]
+Input [14]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89, d_date_sk#91, d_year#92]
+
+(71) HashAggregate [codegen id : 14]
+Input [12]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, d_year#92]
+Keys [8]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92]
+Functions [1]: [partial_sum(((((cs_ext_list_price#88 - cs_ext_wholesale_cost#87) - cs_ext_discount_amt#85) + cs_ext_sales_price#86) / 2))]
+Aggregate Attributes [2]: [sum#93, isEmpty#94]
+Results [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
+
+(72) RowToColumnar
+Input [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
+
+(73) CometColumnarExchange
+Input [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
+Arguments: hashpartitioning(c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(74) CometHashAggregate
+Input [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
+Keys [8]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92]
+Functions [1]: [sum(((((cs_ext_list_price#88 - cs_ext_wholesale_cost#87) - cs_ext_discount_amt#85) + cs_ext_sales_price#86) / 2))]
+
+(75) ColumnarToRow [codegen id : 15]
+Input [2]: [customer_id#97, year_total#98]
+
+(76) BroadcastExchange
+Input [2]: [customer_id#97, year_total#98]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(69) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#23]
-Right keys [1]: [customer_id#99]
+(77) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#22]
+Right keys [1]: [customer_id#97]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#77 > 0.000000) THEN (year_total#100 / year_total#77) END > CASE WHEN (year_total#24 > 0.000000) THEN (year_total#53 / year_total#24) END)
+Join condition: (CASE WHEN (year_total#75 > 0.000000) THEN (year_total#98 / year_total#75) END > CASE WHEN (year_total#23 > 0.000000) THEN (year_total#52 / year_total#23) END)
 
-(70) Project [codegen id : 24]
-Output [10]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100]
-Input [13]: [customer_id#23, year_total#24, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53, year_total#77, customer_id#99, year_total#100]
+(78) Project [codegen id : 24]
+Output [10]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98]
+Input [13]: [customer_id#22, year_total#23, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52, year_total#75, customer_id#97, year_total#98]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108]
+Output [8]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(72) CometFilter
-Input [8]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108]
-Condition : (isnotnull(c_customer_sk#101) AND isnotnull(c_customer_id#102))
+(80) CometFilter
+Input [8]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106]
+Condition : (isnotnull(c_customer_sk#99) AND isnotnull(c_customer_id#100))
 
-(73) ColumnarToRow [codegen id : 18]
-Input [8]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108]
+(81) ColumnarToRow [codegen id : 18]
+Input [8]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
+Output [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#114), dynamicpruningexpression(ws_sold_date_sk#114 IN dynamicpruning#115)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#112), dynamicpruningexpression(ws_sold_date_sk#112 IN dynamicpruning#113)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_sales_price:decimal(7,2),ws_ext_wholesale_cost:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(75) CometFilter
-Input [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
-Condition : isnotnull(ws_bill_customer_sk#109)
+(83) CometFilter
+Input [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
+Condition : isnotnull(ws_bill_customer_sk#107)
 
-(76) ColumnarToRow [codegen id : 16]
-Input [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
+(84) ColumnarToRow [codegen id : 16]
+Input [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
 
-(77) BroadcastExchange
-Input [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
+(85) BroadcastExchange
+Input [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-(78) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [c_customer_sk#101]
-Right keys [1]: [ws_bill_customer_sk#109]
+(86) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [c_customer_sk#99]
+Right keys [1]: [ws_bill_customer_sk#107]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 18]
-Output [12]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
-Input [14]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
+(87) Project [codegen id : 18]
+Output [12]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
+Input [14]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
 
-(80) ReusedExchange [Reuses operator id: 112]
-Output [2]: [d_date_sk#116, d_year#117]
+(88) ReusedExchange [Reuses operator id: 124]
+Output [2]: [d_date_sk#114, d_year#115]
 
-(81) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_sold_date_sk#114]
-Right keys [1]: [d_date_sk#116]
+(89) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_sold_date_sk#112]
+Right keys [1]: [d_date_sk#114]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 18]
-Output [12]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, d_year#117]
-Input [14]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114, d_date_sk#116, d_year#117]
-
-(83) HashAggregate [codegen id : 18]
-Input [12]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, d_year#117]
-Keys [8]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117]
-Functions [1]: [partial_sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))]
-Aggregate Attributes [2]: [sum#118, isEmpty#119]
-Results [10]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, sum#120, isEmpty#121]
-
-(84) Exchange
-Input [10]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, sum#120, isEmpty#121]
-Arguments: hashpartitioning(c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, 5), ENSURE_REQUIREMENTS, [plan_id=13]
-
-(85) HashAggregate [codegen id : 19]
-Input [10]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, sum#120, isEmpty#121]
-Keys [8]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117]
-Functions [1]: [sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))]
-Aggregate Attributes [1]: [sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))#122]
-Results [2]: [c_customer_id#102 AS customer_id#123, sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))#122 AS year_total#124]
-
-(86) Filter [codegen id : 19]
-Input [2]: [customer_id#123, year_total#124]
-Condition : (isnotnull(year_total#124) AND (year_total#124 > 0.000000))
-
-(87) BroadcastExchange
-Input [2]: [customer_id#123, year_total#124]
+(90) Project [codegen id : 18]
+Output [12]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, d_year#115]
+Input [14]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112, d_date_sk#114, d_year#115]
+
+(91) HashAggregate [codegen id : 18]
+Input [12]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, d_year#115]
+Keys [8]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115]
+Functions [1]: [partial_sum(((((ws_ext_list_price#111 - ws_ext_wholesale_cost#110) - ws_ext_discount_amt#108) + ws_ext_sales_price#109) / 2))]
+Aggregate Attributes [2]: [sum#116, isEmpty#117]
+Results [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
+
+(92) RowToColumnar
+Input [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
+
+(93) CometColumnarExchange
+Input [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
+Arguments: hashpartitioning(c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+
+(94) CometHashAggregate
+Input [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
+Keys [8]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115]
+Functions [1]: [sum(((((ws_ext_list_price#111 - ws_ext_wholesale_cost#110) - ws_ext_discount_amt#108) + ws_ext_sales_price#109) / 2))]
+
+(95) CometFilter
+Input [2]: [customer_id#120, year_total#121]
+Condition : (isnotnull(year_total#121) AND (year_total#121 > 0.000000))
+
+(96) ColumnarToRow [codegen id : 19]
+Input [2]: [customer_id#120, year_total#121]
+
+(97) BroadcastExchange
+Input [2]: [customer_id#120, year_total#121]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=14]
 
-(88) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#23]
-Right keys [1]: [customer_id#123]
+(98) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#22]
+Right keys [1]: [customer_id#120]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 24]
-Output [11]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100, year_total#124]
-Input [12]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100, customer_id#123, year_total#124]
+(99) Project [codegen id : 24]
+Output [11]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98, year_total#121]
+Input [12]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98, customer_id#120, year_total#121]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132]
+Output [8]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(91) CometFilter
-Input [8]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132]
-Condition : (isnotnull(c_customer_sk#125) AND isnotnull(c_customer_id#126))
+(101) CometFilter
+Input [8]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129]
+Condition : (isnotnull(c_customer_sk#122) AND isnotnull(c_customer_id#123))
 
-(92) ColumnarToRow [codegen id : 22]
-Input [8]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132]
+(102) ColumnarToRow [codegen id : 22]
+Input [8]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
+Output [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#138), dynamicpruningexpression(ws_sold_date_sk#138 IN dynamicpruning#139)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#135), dynamicpruningexpression(ws_sold_date_sk#135 IN dynamicpruning#136)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_sales_price:decimal(7,2),ws_ext_wholesale_cost:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(94) CometFilter
-Input [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
-Condition : isnotnull(ws_bill_customer_sk#133)
+(104) CometFilter
+Input [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
+Condition : isnotnull(ws_bill_customer_sk#130)
 
-(95) ColumnarToRow [codegen id : 20]
-Input [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
+(105) ColumnarToRow [codegen id : 20]
+Input [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
 
-(96) BroadcastExchange
-Input [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
+(106) BroadcastExchange
+Input [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=15]
 
-(97) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [c_customer_sk#125]
-Right keys [1]: [ws_bill_customer_sk#133]
+(107) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [c_customer_sk#122]
+Right keys [1]: [ws_bill_customer_sk#130]
 Join type: Inner
 Join condition: None
 
-(98) Project [codegen id : 22]
-Output [12]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
-Input [14]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
+(108) Project [codegen id : 22]
+Output [12]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
+Input [14]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
 
-(99) ReusedExchange [Reuses operator id: 116]
-Output [2]: [d_date_sk#140, d_year#141]
+(109) ReusedExchange [Reuses operator id: 128]
+Output [2]: [d_date_sk#137, d_year#138]
 
-(100) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_sold_date_sk#138]
-Right keys [1]: [d_date_sk#140]
+(110) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_sold_date_sk#135]
+Right keys [1]: [d_date_sk#137]
 Join type: Inner
 Join condition: None
 
-(101) Project [codegen id : 22]
-Output [12]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, d_year#141]
-Input [14]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138, d_date_sk#140, d_year#141]
-
-(102) HashAggregate [codegen id : 22]
-Input [12]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, d_year#141]
-Keys [8]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141]
-Functions [1]: [partial_sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))]
-Aggregate Attributes [2]: [sum#142, isEmpty#143]
-Results [10]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, sum#144, isEmpty#145]
-
-(103) Exchange
-Input [10]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, sum#144, isEmpty#145]
-Arguments: hashpartitioning(c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, 5), ENSURE_REQUIREMENTS, [plan_id=16]
-
-(104) HashAggregate [codegen id : 23]
-Input [10]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, sum#144, isEmpty#145]
-Keys [8]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141]
-Functions [1]: [sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))]
-Aggregate Attributes [1]: [sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))#122]
-Results [2]: [c_customer_id#126 AS customer_id#146, sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))#122 AS year_total#147]
-
-(105) BroadcastExchange
-Input [2]: [customer_id#146, year_total#147]
+(111) Project [codegen id : 22]
+Output [12]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, d_year#138]
+Input [14]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135, d_date_sk#137, d_year#138]
+
+(112) HashAggregate [codegen id : 22]
+Input [12]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, d_year#138]
+Keys [8]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138]
+Functions [1]: [partial_sum(((((ws_ext_list_price#134 - ws_ext_wholesale_cost#133) - ws_ext_discount_amt#131) + ws_ext_sales_price#132) / 2))]
+Aggregate Attributes [2]: [sum#139, isEmpty#140]
+Results [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
+
+(113) RowToColumnar
+Input [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
+
+(114) CometColumnarExchange
+Input [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
+Arguments: hashpartitioning(c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
+
+(115) CometHashAggregate
+Input [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
+Keys [8]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138]
+Functions [1]: [sum(((((ws_ext_list_price#134 - ws_ext_wholesale_cost#133) - ws_ext_discount_amt#131) + ws_ext_sales_price#132) / 2))]
+
+(116) ColumnarToRow [codegen id : 23]
+Input [2]: [customer_id#143, year_total#144]
+
+(117) BroadcastExchange
+Input [2]: [customer_id#143, year_total#144]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=17]
 
-(106) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#23]
-Right keys [1]: [customer_id#146]
+(118) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#22]
+Right keys [1]: [customer_id#143]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#77 > 0.000000) THEN (year_total#100 / year_total#77) END > CASE WHEN (year_total#124 > 0.000000) THEN (year_total#147 / year_total#124) END)
+Join condition: (CASE WHEN (year_total#75 > 0.000000) THEN (year_total#98 / year_total#75) END > CASE WHEN (year_total#121 > 0.000000) THEN (year_total#144 / year_total#121) END)
 
-(107) Project [codegen id : 24]
-Output [7]: [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52]
-Input [13]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100, year_total#124, customer_id#146, year_total#147]
+(119) Project [codegen id : 24]
+Output [7]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51]
+Input [13]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98, year_total#121, customer_id#143, year_total#144]
 
-(108) TakeOrderedAndProject
-Input [7]: [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52]
-Arguments: 100, [customer_id#46 ASC NULLS FIRST, customer_first_name#47 ASC NULLS FIRST, customer_last_name#48 ASC NULLS FIRST, customer_preferred_cust_flag#49 ASC NULLS FIRST, customer_birth_country#50 ASC NULLS FIRST, customer_login#51 ASC NULLS FIRST, customer_email_address#52 ASC NULLS FIRST], [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52]
+(120) TakeOrderedAndProject
+Input [7]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51]
+Arguments: 100, [customer_id#45 ASC NULLS FIRST, customer_first_name#46 ASC NULLS FIRST, customer_last_name#47 ASC NULLS FIRST, customer_preferred_cust_flag#48 ASC NULLS FIRST, customer_birth_country#49 ASC NULLS FIRST, customer_login#50 ASC NULLS FIRST, customer_email_address#51 ASC NULLS FIRST], [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#14 IN dynamicpruning#15
-BroadcastExchange (112)
-+- * ColumnarToRow (111)
-   +- CometFilter (110)
-      +- CometScan parquet spark_catalog.default.date_dim (109)
+BroadcastExchange (124)
++- * ColumnarToRow (123)
+   +- CometFilter (122)
+      +- CometScan parquet spark_catalog.default.date_dim (121)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -651,48 +687,48 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(110) CometFilter
+(122) CometFilter
 Input [2]: [d_date_sk#16, d_year#17]
 Condition : ((isnotnull(d_year#17) AND (d_year#17 = 2001)) AND isnotnull(d_date_sk#16))
 
-(111) ColumnarToRow [codegen id : 1]
+(123) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#16, d_year#17]
 
-(112) BroadcastExchange
+(124) BroadcastExchange
 Input [2]: [d_date_sk#16, d_year#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=18]
 
-Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#38 IN dynamicpruning#39
-BroadcastExchange (116)
-+- * ColumnarToRow (115)
-   +- CometFilter (114)
-      +- CometScan parquet spark_catalog.default.date_dim (113)
+Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#37 IN dynamicpruning#38
+BroadcastExchange (128)
++- * ColumnarToRow (127)
+   +- CometFilter (126)
+      +- CometScan parquet spark_catalog.default.date_dim (125)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#40, d_year#41]
+Output [2]: [d_date_sk#39, d_year#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(114) CometFilter
-Input [2]: [d_date_sk#40, d_year#41]
-Condition : ((isnotnull(d_year#41) AND (d_year#41 = 2002)) AND isnotnull(d_date_sk#40))
+(126) CometFilter
+Input [2]: [d_date_sk#39, d_year#40]
+Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2002)) AND isnotnull(d_date_sk#39))
 
-(115) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#40, d_year#41]
+(127) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#39, d_year#40]
 
-(116) BroadcastExchange
-Input [2]: [d_date_sk#40, d_year#41]
+(128) BroadcastExchange
+Input [2]: [d_date_sk#39, d_year#40]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=19]
 
-Subquery:3 Hosting operator id = 37 Hosting Expression = cs_sold_date_sk#67 IN dynamicpruning#15
+Subquery:3 Hosting operator id = 41 Hosting Expression = cs_sold_date_sk#66 IN dynamicpruning#15
 
-Subquery:4 Hosting operator id = 56 Hosting Expression = cs_sold_date_sk#91 IN dynamicpruning#39
+Subquery:4 Hosting operator id = 62 Hosting Expression = cs_sold_date_sk#89 IN dynamicpruning#38
 
-Subquery:5 Hosting operator id = 74 Hosting Expression = ws_sold_date_sk#114 IN dynamicpruning#15
+Subquery:5 Hosting operator id = 82 Hosting Expression = ws_sold_date_sk#112 IN dynamicpruning#15
 
-Subquery:6 Hosting operator id = 93 Hosting Expression = ws_sold_date_sk#138 IN dynamicpruning#39
+Subquery:6 Hosting operator id = 103 Hosting Expression = ws_sold_date_sk#135 IN dynamicpruning#38
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt
index 99e255a0e4..3299726c59 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt
@@ -9,43 +9,13 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
                 Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,customer_preferred_cust_flag,customer_birth_country,customer_login,customer_email_address,year_total,year_total]
                   BroadcastHashJoin [customer_id,customer_id]
                     BroadcastHashJoin [customer_id,customer_id]
-                      Filter [year_total]
-                        HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ss_ext_list_price - ss_ext_wholesale_cost) - ss_ext_discount_amt) + ss_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
-                          InputAdapter
-                            Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #1
-                              WholeStageCodegen (3)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ss_ext_list_price,ss_ext_wholesale_cost,ss_ext_discount_amt,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,d_year]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                          InputAdapter
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ss_customer_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #1
-                                                          BroadcastExchange #3
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
-                      InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (7)
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ss_ext_list_price - ss_ext_wholesale_cost) - ss_ext_discount_amt) + ss_ext_sales_price) / 2)),customer_id,customer_first_name,customer_last_name,customer_preferred_cust_flag,customer_birth_country,customer_login,customer_email_address,year_total,sum,isEmpty]
-                              InputAdapter
-                                Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #5
-                                  WholeStageCodegen (6)
+                      ColumnarToRow
+                        InputAdapter
+                          CometFilter [year_total]
+                            CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
+                              CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #1
+                                RowToColumnar
+                                  WholeStageCodegen (3)
                                     HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ss_ext_list_price,ss_ext_wholesale_cost,ss_ext_discount_amt,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty]
                                       Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,d_year]
                                         BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -56,124 +26,166 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
                                                   CometFilter [c_customer_sk,c_customer_id]
                                                     CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                               InputAdapter
-                                                BroadcastExchange #6
-                                                  WholeStageCodegen (4)
+                                                BroadcastExchange #2
+                                                  WholeStageCodegen (1)
                                                     ColumnarToRow
                                                       InputAdapter
                                                         CometFilter [ss_customer_sk]
                                                           CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #2
-                                                              BroadcastExchange #7
+                                                            SubqueryBroadcast [d_date_sk] #1
+                                                              BroadcastExchange #3
                                                                 WholeStageCodegen (1)
                                                                   ColumnarToRow
                                                                     InputAdapter
                                                                       CometFilter [d_year,d_date_sk]
                                                                         CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_year] #7
+                                            ReusedExchange [d_date_sk,d_year] #3
+                      InputAdapter
+                        BroadcastExchange #4
+                          WholeStageCodegen (7)
+                            ColumnarToRow
+                              InputAdapter
+                                CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
+                                  CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #5
+                                    RowToColumnar
+                                      WholeStageCodegen (6)
+                                        HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ss_ext_list_price,ss_ext_wholesale_cost,ss_ext_discount_amt,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,d_year]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
+                                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [c_customer_sk,c_customer_id]
+                                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                                  InputAdapter
+                                                    BroadcastExchange #6
+                                                      WholeStageCodegen (4)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [ss_customer_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #2
+                                                                  BroadcastExchange #7
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometFilter [d_year,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk,d_year] #7
                     InputAdapter
                       BroadcastExchange #8
                         WholeStageCodegen (11)
-                          Filter [year_total]
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((cs_ext_list_price - cs_ext_wholesale_cost) - cs_ext_discount_amt) + cs_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
-                              InputAdapter
-                                Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
-                                  WholeStageCodegen (10)
-                                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                            BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [c_customer_sk,c_customer_id]
-                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [year_total]
+                                CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
+                                  CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
+                                    RowToColumnar
+                                      WholeStageCodegen (10)
+                                        HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
+                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                                BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [c_customer_sk,c_customer_id]
+                                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                                  InputAdapter
+                                                    BroadcastExchange #10
+                                                      WholeStageCodegen (8)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [cs_bill_customer_sk]
+                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
                                               InputAdapter
-                                                BroadcastExchange #10
-                                                  WholeStageCodegen (8)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [cs_bill_customer_sk]
-                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk,d_year] #3
+                                                ReusedExchange [d_date_sk,d_year] #3
                 InputAdapter
                   BroadcastExchange #11
                     WholeStageCodegen (15)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((cs_ext_list_price - cs_ext_wholesale_cost) - cs_ext_discount_amt) + cs_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
+                      ColumnarToRow
                         InputAdapter
-                          Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
-                            WholeStageCodegen (14)
-                              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
-                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                    Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                      BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [c_customer_sk,c_customer_id]
-                                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                          CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
+                            CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
+                              RowToColumnar
+                                WholeStageCodegen (14)
+                                  HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                    Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
+                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                          BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [c_customer_sk,c_customer_id]
+                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                            InputAdapter
+                                              BroadcastExchange #13
+                                                WholeStageCodegen (12)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [cs_bill_customer_sk]
+                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                                          ReusedSubquery [d_date_sk] #2
                                         InputAdapter
-                                          BroadcastExchange #13
-                                            WholeStageCodegen (12)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [cs_bill_customer_sk]
-                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #2
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk,d_year] #7
+                                          ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #14
                 WholeStageCodegen (19)
-                  Filter [year_total]
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ws_ext_list_price - ws_ext_wholesale_cost) - ws_ext_discount_amt) + ws_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #15
-                          WholeStageCodegen (18)
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk,c_customer_id]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [year_total]
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #15
+                            RowToColumnar
+                              WholeStageCodegen (18)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                          InputAdapter
+                                            BroadcastExchange #16
+                                              WholeStageCodegen (16)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        BroadcastExchange #16
-                                          WholeStageCodegen (16)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
+                                        ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #17
             WholeStageCodegen (23)
-              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ws_ext_list_price - ws_ext_wholesale_cost) - ws_ext_discount_amt) + ws_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
+              ColumnarToRow
                 InputAdapter
-                  Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #18
-                    WholeStageCodegen (22)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_customer_sk,c_customer_id]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
+                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #18
+                      RowToColumnar
+                        WholeStageCodegen (22)
+                          HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_customer_id]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                    InputAdapter
+                                      BroadcastExchange #19
+                                        WholeStageCodegen (20)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #19
-                                    WholeStageCodegen (20)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_customer_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #2
-                            InputAdapter
-                              ReusedExchange [d_date_sk,d_year] #7
+                                  ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt
index 9f6036a23d..89bb2af3e9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt
@@ -1,36 +1,38 @@
 == Physical Plan ==
-TakeOrderedAndProject (32)
-+- * HashAggregate (31)
-   +- Exchange (30)
-      +- * HashAggregate (29)
-         +- * Project (28)
-            +- * BroadcastHashJoin Inner BuildRight (27)
-               :- * Project (25)
-               :  +- * BroadcastHashJoin Inner BuildRight (24)
-               :     :- * Project (18)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-               :     :     :- * ColumnarToRow (12)
-               :     :     :  +- CometProject (11)
-               :     :     :     +- CometSortMergeJoin (10)
-               :     :     :        :- CometSort (4)
-               :     :     :        :  +- CometExchange (3)
-               :     :     :        :     +- CometFilter (2)
-               :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :     :     :        +- CometSort (9)
-               :     :     :           +- CometExchange (8)
-               :     :     :              +- CometProject (7)
-               :     :     :                 +- CometFilter (6)
-               :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (5)
-               :     :     +- BroadcastExchange (16)
-               :     :        +- * ColumnarToRow (15)
-               :     :           +- CometFilter (14)
-               :     :              +- CometScan parquet spark_catalog.default.warehouse (13)
-               :     +- BroadcastExchange (23)
-               :        +- * ColumnarToRow (22)
-               :           +- CometProject (21)
-               :              +- CometFilter (20)
-               :                 +- CometScan parquet spark_catalog.default.item (19)
-               +- ReusedExchange (26)
+* ColumnarToRow (34)
++- CometTakeOrderedAndProject (33)
+   +- CometHashAggregate (32)
+      +- CometColumnarExchange (31)
+         +- RowToColumnar (30)
+            +- * HashAggregate (29)
+               +- * Project (28)
+                  +- * BroadcastHashJoin Inner BuildRight (27)
+                     :- * Project (25)
+                     :  +- * BroadcastHashJoin Inner BuildRight (24)
+                     :     :- * Project (18)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                     :     :     :- * ColumnarToRow (12)
+                     :     :     :  +- CometProject (11)
+                     :     :     :     +- CometSortMergeJoin (10)
+                     :     :     :        :- CometSort (4)
+                     :     :     :        :  +- CometColumnarExchange (3)
+                     :     :     :        :     +- CometFilter (2)
+                     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                     :     :     :        +- CometSort (9)
+                     :     :     :           +- CometColumnarExchange (8)
+                     :     :     :              +- CometProject (7)
+                     :     :     :                 +- CometFilter (6)
+                     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (5)
+                     :     :     +- BroadcastExchange (16)
+                     :     :        +- * ColumnarToRow (15)
+                     :     :           +- CometFilter (14)
+                     :     :              +- CometScan parquet spark_catalog.default.warehouse (13)
+                     :     +- BroadcastExchange (23)
+                     :        +- * ColumnarToRow (22)
+                     :           +- CometProject (21)
+                     :              +- CometFilter (20)
+                     :                 +- CometScan parquet spark_catalog.default.item (19)
+                     +- ReusedExchange (26)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -45,9 +47,9 @@ ReadSchema: struct<cs_warehouse_sk:int,cs_item_sk:int,cs_order_number:int,cs_sal
 Input [5]: [cs_warehouse_sk#1, cs_item_sk#2, cs_order_number#3, cs_sales_price#4, cs_sold_date_sk#5]
 Condition : (isnotnull(cs_warehouse_sk#1) AND isnotnull(cs_item_sk#2))
 
-(3) CometExchange
+(3) CometColumnarExchange
 Input [5]: [cs_warehouse_sk#1, cs_item_sk#2, cs_order_number#3, cs_sales_price#4, cs_sold_date_sk#5]
-Arguments: hashpartitioning(cs_order_number#3, cs_item_sk#2, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(cs_order_number#3, cs_item_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (4) CometSort
 Input [5]: [cs_warehouse_sk#1, cs_item_sk#2, cs_order_number#3, cs_sales_price#4, cs_sold_date_sk#5]
@@ -68,9 +70,9 @@ Condition : (isnotnull(cr_order_number#8) AND isnotnull(cr_item_sk#7))
 Input [4]: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9, cr_returned_date_sk#10]
 Arguments: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9], [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9]
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [3]: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9]
-Arguments: hashpartitioning(cr_order_number#8, cr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(cr_order_number#8, cr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [3]: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9]
@@ -148,7 +150,7 @@ Join condition: None
 Output [5]: [cs_sales_price#4, cs_sold_date_sk#5, cr_refunded_cash#9, w_state#12, i_item_id#14]
 Input [7]: [cs_item_sk#2, cs_sales_price#4, cs_sold_date_sk#5, cr_refunded_cash#9, w_state#12, i_item_sk#13, i_item_id#14]
 
-(26) ReusedExchange [Reuses operator id: 36]
+(26) ReusedExchange [Reuses operator id: 38]
 Output [2]: [d_date_sk#16, d_date#17]
 
 (27) BroadcastHashJoin [codegen id : 4]
@@ -168,28 +170,32 @@ Functions [2]: [partial_sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_pr
 Aggregate Attributes [4]: [sum#18, isEmpty#19, sum#20, isEmpty#21]
 Results [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
 
-(30) Exchange
+(30) RowToColumnar
 Input [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
-Arguments: hashpartitioning(w_state#12, i_item_id#14, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(31) HashAggregate [codegen id : 5]
+(31) CometColumnarExchange
+Input [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
+Arguments: hashpartitioning(w_state#12, i_item_id#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(32) CometHashAggregate
 Input [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Keys [2]: [w_state#12, i_item_id#14]
 Functions [2]: [sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END), sum(CASE WHEN (d_date#17 >= 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)]
-Aggregate Attributes [2]: [sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#26, sum(CASE WHEN (d_date#17 >= 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#27]
-Results [4]: [w_state#12, i_item_id#14, sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#26 AS sales_before#28, sum(CASE WHEN (d_date#17 >= 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#27 AS sales_after#29]
 
-(32) TakeOrderedAndProject
-Input [4]: [w_state#12, i_item_id#14, sales_before#28, sales_after#29]
-Arguments: 100, [w_state#12 ASC NULLS FIRST, i_item_id#14 ASC NULLS FIRST], [w_state#12, i_item_id#14, sales_before#28, sales_after#29]
+(33) CometTakeOrderedAndProject
+Input [4]: [w_state#12, i_item_id#14, sales_before#26, sales_after#27]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[w_state#12 ASC NULLS FIRST,i_item_id#14 ASC NULLS FIRST], output=[w_state#12,i_item_id#14,sales_before#26,sales_after#27]), 100, [w_state#12 ASC NULLS FIRST, i_item_id#14 ASC NULLS FIRST], [w_state#12, i_item_id#14, sales_before#26, sales_after#27]
+
+(34) ColumnarToRow [codegen id : 5]
+Input [4]: [w_state#12, i_item_id#14, sales_before#26, sales_after#27]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (36)
-+- * ColumnarToRow (35)
-   +- CometFilter (34)
-      +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (38)
++- * ColumnarToRow (37)
+   +- CometFilter (36)
+      +- CometScan parquet spark_catalog.default.date_dim (35)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -199,14 +205,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-10), LessThanOrEqual(d_date,2000-04-10), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(34) CometFilter
+(36) CometFilter
 Input [2]: [d_date_sk#16, d_date#17]
 Condition : (((isnotnull(d_date#17) AND (d_date#17 >= 2000-02-10)) AND (d_date#17 <= 2000-04-10)) AND isnotnull(d_date_sk#16))
 
-(35) ColumnarToRow [codegen id : 1]
+(37) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#16, d_date#17]
 
-(36) BroadcastExchange
+(38) BroadcastExchange
 Input [2]: [d_date_sk#16, d_date#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt
index 98d39c58d5..541de7ec5e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt
@@ -1,50 +1,52 @@
-TakeOrderedAndProject [w_state,i_item_id,sales_before,sales_after]
-  WholeStageCodegen (5)
-    HashAggregate [w_state,i_item_id,sum,isEmpty,sum,isEmpty] [sum(CASE WHEN (d_date < 2000-03-11) THEN (cs_sales_price - coalesce(cast(cr_refunded_cash as decimal(12,2)), 0.00)) ELSE 0.00 END),sum(CASE WHEN (d_date >= 2000-03-11) THEN (cs_sales_price - coalesce(cast(cr_refunded_cash as decimal(12,2)), 0.00)) ELSE 0.00 END),sales_before,sales_after,sum,isEmpty,sum,isEmpty]
-      InputAdapter
-        Exchange [w_state,i_item_id] #1
-          WholeStageCodegen (4)
-            HashAggregate [w_state,i_item_id,d_date,cs_sales_price,cr_refunded_cash] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-              Project [cs_sales_price,cr_refunded_cash,w_state,i_item_id,d_date]
-                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                  Project [cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state,i_item_id]
-                    BroadcastHashJoin [cs_item_sk,i_item_sk]
-                      Project [cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state]
-                        BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [cs_warehouse_sk,cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash]
-                                CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                  CometSort [cs_order_number,cs_item_sk]
-                                    CometExchange [cs_order_number,cs_item_sk] #2
-                                      CometFilter [cs_warehouse_sk,cs_item_sk]
-                                        CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_item_sk,cs_order_number,cs_sales_price,cs_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #3
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [d_date,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                  CometSort [cr_order_number,cr_item_sk]
-                                    CometExchange [cr_order_number,cr_item_sk] #4
-                                      CometProject [cr_item_sk,cr_order_number,cr_refunded_cash]
-                                        CometFilter [cr_order_number,cr_item_sk]
-                                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_returned_date_sk]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [w_state,i_item_id,sales_before,sales_after]
+        CometHashAggregate [w_state,i_item_id,sum,isEmpty,sum,isEmpty]
+          CometColumnarExchange [w_state,i_item_id] #1
+            RowToColumnar
+              WholeStageCodegen (4)
+                HashAggregate [w_state,i_item_id,d_date,cs_sales_price,cr_refunded_cash] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  Project [cs_sales_price,cr_refunded_cash,w_state,i_item_id,d_date]
+                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                      Project [cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state,i_item_id]
+                        BroadcastHashJoin [cs_item_sk,i_item_sk]
+                          Project [cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state]
+                            BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometProject [cs_warehouse_sk,cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash]
+                                    CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                      CometSort [cs_order_number,cs_item_sk]
+                                        CometColumnarExchange [cs_order_number,cs_item_sk] #2
+                                          CometFilter [cs_warehouse_sk,cs_item_sk]
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_item_sk,cs_order_number,cs_sales_price,cs_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [d_date,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                      CometSort [cr_order_number,cr_item_sk]
+                                        CometColumnarExchange [cr_order_number,cr_item_sk] #4
+                                          CometProject [cr_item_sk,cr_order_number,cr_refunded_cash]
+                                            CometFilter [cr_order_number,cr_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_returned_date_sk]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (1)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [w_warehouse_sk]
+                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_state]
                           InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (1)
+                            BroadcastExchange #6
+                              WholeStageCodegen (2)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [w_warehouse_sk]
-                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_state]
+                                    CometProject [i_item_sk,i_item_id]
+                                      CometFilter [i_current_price,i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (2)
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [i_item_sk,i_item_id]
-                                  CometFilter [i_current_price,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
-                  InputAdapter
-                    ReusedExchange [d_date_sk,d_date] #3
+                        ReusedExchange [d_date_sk,d_date] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt
index 2308990771..ee6d6a04ec 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt
@@ -1,24 +1,26 @@
 == Physical Plan ==
-TakeOrderedAndProject (20)
-+- * HashAggregate (19)
-   +- Exchange (18)
-      +- * HashAggregate (17)
-         +- * Project (16)
-            +- * BroadcastHashJoin Inner BuildRight (15)
-               :- * ColumnarToRow (4)
-               :  +- CometProject (3)
-               :     +- CometFilter (2)
-               :        +- CometScan parquet spark_catalog.default.item (1)
-               +- BroadcastExchange (14)
-                  +- * ColumnarToRow (13)
-                     +- CometProject (12)
-                        +- CometFilter (11)
-                           +- CometHashAggregate (10)
-                              +- CometExchange (9)
-                                 +- CometHashAggregate (8)
-                                    +- CometProject (7)
-                                       +- CometFilter (6)
-                                          +- CometScan parquet spark_catalog.default.item (5)
+* ColumnarToRow (22)
++- CometTakeOrderedAndProject (21)
+   +- CometHashAggregate (20)
+      +- CometColumnarExchange (19)
+         +- RowToColumnar (18)
+            +- * HashAggregate (17)
+               +- * Project (16)
+                  +- * BroadcastHashJoin Inner BuildRight (15)
+                     :- * ColumnarToRow (4)
+                     :  +- CometProject (3)
+                     :     +- CometFilter (2)
+                     :        +- CometScan parquet spark_catalog.default.item (1)
+                     +- BroadcastExchange (14)
+                        +- * ColumnarToRow (13)
+                           +- CometProject (12)
+                              +- CometFilter (11)
+                                 +- CometHashAggregate (10)
+                                    +- CometColumnarExchange (9)
+                                       +- CometHashAggregate (8)
+                                          +- CometProject (7)
+                                             +- CometFilter (6)
+                                                +- CometScan parquet spark_catalog.default.item (5)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -59,9 +61,9 @@ Input [1]: [i_manufact#5]
 Keys [1]: [i_manufact#5]
 Functions [1]: [partial_count(1)]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [2]: [i_manufact#5, count#9]
-Arguments: hashpartitioning(i_manufact#5, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(i_manufact#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (10) CometHashAggregate
 Input [2]: [i_manufact#5, count#9]
@@ -100,18 +102,22 @@ Functions: []
 Aggregate Attributes: []
 Results [1]: [i_product_name#3]
 
-(18) Exchange
+(18) RowToColumnar
 Input [1]: [i_product_name#3]
-Arguments: hashpartitioning(i_product_name#3, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) HashAggregate [codegen id : 3]
+(19) CometColumnarExchange
+Input [1]: [i_product_name#3]
+Arguments: hashpartitioning(i_product_name#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(20) CometHashAggregate
 Input [1]: [i_product_name#3]
 Keys [1]: [i_product_name#3]
 Functions: []
-Aggregate Attributes: []
-Results [1]: [i_product_name#3]
 
-(20) TakeOrderedAndProject
+(21) CometTakeOrderedAndProject
+Input [1]: [i_product_name#3]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_product_name#3 ASC NULLS FIRST], output=[i_product_name#3]), 100, [i_product_name#3 ASC NULLS FIRST], [i_product_name#3]
+
+(22) ColumnarToRow [codegen id : 3]
 Input [1]: [i_product_name#3]
-Arguments: 100, [i_product_name#3 ASC NULLS FIRST], [i_product_name#3]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt
index 6c8ffadfdb..3c68188747 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt
@@ -1,27 +1,29 @@
-TakeOrderedAndProject [i_product_name]
-  WholeStageCodegen (3)
-    HashAggregate [i_product_name]
-      InputAdapter
-        Exchange [i_product_name] #1
-          WholeStageCodegen (2)
-            HashAggregate [i_product_name]
-              Project [i_product_name]
-                BroadcastHashJoin [i_manufact,i_manufact]
-                  ColumnarToRow
-                    InputAdapter
-                      CometProject [i_manufact,i_product_name]
-                        CometFilter [i_manufact_id,i_manufact]
-                          CometScan parquet spark_catalog.default.item [i_manufact_id,i_manufact,i_product_name]
-                  InputAdapter
-                    BroadcastExchange #2
-                      WholeStageCodegen (1)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [i_manufact]
-                              CometFilter [item_cnt]
-                                CometHashAggregate [i_manufact,count]
-                                  CometExchange [i_manufact] #3
-                                    CometHashAggregate [i_manufact]
-                                      CometProject [i_manufact]
-                                        CometFilter [i_category,i_color,i_units,i_size,i_manufact]
-                                          CometScan parquet spark_catalog.default.item [i_category,i_manufact,i_size,i_color,i_units]
+WholeStageCodegen (3)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_product_name]
+        CometHashAggregate [i_product_name]
+          CometColumnarExchange [i_product_name] #1
+            RowToColumnar
+              WholeStageCodegen (2)
+                HashAggregate [i_product_name]
+                  Project [i_product_name]
+                    BroadcastHashJoin [i_manufact,i_manufact]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [i_manufact,i_product_name]
+                            CometFilter [i_manufact_id,i_manufact]
+                              CometScan parquet spark_catalog.default.item [i_manufact_id,i_manufact,i_product_name]
+                      InputAdapter
+                        BroadcastExchange #2
+                          WholeStageCodegen (1)
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [i_manufact]
+                                  CometFilter [item_cnt]
+                                    CometHashAggregate [i_manufact,count]
+                                      CometColumnarExchange [i_manufact] #3
+                                        CometHashAggregate [i_manufact]
+                                          CometProject [i_manufact]
+                                            CometFilter [i_category,i_color,i_units,i_size,i_manufact]
+                                              CometScan parquet spark_catalog.default.item [i_category,i_manufact,i_size,i_color,i_units]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt
index 958f358b7b..647bf61f60 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt
@@ -1,25 +1,27 @@
 == Physical Plan ==
-TakeOrderedAndProject (21)
-+- * HashAggregate (20)
-   +- Exchange (19)
-      +- * HashAggregate (18)
-         +- * Project (17)
-            +- * BroadcastHashJoin Inner BuildRight (16)
-               :- * Project (10)
-               :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :- * ColumnarToRow (4)
-               :     :  +- CometProject (3)
-               :     :     +- CometFilter (2)
-               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-               :     +- BroadcastExchange (8)
-               :        +- * ColumnarToRow (7)
-               :           +- CometFilter (6)
-               :              +- CometScan parquet spark_catalog.default.store_sales (5)
-               +- BroadcastExchange (15)
-                  +- * ColumnarToRow (14)
-                     +- CometProject (13)
-                        +- CometFilter (12)
-                           +- CometScan parquet spark_catalog.default.item (11)
+* ColumnarToRow (23)
++- CometTakeOrderedAndProject (22)
+   +- CometHashAggregate (21)
+      +- CometColumnarExchange (20)
+         +- RowToColumnar (19)
+            +- * HashAggregate (18)
+               +- * Project (17)
+                  +- * BroadcastHashJoin Inner BuildRight (16)
+                     :- * Project (10)
+                     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :- * ColumnarToRow (4)
+                     :     :  +- CometProject (3)
+                     :     :     +- CometFilter (2)
+                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+                     :     +- BroadcastExchange (8)
+                     :        +- * ColumnarToRow (7)
+                     :           +- CometFilter (6)
+                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                     +- BroadcastExchange (15)
+                        +- * ColumnarToRow (14)
+                           +- CometProject (13)
+                              +- CometFilter (12)
+                                 +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -108,18 +110,22 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
 
-(19) Exchange
+(19) RowToColumnar
 Input [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
-Arguments: hashpartitioning(d_year#2, i_category_id#8, i_category#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
+Arguments: hashpartitioning(d_year#2, i_category_id#8, i_category#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(21) CometHashAggregate
 Input [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
 Keys [3]: [d_year#2, i_category_id#8, i_category#9]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
-Results [4]: [d_year#2, i_category_id#8, i_category#9, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS sum(ss_ext_sales_price)#14]
 
-(21) TakeOrderedAndProject
-Input [4]: [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#14]
-Arguments: 100, [sum(ss_ext_sales_price)#14 DESC NULLS LAST, d_year#2 ASC NULLS FIRST, i_category_id#8 ASC NULLS FIRST, i_category#9 ASC NULLS FIRST], [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#14]
+(22) CometTakeOrderedAndProject
+Input [4]: [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#13]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[sum(ss_ext_sales_price)#13 DESC NULLS LAST,d_year#2 ASC NULLS FIRST,i_category_id#8 ASC NULLS FIRST,i_category#9 ASC NULLS FIRST], output=[d_year#2,i_category_id#8,i_category#9,sum(ss_ext_sales_price)#13]), 100, [sum(ss_ext_sales_price)#13 DESC NULLS LAST, d_year#2 ASC NULLS FIRST, i_category_id#8 ASC NULLS FIRST, i_category#9 ASC NULLS FIRST], [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#13]
+
+(23) ColumnarToRow [codegen id : 4]
+Input [4]: [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#13]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt
index 67906b8c7a..d33229197b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt
@@ -1,31 +1,33 @@
-TakeOrderedAndProject [sum(ss_ext_sales_price),d_year,i_category_id,i_category]
-  WholeStageCodegen (4)
-    HashAggregate [d_year,i_category_id,i_category,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(ss_ext_sales_price),sum]
-      InputAdapter
-        Exchange [d_year,i_category_id,i_category] #1
-          WholeStageCodegen (3)
-            HashAggregate [d_year,i_category_id,i_category,ss_ext_sales_price] [sum,sum]
-              Project [d_year,ss_ext_sales_price,i_category_id,i_category]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [d_year,ss_item_sk,ss_ext_sales_price]
-                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [d_date_sk,d_year]
-                            CometFilter [d_moy,d_year,d_date_sk]
-                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (4)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [sum(ss_ext_sales_price),d_year,i_category_id,i_category]
+        CometHashAggregate [d_year,i_category_id,i_category,sum]
+          CometColumnarExchange [d_year,i_category_id,i_category] #1
+            RowToColumnar
+              WholeStageCodegen (3)
+                HashAggregate [d_year,i_category_id,i_category,ss_ext_sales_price] [sum,sum]
+                  Project [d_year,ss_ext_sales_price,i_category_id,i_category]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [d_year,ss_item_sk,ss_ext_sales_price]
+                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [d_date_sk,d_year]
+                                CometFilter [d_moy,d_year,d_date_sk]
+                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                          InputAdapter
+                            BroadcastExchange #2
+                              WholeStageCodegen (1)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
                       InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (1)
+                        BroadcastExchange #3
+                          WholeStageCodegen (2)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                  InputAdapter
-                    BroadcastExchange #3
-                      WholeStageCodegen (2)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [i_item_sk,i_category_id,i_category]
-                              CometFilter [i_manager_id,i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_category_id,i_category,i_manager_id]
+                                CometProject [i_item_sk,i_category_id,i_category]
+                                  CometFilter [i_manager_id,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_category_id,i_category,i_manager_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt
index 68b4b54005..4e1468e50c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt
@@ -1,25 +1,27 @@
 == Physical Plan ==
-TakeOrderedAndProject (21)
-+- * HashAggregate (20)
-   +- Exchange (19)
-      +- * HashAggregate (18)
-         +- * Project (17)
-            +- * BroadcastHashJoin Inner BuildRight (16)
-               :- * Project (10)
-               :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :- * ColumnarToRow (4)
-               :     :  +- CometProject (3)
-               :     :     +- CometFilter (2)
-               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-               :     +- BroadcastExchange (8)
-               :        +- * ColumnarToRow (7)
-               :           +- CometFilter (6)
-               :              +- CometScan parquet spark_catalog.default.store_sales (5)
-               +- BroadcastExchange (15)
-                  +- * ColumnarToRow (14)
-                     +- CometProject (13)
-                        +- CometFilter (12)
-                           +- CometScan parquet spark_catalog.default.store (11)
+* ColumnarToRow (23)
++- CometTakeOrderedAndProject (22)
+   +- CometHashAggregate (21)
+      +- CometColumnarExchange (20)
+         +- RowToColumnar (19)
+            +- * HashAggregate (18)
+               +- * Project (17)
+                  +- * BroadcastHashJoin Inner BuildRight (16)
+                     :- * Project (10)
+                     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :- * ColumnarToRow (4)
+                     :     :  +- CometProject (3)
+                     :     :     +- CometFilter (2)
+                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+                     :     +- BroadcastExchange (8)
+                     :        +- * ColumnarToRow (7)
+                     :           +- CometFilter (6)
+                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                     +- BroadcastExchange (15)
+                        +- * ColumnarToRow (14)
+                           +- CometProject (13)
+                              +- CometFilter (12)
+                                 +- CometScan parquet spark_catalog.default.store (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -108,18 +110,22 @@ Functions [7]: [partial_sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) T
 Aggregate Attributes [7]: [sum#11, sum#12, sum#13, sum#14, sum#15, sum#16, sum#17]
 Results [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
 
-(19) Exchange
+(19) RowToColumnar
 Input [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(s_store_name#9, s_store_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(s_store_name#9, s_store_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(21) CometHashAggregate
 Input [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
 Keys [2]: [s_store_name#9, s_store_id#8]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Monday   ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Tuesday  ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Wednesday) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Thursday ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Friday   ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Saturday ) THEN ss_sales_price#5 END))]
-Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) THEN ss_sales_price#5 END))#25, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Monday   ) THEN ss_sales_price#5 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Tuesday  ) THEN ss_sales_price#5 END))#27, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Wednesday) THEN ss_sales_price#5 END))#28, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Thursday ) THEN ss_sales_price#5 END))#29, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Friday   ) THEN ss_sales_price#5 END))#30, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Saturday ) THEN ss_sales_price#5 END))#31]
-Results [9]: [s_store_name#9, s_store_id#8, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) THEN ss_sales_price#5 END))#25,17,2) AS sun_sales#32, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Monday   ) THEN ss_sales_price#5 END))#26,17,2) AS mon_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Tuesday  ) THEN ss_sales_price#5 END))#27,17,2) AS tue_sales#34, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Wednesday) THEN ss_sales_price#5 END))#28,17,2) AS wed_sales#35, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Thursday ) THEN ss_sales_price#5 END))#29,17,2) AS thu_sales#36, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Friday   ) THEN ss_sales_price#5 END))#30,17,2) AS fri_sales#37, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Saturday ) THEN ss_sales_price#5 END))#31,17,2) AS sat_sales#38]
 
-(21) TakeOrderedAndProject
-Input [9]: [s_store_name#9, s_store_id#8, sun_sales#32, mon_sales#33, tue_sales#34, wed_sales#35, thu_sales#36, fri_sales#37, sat_sales#38]
-Arguments: 100, [s_store_name#9 ASC NULLS FIRST, s_store_id#8 ASC NULLS FIRST, sun_sales#32 ASC NULLS FIRST, mon_sales#33 ASC NULLS FIRST, tue_sales#34 ASC NULLS FIRST, wed_sales#35 ASC NULLS FIRST, thu_sales#36 ASC NULLS FIRST, fri_sales#37 ASC NULLS FIRST, sat_sales#38 ASC NULLS FIRST], [s_store_name#9, s_store_id#8, sun_sales#32, mon_sales#33, tue_sales#34, wed_sales#35, thu_sales#36, fri_sales#37, sat_sales#38]
+(22) CometTakeOrderedAndProject
+Input [9]: [s_store_name#9, s_store_id#8, sun_sales#25, mon_sales#26, tue_sales#27, wed_sales#28, thu_sales#29, fri_sales#30, sat_sales#31]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[s_store_name#9 ASC NULLS FIRST,s_store_id#8 ASC NULLS FIRST,sun_sales#25 ASC NULLS FIRST,mon_sales#26 ASC NULLS FIRST,tue_sales#27 ASC NULLS FIRST,wed_sales#28 ASC NULLS FIRST,thu_sales#29 ASC NULLS FIRST,fri_sales#30 ASC NULLS FIRST,sat_sales#31 ASC NULLS FIRST], output=[s_store_name#9,s_store_id#8,sun_sales#25,mon_sales#26,tue_sales#27,wed_sales#28,thu_sales#29,fri_sales#30,sat_sales#31]), 100, [s_store_name#9 ASC NULLS FIRST, s_store_id#8 ASC NULLS FIRST, sun_sales#25 ASC NULLS FIRST, mon_sales#26 ASC NULLS FIRST, tue_sales#27 ASC NULLS FIRST, wed_sales#28 ASC NULLS FIRST, thu_sales#29 ASC NULLS FIRST, fri_sales#30 ASC NULLS FIRST, sat_sales#31 ASC NULLS FIRST], [s_store_name#9, s_store_id#8, sun_sales#25, mon_sales#26, tue_sales#27, wed_sales#28, thu_sales#29, fri_sales#30, sat_sales#31]
+
+(23) ColumnarToRow [codegen id : 4]
+Input [9]: [s_store_name#9, s_store_id#8, sun_sales#25, mon_sales#26, tue_sales#27, wed_sales#28, thu_sales#29, fri_sales#30, sat_sales#31]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt
index ef20430969..0980f4764e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt
@@ -1,31 +1,33 @@
-TakeOrderedAndProject [s_store_name,s_store_id,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
-  WholeStageCodegen (4)
-    HashAggregate [s_store_name,s_store_id,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN ss_sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
-      InputAdapter
-        Exchange [s_store_name,s_store_id] #1
-          WholeStageCodegen (3)
-            HashAggregate [s_store_name,s_store_id,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-              Project [d_day_name,ss_sales_price,s_store_id,s_store_name]
-                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                  Project [d_day_name,ss_store_sk,ss_sales_price]
-                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [d_date_sk,d_day_name]
-                            CometFilter [d_year,d_date_sk]
-                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_day_name]
+WholeStageCodegen (4)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [s_store_name,s_store_id,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
+        CometHashAggregate [s_store_name,s_store_id,sum,sum,sum,sum,sum,sum,sum]
+          CometColumnarExchange [s_store_name,s_store_id] #1
+            RowToColumnar
+              WholeStageCodegen (3)
+                HashAggregate [s_store_name,s_store_id,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                  Project [d_day_name,ss_sales_price,s_store_id,s_store_name]
+                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                      Project [d_day_name,ss_store_sk,ss_sales_price]
+                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [d_date_sk,d_day_name]
+                                CometFilter [d_year,d_date_sk]
+                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_day_name]
+                          InputAdapter
+                            BroadcastExchange #2
+                              WholeStageCodegen (1)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_store_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
                       InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (1)
+                        BroadcastExchange #3
+                          WholeStageCodegen (2)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ss_store_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
-                  InputAdapter
-                    BroadcastExchange #3
-                      WholeStageCodegen (2)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [s_store_sk,s_store_id,s_store_name]
-                              CometFilter [s_gmt_offset,s_store_sk]
-                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name,s_gmt_offset]
+                                CometProject [s_store_sk,s_store_id,s_store_name]
+                                  CometFilter [s_gmt_offset,s_store_sk]
+                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name,s_gmt_offset]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt
index d7f13b274c..e3a07a650d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt
@@ -12,10 +12,10 @@ TakeOrderedAndProject (33)
       :     :     :        +- Window (11)
       :     :     :           +- * ColumnarToRow (10)
       :     :     :              +- CometSort (9)
-      :     :     :                 +- CometExchange (8)
+      :     :     :                 +- CometColumnarExchange (8)
       :     :     :                    +- CometFilter (7)
       :     :     :                       +- CometHashAggregate (6)
-      :     :     :                          +- CometExchange (5)
+      :     :     :                          +- CometColumnarExchange (5)
       :     :     :                             +- CometHashAggregate (4)
       :     :     :                                +- CometProject (3)
       :     :     :                                   +- CometFilter (2)
@@ -54,9 +54,9 @@ Input [2]: [ss_item_sk#1, ss_net_profit#3]
 Keys [1]: [ss_item_sk#1]
 Functions [1]: [partial_avg(UnscaledValue(ss_net_profit#3))]
 
-(5) CometExchange
+(5) CometColumnarExchange
 Input [3]: [ss_item_sk#1, sum#5, count#6]
-Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (6) CometHashAggregate
 Input [3]: [ss_item_sk#1, sum#5, count#6]
@@ -67,9 +67,9 @@ Functions [1]: [avg(UnscaledValue(ss_net_profit#3))]
 Input [2]: [item_sk#7, rank_col#8]
 Condition : (isnotnull(rank_col#8) AND (cast(rank_col#8 as decimal(13,7)) > (0.9 * Subquery scalar-subquery#9, [id=#10])))
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [2]: [item_sk#7, rank_col#8]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [2]: [item_sk#7, rank_col#8]
@@ -180,7 +180,7 @@ Arguments: 100, [rnk#11 ASC NULLS FIRST], [rnk#11, best_performing#19, worst_per
 Subquery:1 Hosting operator id = 7 Hosting Expression = Subquery scalar-subquery#9, [id=#10]
 * ColumnarToRow (40)
 +- CometHashAggregate (39)
-   +- CometExchange (38)
+   +- CometColumnarExchange (38)
       +- CometHashAggregate (37)
          +- CometProject (36)
             +- CometFilter (35)
@@ -207,9 +207,9 @@ Input [2]: [ss_store_sk#22, ss_net_profit#23]
 Keys [1]: [ss_store_sk#22]
 Functions [1]: [partial_avg(UnscaledValue(ss_net_profit#23))]
 
-(38) CometExchange
+(38) CometColumnarExchange
 Input [3]: [ss_store_sk#22, sum#25, count#26]
-Arguments: hashpartitioning(ss_store_sk#22, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
+Arguments: hashpartitioning(ss_store_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
 (39) CometHashAggregate
 Input [3]: [ss_store_sk#22, sum#25, count#26]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt
index bc065345c8..faccc1ec5e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt
@@ -17,20 +17,20 @@ TakeOrderedAndProject [rnk,best_performing,worst_performing]
                                 ColumnarToRow
                                   InputAdapter
                                     CometSort [rank_col]
-                                      CometExchange #1
+                                      CometColumnarExchange #1
                                         CometFilter [rank_col]
                                           Subquery #1
                                             WholeStageCodegen (1)
                                               ColumnarToRow
                                                 InputAdapter
                                                   CometHashAggregate [ss_store_sk,sum,count]
-                                                    CometExchange [ss_store_sk] #3
+                                                    CometColumnarExchange [ss_store_sk] #3
                                                       CometHashAggregate [ss_store_sk,ss_net_profit]
                                                         CometProject [ss_store_sk,ss_net_profit]
                                                           CometFilter [ss_store_sk,ss_addr_sk]
                                                             CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk]
                                           CometHashAggregate [ss_item_sk,sum,count]
-                                            CometExchange [ss_item_sk] #2
+                                            CometColumnarExchange [ss_item_sk] #2
                                               CometHashAggregate [ss_item_sk,ss_net_profit]
                                                 CometProject [ss_item_sk,ss_net_profit]
                                                   CometFilter [ss_store_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt
index d5d860a393..ac8a1f4f7a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt
@@ -1,40 +1,42 @@
 == Physical Plan ==
-TakeOrderedAndProject (36)
-+- * HashAggregate (35)
-   +- Exchange (34)
-      +- * HashAggregate (33)
-         +- * Project (32)
-            +- * Filter (31)
-               +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (30)
-                  :- * Project (24)
-                  :  +- * BroadcastHashJoin Inner BuildRight (23)
-                  :     :- * Project (18)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                  :     :     :- * Project (15)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :     :     :     :- * Project (9)
-                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :     :     :     :     +- BroadcastExchange (7)
-                  :     :     :     :        +- * ColumnarToRow (6)
-                  :     :     :     :           +- CometFilter (5)
-                  :     :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                  :     :     :     +- BroadcastExchange (13)
-                  :     :     :        +- * ColumnarToRow (12)
-                  :     :     :           +- CometFilter (11)
-                  :     :     :              +- CometScan parquet spark_catalog.default.customer_address (10)
-                  :     :     +- ReusedExchange (16)
-                  :     +- BroadcastExchange (22)
-                  :        +- * ColumnarToRow (21)
-                  :           +- CometFilter (20)
-                  :              +- CometScan parquet spark_catalog.default.item (19)
-                  +- BroadcastExchange (29)
-                     +- * ColumnarToRow (28)
-                        +- CometProject (27)
-                           +- CometFilter (26)
-                              +- CometScan parquet spark_catalog.default.item (25)
+* ColumnarToRow (38)
++- CometTakeOrderedAndProject (37)
+   +- CometHashAggregate (36)
+      +- CometColumnarExchange (35)
+         +- RowToColumnar (34)
+            +- * HashAggregate (33)
+               +- * Project (32)
+                  +- * Filter (31)
+                     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (30)
+                        :- * Project (24)
+                        :  +- * BroadcastHashJoin Inner BuildRight (23)
+                        :     :- * Project (18)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                        :     :     :- * Project (15)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                        :     :     :     :- * Project (9)
+                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                        :     :     :     :     :- * ColumnarToRow (3)
+                        :     :     :     :     :  +- CometFilter (2)
+                        :     :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                        :     :     :     :     +- BroadcastExchange (7)
+                        :     :     :     :        +- * ColumnarToRow (6)
+                        :     :     :     :           +- CometFilter (5)
+                        :     :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                        :     :     :     +- BroadcastExchange (13)
+                        :     :     :        +- * ColumnarToRow (12)
+                        :     :     :           +- CometFilter (11)
+                        :     :     :              +- CometScan parquet spark_catalog.default.customer_address (10)
+                        :     :     +- ReusedExchange (16)
+                        :     +- BroadcastExchange (22)
+                        :        +- * ColumnarToRow (21)
+                        :           +- CometFilter (20)
+                        :              +- CometScan parquet spark_catalog.default.item (19)
+                        +- BroadcastExchange (29)
+                           +- * ColumnarToRow (28)
+                              +- CometProject (27)
+                                 +- CometFilter (26)
+                                    +- CometScan parquet spark_catalog.default.item (25)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -108,7 +110,7 @@ Join condition: None
 Output [5]: [ws_item_sk#2, ws_sales_price#4, ws_sold_date_sk#5, ca_city#10, ca_zip#11]
 Input [7]: [ws_item_sk#2, ws_sales_price#4, ws_sold_date_sk#5, c_current_addr_sk#8, ca_address_sk#9, ca_city#10, ca_zip#11]
 
-(16) ReusedExchange [Reuses operator id: 41]
+(16) ReusedExchange [Reuses operator id: 43]
 Output [1]: [d_date_sk#12]
 
 (17) BroadcastHashJoin [codegen id : 6]
@@ -192,50 +194,54 @@ Functions [1]: [partial_sum(UnscaledValue(ws_sales_price#4))]
 Aggregate Attributes [1]: [sum#17]
 Results [3]: [ca_zip#11, ca_city#10, sum#18]
 
-(34) Exchange
+(34) RowToColumnar
 Input [3]: [ca_zip#11, ca_city#10, sum#18]
-Arguments: hashpartitioning(ca_zip#11, ca_city#10, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(35) HashAggregate [codegen id : 7]
+(35) CometColumnarExchange
+Input [3]: [ca_zip#11, ca_city#10, sum#18]
+Arguments: hashpartitioning(ca_zip#11, ca_city#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(36) CometHashAggregate
 Input [3]: [ca_zip#11, ca_city#10, sum#18]
 Keys [2]: [ca_zip#11, ca_city#10]
 Functions [1]: [sum(UnscaledValue(ws_sales_price#4))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_sales_price#4))#19]
-Results [3]: [ca_zip#11, ca_city#10, MakeDecimal(sum(UnscaledValue(ws_sales_price#4))#19,17,2) AS sum(ws_sales_price)#20]
 
-(36) TakeOrderedAndProject
-Input [3]: [ca_zip#11, ca_city#10, sum(ws_sales_price)#20]
-Arguments: 100, [ca_zip#11 ASC NULLS FIRST, ca_city#10 ASC NULLS FIRST], [ca_zip#11, ca_city#10, sum(ws_sales_price)#20]
+(37) CometTakeOrderedAndProject
+Input [3]: [ca_zip#11, ca_city#10, sum(ws_sales_price)#19]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_zip#11 ASC NULLS FIRST,ca_city#10 ASC NULLS FIRST], output=[ca_zip#11,ca_city#10,sum(ws_sales_price)#19]), 100, [ca_zip#11 ASC NULLS FIRST, ca_city#10 ASC NULLS FIRST], [ca_zip#11, ca_city#10, sum(ws_sales_price)#19]
+
+(38) ColumnarToRow [codegen id : 7]
+Input [3]: [ca_zip#11, ca_city#10, sum(ws_sales_price)#19]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (41)
-+- * ColumnarToRow (40)
-   +- CometProject (39)
-      +- CometFilter (38)
-         +- CometScan parquet spark_catalog.default.date_dim (37)
+BroadcastExchange (43)
++- * ColumnarToRow (42)
+   +- CometProject (41)
+      +- CometFilter (40)
+         +- CometScan parquet spark_catalog.default.date_dim (39)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#12, d_year#21, d_qoy#22]
+Output [3]: [d_date_sk#12, d_year#20, d_qoy#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(38) CometFilter
-Input [3]: [d_date_sk#12, d_year#21, d_qoy#22]
-Condition : ((((isnotnull(d_qoy#22) AND isnotnull(d_year#21)) AND (d_qoy#22 = 2)) AND (d_year#21 = 2001)) AND isnotnull(d_date_sk#12))
+(40) CometFilter
+Input [3]: [d_date_sk#12, d_year#20, d_qoy#21]
+Condition : ((((isnotnull(d_qoy#21) AND isnotnull(d_year#20)) AND (d_qoy#21 = 2)) AND (d_year#20 = 2001)) AND isnotnull(d_date_sk#12))
 
-(39) CometProject
-Input [3]: [d_date_sk#12, d_year#21, d_qoy#22]
+(41) CometProject
+Input [3]: [d_date_sk#12, d_year#20, d_qoy#21]
 Arguments: [d_date_sk#12], [d_date_sk#12]
 
-(40) ColumnarToRow [codegen id : 1]
+(42) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#12]
 
-(41) BroadcastExchange
+(43) BroadcastExchange
 Input [1]: [d_date_sk#12]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt
index 383cbb7e3b..b4965dae7c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt
@@ -1,61 +1,63 @@
-TakeOrderedAndProject [ca_zip,ca_city,sum(ws_sales_price)]
-  WholeStageCodegen (7)
-    HashAggregate [ca_zip,ca_city,sum] [sum(UnscaledValue(ws_sales_price)),sum(ws_sales_price),sum]
-      InputAdapter
-        Exchange [ca_zip,ca_city] #1
-          WholeStageCodegen (6)
-            HashAggregate [ca_zip,ca_city,ws_sales_price] [sum,sum]
-              Project [ws_sales_price,ca_city,ca_zip]
-                Filter [ca_zip,exists]
-                  BroadcastHashJoin [i_item_id,i_item_id]
-                    Project [ws_sales_price,ca_city,ca_zip,i_item_id]
-                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                        Project [ws_item_sk,ws_sales_price,ca_city,ca_zip]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,ca_city,ca_zip]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,c_current_addr_sk]
-                                  BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ws_bill_customer_sk,ws_item_sk]
-                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sales_price,ws_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_qoy,d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+WholeStageCodegen (7)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_zip,ca_city,sum(ws_sales_price)]
+        CometHashAggregate [ca_zip,ca_city,sum]
+          CometColumnarExchange [ca_zip,ca_city] #1
+            RowToColumnar
+              WholeStageCodegen (6)
+                HashAggregate [ca_zip,ca_city,ws_sales_price] [sum,sum]
+                  Project [ws_sales_price,ca_city,ca_zip]
+                    Filter [ca_zip,exists]
+                      BroadcastHashJoin [i_item_id,i_item_id]
+                        Project [ws_sales_price,ca_city,ca_zip,i_item_id]
+                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                            Project [ws_item_sk,ws_sales_price,ca_city,ca_zip]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,ca_city,ca_zip]
+                                  BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                    Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,c_current_addr_sk]
+                                      BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ws_bill_customer_sk,ws_item_sk]
+                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sales_price,ws_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_qoy,d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                        InputAdapter
+                                          BroadcastExchange #3
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [c_customer_sk,c_current_addr_sk]
+                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                                     InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (1)
+                                      BroadcastExchange #4
+                                        WholeStageCodegen (2)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [c_customer_sk,c_current_addr_sk]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                              CometFilter [ca_address_sk]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city,ca_zip]
                                 InputAdapter
-                                  BroadcastExchange #4
-                                    WholeStageCodegen (2)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ca_address_sk]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city,ca_zip]
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #5
+                                WholeStageCodegen (4)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                         InputAdapter
-                          BroadcastExchange #5
-                            WholeStageCodegen (4)
+                          BroadcastExchange #6
+                            WholeStageCodegen (5)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                    InputAdapter
-                      BroadcastExchange #6
-                        WholeStageCodegen (5)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [i_item_id]
-                                CometFilter [i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                  CometProject [i_item_id]
+                                    CometFilter [i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt
index 84d65306e0..a5c06c49ae 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt
@@ -1,43 +1,45 @@
 == Physical Plan ==
-TakeOrderedAndProject (39)
-+- * Project (38)
-   +- * BroadcastHashJoin Inner BuildRight (37)
-      :- * Project (35)
-      :  +- * BroadcastHashJoin Inner BuildRight (34)
-      :     :- * HashAggregate (29)
-      :     :  +- Exchange (28)
-      :     :     +- * HashAggregate (27)
-      :     :        +- * Project (26)
-      :     :           +- * BroadcastHashJoin Inner BuildRight (25)
-      :     :              :- * Project (20)
-      :     :              :  +- * BroadcastHashJoin Inner BuildRight (19)
-      :     :              :     :- * Project (13)
-      :     :              :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :     :              :     :     :- * Project (6)
-      :     :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :              :     :     :     :- * ColumnarToRow (3)
-      :     :              :     :     :     :  +- CometFilter (2)
-      :     :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :              :     :     :     +- ReusedExchange (4)
-      :     :              :     :     +- BroadcastExchange (11)
-      :     :              :     :        +- * ColumnarToRow (10)
-      :     :              :     :           +- CometProject (9)
-      :     :              :     :              +- CometFilter (8)
-      :     :              :     :                 +- CometScan parquet spark_catalog.default.store (7)
-      :     :              :     +- BroadcastExchange (18)
-      :     :              :        +- * ColumnarToRow (17)
-      :     :              :           +- CometProject (16)
-      :     :              :              +- CometFilter (15)
-      :     :              :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
-      :     :              +- BroadcastExchange (24)
-      :     :                 +- * ColumnarToRow (23)
-      :     :                    +- CometFilter (22)
-      :     :                       +- CometScan parquet spark_catalog.default.customer_address (21)
-      :     +- BroadcastExchange (33)
-      :        +- * ColumnarToRow (32)
-      :           +- CometFilter (31)
-      :              +- CometScan parquet spark_catalog.default.customer (30)
-      +- ReusedExchange (36)
+TakeOrderedAndProject (41)
++- * Project (40)
+   +- * BroadcastHashJoin Inner BuildRight (39)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * ColumnarToRow (31)
+      :     :  +- CometHashAggregate (30)
+      :     :     +- CometColumnarExchange (29)
+      :     :        +- RowToColumnar (28)
+      :     :           +- * HashAggregate (27)
+      :     :              +- * Project (26)
+      :     :                 +- * BroadcastHashJoin Inner BuildRight (25)
+      :     :                    :- * Project (20)
+      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (19)
+      :     :                    :     :- * Project (13)
+      :     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :     :                    :     :     :- * Project (6)
+      :     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :                    :     :     :     :- * ColumnarToRow (3)
+      :     :                    :     :     :     :  +- CometFilter (2)
+      :     :                    :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :                    :     :     :     +- ReusedExchange (4)
+      :     :                    :     :     +- BroadcastExchange (11)
+      :     :                    :     :        +- * ColumnarToRow (10)
+      :     :                    :     :           +- CometProject (9)
+      :     :                    :     :              +- CometFilter (8)
+      :     :                    :     :                 +- CometScan parquet spark_catalog.default.store (7)
+      :     :                    :     +- BroadcastExchange (18)
+      :     :                    :        +- * ColumnarToRow (17)
+      :     :                    :           +- CometProject (16)
+      :     :                    :              +- CometFilter (15)
+      :     :                    :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
+      :     :                    +- BroadcastExchange (24)
+      :     :                       +- * ColumnarToRow (23)
+      :     :                          +- CometFilter (22)
+      :     :                             +- CometScan parquet spark_catalog.default.customer_address (21)
+      :     +- BroadcastExchange (35)
+      :        +- * ColumnarToRow (34)
+      :           +- CometFilter (33)
+      :              +- CometScan parquet spark_catalog.default.customer (32)
+      +- ReusedExchange (38)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -55,7 +57,7 @@ Condition : (((isnotnull(ss_store_sk#4) AND isnotnull(ss_hdemo_sk#2)) AND isnotn
 (3) ColumnarToRow [codegen id : 5]
 Input [8]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_store_sk#4, ss_ticket_number#5, ss_coupon_amt#6, ss_net_profit#7, ss_sold_date_sk#8]
 
-(4) ReusedExchange [Reuses operator id: 44]
+(4) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#10]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -167,91 +169,95 @@ Functions [2]: [partial_sum(UnscaledValue(ss_coupon_amt#6)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#18, sum#19]
 Results [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
 
-(28) Exchange
+(28) RowToColumnar
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
-Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) HashAggregate [codegen id : 8]
+(29) CometColumnarExchange
+Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
+Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(30) CometHashAggregate
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
 Keys [4]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17]
 Functions [2]: [sum(UnscaledValue(ss_coupon_amt#6)), sum(UnscaledValue(ss_net_profit#7))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_coupon_amt#6))#22, sum(UnscaledValue(ss_net_profit#7))#23]
-Results [5]: [ss_ticket_number#5, ss_customer_sk#1, ca_city#17 AS bought_city#24, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#6))#22,17,2) AS amt#25, MakeDecimal(sum(UnscaledValue(ss_net_profit#7))#23,17,2) AS profit#26]
+
+(31) ColumnarToRow [codegen id : 8]
+Input [5]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#22, amt#23, profit#24]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
+Output [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_addr_sk:int,c_first_name:string,c_last_name:string>
 
-(31) CometFilter
-Input [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
-Condition : (isnotnull(c_customer_sk#27) AND isnotnull(c_current_addr_sk#28))
+(33) CometFilter
+Input [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
+Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_current_addr_sk#26))
 
-(32) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
+(34) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
 
-(33) BroadcastExchange
-Input [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
+(35) BroadcastExchange
+Input [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(34) BroadcastHashJoin [codegen id : 8]
+(36) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#27]
+Right keys [1]: [c_customer_sk#25]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
-Output [7]: [ss_ticket_number#5, bought_city#24, amt#25, profit#26, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
-Input [9]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#24, amt#25, profit#26, c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
+(37) Project [codegen id : 8]
+Output [7]: [ss_ticket_number#5, bought_city#22, amt#23, profit#24, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
+Input [9]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#22, amt#23, profit#24, c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
 
-(36) ReusedExchange [Reuses operator id: 24]
-Output [2]: [ca_address_sk#31, ca_city#32]
+(38) ReusedExchange [Reuses operator id: 24]
+Output [2]: [ca_address_sk#29, ca_city#30]
 
-(37) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [c_current_addr_sk#28]
-Right keys [1]: [ca_address_sk#31]
+(39) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [c_current_addr_sk#26]
+Right keys [1]: [ca_address_sk#29]
 Join type: Inner
-Join condition: NOT (ca_city#32 = bought_city#24)
+Join condition: NOT (ca_city#30 = bought_city#22)
 
-(38) Project [codegen id : 8]
-Output [7]: [c_last_name#30, c_first_name#29, ca_city#32, bought_city#24, ss_ticket_number#5, amt#25, profit#26]
-Input [9]: [ss_ticket_number#5, bought_city#24, amt#25, profit#26, c_current_addr_sk#28, c_first_name#29, c_last_name#30, ca_address_sk#31, ca_city#32]
+(40) Project [codegen id : 8]
+Output [7]: [c_last_name#28, c_first_name#27, ca_city#30, bought_city#22, ss_ticket_number#5, amt#23, profit#24]
+Input [9]: [ss_ticket_number#5, bought_city#22, amt#23, profit#24, c_current_addr_sk#26, c_first_name#27, c_last_name#28, ca_address_sk#29, ca_city#30]
 
-(39) TakeOrderedAndProject
-Input [7]: [c_last_name#30, c_first_name#29, ca_city#32, bought_city#24, ss_ticket_number#5, amt#25, profit#26]
-Arguments: 100, [c_last_name#30 ASC NULLS FIRST, c_first_name#29 ASC NULLS FIRST, ca_city#32 ASC NULLS FIRST, bought_city#24 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#30, c_first_name#29, ca_city#32, bought_city#24, ss_ticket_number#5, amt#25, profit#26]
+(41) TakeOrderedAndProject
+Input [7]: [c_last_name#28, c_first_name#27, ca_city#30, bought_city#22, ss_ticket_number#5, amt#23, profit#24]
+Arguments: 100, [c_last_name#28 ASC NULLS FIRST, c_first_name#27 ASC NULLS FIRST, ca_city#30 ASC NULLS FIRST, bought_city#22 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#28, c_first_name#27, ca_city#30, bought_city#22, ss_ticket_number#5, amt#23, profit#24]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (44)
-+- * ColumnarToRow (43)
-   +- CometProject (42)
-      +- CometFilter (41)
-         +- CometScan parquet spark_catalog.default.date_dim (40)
+BroadcastExchange (46)
++- * ColumnarToRow (45)
+   +- CometProject (44)
+      +- CometFilter (43)
+         +- CometScan parquet spark_catalog.default.date_dim (42)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#33, d_dow#34]
+Output [3]: [d_date_sk#10, d_year#31, d_dow#32]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_dow, [0,6]), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dow:int>
 
-(41) CometFilter
-Input [3]: [d_date_sk#10, d_year#33, d_dow#34]
-Condition : ((d_dow#34 IN (6,0) AND d_year#33 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
+(43) CometFilter
+Input [3]: [d_date_sk#10, d_year#31, d_dow#32]
+Condition : ((d_dow#32 IN (6,0) AND d_year#31 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
 
-(42) CometProject
-Input [3]: [d_date_sk#10, d_year#33, d_dow#34]
+(44) CometProject
+Input [3]: [d_date_sk#10, d_year#31, d_dow#32]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(43) ColumnarToRow [codegen id : 1]
+(45) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(44) BroadcastExchange
+(46) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt
index 04c59a2d35..4b9b7960e9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt
@@ -4,56 +4,58 @@ TakeOrderedAndProject [c_last_name,c_first_name,ca_city,bought_city,ss_ticket_nu
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_city,bought_city]
         Project [ss_ticket_number,bought_city,amt,profit,c_current_addr_sk,c_first_name,c_last_name]
           BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-            HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum] [sum(UnscaledValue(ss_coupon_amt)),sum(UnscaledValue(ss_net_profit)),bought_city,amt,profit,sum,sum]
+            ColumnarToRow
               InputAdapter
-                Exchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
-                  WholeStageCodegen (5)
-                    HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
-                      Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ca_city]
-                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                              Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #2
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_dow,d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
+                CometHashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum]
+                  CometColumnarExchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
+                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ca_city]
+                            BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                              Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                      Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #2
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_dow,d_year,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #2
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #2
+                                        BroadcastExchange #3
+                                          WholeStageCodegen (2)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [s_store_sk]
+                                                  CometFilter [s_city,s_store_sk]
+                                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
                                   InputAdapter
-                                    BroadcastExchange #3
-                                      WholeStageCodegen (2)
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (3)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [s_store_sk]
-                                              CometFilter [s_city,s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
+                                            CometProject [hd_demo_sk]
+                                              CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
                               InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (3)
+                                BroadcastExchange #5
+                                  WholeStageCodegen (4)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometProject [hd_demo_sk]
-                                          CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
-                          InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (4)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk,ca_city]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
+                                        CometFilter [ca_address_sk,ca_city]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
             InputAdapter
               BroadcastExchange #6
                 WholeStageCodegen (6)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt
index 9ea57de066..d7dfc7147d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-TakeOrderedAndProject (45)
-+- * Project (44)
-   +- * BroadcastHashJoin Inner BuildRight (43)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * Project (28)
-      :     :  +- * Filter (27)
-      :     :     +- Window (26)
-      :     :        +- * Filter (25)
-      :     :           +- Window (24)
-      :     :              +- * Sort (23)
-      :     :                 +- Exchange (22)
-      :     :                    +- * HashAggregate (21)
-      :     :                       +- Exchange (20)
-      :     :                          +- * HashAggregate (19)
-      :     :                             +- * Project (18)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                   :- * Project (12)
-      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                   :     :- * Project (9)
-      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                   :     :     :- * ColumnarToRow (3)
-      :     :                                   :     :     :  +- CometFilter (2)
-      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                   :     :     +- BroadcastExchange (7)
-      :     :                                   :     :        +- * ColumnarToRow (6)
-      :     :                                   :     :           +- CometFilter (5)
-      :     :                                   :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :                                   :     +- ReusedExchange (10)
-      :     :                                   +- BroadcastExchange (16)
-      :     :                                      +- * ColumnarToRow (15)
-      :     :                                         +- CometFilter (14)
-      :     :                                            +- CometScan parquet spark_catalog.default.store (13)
-      :     +- BroadcastExchange (35)
-      :        +- * Project (34)
-      :           +- Window (33)
-      :              +- * Sort (32)
-      :                 +- Exchange (31)
-      :                    +- * HashAggregate (30)
-      :                       +- ReusedExchange (29)
-      +- BroadcastExchange (42)
-         +- * Project (41)
-            +- Window (40)
-               +- * Sort (39)
-                  +- ReusedExchange (38)
+TakeOrderedAndProject (47)
++- * Project (46)
+   +- * BroadcastHashJoin Inner BuildRight (45)
+      :- * Project (38)
+      :  +- * BroadcastHashJoin Inner BuildRight (37)
+      :     :- * Project (30)
+      :     :  +- * Filter (29)
+      :     :     +- Window (28)
+      :     :        +- * Filter (27)
+      :     :           +- Window (26)
+      :     :              +- * ColumnarToRow (25)
+      :     :                 +- CometSort (24)
+      :     :                    +- CometColumnarExchange (23)
+      :     :                       +- CometHashAggregate (22)
+      :     :                          +- CometColumnarExchange (21)
+      :     :                             +- RowToColumnar (20)
+      :     :                                +- * HashAggregate (19)
+      :     :                                   +- * Project (18)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                         :- * Project (12)
+      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                         :     :- * Project (9)
+      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                         :     :     :- * ColumnarToRow (3)
+      :     :                                         :     :     :  +- CometFilter (2)
+      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                         :     :     +- BroadcastExchange (7)
+      :     :                                         :     :        +- * ColumnarToRow (6)
+      :     :                                         :     :           +- CometFilter (5)
+      :     :                                         :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :                                         :     +- ReusedExchange (10)
+      :     :                                         +- BroadcastExchange (16)
+      :     :                                            +- * ColumnarToRow (15)
+      :     :                                               +- CometFilter (14)
+      :     :                                                  +- CometScan parquet spark_catalog.default.store (13)
+      :     +- BroadcastExchange (36)
+      :        +- * Project (35)
+      :           +- Window (34)
+      :              +- * ColumnarToRow (33)
+      :                 +- CometSort (32)
+      :                    +- ReusedExchange (31)
+      +- BroadcastExchange (44)
+         +- * Project (43)
+            +- Window (42)
+               +- * ColumnarToRow (41)
+                  +- CometSort (40)
+                     +- ReusedExchange (39)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -89,7 +91,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, ss_item_sk#4, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 49]
+(10) ReusedExchange [Reuses operator id: 51]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -137,125 +139,124 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#6))]
 Aggregate Attributes [1]: [sum#15]
 Results [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 
-(20) Exchange
+(20) RowToColumnar
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 Keys [6]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#6))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#6))#17]
-Results [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS sum_sales#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS _w0#19]
 
-(22) Exchange
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(23) CometColumnarExchange
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(23) Sort [codegen id : 6]
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
-Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
+(24) CometSort
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(24) Window
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(25) ColumnarToRow [codegen id : 5]
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+
+(26) Window
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(25) Filter [codegen id : 7]
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
+(27) Filter [codegen id : 6]
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(26) Window
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
-Arguments: [avg(_w0#19) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#21], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
-
-(27) Filter [codegen id : 22]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
-Condition : ((isnotnull(avg_monthly_sales#21) AND (avg_monthly_sales#21 > 0.000000)) AND CASE WHEN (avg_monthly_sales#21 > 0.000000) THEN ((abs((sum_sales#18 - avg_monthly_sales#21)) / avg_monthly_sales#21) > 0.1000000000000000) END)
-
-(28) Project [codegen id : 22]
-Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
-
-(29) ReusedExchange [Reuses operator id: 20]
-Output [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
-
-(30) HashAggregate [codegen id : 12]
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
-Keys [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#29))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#29))#17]
-Results [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, MakeDecimal(sum(UnscaledValue(ss_sales_price#29))#17,17,2) AS sum_sales#18]
-
-(31) Exchange
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
-Arguments: hashpartitioning(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(32) Sort [codegen id : 13]
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
-Arguments: [i_category#22 ASC NULLS FIRST, i_brand#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST, s_company_name#25 ASC NULLS FIRST, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST], false, 0
-
-(33) Window
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
-Arguments: [rank(d_year#26, d_moy#27) windowspecdefinition(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#30], [i_category#22, i_brand#23, s_store_name#24, s_company_name#25], [d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST]
-
-(34) Project [codegen id : 14]
-Output [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#18 AS sum_sales#31, rn#30]
-Input [8]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18, rn#30]
-
-(35) BroadcastExchange
-Input [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=6]
-
-(36) BroadcastHashJoin [codegen id : 22]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
-Right keys [5]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, (rn#30 + 1)]
+(28) Window
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
+
+(29) Filter [codegen id : 19]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
+
+(30) Project [codegen id : 19]
+Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+
+(31) ReusedExchange [Reuses operator id: 23]
+Output [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+
+(32) CometSort
+Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+Arguments: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17], [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, s_store_name#23 ASC NULLS FIRST, s_company_name#24 ASC NULLS FIRST, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
+
+(33) ColumnarToRow [codegen id : 11]
+Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+
+(34) Window
+Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+Arguments: [rank(d_year#25, d_moy#26) windowspecdefinition(i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#27], [i_category#21, i_brand#22, s_store_name#23, s_company_name#24], [d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
+
+(35) Project [codegen id : 12]
+Output [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#17 AS sum_sales#28, rn#27]
+Input [8]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17, rn#27]
+
+(36) BroadcastExchange
+Input [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=5]
+
+(37) BroadcastHashJoin [codegen id : 19]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
+Right keys [5]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, (rn#27 + 1)]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 22]
-Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31]
-Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
+(38) Project [codegen id : 19]
+Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28]
+Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
+
+(39) ReusedExchange [Reuses operator id: 23]
+Output [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
 
-(38) ReusedExchange [Reuses operator id: 31]
-Output [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
+(40) CometSort
+Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17], [i_category#29 ASC NULLS FIRST, i_brand#30 ASC NULLS FIRST, s_store_name#31 ASC NULLS FIRST, s_company_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
 
-(39) Sort [codegen id : 20]
-Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
-Arguments: [i_category#32 ASC NULLS FIRST, i_brand#33 ASC NULLS FIRST, s_store_name#34 ASC NULLS FIRST, s_company_name#35 ASC NULLS FIRST, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST], false, 0
+(41) ColumnarToRow [codegen id : 17]
+Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
 
-(40) Window
-Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
-Arguments: [rank(d_year#36, d_moy#37) windowspecdefinition(i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#38], [i_category#32, i_brand#33, s_store_name#34, s_company_name#35], [d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST]
+(42) Window
+Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#29, i_brand#30, s_store_name#31, s_company_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
 
-(41) Project [codegen id : 21]
-Output [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#18 AS sum_sales#39, rn#38]
-Input [8]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18, rn#38]
+(43) Project [codegen id : 18]
+Output [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#17 AS sum_sales#36, rn#35]
+Input [8]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
 
-(42) BroadcastExchange
-Input [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=7]
+(44) BroadcastExchange
+Input [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 22]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
-Right keys [5]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, (rn#38 - 1)]
+(45) BroadcastHashJoin [codegen id : 19]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
+Right keys [5]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, (rn#35 - 1)]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 22]
-Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, sum_sales#31 AS psum#40, sum_sales#39 AS nsum#41]
-Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31, i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
+(46) Project [codegen id : 19]
+Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#28 AS psum#37, sum_sales#36 AS nsum#38]
+Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28, i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
 
-(45) TakeOrderedAndProject
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
-Arguments: 100, [(sum_sales#18 - avg_monthly_sales#21) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
+(47) TakeOrderedAndProject
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometFilter (47)
-      +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (51)
++- * ColumnarToRow (50)
+   +- CometFilter (49)
+      +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -265,15 +266,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
+(49) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(48) ColumnarToRow [codegen id : 1]
+(50) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(49) BroadcastExchange
+(51) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt
index 80b8da7b14..b93090ae54 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_brand,s_company_name,d_year,d_moy,psum,nsum]
-  WholeStageCodegen (22)
+  WholeStageCodegen (19)
     Project [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,s_store_name,s_company_name,rn,i_category,i_brand,s_store_name,s_company_name,rn]
         Project [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_bra
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,s_store_name,s_company_name,d_year]
-                    WholeStageCodegen (7)
+                    WholeStageCodegen (6)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                            WholeStageCodegen (6)
-                              Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                            WholeStageCodegen (5)
+                              ColumnarToRow
                                 InputAdapter
-                                  Exchange [i_category,i_brand,s_store_name,s_company_name] #1
-                                    WholeStageCodegen (5)
-                                      HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
-                                        InputAdapter
-                                          Exchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
+                                  CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                                    CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name] #1
+                                      CometHashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum]
+                                        CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
+                                          RowToColumnar
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,ss_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,ss_sales_price,d_year,d_moy,s_store_name,s_company_name]
@@ -57,25 +57,23 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_bra
                                                                 CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (14)
+                WholeStageCodegen (12)
                   Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                        WholeStageCodegen (13)
-                          Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                        WholeStageCodegen (11)
+                          ColumnarToRow
                             InputAdapter
-                              Exchange [i_category,i_brand,s_store_name,s_company_name] #7
-                                WholeStageCodegen (12)
-                                  HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,sum]
-                                    InputAdapter
-                                      ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] #2
+                              CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                                ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
         InputAdapter
-          BroadcastExchange #8
-            WholeStageCodegen (21)
+          BroadcastExchange #7
+            WholeStageCodegen (18)
               Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                    WholeStageCodegen (20)
-                      Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                    WholeStageCodegen (17)
+                      ColumnarToRow
                         InputAdapter
-                          ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #7
+                          CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                            ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt
index a13a86a914..4c4c294385 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt
@@ -1,32 +1,34 @@
 == Physical Plan ==
-* HashAggregate (28)
-+- Exchange (27)
-   +- * HashAggregate (26)
-      +- * Project (25)
-         +- * BroadcastHashJoin Inner BuildRight (24)
-            :- * Project (22)
-            :  +- * BroadcastHashJoin Inner BuildRight (21)
-            :     :- * Project (15)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-            :     :     :- * Project (9)
-            :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-            :     :     :     :- * ColumnarToRow (3)
-            :     :     :     :  +- CometFilter (2)
-            :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :     :     :     +- BroadcastExchange (7)
-            :     :     :        +- * ColumnarToRow (6)
-            :     :     :           +- CometFilter (5)
-            :     :     :              +- CometScan parquet spark_catalog.default.store (4)
-            :     :     +- BroadcastExchange (13)
-            :     :        +- * ColumnarToRow (12)
-            :     :           +- CometFilter (11)
-            :     :              +- CometScan parquet spark_catalog.default.customer_demographics (10)
-            :     +- BroadcastExchange (20)
-            :        +- * ColumnarToRow (19)
-            :           +- CometProject (18)
-            :              +- CometFilter (17)
-            :                 +- CometScan parquet spark_catalog.default.customer_address (16)
-            +- ReusedExchange (23)
+* ColumnarToRow (30)
++- CometHashAggregate (29)
+   +- CometColumnarExchange (28)
+      +- RowToColumnar (27)
+         +- * HashAggregate (26)
+            +- * Project (25)
+               +- * BroadcastHashJoin Inner BuildRight (24)
+                  :- * Project (22)
+                  :  +- * BroadcastHashJoin Inner BuildRight (21)
+                  :     :- * Project (15)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :     :     :- * Project (9)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :     :     :     +- BroadcastExchange (7)
+                  :     :     :        +- * ColumnarToRow (6)
+                  :     :     :           +- CometFilter (5)
+                  :     :     :              +- CometScan parquet spark_catalog.default.store (4)
+                  :     :     +- BroadcastExchange (13)
+                  :     :        +- * ColumnarToRow (12)
+                  :     :           +- CometFilter (11)
+                  :     :              +- CometScan parquet spark_catalog.default.customer_demographics (10)
+                  :     +- BroadcastExchange (20)
+                  :        +- * ColumnarToRow (19)
+                  :           +- CometProject (18)
+                  :              +- CometFilter (17)
+                  :                 +- CometScan parquet spark_catalog.default.customer_address (16)
+                  +- ReusedExchange (23)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -132,7 +134,7 @@ Join condition: ((((ca_state#14 IN (CO,OH,TX) AND (ss_net_profit#6 >= 0.00)) AND
 Output [2]: [ss_quantity#4, ss_sold_date_sk#7]
 Input [6]: [ss_addr_sk#2, ss_quantity#4, ss_net_profit#6, ss_sold_date_sk#7, ca_address_sk#13, ca_state#14]
 
-(23) ReusedExchange [Reuses operator id: 33]
+(23) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#16]
 
 (24) BroadcastHashJoin [codegen id : 5]
@@ -152,46 +154,50 @@ Functions [1]: [partial_sum(ss_quantity#4)]
 Aggregate Attributes [1]: [sum#17]
 Results [1]: [sum#18]
 
-(27) Exchange
+(27) RowToColumnar
 Input [1]: [sum#18]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 6]
+(28) CometColumnarExchange
+Input [1]: [sum#18]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [1]: [sum#18]
 Keys: []
 Functions [1]: [sum(ss_quantity#4)]
-Aggregate Attributes [1]: [sum(ss_quantity#4)#19]
-Results [1]: [sum(ss_quantity#4)#19 AS sum(ss_quantity)#20]
+
+(30) ColumnarToRow [codegen id : 6]
+Input [1]: [sum(ss_quantity)#19]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (33)
-+- * ColumnarToRow (32)
-   +- CometProject (31)
-      +- CometFilter (30)
-         +- CometScan parquet spark_catalog.default.date_dim (29)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#16, d_year#21]
+Output [2]: [d_date_sk#16, d_year#20]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(30) CometFilter
-Input [2]: [d_date_sk#16, d_year#21]
-Condition : ((isnotnull(d_year#21) AND (d_year#21 = 2001)) AND isnotnull(d_date_sk#16))
+(32) CometFilter
+Input [2]: [d_date_sk#16, d_year#20]
+Condition : ((isnotnull(d_year#20) AND (d_year#20 = 2001)) AND isnotnull(d_date_sk#16))
 
-(31) CometProject
-Input [2]: [d_date_sk#16, d_year#21]
+(33) CometProject
+Input [2]: [d_date_sk#16, d_year#20]
 Arguments: [d_date_sk#16], [d_date_sk#16]
 
-(32) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#16]
 
-(33) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt
index 4022da74f1..fee69a7cc8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt
@@ -1,50 +1,52 @@
 WholeStageCodegen (6)
-  HashAggregate [sum] [sum(ss_quantity),sum(ss_quantity),sum]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (5)
-          HashAggregate [ss_quantity] [sum,sum]
-            Project [ss_quantity]
-              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                Project [ss_quantity,ss_sold_date_sk]
-                  BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
-                    Project [ss_addr_sk,ss_quantity,ss_net_profit,ss_sold_date_sk]
-                      BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
-                        Project [ss_cdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
-                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ss_store_sk,ss_cdemo_sk,ss_addr_sk,ss_sales_price,ss_net_profit]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_year,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+      CometHashAggregate [sum]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (5)
+              HashAggregate [ss_quantity] [sum,sum]
+                Project [ss_quantity]
+                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                    Project [ss_quantity,ss_sold_date_sk]
+                      BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
+                        Project [ss_addr_sk,ss_quantity,ss_net_profit,ss_sold_date_sk]
+                          BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
+                            Project [ss_cdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_store_sk,ss_cdemo_sk,ss_addr_sk,ss_sales_price,ss_net_profit]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_year,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                InputAdapter
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [s_store_sk]
+                                            CometScan parquet spark_catalog.default.store [s_store_sk]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (1)
+                              BroadcastExchange #4
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [s_store_sk]
-                                        CometScan parquet spark_catalog.default.store [s_store_sk]
+                                      CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
+                                        CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (2)
+                          BroadcastExchange #5
+                            WholeStageCodegen (3)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
-                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
+                                  CometProject [ca_address_sk,ca_state]
+                                    CometFilter [ca_country,ca_address_sk,ca_state]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                     InputAdapter
-                      BroadcastExchange #5
-                        WholeStageCodegen (3)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [ca_address_sk,ca_state]
-                                CometFilter [ca_country,ca_address_sk,ca_state]
-                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
-                InputAdapter
-                  ReusedExchange [d_date_sk] #2
+                      ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
index fa45aa3820..367b843853 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
@@ -1,81 +1,89 @@
 == Physical Plan ==
-TakeOrderedAndProject (77)
-+- * HashAggregate (76)
-   +- Exchange (75)
-      +- * HashAggregate (74)
-         +- Union (73)
-            :- * Project (24)
-            :  +- * Filter (23)
-            :     +- Window (22)
-            :        +- * Sort (21)
-            :           +- Window (20)
-            :              +- * Sort (19)
-            :                 +- Exchange (18)
-            :                    +- * HashAggregate (17)
-            :                       +- Exchange (16)
-            :                          +- * HashAggregate (15)
-            :                             +- * Project (14)
-            :                                +- * BroadcastHashJoin Inner BuildRight (13)
-            :                                   :- * Project (11)
-            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (10)
-            :                                   :     :- BroadcastExchange (5)
-            :                                   :     :  +- * ColumnarToRow (4)
-            :                                   :     :     +- CometProject (3)
-            :                                   :     :        +- CometFilter (2)
-            :                                   :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
-            :                                   :     +- * ColumnarToRow (9)
-            :                                   :        +- CometProject (8)
-            :                                   :           +- CometFilter (7)
-            :                                   :              +- CometScan parquet spark_catalog.default.web_returns (6)
-            :                                   +- ReusedExchange (12)
-            :- * Project (48)
-            :  +- * Filter (47)
-            :     +- Window (46)
-            :        +- * Sort (45)
-            :           +- Window (44)
-            :              +- * Sort (43)
-            :                 +- Exchange (42)
-            :                    +- * HashAggregate (41)
-            :                       +- Exchange (40)
-            :                          +- * HashAggregate (39)
-            :                             +- * Project (38)
-            :                                +- * BroadcastHashJoin Inner BuildRight (37)
-            :                                   :- * Project (35)
-            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (34)
-            :                                   :     :- BroadcastExchange (29)
-            :                                   :     :  +- * ColumnarToRow (28)
-            :                                   :     :     +- CometProject (27)
-            :                                   :     :        +- CometFilter (26)
-            :                                   :     :           +- CometScan parquet spark_catalog.default.catalog_sales (25)
-            :                                   :     +- * ColumnarToRow (33)
-            :                                   :        +- CometProject (32)
-            :                                   :           +- CometFilter (31)
-            :                                   :              +- CometScan parquet spark_catalog.default.catalog_returns (30)
-            :                                   +- ReusedExchange (36)
-            +- * Project (72)
-               +- * Filter (71)
-                  +- Window (70)
-                     +- * Sort (69)
-                        +- Window (68)
-                           +- * Sort (67)
-                              +- Exchange (66)
-                                 +- * HashAggregate (65)
-                                    +- Exchange (64)
-                                       +- * HashAggregate (63)
-                                          +- * Project (62)
-                                             +- * BroadcastHashJoin Inner BuildRight (61)
-                                                :- * Project (59)
-                                                :  +- * BroadcastHashJoin Inner BuildLeft (58)
-                                                :     :- BroadcastExchange (53)
-                                                :     :  +- * ColumnarToRow (52)
-                                                :     :     +- CometProject (51)
-                                                :     :        +- CometFilter (50)
-                                                :     :           +- CometScan parquet spark_catalog.default.store_sales (49)
-                                                :     +- * ColumnarToRow (57)
-                                                :        +- CometProject (56)
-                                                :           +- CometFilter (55)
-                                                :              +- CometScan parquet spark_catalog.default.store_returns (54)
-                                                +- ReusedExchange (60)
+* ColumnarToRow (85)
++- CometTakeOrderedAndProject (84)
+   +- CometHashAggregate (83)
+      +- CometColumnarExchange (82)
+         +- RowToColumnar (81)
+            +- * HashAggregate (80)
+               +- Union (79)
+                  :- * Project (26)
+                  :  +- * Filter (25)
+                  :     +- Window (24)
+                  :        +- * Sort (23)
+                  :           +- Window (22)
+                  :              +- * ColumnarToRow (21)
+                  :                 +- CometSort (20)
+                  :                    +- CometColumnarExchange (19)
+                  :                       +- CometHashAggregate (18)
+                  :                          +- CometColumnarExchange (17)
+                  :                             +- RowToColumnar (16)
+                  :                                +- * HashAggregate (15)
+                  :                                   +- * Project (14)
+                  :                                      +- * BroadcastHashJoin Inner BuildRight (13)
+                  :                                         :- * Project (11)
+                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (10)
+                  :                                         :     :- BroadcastExchange (5)
+                  :                                         :     :  +- * ColumnarToRow (4)
+                  :                                         :     :     +- CometProject (3)
+                  :                                         :     :        +- CometFilter (2)
+                  :                                         :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :                                         :     +- * ColumnarToRow (9)
+                  :                                         :        +- CometProject (8)
+                  :                                         :           +- CometFilter (7)
+                  :                                         :              +- CometScan parquet spark_catalog.default.web_returns (6)
+                  :                                         +- ReusedExchange (12)
+                  :- * Project (52)
+                  :  +- * Filter (51)
+                  :     +- Window (50)
+                  :        +- * Sort (49)
+                  :           +- Window (48)
+                  :              +- * ColumnarToRow (47)
+                  :                 +- CometSort (46)
+                  :                    +- CometColumnarExchange (45)
+                  :                       +- CometHashAggregate (44)
+                  :                          +- CometColumnarExchange (43)
+                  :                             +- RowToColumnar (42)
+                  :                                +- * HashAggregate (41)
+                  :                                   +- * Project (40)
+                  :                                      +- * BroadcastHashJoin Inner BuildRight (39)
+                  :                                         :- * Project (37)
+                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (36)
+                  :                                         :     :- BroadcastExchange (31)
+                  :                                         :     :  +- * ColumnarToRow (30)
+                  :                                         :     :     +- CometProject (29)
+                  :                                         :     :        +- CometFilter (28)
+                  :                                         :     :           +- CometScan parquet spark_catalog.default.catalog_sales (27)
+                  :                                         :     +- * ColumnarToRow (35)
+                  :                                         :        +- CometProject (34)
+                  :                                         :           +- CometFilter (33)
+                  :                                         :              +- CometScan parquet spark_catalog.default.catalog_returns (32)
+                  :                                         +- ReusedExchange (38)
+                  +- * Project (78)
+                     +- * Filter (77)
+                        +- Window (76)
+                           +- * Sort (75)
+                              +- Window (74)
+                                 +- * ColumnarToRow (73)
+                                    +- CometSort (72)
+                                       +- CometColumnarExchange (71)
+                                          +- CometHashAggregate (70)
+                                             +- CometColumnarExchange (69)
+                                                +- RowToColumnar (68)
+                                                   +- * HashAggregate (67)
+                                                      +- * Project (66)
+                                                         +- * BroadcastHashJoin Inner BuildRight (65)
+                                                            :- * Project (63)
+                                                            :  +- * BroadcastHashJoin Inner BuildLeft (62)
+                                                            :     :- BroadcastExchange (57)
+                                                            :     :  +- * ColumnarToRow (56)
+                                                            :     :     +- CometProject (55)
+                                                            :     :        +- CometFilter (54)
+                                                            :     :           +- CometScan parquet spark_catalog.default.store_sales (53)
+                                                            :     +- * ColumnarToRow (61)
+                                                            :        +- CometProject (60)
+                                                            :           +- CometFilter (59)
+                                                            :              +- CometScan parquet spark_catalog.default.store_returns (58)
+                                                            +- ReusedExchange (64)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -129,7 +137,7 @@ Join condition: None
 Output [6]: [ws_item_sk#1, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_return_quantity#10, wr_return_amt#11]
 Input [9]: [ws_item_sk#1, ws_order_number#2, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_item_sk#8, wr_order_number#9, wr_return_quantity#10, wr_return_amt#11]
 
-(12) ReusedExchange [Reuses operator id: 82]
+(12) ReusedExchange [Reuses operator id: 90]
 Output [1]: [d_date_sk#13]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -149,323 +157,339 @@ Functions [4]: [partial_sum(coalesce(wr_return_quantity#10, 0)), partial_sum(coa
 Aggregate Attributes [6]: [sum#14, sum#15, sum#16, isEmpty#17, sum#18, isEmpty#19]
 Results [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 
-(16) Exchange
+(16) RowToColumnar
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(17) HashAggregate [codegen id : 4]
+(17) CometColumnarExchange
+Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(18) CometHashAggregate
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Keys [1]: [ws_item_sk#1]
 Functions [4]: [sum(coalesce(wr_return_quantity#10, 0)), sum(coalesce(ws_quantity#3, 0)), sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00)), sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))]
-Aggregate Attributes [4]: [sum(coalesce(wr_return_quantity#10, 0))#26, sum(coalesce(ws_quantity#3, 0))#27, sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28, sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29]
-Results [3]: [ws_item_sk#1 AS item#30, (cast(sum(coalesce(wr_return_quantity#10, 0))#26 as decimal(15,4)) / cast(sum(coalesce(ws_quantity#3, 0))#27 as decimal(15,4))) AS return_ratio#31, (cast(sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28 as decimal(15,4)) / cast(sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29 as decimal(15,4))) AS currency_ratio#32]
-
-(18) Exchange
-Input [3]: [item#30, return_ratio#31, currency_ratio#32]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) Sort [codegen id : 5]
-Input [3]: [item#30, return_ratio#31, currency_ratio#32]
-Arguments: [return_ratio#31 ASC NULLS FIRST], false, 0
+(19) CometColumnarExchange
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(20) Window
-Input [3]: [item#30, return_ratio#31, currency_ratio#32]
-Arguments: [rank(return_ratio#31) windowspecdefinition(return_ratio#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#33], [return_ratio#31 ASC NULLS FIRST]
+(20) CometSort
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+Arguments: [item#26, return_ratio#27, currency_ratio#28], [return_ratio#27 ASC NULLS FIRST]
 
-(21) Sort [codegen id : 6]
-Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
-Arguments: [currency_ratio#32 ASC NULLS FIRST], false, 0
+(21) ColumnarToRow [codegen id : 4]
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
 
 (22) Window
-Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
-Arguments: [rank(currency_ratio#32) windowspecdefinition(currency_ratio#32 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#34], [currency_ratio#32 ASC NULLS FIRST]
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+Arguments: [rank(return_ratio#27) windowspecdefinition(return_ratio#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#29], [return_ratio#27 ASC NULLS FIRST]
 
-(23) Filter [codegen id : 7]
-Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
-Condition : ((return_rank#33 <= 10) OR (currency_rank#34 <= 10))
+(23) Sort [codegen id : 5]
+Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
+Arguments: [currency_ratio#28 ASC NULLS FIRST], false, 0
 
-(24) Project [codegen id : 7]
-Output [5]: [web AS channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
+(24) Window
+Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
+Arguments: [rank(currency_ratio#28) windowspecdefinition(currency_ratio#28 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#30], [currency_ratio#28 ASC NULLS FIRST]
+
+(25) Filter [codegen id : 6]
+Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
+Condition : ((return_rank#29 <= 10) OR (currency_rank#30 <= 10))
+
+(26) Project [codegen id : 6]
+Output [5]: [web AS channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
+Output [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#41), dynamicpruningexpression(cs_sold_date_sk#41 IN dynamicpruning#42)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#37), dynamicpruningexpression(cs_sold_date_sk#37 IN dynamicpruning#38)]
 PushedFilters: [IsNotNull(cs_net_profit), IsNotNull(cs_net_paid), IsNotNull(cs_quantity), GreaterThan(cs_net_profit,1.00), GreaterThan(cs_net_paid,0.00), GreaterThan(cs_quantity,0), IsNotNull(cs_order_number), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_net_paid:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(26) CometFilter
-Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
-Condition : (((((((isnotnull(cs_net_profit#40) AND isnotnull(cs_net_paid#39)) AND isnotnull(cs_quantity#38)) AND (cs_net_profit#40 > 1.00)) AND (cs_net_paid#39 > 0.00)) AND (cs_quantity#38 > 0)) AND isnotnull(cs_order_number#37)) AND isnotnull(cs_item_sk#36))
+(28) CometFilter
+Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
+Condition : (((((((isnotnull(cs_net_profit#36) AND isnotnull(cs_net_paid#35)) AND isnotnull(cs_quantity#34)) AND (cs_net_profit#36 > 1.00)) AND (cs_net_paid#35 > 0.00)) AND (cs_quantity#34 > 0)) AND isnotnull(cs_order_number#33)) AND isnotnull(cs_item_sk#32))
 
-(27) CometProject
-Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
-Arguments: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41], [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
+(29) CometProject
+Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
+Arguments: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37], [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
 
-(28) ColumnarToRow [codegen id : 8]
-Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
+(30) ColumnarToRow [codegen id : 7]
+Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
 
-(29) BroadcastExchange
-Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
+(31) BroadcastExchange
+Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=4]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
+Output [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_return_amount), GreaterThan(cr_return_amount,10000.00), IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(31) CometFilter
-Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
-Condition : (((isnotnull(cr_return_amount#46) AND (cr_return_amount#46 > 10000.00)) AND isnotnull(cr_order_number#44)) AND isnotnull(cr_item_sk#43))
+(33) CometFilter
+Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
+Condition : (((isnotnull(cr_return_amount#42) AND (cr_return_amount#42 > 10000.00)) AND isnotnull(cr_order_number#40)) AND isnotnull(cr_item_sk#39))
 
-(32) CometProject
-Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
-Arguments: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46], [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
+(34) CometProject
+Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
+Arguments: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42], [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
 
-(33) ColumnarToRow
-Input [4]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
+(35) ColumnarToRow
+Input [4]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [2]: [cs_order_number#37, cs_item_sk#36]
-Right keys [2]: [cr_order_number#44, cr_item_sk#43]
+(36) BroadcastHashJoin [codegen id : 9]
+Left keys [2]: [cs_order_number#33, cs_item_sk#32]
+Right keys [2]: [cr_order_number#40, cr_item_sk#39]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [6]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46]
-Input [9]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
+(37) Project [codegen id : 9]
+Output [6]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42]
+Input [9]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
 
-(36) ReusedExchange [Reuses operator id: 82]
-Output [1]: [d_date_sk#48]
+(38) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#44]
 
-(37) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#41]
-Right keys [1]: [d_date_sk#48]
+(39) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [cs_sold_date_sk#37]
+Right keys [1]: [d_date_sk#44]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
-Output [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
-Input [7]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46, d_date_sk#48]
+(40) Project [codegen id : 9]
+Output [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
+Input [7]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42, d_date_sk#44]
+
+(41) HashAggregate [codegen id : 9]
+Input [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
+Keys [1]: [cs_item_sk#32]
+Functions [4]: [partial_sum(coalesce(cr_return_quantity#41, 0)), partial_sum(coalesce(cs_quantity#34, 0)), partial_sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#45, sum#46, sum#47, isEmpty#48, sum#49, isEmpty#50]
+Results [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
 
-(39) HashAggregate [codegen id : 10]
-Input [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
-Keys [1]: [cs_item_sk#36]
-Functions [4]: [partial_sum(coalesce(cr_return_quantity#45, 0)), partial_sum(coalesce(cs_quantity#38, 0)), partial_sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#49, sum#50, sum#51, isEmpty#52, sum#53, isEmpty#54]
-Results [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
+(42) RowToColumnar
+Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
 
-(40) Exchange
-Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
-Arguments: hashpartitioning(cs_item_sk#36, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(43) CometColumnarExchange
+Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+Arguments: hashpartitioning(cs_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(41) HashAggregate [codegen id : 11]
-Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
-Keys [1]: [cs_item_sk#36]
-Functions [4]: [sum(coalesce(cr_return_quantity#45, 0)), sum(coalesce(cs_quantity#38, 0)), sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
-Aggregate Attributes [4]: [sum(coalesce(cr_return_quantity#45, 0))#61, sum(coalesce(cs_quantity#38, 0))#62, sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63, sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64]
-Results [3]: [cs_item_sk#36 AS item#65, (cast(sum(coalesce(cr_return_quantity#45, 0))#61 as decimal(15,4)) / cast(sum(coalesce(cs_quantity#38, 0))#62 as decimal(15,4))) AS return_ratio#66, (cast(sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63 as decimal(15,4)) / cast(sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64 as decimal(15,4))) AS currency_ratio#67]
+(44) CometHashAggregate
+Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+Keys [1]: [cs_item_sk#32]
+Functions [4]: [sum(coalesce(cr_return_quantity#41, 0)), sum(coalesce(cs_quantity#34, 0)), sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
 
-(42) Exchange
-Input [3]: [item#65, return_ratio#66, currency_ratio#67]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
+(45) CometColumnarExchange
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(43) Sort [codegen id : 12]
-Input [3]: [item#65, return_ratio#66, currency_ratio#67]
-Arguments: [return_ratio#66 ASC NULLS FIRST], false, 0
+(46) CometSort
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+Arguments: [item#57, return_ratio#58, currency_ratio#59], [return_ratio#58 ASC NULLS FIRST]
 
-(44) Window
-Input [3]: [item#65, return_ratio#66, currency_ratio#67]
-Arguments: [rank(return_ratio#66) windowspecdefinition(return_ratio#66 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#68], [return_ratio#66 ASC NULLS FIRST]
+(47) ColumnarToRow [codegen id : 10]
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
 
-(45) Sort [codegen id : 13]
-Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
-Arguments: [currency_ratio#67 ASC NULLS FIRST], false, 0
+(48) Window
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+Arguments: [rank(return_ratio#58) windowspecdefinition(return_ratio#58 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#60], [return_ratio#58 ASC NULLS FIRST]
 
-(46) Window
-Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
-Arguments: [rank(currency_ratio#67) windowspecdefinition(currency_ratio#67 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#69], [currency_ratio#67 ASC NULLS FIRST]
+(49) Sort [codegen id : 11]
+Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
+Arguments: [currency_ratio#59 ASC NULLS FIRST], false, 0
 
-(47) Filter [codegen id : 14]
-Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
-Condition : ((return_rank#68 <= 10) OR (currency_rank#69 <= 10))
+(50) Window
+Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
+Arguments: [rank(currency_ratio#59) windowspecdefinition(currency_ratio#59 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#61], [currency_ratio#59 ASC NULLS FIRST]
 
-(48) Project [codegen id : 14]
-Output [5]: [catalog AS channel#70, item#65, return_ratio#66, return_rank#68, currency_rank#69]
-Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
+(51) Filter [codegen id : 12]
+Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
+Condition : ((return_rank#60 <= 10) OR (currency_rank#61 <= 10))
+
+(52) Project [codegen id : 12]
+Output [5]: [catalog AS channel#62, item#57, return_ratio#58, return_rank#60, currency_rank#61]
+Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
+Output [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#76), dynamicpruningexpression(ss_sold_date_sk#76 IN dynamicpruning#77)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#68), dynamicpruningexpression(ss_sold_date_sk#68 IN dynamicpruning#69)]
 PushedFilters: [IsNotNull(ss_net_profit), IsNotNull(ss_net_paid), IsNotNull(ss_quantity), GreaterThan(ss_net_profit,1.00), GreaterThan(ss_net_paid,0.00), GreaterThan(ss_quantity,0), IsNotNull(ss_ticket_number), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_net_paid:decimal(7,2),ss_net_profit:decimal(7,2)>
 
-(50) CometFilter
-Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
-Condition : (((((((isnotnull(ss_net_profit#75) AND isnotnull(ss_net_paid#74)) AND isnotnull(ss_quantity#73)) AND (ss_net_profit#75 > 1.00)) AND (ss_net_paid#74 > 0.00)) AND (ss_quantity#73 > 0)) AND isnotnull(ss_ticket_number#72)) AND isnotnull(ss_item_sk#71))
+(54) CometFilter
+Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
+Condition : (((((((isnotnull(ss_net_profit#67) AND isnotnull(ss_net_paid#66)) AND isnotnull(ss_quantity#65)) AND (ss_net_profit#67 > 1.00)) AND (ss_net_paid#66 > 0.00)) AND (ss_quantity#65 > 0)) AND isnotnull(ss_ticket_number#64)) AND isnotnull(ss_item_sk#63))
 
-(51) CometProject
-Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
-Arguments: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76], [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
+(55) CometProject
+Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
+Arguments: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68], [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
 
-(52) ColumnarToRow [codegen id : 15]
-Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
+(56) ColumnarToRow [codegen id : 13]
+Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
 
-(53) BroadcastExchange
-Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
+(57) BroadcastExchange
+Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=7]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
+Output [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_return_amt), GreaterThan(sr_return_amt,10000.00), IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(55) CometFilter
-Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
-Condition : (((isnotnull(sr_return_amt#81) AND (sr_return_amt#81 > 10000.00)) AND isnotnull(sr_ticket_number#79)) AND isnotnull(sr_item_sk#78))
+(59) CometFilter
+Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
+Condition : (((isnotnull(sr_return_amt#73) AND (sr_return_amt#73 > 10000.00)) AND isnotnull(sr_ticket_number#71)) AND isnotnull(sr_item_sk#70))
 
-(56) CometProject
-Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
-Arguments: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81], [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
+(60) CometProject
+Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
+Arguments: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73], [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
 
-(57) ColumnarToRow
-Input [4]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
+(61) ColumnarToRow
+Input [4]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
 
-(58) BroadcastHashJoin [codegen id : 17]
-Left keys [2]: [ss_ticket_number#72, ss_item_sk#71]
-Right keys [2]: [sr_ticket_number#79, sr_item_sk#78]
+(62) BroadcastHashJoin [codegen id : 15]
+Left keys [2]: [ss_ticket_number#64, ss_item_sk#63]
+Right keys [2]: [sr_ticket_number#71, sr_item_sk#70]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 17]
-Output [6]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81]
-Input [9]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
+(63) Project [codegen id : 15]
+Output [6]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73]
+Input [9]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
 
-(60) ReusedExchange [Reuses operator id: 82]
-Output [1]: [d_date_sk#83]
+(64) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#75]
 
-(61) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ss_sold_date_sk#76]
-Right keys [1]: [d_date_sk#83]
+(65) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ss_sold_date_sk#68]
+Right keys [1]: [d_date_sk#75]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 17]
-Output [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
-Input [7]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81, d_date_sk#83]
-
-(63) HashAggregate [codegen id : 17]
-Input [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
-Keys [1]: [ss_item_sk#71]
-Functions [4]: [partial_sum(coalesce(sr_return_quantity#80, 0)), partial_sum(coalesce(ss_quantity#73, 0)), partial_sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#84, sum#85, sum#86, isEmpty#87, sum#88, isEmpty#89]
-Results [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-
-(64) Exchange
-Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-Arguments: hashpartitioning(ss_item_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=8]
-
-(65) HashAggregate [codegen id : 18]
-Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-Keys [1]: [ss_item_sk#71]
-Functions [4]: [sum(coalesce(sr_return_quantity#80, 0)), sum(coalesce(ss_quantity#73, 0)), sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
-Aggregate Attributes [4]: [sum(coalesce(sr_return_quantity#80, 0))#96, sum(coalesce(ss_quantity#73, 0))#97, sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98, sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99]
-Results [3]: [ss_item_sk#71 AS item#100, (cast(sum(coalesce(sr_return_quantity#80, 0))#96 as decimal(15,4)) / cast(sum(coalesce(ss_quantity#73, 0))#97 as decimal(15,4))) AS return_ratio#101, (cast(sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98 as decimal(15,4)) / cast(sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99 as decimal(15,4))) AS currency_ratio#102]
-
-(66) Exchange
-Input [3]: [item#100, return_ratio#101, currency_ratio#102]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=9]
-
-(67) Sort [codegen id : 19]
-Input [3]: [item#100, return_ratio#101, currency_ratio#102]
-Arguments: [return_ratio#101 ASC NULLS FIRST], false, 0
-
-(68) Window
-Input [3]: [item#100, return_ratio#101, currency_ratio#102]
-Arguments: [rank(return_ratio#101) windowspecdefinition(return_ratio#101 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#103], [return_ratio#101 ASC NULLS FIRST]
-
-(69) Sort [codegen id : 20]
-Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
-Arguments: [currency_ratio#102 ASC NULLS FIRST], false, 0
-
-(70) Window
-Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
-Arguments: [rank(currency_ratio#102) windowspecdefinition(currency_ratio#102 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#104], [currency_ratio#102 ASC NULLS FIRST]
-
-(71) Filter [codegen id : 21]
-Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
-Condition : ((return_rank#103 <= 10) OR (currency_rank#104 <= 10))
-
-(72) Project [codegen id : 21]
-Output [5]: [store AS channel#105, item#100, return_ratio#101, return_rank#103, currency_rank#104]
-Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
-
-(73) Union
-
-(74) HashAggregate [codegen id : 22]
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+(66) Project [codegen id : 15]
+Output [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
+Input [7]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73, d_date_sk#75]
+
+(67) HashAggregate [codegen id : 15]
+Input [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
+Keys [1]: [ss_item_sk#63]
+Functions [4]: [partial_sum(coalesce(sr_return_quantity#72, 0)), partial_sum(coalesce(ss_quantity#65, 0)), partial_sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#76, sum#77, sum#78, isEmpty#79, sum#80, isEmpty#81]
+Results [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+
+(68) RowToColumnar
+Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+
+(69) CometColumnarExchange
+Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+Arguments: hashpartitioning(ss_item_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+
+(70) CometHashAggregate
+Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+Keys [1]: [ss_item_sk#63]
+Functions [4]: [sum(coalesce(sr_return_quantity#72, 0)), sum(coalesce(ss_quantity#65, 0)), sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
+
+(71) CometColumnarExchange
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(72) CometSort
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+Arguments: [item#88, return_ratio#89, currency_ratio#90], [return_ratio#89 ASC NULLS FIRST]
+
+(73) ColumnarToRow [codegen id : 16]
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+
+(74) Window
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+Arguments: [rank(return_ratio#89) windowspecdefinition(return_ratio#89 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#91], [return_ratio#89 ASC NULLS FIRST]
+
+(75) Sort [codegen id : 17]
+Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
+Arguments: [currency_ratio#90 ASC NULLS FIRST], false, 0
+
+(76) Window
+Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
+Arguments: [rank(currency_ratio#90) windowspecdefinition(currency_ratio#90 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#92], [currency_ratio#90 ASC NULLS FIRST]
+
+(77) Filter [codegen id : 18]
+Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
+Condition : ((return_rank#91 <= 10) OR (currency_rank#92 <= 10))
+
+(78) Project [codegen id : 18]
+Output [5]: [store AS channel#93, item#88, return_ratio#89, return_rank#91, currency_rank#92]
+Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
+
+(79) Union
+
+(80) HashAggregate [codegen id : 19]
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 Functions: []
 Aggregate Attributes: []
-Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Results [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 
-(75) Exchange
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Arguments: hashpartitioning(channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(81) RowToColumnar
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 
-(76) HashAggregate [codegen id : 23]
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+(82) CometColumnarExchange
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Arguments: hashpartitioning(channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(83) CometHashAggregate
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
-(77) TakeOrderedAndProject
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Arguments: 100, [channel#35 ASC NULLS FIRST, return_rank#33 ASC NULLS FIRST, currency_rank#34 ASC NULLS FIRST], [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+(84) CometTakeOrderedAndProject
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#31 ASC NULLS FIRST,return_rank#29 ASC NULLS FIRST,currency_rank#30 ASC NULLS FIRST], output=[channel#31,item#26,return_ratio#27,return_rank#29,currency_rank#30]), 100, [channel#31 ASC NULLS FIRST, return_rank#29 ASC NULLS FIRST, currency_rank#30 ASC NULLS FIRST], [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+
+(85) ColumnarToRow [codegen id : 20]
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (82)
-+- * ColumnarToRow (81)
-   +- CometProject (80)
-      +- CometFilter (79)
-         +- CometScan parquet spark_catalog.default.date_dim (78)
+BroadcastExchange (90)
++- * ColumnarToRow (89)
+   +- CometProject (88)
+      +- CometFilter (87)
+         +- CometScan parquet spark_catalog.default.date_dim (86)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#13, d_year#106, d_moy#107]
+Output [3]: [d_date_sk#13, d_year#94, d_moy#95]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,12), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(79) CometFilter
-Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
-Condition : ((((isnotnull(d_year#106) AND isnotnull(d_moy#107)) AND (d_year#106 = 2001)) AND (d_moy#107 = 12)) AND isnotnull(d_date_sk#13))
+(87) CometFilter
+Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
+Condition : ((((isnotnull(d_year#94) AND isnotnull(d_moy#95)) AND (d_year#94 = 2001)) AND (d_moy#95 = 12)) AND isnotnull(d_date_sk#13))
 
-(80) CometProject
-Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
+(88) CometProject
+Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
 Arguments: [d_date_sk#13], [d_date_sk#13]
 
-(81) ColumnarToRow [codegen id : 1]
+(89) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#13]
 
-(82) BroadcastExchange
+(90) BroadcastExchange
 Input [1]: [d_date_sk#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-Subquery:2 Hosting operator id = 25 Hosting Expression = cs_sold_date_sk#41 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 27 Hosting Expression = cs_sold_date_sk#37 IN dynamicpruning#7
 
-Subquery:3 Hosting operator id = 49 Hosting Expression = ss_sold_date_sk#76 IN dynamicpruning#7
+Subquery:3 Hosting operator id = 53 Hosting Expression = ss_sold_date_sk#68 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
index f007c1c663..728ec5ade5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
@@ -1,133 +1,135 @@
-TakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
-  WholeStageCodegen (23)
-    HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-      InputAdapter
-        Exchange [channel,item,return_ratio,return_rank,currency_rank] #1
-          WholeStageCodegen (22)
-            HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-              InputAdapter
-                Union
-                  WholeStageCodegen (7)
-                    Project [item,return_ratio,return_rank,currency_rank]
-                      Filter [return_rank,currency_rank]
-                        InputAdapter
-                          Window [currency_ratio]
-                            WholeStageCodegen (6)
-                              Sort [currency_ratio]
-                                InputAdapter
-                                  Window [return_ratio]
-                                    WholeStageCodegen (5)
-                                      Sort [return_ratio]
-                                        InputAdapter
-                                          Exchange #2
-                                            WholeStageCodegen (4)
-                                              HashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(wr_return_quantity, 0)),sum(coalesce(ws_quantity, 0)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ws_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [ws_item_sk] #3
-                                                    WholeStageCodegen (3)
-                                                      HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                        Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
-                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
-                                                              BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+WholeStageCodegen (20)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
+        CometHashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+          CometColumnarExchange [channel,item,return_ratio,return_rank,currency_rank] #1
+            RowToColumnar
+              WholeStageCodegen (19)
+                HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+                  InputAdapter
+                    Union
+                      WholeStageCodegen (6)
+                        Project [item,return_ratio,return_rank,currency_rank]
+                          Filter [return_rank,currency_rank]
+                            InputAdapter
+                              Window [currency_ratio]
+                                WholeStageCodegen (5)
+                                  Sort [currency_ratio]
+                                    InputAdapter
+                                      Window [return_ratio]
+                                        WholeStageCodegen (4)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [return_ratio]
+                                                CometColumnarExchange #2
+                                                  CometHashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                    CometColumnarExchange [ws_item_sk] #3
+                                                      RowToColumnar
+                                                        WholeStageCodegen (3)
+                                                          HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
+                                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
+                                                                  BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #4
+                                                                        WholeStageCodegen (1)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
+                                                                                CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
+                                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
+                                                                                    SubqueryBroadcast [d_date_sk] #1
+                                                                                      BroadcastExchange #5
+                                                                                        WholeStageCodegen (1)
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometProject [d_date_sk]
+                                                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                                                          CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
+                                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
                                                                 InputAdapter
-                                                                  BroadcastExchange #4
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
-                                                                            CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
-                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                                  BroadcastExchange #5
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometProject [d_date_sk]
-                                                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                                                      CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
-                                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
-                                                            InputAdapter
-                                                              ReusedExchange [d_date_sk] #5
-                  WholeStageCodegen (14)
-                    Project [item,return_ratio,return_rank,currency_rank]
-                      Filter [return_rank,currency_rank]
-                        InputAdapter
-                          Window [currency_ratio]
-                            WholeStageCodegen (13)
-                              Sort [currency_ratio]
-                                InputAdapter
-                                  Window [return_ratio]
-                                    WholeStageCodegen (12)
-                                      Sort [return_ratio]
-                                        InputAdapter
-                                          Exchange #6
-                                            WholeStageCodegen (11)
-                                              HashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(cr_return_quantity, 0)),sum(coalesce(cs_quantity, 0)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum(coalesce(cast(cs_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [cs_item_sk] #7
-                                                    WholeStageCodegen (10)
-                                                      HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                        Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
-                                                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
-                                                              BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                                  ReusedExchange [d_date_sk] #5
+                      WholeStageCodegen (12)
+                        Project [item,return_ratio,return_rank,currency_rank]
+                          Filter [return_rank,currency_rank]
+                            InputAdapter
+                              Window [currency_ratio]
+                                WholeStageCodegen (11)
+                                  Sort [currency_ratio]
+                                    InputAdapter
+                                      Window [return_ratio]
+                                        WholeStageCodegen (10)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [return_ratio]
+                                                CometColumnarExchange #6
+                                                  CometHashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                    CometColumnarExchange [cs_item_sk] #7
+                                                      RowToColumnar
+                                                        WholeStageCodegen (9)
+                                                          HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
+                                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
+                                                                  BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #8
+                                                                        WholeStageCodegen (7)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
+                                                                                CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
+                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
+                                                                                    ReusedSubquery [d_date_sk] #1
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                                                          CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
+                                                                            CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
                                                                 InputAdapter
-                                                                  BroadcastExchange #8
-                                                                    WholeStageCodegen (8)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
-                                                                            CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
-                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                                                      CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
-                                                                        CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
-                                                            InputAdapter
-                                                              ReusedExchange [d_date_sk] #5
-                  WholeStageCodegen (21)
-                    Project [item,return_ratio,return_rank,currency_rank]
-                      Filter [return_rank,currency_rank]
-                        InputAdapter
-                          Window [currency_ratio]
-                            WholeStageCodegen (20)
-                              Sort [currency_ratio]
-                                InputAdapter
-                                  Window [return_ratio]
-                                    WholeStageCodegen (19)
-                                      Sort [return_ratio]
-                                        InputAdapter
-                                          Exchange #9
-                                            WholeStageCodegen (18)
-                                              HashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(sr_return_quantity, 0)),sum(coalesce(ss_quantity, 0)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ss_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [ss_item_sk] #10
-                                                    WholeStageCodegen (17)
-                                                      HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                        Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
-                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
-                                                              BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                                  ReusedExchange [d_date_sk] #5
+                      WholeStageCodegen (18)
+                        Project [item,return_ratio,return_rank,currency_rank]
+                          Filter [return_rank,currency_rank]
+                            InputAdapter
+                              Window [currency_ratio]
+                                WholeStageCodegen (17)
+                                  Sort [currency_ratio]
+                                    InputAdapter
+                                      Window [return_ratio]
+                                        WholeStageCodegen (16)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [return_ratio]
+                                                CometColumnarExchange #9
+                                                  CometHashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                    CometColumnarExchange [ss_item_sk] #10
+                                                      RowToColumnar
+                                                        WholeStageCodegen (15)
+                                                          HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
+                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
+                                                                  BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #11
+                                                                        WholeStageCodegen (13)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
+                                                                                CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
+                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
+                                                                                    ReusedSubquery [d_date_sk] #1
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                                                          CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
+                                                                            CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
                                                                 InputAdapter
-                                                                  BroadcastExchange #11
-                                                                    WholeStageCodegen (15)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
-                                                                            CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                                                      CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
-                                                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
-                                                            InputAdapter
-                                                              ReusedExchange [d_date_sk] #5
+                                                                  ReusedExchange [d_date_sk] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
index 468df4fec4..e6cab40f97 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
@@ -1,76 +1,84 @@
 == Physical Plan ==
-TakeOrderedAndProject (72)
-+- * HashAggregate (71)
-   +- Exchange (70)
-      +- * HashAggregate (69)
-         +- * Expand (68)
-            +- Union (67)
-               :- * HashAggregate (20)
-               :  +- Exchange (19)
-               :     +- * HashAggregate (18)
-               :        +- * Project (17)
-               :           +- * BroadcastHashJoin Inner BuildRight (16)
-               :              :- * Project (11)
-               :              :  +- * BroadcastHashJoin Inner BuildRight (10)
-               :              :     :- * ColumnarToRow (8)
-               :              :     :  +- CometUnion (7)
-               :              :     :     :- CometProject (3)
-               :              :     :     :  +- CometFilter (2)
-               :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :              :     :     +- CometProject (6)
-               :              :     :        +- CometFilter (5)
-               :              :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
-               :              :     +- ReusedExchange (9)
-               :              +- BroadcastExchange (15)
-               :                 +- * ColumnarToRow (14)
-               :                    +- CometFilter (13)
-               :                       +- CometScan parquet spark_catalog.default.store (12)
-               :- * HashAggregate (40)
-               :  +- Exchange (39)
-               :     +- * HashAggregate (38)
-               :        +- * Project (37)
-               :           +- * BroadcastHashJoin Inner BuildRight (36)
-               :              :- * Project (31)
-               :              :  +- * BroadcastHashJoin Inner BuildRight (30)
-               :              :     :- * ColumnarToRow (28)
-               :              :     :  +- CometUnion (27)
-               :              :     :     :- CometProject (23)
-               :              :     :     :  +- CometFilter (22)
-               :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (21)
-               :              :     :     +- CometProject (26)
-               :              :     :        +- CometFilter (25)
-               :              :     :           +- CometScan parquet spark_catalog.default.catalog_returns (24)
-               :              :     +- ReusedExchange (29)
-               :              +- BroadcastExchange (35)
-               :                 +- * ColumnarToRow (34)
-               :                    +- CometFilter (33)
-               :                       +- CometScan parquet spark_catalog.default.catalog_page (32)
-               +- * HashAggregate (66)
-                  +- Exchange (65)
-                     +- * HashAggregate (64)
-                        +- * Project (63)
-                           +- * BroadcastHashJoin Inner BuildRight (62)
-                              :- * Project (57)
-                              :  +- * BroadcastHashJoin Inner BuildRight (56)
-                              :     :- Union (54)
-                              :     :  :- * ColumnarToRow (44)
-                              :     :  :  +- CometProject (43)
-                              :     :  :     +- CometFilter (42)
-                              :     :  :        +- CometScan parquet spark_catalog.default.web_sales (41)
-                              :     :  +- * Project (53)
-                              :     :     +- * BroadcastHashJoin Inner BuildLeft (52)
-                              :     :        :- BroadcastExchange (47)
-                              :     :        :  +- * ColumnarToRow (46)
-                              :     :        :     +- CometScan parquet spark_catalog.default.web_returns (45)
-                              :     :        +- * ColumnarToRow (51)
-                              :     :           +- CometProject (50)
-                              :     :              +- CometFilter (49)
-                              :     :                 +- CometScan parquet spark_catalog.default.web_sales (48)
-                              :     +- ReusedExchange (55)
-                              +- BroadcastExchange (61)
-                                 +- * ColumnarToRow (60)
-                                    +- CometFilter (59)
-                                       +- CometScan parquet spark_catalog.default.web_site (58)
+* ColumnarToRow (80)
++- CometTakeOrderedAndProject (79)
+   +- CometHashAggregate (78)
+      +- CometColumnarExchange (77)
+         +- RowToColumnar (76)
+            +- * HashAggregate (75)
+               +- * Expand (74)
+                  +- Union (73)
+                     :- * HashAggregate (22)
+                     :  +- * ColumnarToRow (21)
+                     :     +- CometColumnarExchange (20)
+                     :        +- RowToColumnar (19)
+                     :           +- * HashAggregate (18)
+                     :              +- * Project (17)
+                     :                 +- * BroadcastHashJoin Inner BuildRight (16)
+                     :                    :- * Project (11)
+                     :                    :  +- * BroadcastHashJoin Inner BuildRight (10)
+                     :                    :     :- * ColumnarToRow (8)
+                     :                    :     :  +- CometUnion (7)
+                     :                    :     :     :- CometProject (3)
+                     :                    :     :     :  +- CometFilter (2)
+                     :                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :                    :     :     +- CometProject (6)
+                     :                    :     :        +- CometFilter (5)
+                     :                    :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
+                     :                    :     +- ReusedExchange (9)
+                     :                    +- BroadcastExchange (15)
+                     :                       +- * ColumnarToRow (14)
+                     :                          +- CometFilter (13)
+                     :                             +- CometScan parquet spark_catalog.default.store (12)
+                     :- * HashAggregate (44)
+                     :  +- * ColumnarToRow (43)
+                     :     +- CometColumnarExchange (42)
+                     :        +- RowToColumnar (41)
+                     :           +- * HashAggregate (40)
+                     :              +- * Project (39)
+                     :                 +- * BroadcastHashJoin Inner BuildRight (38)
+                     :                    :- * Project (33)
+                     :                    :  +- * BroadcastHashJoin Inner BuildRight (32)
+                     :                    :     :- * ColumnarToRow (30)
+                     :                    :     :  +- CometUnion (29)
+                     :                    :     :     :- CometProject (25)
+                     :                    :     :     :  +- CometFilter (24)
+                     :                    :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (23)
+                     :                    :     :     +- CometProject (28)
+                     :                    :     :        +- CometFilter (27)
+                     :                    :     :           +- CometScan parquet spark_catalog.default.catalog_returns (26)
+                     :                    :     +- ReusedExchange (31)
+                     :                    +- BroadcastExchange (37)
+                     :                       +- * ColumnarToRow (36)
+                     :                          +- CometFilter (35)
+                     :                             +- CometScan parquet spark_catalog.default.catalog_page (34)
+                     +- * HashAggregate (72)
+                        +- * ColumnarToRow (71)
+                           +- CometColumnarExchange (70)
+                              +- RowToColumnar (69)
+                                 +- * HashAggregate (68)
+                                    +- * Project (67)
+                                       +- * BroadcastHashJoin Inner BuildRight (66)
+                                          :- * Project (61)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (60)
+                                          :     :- Union (58)
+                                          :     :  :- * ColumnarToRow (48)
+                                          :     :  :  +- CometProject (47)
+                                          :     :  :     +- CometFilter (46)
+                                          :     :  :        +- CometScan parquet spark_catalog.default.web_sales (45)
+                                          :     :  +- * Project (57)
+                                          :     :     +- * BroadcastHashJoin Inner BuildLeft (56)
+                                          :     :        :- BroadcastExchange (51)
+                                          :     :        :  +- * ColumnarToRow (50)
+                                          :     :        :     +- CometScan parquet spark_catalog.default.web_returns (49)
+                                          :     :        +- * ColumnarToRow (55)
+                                          :     :           +- CometProject (54)
+                                          :     :              +- CometFilter (53)
+                                          :     :                 +- CometScan parquet spark_catalog.default.web_sales (52)
+                                          :     +- ReusedExchange (59)
+                                          +- BroadcastExchange (65)
+                                             +- * ColumnarToRow (64)
+                                                +- CometFilter (63)
+                                                   +- CometScan parquet spark_catalog.default.web_site (62)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -112,7 +120,7 @@ Child 1 Input [6]: [store_sk#16, date_sk#17, sales_price#18, profit#19, return_a
 (8) ColumnarToRow [codegen id : 3]
 Input [6]: [store_sk#6, date_sk#7, sales_price#8, profit#9, return_amt#10, net_loss#11]
 
-(9) ReusedExchange [Reuses operator id: 77]
+(9) ReusedExchange [Reuses operator id: 85]
 Output [1]: [d_date_sk#22]
 
 (10) BroadcastHashJoin [codegen id : 3]
@@ -160,11 +168,17 @@ Functions [4]: [partial_sum(UnscaledValue(sales_price#8)), partial_sum(UnscaledV
 Aggregate Attributes [4]: [sum#25, sum#26, sum#27, sum#28]
 Results [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 
-(19) Exchange
+(19) RowToColumnar
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
-Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
+Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(21) ColumnarToRow [codegen id : 4]
+Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
+
+(22) HashAggregate [codegen id : 4]
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 Keys [1]: [s_store_id#24]
 Functions [4]: [sum(UnscaledValue(sales_price#8)), sum(UnscaledValue(return_amt#10)), sum(UnscaledValue(profit#9)), sum(UnscaledValue(net_loss#11))]
@@ -179,11 +193,11 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(22) CometFilter
+(24) CometFilter
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : isnotnull(cs_catalog_page_sk#42)
 
-(23) CometProject
+(25) CometProject
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52], [cs_catalog_page_sk#42 AS page_sk#47, cs_sold_date_sk#45 AS date_sk#48, cs_ext_sales_price#43 AS sales_price#49, cs_net_profit#44 AS profit#50, 0.00 AS return_amt#51, 0.00 AS net_loss#52]
 
@@ -195,31 +209,31 @@ PartitionFilters: [isnotnull(cr_returned_date_sk#56), dynamicpruningexpression(c
 PushedFilters: [IsNotNull(cr_catalog_page_sk)]
 ReadSchema: struct<cr_catalog_page_sk:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(25) CometFilter
+(27) CometFilter
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Condition : isnotnull(cr_catalog_page_sk#53)
 
-(26) CometProject
+(28) CometProject
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Arguments: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62], [cr_catalog_page_sk#53 AS page_sk#57, cr_returned_date_sk#56 AS date_sk#58, 0.00 AS sales_price#59, 0.00 AS profit#60, cr_return_amount#54 AS return_amt#61, cr_net_loss#55 AS net_loss#62]
 
-(27) CometUnion
+(29) CometUnion
 Child 0 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Child 1 Input [6]: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62]
 
-(28) ColumnarToRow [codegen id : 7]
+(30) ColumnarToRow [codegen id : 7]
 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 
-(29) ReusedExchange [Reuses operator id: 77]
+(31) ReusedExchange [Reuses operator id: 85]
 Output [1]: [d_date_sk#63]
 
-(30) BroadcastHashJoin [codegen id : 7]
+(32) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [date_sk#48]
 Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 7]
+(33) Project [codegen id : 7]
 Output [5]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Input [7]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52, d_date_sk#63]
 
@@ -230,39 +244,45 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(33) CometFilter
+(35) CometFilter
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Condition : isnotnull(cp_catalog_page_sk#64)
 
-(34) ColumnarToRow [codegen id : 6]
+(36) ColumnarToRow [codegen id : 6]
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(35) BroadcastExchange
+(37) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(36) BroadcastHashJoin [codegen id : 7]
+(38) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [page_sk#47]
 Right keys [1]: [cp_catalog_page_sk#64]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 7]
+(39) Project [codegen id : 7]
 Output [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Input [7]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(38) HashAggregate [codegen id : 7]
+(40) HashAggregate [codegen id : 7]
 Input [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#49)), partial_sum(UnscaledValue(return_amt#51)), partial_sum(UnscaledValue(profit#50)), partial_sum(UnscaledValue(net_loss#52))]
 Aggregate Attributes [4]: [sum#66, sum#67, sum#68, sum#69]
 Results [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 
-(39) Exchange
+(41) RowToColumnar
+Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
+
+(42) CometColumnarExchange
+Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
+Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(43) ColumnarToRow [codegen id : 8]
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
-Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(40) HashAggregate [codegen id : 8]
+(44) HashAggregate [codegen id : 8]
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [sum(UnscaledValue(sales_price#49)), sum(UnscaledValue(return_amt#51)), sum(UnscaledValue(profit#50)), sum(UnscaledValue(net_loss#52))]
@@ -277,15 +297,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#86), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_web_site_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(42) CometFilter
+(46) CometFilter
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Condition : isnotnull(ws_web_site_sk#83)
 
-(43) CometProject
+(47) CometProject
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Arguments: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93], [ws_web_site_sk#83 AS wsr_web_site_sk#88, ws_sold_date_sk#86 AS date_sk#89, ws_ext_sales_price#84 AS sales_price#90, ws_net_profit#85 AS profit#91, 0.00 AS return_amt#92, 0.00 AS net_loss#93]
 
-(44) ColumnarToRow [codegen id : 9]
+(48) ColumnarToRow [codegen id : 9]
 Input [6]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
@@ -295,10 +315,10 @@ Location: InMemoryFileIndex []
 PartitionFilters: [isnotnull(wr_returned_date_sk#98), dynamicpruningexpression(wr_returned_date_sk#98 IN dynamicpruning#87)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(46) ColumnarToRow [codegen id : 10]
+(50) ColumnarToRow [codegen id : 10]
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 
-(47) BroadcastExchange
+(51) BroadcastExchange
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, true] as bigint), 32) | (cast(input[1, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
@@ -309,39 +329,39 @@ Location [not included in comparison]/{warehouse_dir}/web_sales]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_order_number), IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_order_number:int>
 
-(49) CometFilter
+(53) CometFilter
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Condition : ((isnotnull(ws_item_sk#99) AND isnotnull(ws_order_number#101)) AND isnotnull(ws_web_site_sk#100))
 
-(50) CometProject
+(54) CometProject
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Arguments: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101], [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(51) ColumnarToRow
+(55) ColumnarToRow
 Input [3]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(52) BroadcastHashJoin [codegen id : 11]
+(56) BroadcastHashJoin [codegen id : 11]
 Left keys [2]: [wr_item_sk#94, wr_order_number#95]
 Right keys [2]: [ws_item_sk#99, ws_order_number#101]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 11]
+(57) Project [codegen id : 11]
 Output [6]: [ws_web_site_sk#100 AS wsr_web_site_sk#103, wr_returned_date_sk#98 AS date_sk#104, 0.00 AS sales_price#105, 0.00 AS profit#106, wr_return_amt#96 AS return_amt#107, wr_net_loss#97 AS net_loss#108]
 Input [8]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98, ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(54) Union
+(58) Union
 
-(55) ReusedExchange [Reuses operator id: 77]
+(59) ReusedExchange [Reuses operator id: 85]
 Output [1]: [d_date_sk#109]
 
-(56) BroadcastHashJoin [codegen id : 14]
+(60) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [date_sk#89]
 Right keys [1]: [d_date_sk#109]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 14]
+(61) Project [codegen id : 14]
 Output [5]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93]
 Input [7]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93, d_date_sk#109]
 
@@ -352,113 +372,123 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(59) CometFilter
+(63) CometFilter
 Input [2]: [web_site_sk#110, web_site_id#111]
 Condition : isnotnull(web_site_sk#110)
 
-(60) ColumnarToRow [codegen id : 13]
+(64) ColumnarToRow [codegen id : 13]
 Input [2]: [web_site_sk#110, web_site_id#111]
 
-(61) BroadcastExchange
+(65) BroadcastExchange
 Input [2]: [web_site_sk#110, web_site_id#111]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(62) BroadcastHashJoin [codegen id : 14]
+(66) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [wsr_web_site_sk#88]
 Right keys [1]: [web_site_sk#110]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 14]
+(67) Project [codegen id : 14]
 Output [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Input [7]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_sk#110, web_site_id#111]
 
-(64) HashAggregate [codegen id : 14]
+(68) HashAggregate [codegen id : 14]
 Input [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Keys [1]: [web_site_id#111]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#90)), partial_sum(UnscaledValue(return_amt#92)), partial_sum(UnscaledValue(profit#91)), partial_sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum#112, sum#113, sum#114, sum#115]
 Results [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 
-(65) Exchange
+(69) RowToColumnar
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
-Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(66) HashAggregate [codegen id : 15]
+(70) CometColumnarExchange
+Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
+Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(71) ColumnarToRow [codegen id : 15]
+Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
+
+(72) HashAggregate [codegen id : 15]
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 Keys [1]: [web_site_id#111]
 Functions [4]: [sum(UnscaledValue(sales_price#90)), sum(UnscaledValue(return_amt#92)), sum(UnscaledValue(profit#91)), sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum(UnscaledValue(sales_price#90))#120, sum(UnscaledValue(return_amt#92))#121, sum(UnscaledValue(profit#91))#122, sum(UnscaledValue(net_loss#93))#123]
 Results [5]: [MakeDecimal(sum(UnscaledValue(sales_price#90))#120,17,2) AS sales#124, MakeDecimal(sum(UnscaledValue(return_amt#92))#121,17,2) AS returns#125, (MakeDecimal(sum(UnscaledValue(profit#91))#122,17,2) - MakeDecimal(sum(UnscaledValue(net_loss#93))#123,17,2)) AS profit#126, web channel AS channel#127, concat(web_site, web_site_id#111) AS id#128]
 
-(67) Union
+(73) Union
 
-(68) Expand [codegen id : 16]
+(74) Expand [codegen id : 16]
 Input [5]: [sales#37, returns#38, profit#39, channel#40, id#41]
 Arguments: [[sales#37, returns#38, profit#39, channel#40, id#41, 0], [sales#37, returns#38, profit#39, channel#40, null, 1], [sales#37, returns#38, profit#39, null, null, 3]], [sales#37, returns#38, profit#39, channel#129, id#130, spark_grouping_id#131]
 
-(69) HashAggregate [codegen id : 16]
+(75) HashAggregate [codegen id : 16]
 Input [6]: [sales#37, returns#38, profit#39, channel#129, id#130, spark_grouping_id#131]
 Keys [3]: [channel#129, id#130, spark_grouping_id#131]
 Functions [3]: [partial_sum(sales#37), partial_sum(returns#38), partial_sum(profit#39)]
 Aggregate Attributes [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
 Results [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
 
-(70) Exchange
+(76) RowToColumnar
 Input [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
-Arguments: hashpartitioning(channel#129, id#130, spark_grouping_id#131, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(71) HashAggregate [codegen id : 17]
+(77) CometColumnarExchange
+Input [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
+Arguments: hashpartitioning(channel#129, id#130, spark_grouping_id#131, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+
+(78) CometHashAggregate
 Input [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
 Keys [3]: [channel#129, id#130, spark_grouping_id#131]
 Functions [3]: [sum(sales#37), sum(returns#38), sum(profit#39)]
-Aggregate Attributes [3]: [sum(sales#37)#144, sum(returns#38)#145, sum(profit#39)#146]
-Results [5]: [channel#129, id#130, sum(sales#37)#144 AS sales#147, sum(returns#38)#145 AS returns#148, sum(profit#39)#146 AS profit#149]
 
-(72) TakeOrderedAndProject
-Input [5]: [channel#129, id#130, sales#147, returns#148, profit#149]
-Arguments: 100, [channel#129 ASC NULLS FIRST, id#130 ASC NULLS FIRST], [channel#129, id#130, sales#147, returns#148, profit#149]
+(79) CometTakeOrderedAndProject
+Input [5]: [channel#129, id#130, sales#144, returns#145, profit#146]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#129 ASC NULLS FIRST,id#130 ASC NULLS FIRST], output=[channel#129,id#130,sales#144,returns#145,profit#146]), 100, [channel#129 ASC NULLS FIRST, id#130 ASC NULLS FIRST], [channel#129, id#130, sales#144, returns#145, profit#146]
+
+(80) ColumnarToRow [codegen id : 17]
+Input [5]: [channel#129, id#130, sales#144, returns#145, profit#146]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (77)
-+- * ColumnarToRow (76)
-   +- CometProject (75)
-      +- CometFilter (74)
-         +- CometScan parquet spark_catalog.default.date_dim (73)
+BroadcastExchange (85)
++- * ColumnarToRow (84)
+   +- CometProject (83)
+      +- CometFilter (82)
+         +- CometScan parquet spark_catalog.default.date_dim (81)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#22, d_date#150]
+Output [2]: [d_date_sk#22, d_date#147]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), LessThanOrEqual(d_date,2000-09-06), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(74) CometFilter
-Input [2]: [d_date_sk#22, d_date#150]
-Condition : (((isnotnull(d_date#150) AND (d_date#150 >= 2000-08-23)) AND (d_date#150 <= 2000-09-06)) AND isnotnull(d_date_sk#22))
+(82) CometFilter
+Input [2]: [d_date_sk#22, d_date#147]
+Condition : (((isnotnull(d_date#147) AND (d_date#147 >= 2000-08-23)) AND (d_date#147 <= 2000-09-06)) AND isnotnull(d_date_sk#22))
 
-(75) CometProject
-Input [2]: [d_date_sk#22, d_date#150]
+(83) CometProject
+Input [2]: [d_date_sk#22, d_date#147]
 Arguments: [d_date_sk#22], [d_date_sk#22]
 
-(76) ColumnarToRow [codegen id : 1]
+(84) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#22]
 
-(77) BroadcastExchange
+(85) BroadcastExchange
 Input [1]: [d_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#15 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 21 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 23 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 24 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 26 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 45 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 45 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 49 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
index 33a1fb7a82..26119c3bd3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
@@ -1,120 +1,128 @@
-TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (17)
-    HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-      InputAdapter
-        Exchange [channel,id,spark_grouping_id] #1
-          WholeStageCodegen (16)
-            HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-              Expand [sales,returns,profit,channel,id]
-                InputAdapter
-                  Union
-                    WholeStageCodegen (4)
-                      HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
-                        InputAdapter
-                          Exchange [s_store_id] #2
-                            WholeStageCodegen (3)
-                              HashAggregate [s_store_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
-                                Project [sales_price,profit,return_amt,net_loss,s_store_id]
-                                  BroadcastHashJoin [store_sk,s_store_sk]
-                                    Project [store_sk,sales_price,profit,return_amt,net_loss]
-                                      BroadcastHashJoin [date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometUnion
-                                              CometProject [ss_store_sk,ss_sold_date_sk,ss_ext_sales_price,ss_net_profit] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                CometFilter [ss_store_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_date,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                              CometProject [sr_store_sk,sr_returned_date_sk,sr_return_amt,sr_net_loss] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                CometFilter [sr_store_sk]
-                                                  CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                                    InputAdapter
-                                      BroadcastExchange #4
-                                        WholeStageCodegen (2)
-                                          ColumnarToRow
+WholeStageCodegen (17)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
+        CometHashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+          CometColumnarExchange [channel,id,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (16)
+                HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  Expand [sales,returns,profit,channel,id]
+                    InputAdapter
+                      Union
+                        WholeStageCodegen (4)
+                          HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [s_store_id] #2
+                                  RowToColumnar
+                                    WholeStageCodegen (3)
+                                      HashAggregate [s_store_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
+                                        Project [sales_price,profit,return_amt,net_loss,s_store_id]
+                                          BroadcastHashJoin [store_sk,s_store_sk]
+                                            Project [store_sk,sales_price,profit,return_amt,net_loss]
+                                              BroadcastHashJoin [date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometUnion
+                                                      CometProject [ss_store_sk,ss_sold_date_sk,ss_ext_sales_price,ss_net_profit] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                        CometFilter [ss_store_sk]
+                                                          CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #1
+                                                              BroadcastExchange #3
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_date,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                      CometProject [sr_store_sk,sr_returned_date_sk,sr_return_amt,sr_net_loss] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                        CometFilter [sr_store_sk]
+                                                          CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
+                                                InputAdapter
+                                                  ReusedExchange [d_date_sk] #3
                                             InputAdapter
-                                              CometFilter [s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
-                    WholeStageCodegen (8)
-                      HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
-                        InputAdapter
-                          Exchange [cp_catalog_page_id] #5
-                            WholeStageCodegen (7)
-                              HashAggregate [cp_catalog_page_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
-                                Project [sales_price,profit,return_amt,net_loss,cp_catalog_page_id]
-                                  BroadcastHashJoin [page_sk,cp_catalog_page_sk]
-                                    Project [page_sk,sales_price,profit,return_amt,net_loss]
-                                      BroadcastHashJoin [date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometUnion
-                                              CometProject [cs_catalog_page_sk,cs_sold_date_sk,cs_ext_sales_price,cs_net_profit] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                CometFilter [cs_catalog_page_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                              CometProject [cr_catalog_page_sk,cr_returned_date_sk,cr_return_amount,cr_net_loss] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                CometFilter [cr_catalog_page_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_returns [cr_catalog_page_sk,cr_return_amount,cr_net_loss,cr_returned_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                                    InputAdapter
-                                      BroadcastExchange #6
-                                        WholeStageCodegen (6)
-                                          ColumnarToRow
+                                              BroadcastExchange #4
+                                                WholeStageCodegen (2)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
+                        WholeStageCodegen (8)
+                          HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [cp_catalog_page_id] #5
+                                  RowToColumnar
+                                    WholeStageCodegen (7)
+                                      HashAggregate [cp_catalog_page_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
+                                        Project [sales_price,profit,return_amt,net_loss,cp_catalog_page_id]
+                                          BroadcastHashJoin [page_sk,cp_catalog_page_sk]
+                                            Project [page_sk,sales_price,profit,return_amt,net_loss]
+                                              BroadcastHashJoin [date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometUnion
+                                                      CometProject [cs_catalog_page_sk,cs_sold_date_sk,cs_ext_sales_price,cs_net_profit] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                        CometFilter [cs_catalog_page_sk]
+                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
+                                                      CometProject [cr_catalog_page_sk,cr_returned_date_sk,cr_return_amount,cr_net_loss] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                        CometFilter [cr_catalog_page_sk]
+                                                          CometScan parquet spark_catalog.default.catalog_returns [cr_catalog_page_sk,cr_return_amount,cr_net_loss,cr_returned_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
+                                                InputAdapter
+                                                  ReusedExchange [d_date_sk] #3
                                             InputAdapter
-                                              CometFilter [cp_catalog_page_sk]
-                                                CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
-                    WholeStageCodegen (15)
-                      HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
-                        InputAdapter
-                          Exchange [web_site_id] #7
-                            WholeStageCodegen (14)
-                              HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
-                                Project [sales_price,profit,return_amt,net_loss,web_site_id]
-                                  BroadcastHashJoin [wsr_web_site_sk,web_site_sk]
-                                    Project [wsr_web_site_sk,sales_price,profit,return_amt,net_loss]
-                                      BroadcastHashJoin [date_sk,d_date_sk]
-                                        InputAdapter
-                                          Union
-                                            WholeStageCodegen (9)
-                                              ColumnarToRow
+                                              BroadcastExchange #6
+                                                WholeStageCodegen (6)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [cp_catalog_page_sk]
+                                                        CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
+                        WholeStageCodegen (15)
+                          HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [web_site_id] #7
+                                  RowToColumnar
+                                    WholeStageCodegen (14)
+                                      HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
+                                        Project [sales_price,profit,return_amt,net_loss,web_site_id]
+                                          BroadcastHashJoin [wsr_web_site_sk,web_site_sk]
+                                            Project [wsr_web_site_sk,sales_price,profit,return_amt,net_loss]
+                                              BroadcastHashJoin [date_sk,d_date_sk]
                                                 InputAdapter
-                                                  CometProject [ws_web_site_sk,ws_sold_date_sk,ws_ext_sales_price,ws_net_profit] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                    CometFilter [ws_web_site_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_web_site_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
-                                            WholeStageCodegen (11)
-                                              Project [ws_web_site_sk,wr_returned_date_sk,wr_return_amt,wr_net_loss]
-                                                BroadcastHashJoin [wr_item_sk,wr_order_number,ws_item_sk,ws_order_number]
-                                                  InputAdapter
-                                                    BroadcastExchange #8
-                                                      WholeStageCodegen (10)
-                                                        ColumnarToRow
+                                                  Union
+                                                    WholeStageCodegen (9)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [ws_web_site_sk,ws_sold_date_sk,ws_ext_sales_price,ws_net_profit] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                            CometFilter [ws_web_site_sk]
+                                                              CometScan parquet spark_catalog.default.web_sales [ws_web_site_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                    WholeStageCodegen (11)
+                                                      Project [ws_web_site_sk,wr_returned_date_sk,wr_return_amt,wr_net_loss]
+                                                        BroadcastHashJoin [wr_item_sk,wr_order_number,ws_item_sk,ws_order_number]
                                                           InputAdapter
-                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
-                                                              ReusedSubquery [d_date_sk] #1
+                                                            BroadcastExchange #8
+                                                              WholeStageCodegen (10)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                                      ReusedSubquery [d_date_sk] #1
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [ws_item_sk,ws_web_site_sk,ws_order_number]
+                                                                CometFilter [ws_item_sk,ws_order_number,ws_web_site_sk]
+                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_order_number,ws_sold_date_sk]
+                                                InputAdapter
+                                                  ReusedExchange [d_date_sk] #3
+                                            InputAdapter
+                                              BroadcastExchange #9
+                                                WholeStageCodegen (13)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometProject [ws_item_sk,ws_web_site_sk,ws_order_number]
-                                                        CometFilter [ws_item_sk,ws_order_number,ws_web_site_sk]
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_order_number,ws_sold_date_sk]
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                                    InputAdapter
-                                      BroadcastExchange #9
-                                        WholeStageCodegen (13)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [web_site_sk]
-                                                CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
+                                                      CometFilter [web_site_sk]
+                                                        CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt
index b178faed1a..c30a1571cb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt
@@ -1,32 +1,34 @@
 == Physical Plan ==
-TakeOrderedAndProject (28)
-+- * HashAggregate (27)
-   +- Exchange (26)
-      +- * HashAggregate (25)
-         +- * Project (24)
-            +- * BroadcastHashJoin Inner BuildRight (23)
-               :- * Project (21)
-               :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :     :- * Project (15)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :- * Project (9)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :  +- CometFilter (2)
-               :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :     :     +- BroadcastExchange (7)
-               :     :     :        +- * ColumnarToRow (6)
-               :     :     :           +- CometFilter (5)
-               :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-               :     :     +- BroadcastExchange (13)
-               :     :        +- * ColumnarToRow (12)
-               :     :           +- CometFilter (11)
-               :     :              +- CometScan parquet spark_catalog.default.store (10)
-               :     +- BroadcastExchange (19)
-               :        +- * ColumnarToRow (18)
-               :           +- CometFilter (17)
-               :              +- CometScan parquet spark_catalog.default.date_dim (16)
-               +- ReusedExchange (22)
+* ColumnarToRow (30)
++- CometTakeOrderedAndProject (29)
+   +- CometHashAggregate (28)
+      +- CometColumnarExchange (27)
+         +- RowToColumnar (26)
+            +- * HashAggregate (25)
+               +- * Project (24)
+                  +- * BroadcastHashJoin Inner BuildRight (23)
+                     :- * Project (21)
+                     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :     :- * Project (15)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :- * Project (9)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :     :     +- BroadcastExchange (7)
+                     :     :     :        +- * ColumnarToRow (6)
+                     :     :     :           +- CometFilter (5)
+                     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+                     :     :     +- BroadcastExchange (13)
+                     :     :        +- * ColumnarToRow (12)
+                     :     :           +- CometFilter (11)
+                     :     :              +- CometScan parquet spark_catalog.default.store (10)
+                     :     +- BroadcastExchange (19)
+                     :        +- * ColumnarToRow (18)
+                     :           +- CometFilter (17)
+                     :              +- CometScan parquet spark_catalog.default.date_dim (16)
+                     +- ReusedExchange (22)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -129,7 +131,7 @@ Join condition: None
 Output [12]: [ss_sold_date_sk#5, sr_returned_date_sk#9, s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21]
 Input [13]: [ss_sold_date_sk#5, sr_returned_date_sk#9, s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, d_date_sk#22]
 
-(22) ReusedExchange [Reuses operator id: 33]
+(22) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#23]
 
 (23) BroadcastHashJoin [codegen id : 5]
@@ -149,50 +151,54 @@ Functions [5]: [partial_sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#
 Aggregate Attributes [5]: [sum#24, sum#25, sum#26, sum#27, sum#28]
 Results [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
 
-(26) Exchange
+(26) RowToColumnar
 Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
-Arguments: hashpartitioning(s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(27) HashAggregate [codegen id : 6]
+(27) CometColumnarExchange
+Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
+Arguments: hashpartitioning(s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(28) CometHashAggregate
 Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
 Keys [10]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21]
 Functions [5]: [sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END), sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 30) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END), sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 60) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END), sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 90) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END), sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)]
-Aggregate Attributes [5]: [sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#34, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 30) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#35, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 60) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#36, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 90) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#37, sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#38]
-Results [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#34 AS 30 days #39, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 30) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#35 AS 31 - 60 days #40, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 60) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#36 AS 61 - 90 days #41, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 90) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#37 AS 91 - 120 days #42, sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#38 AS >120 days #43]
 
-(28) TakeOrderedAndProject
-Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #39, 31 - 60 days #40, 61 - 90 days #41, 91 - 120 days #42, >120 days #43]
-Arguments: 100, [s_store_name#12 ASC NULLS FIRST, s_company_id#13 ASC NULLS FIRST, s_street_number#14 ASC NULLS FIRST, s_street_name#15 ASC NULLS FIRST, s_street_type#16 ASC NULLS FIRST, s_suite_number#17 ASC NULLS FIRST, s_city#18 ASC NULLS FIRST, s_county#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST, s_zip#21 ASC NULLS FIRST], [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #39, 31 - 60 days #40, 61 - 90 days #41, 91 - 120 days #42, >120 days #43]
+(29) CometTakeOrderedAndProject
+Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #34, 31 - 60 days #35, 61 - 90 days #36, 91 - 120 days #37, >120 days #38]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[s_store_name#12 ASC NULLS FIRST,s_company_id#13 ASC NULLS FIRST,s_street_number#14 ASC NULLS FIRST,s_street_name#15 ASC NULLS FIRST,s_street_type#16 ASC NULLS FIRST,s_suite_number#17 ASC NULLS FIRST,s_city#18 ASC NULLS FIRST,s_county#19 ASC NULLS FIRST,s_state#20 ASC NULLS FIRST,s_zip#21 ASC NULLS FIRST], output=[s_store_name#12,s_company_id#13,s_street_number#14,s_street_name#15,s_street_type#16,s_suite_number#17,s_city#18,s_county#19,s_state#20,s_zip#21,30 days #34,31 - 60 days #35,61 - 90 days #36,91 - 120 days #37,>120 days #38]), 100, [s_store_name#12 ASC NULLS FIRST, s_company_id#13 ASC NULLS FIRST, s_street_number#14 ASC NULLS FIRST, s_street_name#15 ASC NULLS FIRST, s_street_type#16 ASC NULLS FIRST, s_suite_number#17 ASC NULLS FIRST, s_city#18 ASC NULLS FIRST, s_county#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST, s_zip#21 ASC NULLS FIRST], [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #34, 31 - 60 days #35, 61 - 90 days #36, 91 - 120 days #37, >120 days #38]
+
+(30) ColumnarToRow [codegen id : 6]
+Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #34, 31 - 60 days #35, 61 - 90 days #36, 91 - 120 days #37, >120 days #38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (33)
-+- * ColumnarToRow (32)
-   +- CometProject (31)
-      +- CometFilter (30)
-         +- CometScan parquet spark_catalog.default.date_dim (29)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#23, d_year#44, d_moy#45]
+Output [3]: [d_date_sk#23, d_year#39, d_moy#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,8), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(30) CometFilter
-Input [3]: [d_date_sk#23, d_year#44, d_moy#45]
-Condition : ((((isnotnull(d_year#44) AND isnotnull(d_moy#45)) AND (d_year#44 = 2001)) AND (d_moy#45 = 8)) AND isnotnull(d_date_sk#23))
+(32) CometFilter
+Input [3]: [d_date_sk#23, d_year#39, d_moy#40]
+Condition : ((((isnotnull(d_year#39) AND isnotnull(d_moy#40)) AND (d_year#39 = 2001)) AND (d_moy#40 = 8)) AND isnotnull(d_date_sk#23))
 
-(31) CometProject
-Input [3]: [d_date_sk#23, d_year#44, d_moy#45]
+(33) CometProject
+Input [3]: [d_date_sk#23, d_year#39, d_moy#40]
 Arguments: [d_date_sk#23], [d_date_sk#23]
 
-(32) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#23]
 
-(33) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#23]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt
index dfdcaf4975..07cfd15950 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt
@@ -1,50 +1,52 @@
-TakeOrderedAndProject [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
-  WholeStageCodegen (6)
-    HashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sum,sum,sum,sum,sum] [sum(CASE WHEN ((sr_returned_date_sk - ss_sold_date_sk) <= 30) THEN 1 ELSE 0 END),sum(CASE WHEN (((sr_returned_date_sk - ss_sold_date_sk) > 30) AND ((sr_returned_date_sk - ss_sold_date_sk) <= 60)) THEN 1 ELSE 0 END),sum(CASE WHEN (((sr_returned_date_sk - ss_sold_date_sk) > 60) AND ((sr_returned_date_sk - ss_sold_date_sk) <= 90)) THEN 1 ELSE 0 END),sum(CASE WHEN (((sr_returned_date_sk - ss_sold_date_sk) > 90) AND ((sr_returned_date_sk - ss_sold_date_sk) <= 120)) THEN 1 ELSE 0 END),sum(CASE WHEN ((sr_returned_date_sk - ss_sold_date_sk) > 120) THEN 1 ELSE 0 END),30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ,sum,sum,sum,sum,sum]
-      InputAdapter
-        Exchange [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip] #1
-          WholeStageCodegen (5)
-            HashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sr_returned_date_sk,ss_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-              Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
-                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
+        CometHashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sum,sum,sum,sum,sum]
+          CometColumnarExchange [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                HashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sr_returned_date_sk,ss_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
                   Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
-                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                    BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
                       Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_store_sk,ss_sold_date_sk,sr_returned_date_sk]
-                            BroadcastHashJoin [ss_ticket_number,ss_item_sk,ss_customer_sk,sr_ticket_number,sr_item_sk,sr_customer_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [ss_ticket_number,ss_item_sk,ss_customer_sk,ss_store_sk]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                          Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
+                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                              Project [ss_store_sk,ss_sold_date_sk,sr_returned_date_sk]
+                                BroadcastHashJoin [ss_ticket_number,ss_item_sk,ss_customer_sk,sr_ticket_number,sr_item_sk,sr_customer_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ss_ticket_number,ss_item_sk,ss_customer_sk,ss_store_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [sr_ticket_number,sr_item_sk,sr_customer_sk]
+                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_returned_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                               InputAdapter
-                                BroadcastExchange #2
-                                  WholeStageCodegen (1)
+                                BroadcastExchange #4
+                                  WholeStageCodegen (2)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [sr_ticket_number,sr_item_sk,sr_customer_sk]
-                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_returned_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_moy,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                        CometFilter [s_store_sk]
+                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (2)
+                            BroadcastExchange #5
+                              WholeStageCodegen (3)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [s_store_sk]
-                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
+                                    CometFilter [d_date_sk]
+                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk]
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (3)
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [d_date_sk]
-                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk]
-                  InputAdapter
-                    ReusedExchange [d_date_sk] #3
+                        ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
index c55b122617..68387ead7b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
@@ -1,41 +1,48 @@
 == Physical Plan ==
-TakeOrderedAndProject (37)
-+- * Filter (36)
-   +- Window (35)
-      +- * Sort (34)
-         +- Exchange (33)
-            +- * Project (32)
-               +- * SortMergeJoin FullOuter (31)
-                  :- * Sort (15)
-                  :  +- Exchange (14)
-                  :     +- * Project (13)
-                  :        +- Window (12)
-                  :           +- * Sort (11)
-                  :              +- Exchange (10)
-                  :                 +- * HashAggregate (9)
-                  :                    +- Exchange (8)
-                  :                       +- * HashAggregate (7)
-                  :                          +- * Project (6)
-                  :                             +- * BroadcastHashJoin Inner BuildRight (5)
-                  :                                :- * ColumnarToRow (3)
-                  :                                :  +- CometFilter (2)
-                  :                                :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :                                +- ReusedExchange (4)
-                  +- * Sort (30)
-                     +- Exchange (29)
-                        +- * Project (28)
-                           +- Window (27)
-                              +- * Sort (26)
-                                 +- Exchange (25)
-                                    +- * HashAggregate (24)
-                                       +- Exchange (23)
-                                          +- * HashAggregate (22)
-                                             +- * Project (21)
-                                                +- * BroadcastHashJoin Inner BuildRight (20)
-                                                   :- * ColumnarToRow (18)
-                                                   :  +- CometFilter (17)
-                                                   :     +- CometScan parquet spark_catalog.default.store_sales (16)
-                                                   +- ReusedExchange (19)
+TakeOrderedAndProject (44)
++- * Filter (43)
+   +- Window (42)
+      +- * ColumnarToRow (41)
+         +- CometSort (40)
+            +- CometColumnarExchange (39)
+               +- CometProject (38)
+                  +- CometSortMergeJoin (37)
+                     :- CometSort (18)
+                     :  +- CometColumnarExchange (17)
+                     :     +- RowToColumnar (16)
+                     :        +- * Project (15)
+                     :           +- Window (14)
+                     :              +- * ColumnarToRow (13)
+                     :                 +- CometSort (12)
+                     :                    +- CometColumnarExchange (11)
+                     :                       +- CometHashAggregate (10)
+                     :                          +- CometColumnarExchange (9)
+                     :                             +- RowToColumnar (8)
+                     :                                +- * HashAggregate (7)
+                     :                                   +- * Project (6)
+                     :                                      +- * BroadcastHashJoin Inner BuildRight (5)
+                     :                                         :- * ColumnarToRow (3)
+                     :                                         :  +- CometFilter (2)
+                     :                                         :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                     :                                         +- ReusedExchange (4)
+                     +- CometSort (36)
+                        +- CometColumnarExchange (35)
+                           +- RowToColumnar (34)
+                              +- * Project (33)
+                                 +- Window (32)
+                                    +- * ColumnarToRow (31)
+                                       +- CometSort (30)
+                                          +- CometColumnarExchange (29)
+                                             +- CometHashAggregate (28)
+                                                +- CometColumnarExchange (27)
+                                                   +- RowToColumnar (26)
+                                                      +- * HashAggregate (25)
+                                                         +- * Project (24)
+                                                            +- * BroadcastHashJoin Inner BuildRight (23)
+                                                               :- * ColumnarToRow (21)
+                                                               :  +- CometFilter (20)
+                                                               :     +- CometScan parquet spark_catalog.default.store_sales (19)
+                                                               +- ReusedExchange (22)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -53,7 +60,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 2]
 Input [3]: [ws_item_sk#1, ws_sales_price#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 42]
+(4) ReusedExchange [Reuses operator id: 49]
 Output [2]: [d_date_sk#5, d_date#6]
 
 (5) BroadcastHashJoin [codegen id : 2]
@@ -73,173 +80,189 @@ Functions [1]: [partial_sum(UnscaledValue(ws_sales_price#2))]
 Aggregate Attributes [1]: [sum#7]
 Results [3]: [ws_item_sk#1, d_date#6, sum#8]
 
-(8) Exchange
+(8) RowToColumnar
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
-Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(9) HashAggregate [codegen id : 3]
+(9) CometColumnarExchange
+Input [3]: [ws_item_sk#1, d_date#6, sum#8]
+Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+
+(10) CometHashAggregate
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
 Keys [2]: [ws_item_sk#1, d_date#6]
 Functions [1]: [sum(UnscaledValue(ws_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_sales_price#2))#9]
-Results [4]: [ws_item_sk#1 AS item_sk#10, d_date#6, MakeDecimal(sum(UnscaledValue(ws_sales_price#2))#9,17,2) AS _w0#11, ws_item_sk#1]
 
-(10) Exchange
-Input [4]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
+(11) CometColumnarExchange
+Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(12) CometSort
+Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
+Arguments: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1], [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
 
-(11) Sort [codegen id : 4]
-Input [4]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1]
-Arguments: [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
+(13) ColumnarToRow [codegen id : 3]
+Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
 
-(12) Window
-Input [4]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1]
-Arguments: [sum(_w0#11) windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#12], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
+(14) Window
+Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
+Arguments: [sum(_w0#10) windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#11], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
 
-(13) Project [codegen id : 5]
-Output [3]: [item_sk#10, d_date#6, cume_sales#12]
-Input [5]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1, cume_sales#12]
+(15) Project [codegen id : 4]
+Output [3]: [item_sk#9, d_date#6, cume_sales#11]
+Input [5]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1, cume_sales#11]
 
-(14) Exchange
-Input [3]: [item_sk#10, d_date#6, cume_sales#12]
-Arguments: hashpartitioning(item_sk#10, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(16) RowToColumnar
+Input [3]: [item_sk#9, d_date#6, cume_sales#11]
 
-(15) Sort [codegen id : 6]
-Input [3]: [item_sk#10, d_date#6, cume_sales#12]
-Arguments: [item_sk#10 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
+(17) CometColumnarExchange
+Input [3]: [item_sk#9, d_date#6, cume_sales#11]
+Arguments: hashpartitioning(item_sk#9, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(18) CometSort
+Input [3]: [item_sk#9, d_date#6, cume_sales#11]
+Arguments: [item_sk#9, d_date#6, cume_sales#11], [item_sk#9 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15]
+Output [3]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#15), dynamicpruningexpression(ss_sold_date_sk#15 IN dynamicpruning#16)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#14), dynamicpruningexpression(ss_sold_date_sk#14 IN dynamicpruning#15)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_sales_price:decimal(7,2)>
 
-(17) CometFilter
-Input [3]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15]
-Condition : isnotnull(ss_item_sk#13)
+(20) CometFilter
+Input [3]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14]
+Condition : isnotnull(ss_item_sk#12)
 
-(18) ColumnarToRow [codegen id : 8]
-Input [3]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15]
+(21) ColumnarToRow [codegen id : 6]
+Input [3]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14]
 
-(19) ReusedExchange [Reuses operator id: 42]
-Output [2]: [d_date_sk#17, d_date#18]
+(22) ReusedExchange [Reuses operator id: 49]
+Output [2]: [d_date_sk#16, d_date#17]
 
-(20) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_sold_date_sk#15]
-Right keys [1]: [d_date_sk#17]
+(23) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#14]
+Right keys [1]: [d_date_sk#16]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 8]
-Output [3]: [ss_item_sk#13, ss_sales_price#14, d_date#18]
-Input [5]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15, d_date_sk#17, d_date#18]
-
-(22) HashAggregate [codegen id : 8]
-Input [3]: [ss_item_sk#13, ss_sales_price#14, d_date#18]
-Keys [2]: [ss_item_sk#13, d_date#18]
-Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#14))]
-Aggregate Attributes [1]: [sum#19]
-Results [3]: [ss_item_sk#13, d_date#18, sum#20]
-
-(23) Exchange
-Input [3]: [ss_item_sk#13, d_date#18, sum#20]
-Arguments: hashpartitioning(ss_item_sk#13, d_date#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(24) HashAggregate [codegen id : 9]
-Input [3]: [ss_item_sk#13, d_date#18, sum#20]
-Keys [2]: [ss_item_sk#13, d_date#18]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#14))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#14))#21]
-Results [4]: [ss_item_sk#13 AS item_sk#22, d_date#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#14))#21,17,2) AS _w0#23, ss_item_sk#13]
-
-(25) Exchange
-Input [4]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13]
-Arguments: hashpartitioning(ss_item_sk#13, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(26) Sort [codegen id : 10]
-Input [4]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13]
-Arguments: [ss_item_sk#13 ASC NULLS FIRST, d_date#18 ASC NULLS FIRST], false, 0
-
-(27) Window
-Input [4]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13]
-Arguments: [sum(_w0#23) windowspecdefinition(ss_item_sk#13, d_date#18 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#24], [ss_item_sk#13], [d_date#18 ASC NULLS FIRST]
-
-(28) Project [codegen id : 11]
-Output [3]: [item_sk#22, d_date#18, cume_sales#24]
-Input [5]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13, cume_sales#24]
-
-(29) Exchange
-Input [3]: [item_sk#22, d_date#18, cume_sales#24]
-Arguments: hashpartitioning(item_sk#22, d_date#18, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(30) Sort [codegen id : 12]
-Input [3]: [item_sk#22, d_date#18, cume_sales#24]
-Arguments: [item_sk#22 ASC NULLS FIRST, d_date#18 ASC NULLS FIRST], false, 0
-
-(31) SortMergeJoin [codegen id : 13]
-Left keys [2]: [item_sk#10, d_date#6]
-Right keys [2]: [item_sk#22, d_date#18]
-Join type: FullOuter
-Join condition: None
+(24) Project [codegen id : 6]
+Output [3]: [ss_item_sk#12, ss_sales_price#13, d_date#17]
+Input [5]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14, d_date_sk#16, d_date#17]
+
+(25) HashAggregate [codegen id : 6]
+Input [3]: [ss_item_sk#12, ss_sales_price#13, d_date#17]
+Keys [2]: [ss_item_sk#12, d_date#17]
+Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#13))]
+Aggregate Attributes [1]: [sum#18]
+Results [3]: [ss_item_sk#12, d_date#17, sum#19]
+
+(26) RowToColumnar
+Input [3]: [ss_item_sk#12, d_date#17, sum#19]
+
+(27) CometColumnarExchange
+Input [3]: [ss_item_sk#12, d_date#17, sum#19]
+Arguments: hashpartitioning(ss_item_sk#12, d_date#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(28) CometHashAggregate
+Input [3]: [ss_item_sk#12, d_date#17, sum#19]
+Keys [2]: [ss_item_sk#12, d_date#17]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#13))]
+
+(29) CometColumnarExchange
+Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
+Arguments: hashpartitioning(ss_item_sk#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(30) CometSort
+Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
+Arguments: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12], [ss_item_sk#12 ASC NULLS FIRST, d_date#17 ASC NULLS FIRST]
+
+(31) ColumnarToRow [codegen id : 7]
+Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
+
+(32) Window
+Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
+Arguments: [sum(_w0#21) windowspecdefinition(ss_item_sk#12, d_date#17 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#22], [ss_item_sk#12], [d_date#17 ASC NULLS FIRST]
+
+(33) Project [codegen id : 8]
+Output [3]: [item_sk#20, d_date#17, cume_sales#22]
+Input [5]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12, cume_sales#22]
+
+(34) RowToColumnar
+Input [3]: [item_sk#20, d_date#17, cume_sales#22]
+
+(35) CometColumnarExchange
+Input [3]: [item_sk#20, d_date#17, cume_sales#22]
+Arguments: hashpartitioning(item_sk#20, d_date#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(36) CometSort
+Input [3]: [item_sk#20, d_date#17, cume_sales#22]
+Arguments: [item_sk#20, d_date#17, cume_sales#22], [item_sk#20 ASC NULLS FIRST, d_date#17 ASC NULLS FIRST]
+
+(37) CometSortMergeJoin
+Left output [3]: [item_sk#9, d_date#6, cume_sales#11]
+Right output [3]: [item_sk#20, d_date#17, cume_sales#22]
+Arguments: [item_sk#9, d_date#6], [item_sk#20, d_date#17], FullOuter
+
+(38) CometProject
+Input [6]: [item_sk#9, d_date#6, cume_sales#11, item_sk#20, d_date#17, cume_sales#22]
+Arguments: [item_sk#23, d_date#24, web_sales#25, store_sales#26], [CASE WHEN isnotnull(item_sk#9) THEN item_sk#9 ELSE item_sk#20 END AS item_sk#23, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#17 END AS d_date#24, cume_sales#11 AS web_sales#25, cume_sales#22 AS store_sales#26]
 
-(32) Project [codegen id : 13]
-Output [4]: [CASE WHEN isnotnull(item_sk#10) THEN item_sk#10 ELSE item_sk#22 END AS item_sk#25, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#18 END AS d_date#26, cume_sales#12 AS web_sales#27, cume_sales#24 AS store_sales#28]
-Input [6]: [item_sk#10, d_date#6, cume_sales#12, item_sk#22, d_date#18, cume_sales#24]
+(39) CometColumnarExchange
+Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
+Arguments: hashpartitioning(item_sk#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(33) Exchange
-Input [4]: [item_sk#25, d_date#26, web_sales#27, store_sales#28]
-Arguments: hashpartitioning(item_sk#25, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(40) CometSort
+Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
+Arguments: [item_sk#23, d_date#24, web_sales#25, store_sales#26], [item_sk#23 ASC NULLS FIRST, d_date#24 ASC NULLS FIRST]
 
-(34) Sort [codegen id : 14]
-Input [4]: [item_sk#25, d_date#26, web_sales#27, store_sales#28]
-Arguments: [item_sk#25 ASC NULLS FIRST, d_date#26 ASC NULLS FIRST], false, 0
+(41) ColumnarToRow [codegen id : 9]
+Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
 
-(35) Window
-Input [4]: [item_sk#25, d_date#26, web_sales#27, store_sales#28]
-Arguments: [max(web_sales#27) windowspecdefinition(item_sk#25, d_date#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS web_cumulative#29, max(store_sales#28) windowspecdefinition(item_sk#25, d_date#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS store_cumulative#30], [item_sk#25], [d_date#26 ASC NULLS FIRST]
+(42) Window
+Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
+Arguments: [max(web_sales#25) windowspecdefinition(item_sk#23, d_date#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS web_cumulative#27, max(store_sales#26) windowspecdefinition(item_sk#23, d_date#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS store_cumulative#28], [item_sk#23], [d_date#24 ASC NULLS FIRST]
 
-(36) Filter [codegen id : 15]
-Input [6]: [item_sk#25, d_date#26, web_sales#27, store_sales#28, web_cumulative#29, store_cumulative#30]
-Condition : ((isnotnull(web_cumulative#29) AND isnotnull(store_cumulative#30)) AND (web_cumulative#29 > store_cumulative#30))
+(43) Filter [codegen id : 10]
+Input [6]: [item_sk#23, d_date#24, web_sales#25, store_sales#26, web_cumulative#27, store_cumulative#28]
+Condition : ((isnotnull(web_cumulative#27) AND isnotnull(store_cumulative#28)) AND (web_cumulative#27 > store_cumulative#28))
 
-(37) TakeOrderedAndProject
-Input [6]: [item_sk#25, d_date#26, web_sales#27, store_sales#28, web_cumulative#29, store_cumulative#30]
-Arguments: 100, [item_sk#25 ASC NULLS FIRST, d_date#26 ASC NULLS FIRST], [item_sk#25, d_date#26, web_sales#27, store_sales#28, web_cumulative#29, store_cumulative#30]
+(44) TakeOrderedAndProject
+Input [6]: [item_sk#23, d_date#24, web_sales#25, store_sales#26, web_cumulative#27, store_cumulative#28]
+Arguments: 100, [item_sk#23 ASC NULLS FIRST, d_date#24 ASC NULLS FIRST], [item_sk#23, d_date#24, web_sales#25, store_sales#26, web_cumulative#27, store_cumulative#28]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (42)
-+- * ColumnarToRow (41)
-   +- CometProject (40)
-      +- CometFilter (39)
-         +- CometScan parquet spark_catalog.default.date_dim (38)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#5, d_date#6, d_month_seq#31]
+Output [3]: [d_date_sk#5, d_date#6, d_month_seq#29]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(39) CometFilter
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#31]
-Condition : (((isnotnull(d_month_seq#31) AND (d_month_seq#31 >= 1200)) AND (d_month_seq#31 <= 1211)) AND isnotnull(d_date_sk#5))
+(46) CometFilter
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#29]
+Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1200)) AND (d_month_seq#29 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(40) CometProject
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#31]
+(47) CometProject
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#29]
 Arguments: [d_date_sk#5, d_date#6], [d_date_sk#5, d_date#6]
 
-(41) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#5, d_date#6]
 
-(42) BroadcastExchange
+(49) BroadcastExchange
 Input [2]: [d_date_sk#5, d_date#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = ss_sold_date_sk#15 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 19 Hosting Expression = ss_sold_date_sk#14 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
index 181cd1b98c..d46e28b44c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
@@ -1,75 +1,71 @@
 TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-  WholeStageCodegen (15)
+  WholeStageCodegen (10)
     Filter [web_cumulative,store_cumulative]
       InputAdapter
         Window [web_sales,item_sk,d_date,store_sales]
-          WholeStageCodegen (14)
-            Sort [item_sk,d_date]
+          WholeStageCodegen (9)
+            ColumnarToRow
               InputAdapter
-                Exchange [item_sk] #1
-                  WholeStageCodegen (13)
-                    Project [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales]
-                      SortMergeJoin [item_sk,d_date,item_sk,d_date]
-                        InputAdapter
-                          WholeStageCodegen (6)
-                            Sort [item_sk,d_date]
-                              InputAdapter
-                                Exchange [item_sk,d_date] #2
-                                  WholeStageCodegen (5)
-                                    Project [item_sk,d_date,cume_sales]
-                                      InputAdapter
-                                        Window [_w0,ws_item_sk,d_date]
-                                          WholeStageCodegen (4)
-                                            Sort [ws_item_sk,d_date]
-                                              InputAdapter
-                                                Exchange [ws_item_sk] #3
-                                                  WholeStageCodegen (3)
-                                                    HashAggregate [ws_item_sk,d_date,sum] [sum(UnscaledValue(ws_sales_price)),item_sk,_w0,sum]
-                                                      InputAdapter
-                                                        Exchange [ws_item_sk,d_date] #4
-                                                          WholeStageCodegen (2)
-                                                            HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
-                                                              Project [ws_item_sk,ws_sales_price,d_date]
-                                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometFilter [ws_item_sk]
-                                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
-                                                                          SubqueryBroadcast [d_date_sk] #1
-                                                                            BroadcastExchange #5
-                                                                              WholeStageCodegen (1)
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometProject [d_date_sk,d_date]
-                                                                                      CometFilter [d_month_seq,d_date_sk]
-                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                                                  InputAdapter
-                                                                    ReusedExchange [d_date_sk,d_date] #5
-                        InputAdapter
-                          WholeStageCodegen (12)
-                            Sort [item_sk,d_date]
-                              InputAdapter
-                                Exchange [item_sk,d_date] #6
-                                  WholeStageCodegen (11)
-                                    Project [item_sk,d_date,cume_sales]
-                                      InputAdapter
-                                        Window [_w0,ss_item_sk,d_date]
-                                          WholeStageCodegen (10)
-                                            Sort [ss_item_sk,d_date]
-                                              InputAdapter
-                                                Exchange [ss_item_sk] #7
-                                                  WholeStageCodegen (9)
-                                                    HashAggregate [ss_item_sk,d_date,sum] [sum(UnscaledValue(ss_sales_price)),item_sk,_w0,sum]
-                                                      InputAdapter
-                                                        Exchange [ss_item_sk,d_date] #8
-                                                          WholeStageCodegen (8)
-                                                            HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
-                                                              Project [ss_item_sk,ss_sales_price,d_date]
-                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometFilter [ss_item_sk]
-                                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
-                                                                          ReusedSubquery [d_date_sk] #1
-                                                                  InputAdapter
-                                                                    ReusedExchange [d_date_sk,d_date] #5
+                CometSort [item_sk,d_date]
+                  CometColumnarExchange [item_sk] #1
+                    CometProject [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales] [item_sk,d_date,web_sales,store_sales]
+                      CometSortMergeJoin [item_sk,d_date,item_sk,d_date]
+                        CometSort [item_sk,d_date]
+                          CometColumnarExchange [item_sk,d_date] #2
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                Project [item_sk,d_date,cume_sales]
+                                  InputAdapter
+                                    Window [_w0,ws_item_sk,d_date]
+                                      WholeStageCodegen (3)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometSort [ws_item_sk,d_date]
+                                              CometColumnarExchange [ws_item_sk] #3
+                                                CometHashAggregate [ws_item_sk,d_date,sum]
+                                                  CometColumnarExchange [ws_item_sk,d_date] #4
+                                                    RowToColumnar
+                                                      WholeStageCodegen (2)
+                                                        HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
+                                                          Project [ws_item_sk,ws_sales_price,d_date]
+                                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [ws_item_sk]
+                                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
+                                                                      SubqueryBroadcast [d_date_sk] #1
+                                                                        BroadcastExchange #5
+                                                                          WholeStageCodegen (1)
+                                                                            ColumnarToRow
+                                                                              InputAdapter
+                                                                                CometProject [d_date_sk,d_date]
+                                                                                  CometFilter [d_month_seq,d_date_sk]
+                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                                              InputAdapter
+                                                                ReusedExchange [d_date_sk,d_date] #5
+                        CometSort [item_sk,d_date]
+                          CometColumnarExchange [item_sk,d_date] #6
+                            RowToColumnar
+                              WholeStageCodegen (8)
+                                Project [item_sk,d_date,cume_sales]
+                                  InputAdapter
+                                    Window [_w0,ss_item_sk,d_date]
+                                      WholeStageCodegen (7)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometSort [ss_item_sk,d_date]
+                                              CometColumnarExchange [ss_item_sk] #7
+                                                CometHashAggregate [ss_item_sk,d_date,sum]
+                                                  CometColumnarExchange [ss_item_sk,d_date] #8
+                                                    RowToColumnar
+                                                      WholeStageCodegen (6)
+                                                        HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
+                                                          Project [ss_item_sk,ss_sales_price,d_date]
+                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [ss_item_sk]
+                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
+                                                                      ReusedSubquery [d_date_sk] #1
+                                                              InputAdapter
+                                                                ReusedExchange [d_date_sk,d_date] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt
index 8df157e51b..d6e0e7ab24 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt
@@ -1,25 +1,27 @@
 == Physical Plan ==
-TakeOrderedAndProject (21)
-+- * HashAggregate (20)
-   +- Exchange (19)
-      +- * HashAggregate (18)
-         +- * Project (17)
-            +- * BroadcastHashJoin Inner BuildRight (16)
-               :- * Project (10)
-               :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :- * ColumnarToRow (4)
-               :     :  +- CometProject (3)
-               :     :     +- CometFilter (2)
-               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-               :     +- BroadcastExchange (8)
-               :        +- * ColumnarToRow (7)
-               :           +- CometFilter (6)
-               :              +- CometScan parquet spark_catalog.default.store_sales (5)
-               +- BroadcastExchange (15)
-                  +- * ColumnarToRow (14)
-                     +- CometProject (13)
-                        +- CometFilter (12)
-                           +- CometScan parquet spark_catalog.default.item (11)
+* ColumnarToRow (23)
++- CometTakeOrderedAndProject (22)
+   +- CometHashAggregate (21)
+      +- CometColumnarExchange (20)
+         +- RowToColumnar (19)
+            +- * HashAggregate (18)
+               +- * Project (17)
+                  +- * BroadcastHashJoin Inner BuildRight (16)
+                     :- * Project (10)
+                     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :- * ColumnarToRow (4)
+                     :     :  +- CometProject (3)
+                     :     :     +- CometFilter (2)
+                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+                     :     +- BroadcastExchange (8)
+                     :        +- * ColumnarToRow (7)
+                     :           +- CometFilter (6)
+                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                     +- BroadcastExchange (15)
+                        +- * ColumnarToRow (14)
+                           +- CometProject (13)
+                              +- CometFilter (12)
+                                 +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -108,18 +110,22 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 
-(19) Exchange
+(19) RowToColumnar
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
-Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
+Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(21) CometHashAggregate
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 Keys [3]: [d_year#2, i_brand#9, i_brand_id#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
-Results [4]: [d_year#2, i_brand_id#8 AS brand_id#14, i_brand#9 AS brand#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS ext_price#16]
 
-(21) TakeOrderedAndProject
-Input [4]: [d_year#2, brand_id#14, brand#15, ext_price#16]
-Arguments: 100, [d_year#2 ASC NULLS FIRST, ext_price#16 DESC NULLS LAST, brand_id#14 ASC NULLS FIRST], [d_year#2, brand_id#14, brand#15, ext_price#16]
+(22) CometTakeOrderedAndProject
+Input [4]: [d_year#2, brand_id#13, brand#14, ext_price#15]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[d_year#2 ASC NULLS FIRST,ext_price#15 DESC NULLS LAST,brand_id#13 ASC NULLS FIRST], output=[d_year#2,brand_id#13,brand#14,ext_price#15]), 100, [d_year#2 ASC NULLS FIRST, ext_price#15 DESC NULLS LAST, brand_id#13 ASC NULLS FIRST], [d_year#2, brand_id#13, brand#14, ext_price#15]
+
+(23) ColumnarToRow [codegen id : 4]
+Input [4]: [d_year#2, brand_id#13, brand#14, ext_price#15]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt
index 91fdc2f17d..7607d1ccdd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt
@@ -1,31 +1,33 @@
-TakeOrderedAndProject [d_year,ext_price,brand_id,brand]
-  WholeStageCodegen (4)
-    HashAggregate [d_year,i_brand,i_brand_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,ext_price,sum]
-      InputAdapter
-        Exchange [d_year,i_brand,i_brand_id] #1
-          WholeStageCodegen (3)
-            HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
-              Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [d_year,ss_item_sk,ss_ext_sales_price]
-                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [d_date_sk,d_year]
-                            CometFilter [d_moy,d_year,d_date_sk]
-                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (4)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [d_year,ext_price,brand_id,brand]
+        CometHashAggregate [d_year,i_brand,i_brand_id,sum]
+          CometColumnarExchange [d_year,i_brand,i_brand_id] #1
+            RowToColumnar
+              WholeStageCodegen (3)
+                HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
+                  Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [d_year,ss_item_sk,ss_ext_sales_price]
+                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [d_date_sk,d_year]
+                                CometFilter [d_moy,d_year,d_date_sk]
+                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                          InputAdapter
+                            BroadcastExchange #2
+                              WholeStageCodegen (1)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
                       InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (1)
+                        BroadcastExchange #3
+                          WholeStageCodegen (2)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                  InputAdapter
-                    BroadcastExchange #3
-                      WholeStageCodegen (2)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [i_item_sk,i_brand_id,i_brand]
-                              CometFilter [i_manager_id,i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
+                                CometProject [i_item_sk,i_brand_id,i_brand]
+                                  CometFilter [i_manager_id,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt
index 5142c9e4e4..5cb48513fc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt
@@ -1,32 +1,34 @@
 == Physical Plan ==
-TakeOrderedAndProject (28)
-+- * Project (27)
-   +- * Filter (26)
-      +- Window (25)
-         +- * Sort (24)
-            +- Exchange (23)
-               +- * HashAggregate (22)
-                  +- Exchange (21)
-                     +- * HashAggregate (20)
-                        +- * Project (19)
-                           +- * BroadcastHashJoin Inner BuildRight (18)
-                              :- * Project (13)
-                              :  +- * BroadcastHashJoin Inner BuildRight (12)
-                              :     :- * Project (10)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                              :     :     :- * ColumnarToRow (4)
-                              :     :     :  +- CometProject (3)
-                              :     :     :     +- CometFilter (2)
-                              :     :     :        +- CometScan parquet spark_catalog.default.item (1)
-                              :     :     +- BroadcastExchange (8)
-                              :     :        +- * ColumnarToRow (7)
-                              :     :           +- CometFilter (6)
-                              :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                              :     +- ReusedExchange (11)
-                              +- BroadcastExchange (17)
-                                 +- * ColumnarToRow (16)
-                                    +- CometFilter (15)
-                                       +- CometScan parquet spark_catalog.default.store (14)
+TakeOrderedAndProject (30)
++- * Project (29)
+   +- * Filter (28)
+      +- Window (27)
+         +- * ColumnarToRow (26)
+            +- CometSort (25)
+               +- CometColumnarExchange (24)
+                  +- CometHashAggregate (23)
+                     +- CometColumnarExchange (22)
+                        +- RowToColumnar (21)
+                           +- * HashAggregate (20)
+                              +- * Project (19)
+                                 +- * BroadcastHashJoin Inner BuildRight (18)
+                                    :- * Project (13)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (12)
+                                    :     :- * Project (10)
+                                    :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                                    :     :     :- * ColumnarToRow (4)
+                                    :     :     :  +- CometProject (3)
+                                    :     :     :     +- CometFilter (2)
+                                    :     :     :        +- CometScan parquet spark_catalog.default.item (1)
+                                    :     :     +- BroadcastExchange (8)
+                                    :     :        +- * ColumnarToRow (7)
+                                    :     :           +- CometFilter (6)
+                                    :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                                    :     +- ReusedExchange (11)
+                                    +- BroadcastExchange (17)
+                                       +- * ColumnarToRow (16)
+                                          +- CometFilter (15)
+                                             +- CometScan parquet spark_catalog.default.store (14)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -76,7 +78,7 @@ Join condition: None
 Output [4]: [i_manufact_id#5, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 Input [6]: [i_item_sk#1, i_manufact_id#5, ss_item_sk#10, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 
-(11) ReusedExchange [Reuses operator id: 33]
+(11) ReusedExchange [Reuses operator id: 35]
 Output [2]: [d_date_sk#15, d_qoy#16]
 
 (12) BroadcastHashJoin [codegen id : 4]
@@ -124,70 +126,74 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#12))]
 Aggregate Attributes [1]: [sum#18]
 Results [3]: [i_manufact_id#5, d_qoy#16, sum#19]
 
-(21) Exchange
+(21) RowToColumnar
 Input [3]: [i_manufact_id#5, d_qoy#16, sum#19]
-Arguments: hashpartitioning(i_manufact_id#5, d_qoy#16, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) HashAggregate [codegen id : 5]
+(22) CometColumnarExchange
+Input [3]: [i_manufact_id#5, d_qoy#16, sum#19]
+Arguments: hashpartitioning(i_manufact_id#5, d_qoy#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(23) CometHashAggregate
 Input [3]: [i_manufact_id#5, d_qoy#16, sum#19]
 Keys [2]: [i_manufact_id#5, d_qoy#16]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#12))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#12))#20]
-Results [3]: [i_manufact_id#5, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS sum_sales#21, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS _w0#22]
 
-(23) Exchange
-Input [3]: [i_manufact_id#5, sum_sales#21, _w0#22]
-Arguments: hashpartitioning(i_manufact_id#5, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(24) CometColumnarExchange
+Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
+Arguments: hashpartitioning(i_manufact_id#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(25) CometSort
+Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
+Arguments: [i_manufact_id#5, sum_sales#20, _w0#21], [i_manufact_id#5 ASC NULLS FIRST]
 
-(24) Sort [codegen id : 6]
-Input [3]: [i_manufact_id#5, sum_sales#21, _w0#22]
-Arguments: [i_manufact_id#5 ASC NULLS FIRST], false, 0
+(26) ColumnarToRow [codegen id : 5]
+Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
 
-(25) Window
-Input [3]: [i_manufact_id#5, sum_sales#21, _w0#22]
-Arguments: [avg(_w0#22) windowspecdefinition(i_manufact_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_quarterly_sales#23], [i_manufact_id#5]
+(27) Window
+Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
+Arguments: [avg(_w0#21) windowspecdefinition(i_manufact_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_quarterly_sales#22], [i_manufact_id#5]
 
-(26) Filter [codegen id : 7]
-Input [4]: [i_manufact_id#5, sum_sales#21, _w0#22, avg_quarterly_sales#23]
-Condition : CASE WHEN (avg_quarterly_sales#23 > 0.000000) THEN ((abs((sum_sales#21 - avg_quarterly_sales#23)) / avg_quarterly_sales#23) > 0.1000000000000000) ELSE false END
+(28) Filter [codegen id : 6]
+Input [4]: [i_manufact_id#5, sum_sales#20, _w0#21, avg_quarterly_sales#22]
+Condition : CASE WHEN (avg_quarterly_sales#22 > 0.000000) THEN ((abs((sum_sales#20 - avg_quarterly_sales#22)) / avg_quarterly_sales#22) > 0.1000000000000000) ELSE false END
 
-(27) Project [codegen id : 7]
-Output [3]: [i_manufact_id#5, sum_sales#21, avg_quarterly_sales#23]
-Input [4]: [i_manufact_id#5, sum_sales#21, _w0#22, avg_quarterly_sales#23]
+(29) Project [codegen id : 6]
+Output [3]: [i_manufact_id#5, sum_sales#20, avg_quarterly_sales#22]
+Input [4]: [i_manufact_id#5, sum_sales#20, _w0#21, avg_quarterly_sales#22]
 
-(28) TakeOrderedAndProject
-Input [3]: [i_manufact_id#5, sum_sales#21, avg_quarterly_sales#23]
-Arguments: 100, [avg_quarterly_sales#23 ASC NULLS FIRST, sum_sales#21 ASC NULLS FIRST, i_manufact_id#5 ASC NULLS FIRST], [i_manufact_id#5, sum_sales#21, avg_quarterly_sales#23]
+(30) TakeOrderedAndProject
+Input [3]: [i_manufact_id#5, sum_sales#20, avg_quarterly_sales#22]
+Arguments: 100, [avg_quarterly_sales#22 ASC NULLS FIRST, sum_sales#20 ASC NULLS FIRST, i_manufact_id#5 ASC NULLS FIRST], [i_manufact_id#5, sum_sales#20, avg_quarterly_sales#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = ss_sold_date_sk#13 IN dynamicpruning#14
-BroadcastExchange (33)
-+- * ColumnarToRow (32)
-   +- CometProject (31)
-      +- CometFilter (30)
-         +- CometScan parquet spark_catalog.default.date_dim (29)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#15, d_month_seq#24, d_qoy#16]
+Output [3]: [d_date_sk#15, d_month_seq#23, d_qoy#16]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_month_seq, [1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_qoy:int>
 
-(30) CometFilter
-Input [3]: [d_date_sk#15, d_month_seq#24, d_qoy#16]
-Condition : (d_month_seq#24 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
+(32) CometFilter
+Input [3]: [d_date_sk#15, d_month_seq#23, d_qoy#16]
+Condition : (d_month_seq#23 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
 
-(31) CometProject
-Input [3]: [d_date_sk#15, d_month_seq#24, d_qoy#16]
+(33) CometProject
+Input [3]: [d_date_sk#15, d_month_seq#23, d_qoy#16]
 Arguments: [d_date_sk#15, d_qoy#16], [d_date_sk#15, d_qoy#16]
 
-(32) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#15, d_qoy#16]
 
-(33) BroadcastExchange
+(35) BroadcastExchange
 Input [2]: [d_date_sk#15, d_qoy#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt
index adda5c34f7..af0269ae39 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [avg_quarterly_sales,sum_sales,i_manufact_id]
-  WholeStageCodegen (7)
+  WholeStageCodegen (6)
     Project [i_manufact_id,sum_sales,avg_quarterly_sales]
       Filter [avg_quarterly_sales,sum_sales]
         InputAdapter
           Window [_w0,i_manufact_id]
-            WholeStageCodegen (6)
-              Sort [i_manufact_id]
+            WholeStageCodegen (5)
+              ColumnarToRow
                 InputAdapter
-                  Exchange [i_manufact_id] #1
-                    WholeStageCodegen (5)
-                      HashAggregate [i_manufact_id,d_qoy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
-                        InputAdapter
-                          Exchange [i_manufact_id,d_qoy] #2
+                  CometSort [i_manufact_id]
+                    CometColumnarExchange [i_manufact_id] #1
+                      CometHashAggregate [i_manufact_id,d_qoy,sum]
+                        CometColumnarExchange [i_manufact_id,d_qoy] #2
+                          RowToColumnar
                             WholeStageCodegen (4)
                               HashAggregate [i_manufact_id,d_qoy,ss_sales_price] [sum,sum]
                                 Project [i_manufact_id,ss_sales_price,d_qoy]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt
index 00c8f9c9b0..5baa553cf1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt
@@ -1,59 +1,63 @@
 == Physical Plan ==
-TakeOrderedAndProject (55)
-+- * HashAggregate (54)
-   +- Exchange (53)
-      +- * HashAggregate (52)
-         +- * HashAggregate (51)
-            +- Exchange (50)
-               +- * HashAggregate (49)
-                  +- * Project (48)
-                     +- * BroadcastHashJoin Inner BuildRight (47)
-                        :- * Project (45)
-                        :  +- * BroadcastHashJoin Inner BuildRight (44)
-                        :     :- * Project (39)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (38)
-                        :     :     :- * Project (33)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (32)
-                        :     :     :     :- * HashAggregate (27)
-                        :     :     :     :  +- Exchange (26)
-                        :     :     :     :     +- * HashAggregate (25)
-                        :     :     :     :        +- * Project (24)
-                        :     :     :     :           +- * BroadcastHashJoin Inner BuildRight (23)
-                        :     :     :     :              :- * Project (18)
-                        :     :     :     :              :  +- * BroadcastHashJoin Inner BuildRight (17)
-                        :     :     :     :              :     :- * Project (15)
-                        :     :     :     :              :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                        :     :     :     :              :     :     :- * ColumnarToRow (8)
-                        :     :     :     :              :     :     :  +- CometUnion (7)
-                        :     :     :     :              :     :     :     :- CometProject (3)
-                        :     :     :     :              :     :     :     :  +- CometFilter (2)
-                        :     :     :     :              :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                        :     :     :     :              :     :     :     +- CometProject (6)
-                        :     :     :     :              :     :     :        +- CometFilter (5)
-                        :     :     :     :              :     :     :           +- CometScan parquet spark_catalog.default.web_sales (4)
-                        :     :     :     :              :     :     +- BroadcastExchange (13)
-                        :     :     :     :              :     :        +- * ColumnarToRow (12)
-                        :     :     :     :              :     :           +- CometProject (11)
-                        :     :     :     :              :     :              +- CometFilter (10)
-                        :     :     :     :              :     :                 +- CometScan parquet spark_catalog.default.item (9)
-                        :     :     :     :              :     +- ReusedExchange (16)
-                        :     :     :     :              +- BroadcastExchange (22)
-                        :     :     :     :                 +- * ColumnarToRow (21)
-                        :     :     :     :                    +- CometFilter (20)
-                        :     :     :     :                       +- CometScan parquet spark_catalog.default.customer (19)
-                        :     :     :     +- BroadcastExchange (31)
-                        :     :     :        +- * ColumnarToRow (30)
-                        :     :     :           +- CometFilter (29)
-                        :     :     :              +- CometScan parquet spark_catalog.default.store_sales (28)
-                        :     :     +- BroadcastExchange (37)
-                        :     :        +- * ColumnarToRow (36)
-                        :     :           +- CometFilter (35)
-                        :     :              +- CometScan parquet spark_catalog.default.customer_address (34)
-                        :     +- BroadcastExchange (43)
-                        :        +- * ColumnarToRow (42)
-                        :           +- CometFilter (41)
-                        :              +- CometScan parquet spark_catalog.default.store (40)
-                        +- ReusedExchange (46)
+* ColumnarToRow (59)
++- CometTakeOrderedAndProject (58)
+   +- CometHashAggregate (57)
+      +- CometColumnarExchange (56)
+         +- CometHashAggregate (55)
+            +- CometHashAggregate (54)
+               +- CometColumnarExchange (53)
+                  +- RowToColumnar (52)
+                     +- * HashAggregate (51)
+                        +- * Project (50)
+                           +- * BroadcastHashJoin Inner BuildRight (49)
+                              :- * Project (47)
+                              :  +- * BroadcastHashJoin Inner BuildRight (46)
+                              :     :- * Project (41)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (40)
+                              :     :     :- * Project (35)
+                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+                              :     :     :     :- * ColumnarToRow (29)
+                              :     :     :     :  +- CometHashAggregate (28)
+                              :     :     :     :     +- CometColumnarExchange (27)
+                              :     :     :     :        +- RowToColumnar (26)
+                              :     :     :     :           +- * HashAggregate (25)
+                              :     :     :     :              +- * Project (24)
+                              :     :     :     :                 +- * BroadcastHashJoin Inner BuildRight (23)
+                              :     :     :     :                    :- * Project (18)
+                              :     :     :     :                    :  +- * BroadcastHashJoin Inner BuildRight (17)
+                              :     :     :     :                    :     :- * Project (15)
+                              :     :     :     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                              :     :     :     :                    :     :     :- * ColumnarToRow (8)
+                              :     :     :     :                    :     :     :  +- CometUnion (7)
+                              :     :     :     :                    :     :     :     :- CometProject (3)
+                              :     :     :     :                    :     :     :     :  +- CometFilter (2)
+                              :     :     :     :                    :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                              :     :     :     :                    :     :     :     +- CometProject (6)
+                              :     :     :     :                    :     :     :        +- CometFilter (5)
+                              :     :     :     :                    :     :     :           +- CometScan parquet spark_catalog.default.web_sales (4)
+                              :     :     :     :                    :     :     +- BroadcastExchange (13)
+                              :     :     :     :                    :     :        +- * ColumnarToRow (12)
+                              :     :     :     :                    :     :           +- CometProject (11)
+                              :     :     :     :                    :     :              +- CometFilter (10)
+                              :     :     :     :                    :     :                 +- CometScan parquet spark_catalog.default.item (9)
+                              :     :     :     :                    :     +- ReusedExchange (16)
+                              :     :     :     :                    +- BroadcastExchange (22)
+                              :     :     :     :                       +- * ColumnarToRow (21)
+                              :     :     :     :                          +- CometFilter (20)
+                              :     :     :     :                             +- CometScan parquet spark_catalog.default.customer (19)
+                              :     :     :     +- BroadcastExchange (33)
+                              :     :     :        +- * ColumnarToRow (32)
+                              :     :     :           +- CometFilter (31)
+                              :     :     :              +- CometScan parquet spark_catalog.default.store_sales (30)
+                              :     :     +- BroadcastExchange (39)
+                              :     :        +- * ColumnarToRow (38)
+                              :     :           +- CometFilter (37)
+                              :     :              +- CometScan parquet spark_catalog.default.customer_address (36)
+                              :     +- BroadcastExchange (45)
+                              :        +- * ColumnarToRow (44)
+                              :           +- CometFilter (43)
+                              :              +- CometScan parquet spark_catalog.default.store (42)
+                              +- ReusedExchange (48)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -127,7 +131,7 @@ Join condition: None
 Output [2]: [sold_date_sk#5, customer_sk#6]
 Input [4]: [sold_date_sk#5, customer_sk#6, item_sk#7, i_item_sk#14]
 
-(16) ReusedExchange [Reuses operator id: 60]
+(16) ReusedExchange [Reuses operator id: 64]
 Output [1]: [d_date_sk#17]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -175,16 +179,20 @@ Functions: []
 Aggregate Attributes: []
 Results [2]: [c_customer_sk#18, c_current_addr_sk#19]
 
-(26) Exchange
+(26) RowToColumnar
 Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
-Arguments: hashpartitioning(c_customer_sk#18, c_current_addr_sk#19, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(27) HashAggregate [codegen id : 9]
+(27) CometColumnarExchange
+Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
+Arguments: hashpartitioning(c_customer_sk#18, c_current_addr_sk#19, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(28) CometHashAggregate
 Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
 Keys [2]: [c_customer_sk#18, c_current_addr_sk#19]
 Functions: []
-Aggregate Attributes: []
-Results [2]: [c_customer_sk#18, c_current_addr_sk#19]
+
+(29) ColumnarToRow [codegen id : 9]
+Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
@@ -194,24 +202,24 @@ PartitionFilters: [isnotnull(ss_sold_date_sk#22), dynamicpruningexpression(ss_so
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(29) CometFilter
+(31) CometFilter
 Input [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Condition : isnotnull(ss_customer_sk#20)
 
-(30) ColumnarToRow [codegen id : 5]
+(32) ColumnarToRow [codegen id : 5]
 Input [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 
-(31) BroadcastExchange
+(33) BroadcastExchange
 Input [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(32) BroadcastHashJoin [codegen id : 9]
+(34) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [c_customer_sk#18]
 Right keys [1]: [ss_customer_sk#20]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 9]
+(35) Project [codegen id : 9]
 Output [4]: [c_customer_sk#18, c_current_addr_sk#19, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Input [5]: [c_customer_sk#18, c_current_addr_sk#19, ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 
@@ -222,24 +230,24 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_address_sk), IsNotNull(ca_county), IsNotNull(ca_state)]
 ReadSchema: struct<ca_address_sk:int,ca_county:string,ca_state:string>
 
-(35) CometFilter
+(37) CometFilter
 Input [3]: [ca_address_sk#24, ca_county#25, ca_state#26]
 Condition : ((isnotnull(ca_address_sk#24) AND isnotnull(ca_county#25)) AND isnotnull(ca_state#26))
 
-(36) ColumnarToRow [codegen id : 6]
+(38) ColumnarToRow [codegen id : 6]
 Input [3]: [ca_address_sk#24, ca_county#25, ca_state#26]
 
-(37) BroadcastExchange
+(39) BroadcastExchange
 Input [3]: [ca_address_sk#24, ca_county#25, ca_state#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(38) BroadcastHashJoin [codegen id : 9]
+(40) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [c_current_addr_sk#19]
 Right keys [1]: [ca_address_sk#24]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 9]
+(41) Project [codegen id : 9]
 Output [5]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22, ca_county#25, ca_state#26]
 Input [7]: [c_customer_sk#18, c_current_addr_sk#19, ss_ext_sales_price#21, ss_sold_date_sk#22, ca_address_sk#24, ca_county#25, ca_state#26]
 
@@ -250,226 +258,226 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_county), IsNotNull(s_state)]
 ReadSchema: struct<s_county:string,s_state:string>
 
-(41) CometFilter
+(43) CometFilter
 Input [2]: [s_county#27, s_state#28]
 Condition : (isnotnull(s_county#27) AND isnotnull(s_state#28))
 
-(42) ColumnarToRow [codegen id : 7]
+(44) ColumnarToRow [codegen id : 7]
 Input [2]: [s_county#27, s_state#28]
 
-(43) BroadcastExchange
+(45) BroadcastExchange
 Input [2]: [s_county#27, s_state#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, false], input[1, string, false]),false), [plan_id=6]
 
-(44) BroadcastHashJoin [codegen id : 9]
+(46) BroadcastHashJoin [codegen id : 9]
 Left keys [2]: [ca_county#25, ca_state#26]
 Right keys [2]: [s_county#27, s_state#28]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 9]
+(47) Project [codegen id : 9]
 Output [3]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Input [7]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22, ca_county#25, ca_state#26, s_county#27, s_state#28]
 
-(46) ReusedExchange [Reuses operator id: 65]
+(48) ReusedExchange [Reuses operator id: 69]
 Output [1]: [d_date_sk#29]
 
-(47) BroadcastHashJoin [codegen id : 9]
+(49) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_sold_date_sk#22]
 Right keys [1]: [d_date_sk#29]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 9]
+(50) Project [codegen id : 9]
 Output [2]: [c_customer_sk#18, ss_ext_sales_price#21]
 Input [4]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22, d_date_sk#29]
 
-(49) HashAggregate [codegen id : 9]
+(51) HashAggregate [codegen id : 9]
 Input [2]: [c_customer_sk#18, ss_ext_sales_price#21]
 Keys [1]: [c_customer_sk#18]
 Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#21))]
 Aggregate Attributes [1]: [sum#30]
 Results [2]: [c_customer_sk#18, sum#31]
 
-(50) Exchange
+(52) RowToColumnar
+Input [2]: [c_customer_sk#18, sum#31]
+
+(53) CometColumnarExchange
 Input [2]: [c_customer_sk#18, sum#31]
-Arguments: hashpartitioning(c_customer_sk#18, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+Arguments: hashpartitioning(c_customer_sk#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(51) HashAggregate [codegen id : 10]
+(54) CometHashAggregate
 Input [2]: [c_customer_sk#18, sum#31]
 Keys [1]: [c_customer_sk#18]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#21))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#21))#32]
-Results [1]: [cast((MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#21))#32,17,2) / 50) as int) AS segment#33]
 
-(52) HashAggregate [codegen id : 10]
-Input [1]: [segment#33]
-Keys [1]: [segment#33]
+(55) CometHashAggregate
+Input [1]: [segment#32]
+Keys [1]: [segment#32]
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#34]
-Results [2]: [segment#33, count#35]
 
-(53) Exchange
-Input [2]: [segment#33, count#35]
-Arguments: hashpartitioning(segment#33, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(56) CometColumnarExchange
+Input [2]: [segment#32, count#33]
+Arguments: hashpartitioning(segment#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(54) HashAggregate [codegen id : 11]
-Input [2]: [segment#33, count#35]
-Keys [1]: [segment#33]
+(57) CometHashAggregate
+Input [2]: [segment#32, count#33]
+Keys [1]: [segment#32]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#36]
-Results [3]: [segment#33, count(1)#36 AS num_customers#37, (segment#33 * 50) AS segment_base#38]
 
-(55) TakeOrderedAndProject
-Input [3]: [segment#33, num_customers#37, segment_base#38]
-Arguments: 100, [segment#33 ASC NULLS FIRST, num_customers#37 ASC NULLS FIRST], [segment#33, num_customers#37, segment_base#38]
+(58) CometTakeOrderedAndProject
+Input [3]: [segment#32, num_customers#34, segment_base#35]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[segment#32 ASC NULLS FIRST,num_customers#34 ASC NULLS FIRST], output=[segment#32,num_customers#34,segment_base#35]), 100, [segment#32 ASC NULLS FIRST, num_customers#34 ASC NULLS FIRST], [segment#32, num_customers#34, segment_base#35]
+
+(59) ColumnarToRow [codegen id : 10]
+Input [3]: [segment#32, num_customers#34, segment_base#35]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (60)
-+- * ColumnarToRow (59)
-   +- CometProject (58)
-      +- CometFilter (57)
-         +- CometScan parquet spark_catalog.default.date_dim (56)
+BroadcastExchange (64)
++- * ColumnarToRow (63)
+   +- CometProject (62)
+      +- CometFilter (61)
+         +- CometScan parquet spark_catalog.default.date_dim (60)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#17, d_year#39, d_moy#40]
+Output [3]: [d_date_sk#17, d_year#36, d_moy#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,12), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(57) CometFilter
-Input [3]: [d_date_sk#17, d_year#39, d_moy#40]
-Condition : ((((isnotnull(d_moy#40) AND isnotnull(d_year#39)) AND (d_moy#40 = 12)) AND (d_year#39 = 1998)) AND isnotnull(d_date_sk#17))
+(61) CometFilter
+Input [3]: [d_date_sk#17, d_year#36, d_moy#37]
+Condition : ((((isnotnull(d_moy#37) AND isnotnull(d_year#36)) AND (d_moy#37 = 12)) AND (d_year#36 = 1998)) AND isnotnull(d_date_sk#17))
 
-(58) CometProject
-Input [3]: [d_date_sk#17, d_year#39, d_moy#40]
+(62) CometProject
+Input [3]: [d_date_sk#17, d_year#36, d_moy#37]
 Arguments: [d_date_sk#17], [d_date_sk#17]
 
-(59) ColumnarToRow [codegen id : 1]
+(63) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#17]
 
-(60) BroadcastExchange
+(64) BroadcastExchange
 Input [1]: [d_date_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = ws_sold_date_sk#10 IN dynamicpruning#4
 
-Subquery:3 Hosting operator id = 28 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
-BroadcastExchange (65)
-+- * ColumnarToRow (64)
-   +- CometProject (63)
-      +- CometFilter (62)
-         +- CometScan parquet spark_catalog.default.date_dim (61)
+Subquery:3 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
+BroadcastExchange (69)
++- * ColumnarToRow (68)
+   +- CometProject (67)
+      +- CometFilter (66)
+         +- CometScan parquet spark_catalog.default.date_dim (65)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#29, d_month_seq#41]
+Output [2]: [d_date_sk#29, d_month_seq#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(62) CometFilter
-Input [2]: [d_date_sk#29, d_month_seq#41]
-Condition : (((isnotnull(d_month_seq#41) AND (d_month_seq#41 >= Subquery scalar-subquery#42, [id=#43])) AND (d_month_seq#41 <= Subquery scalar-subquery#44, [id=#45])) AND isnotnull(d_date_sk#29))
+(66) CometFilter
+Input [2]: [d_date_sk#29, d_month_seq#38]
+Condition : (((isnotnull(d_month_seq#38) AND (d_month_seq#38 >= Subquery scalar-subquery#39, [id=#40])) AND (d_month_seq#38 <= Subquery scalar-subquery#41, [id=#42])) AND isnotnull(d_date_sk#29))
 
-(63) CometProject
-Input [2]: [d_date_sk#29, d_month_seq#41]
+(67) CometProject
+Input [2]: [d_date_sk#29, d_month_seq#38]
 Arguments: [d_date_sk#29], [d_date_sk#29]
 
-(64) ColumnarToRow [codegen id : 1]
+(68) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#29]
 
-(65) BroadcastExchange
+(69) BroadcastExchange
 Input [1]: [d_date_sk#29]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=10]
 
-Subquery:4 Hosting operator id = 62 Hosting Expression = Subquery scalar-subquery#42, [id=#43]
-* ColumnarToRow (72)
-+- CometHashAggregate (71)
-   +- CometExchange (70)
-      +- CometHashAggregate (69)
-         +- CometProject (68)
-            +- CometFilter (67)
-               +- CometScan parquet spark_catalog.default.date_dim (66)
+Subquery:4 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#39, [id=#40]
+* ColumnarToRow (76)
++- CometHashAggregate (75)
+   +- CometColumnarExchange (74)
+      +- CometHashAggregate (73)
+         +- CometProject (72)
+            +- CometFilter (71)
+               +- CometScan parquet spark_catalog.default.date_dim (70)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#46, d_year#47, d_moy#48]
+Output [3]: [d_month_seq#43, d_year#44, d_moy#45]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,12)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(67) CometFilter
-Input [3]: [d_month_seq#46, d_year#47, d_moy#48]
-Condition : (((isnotnull(d_year#47) AND isnotnull(d_moy#48)) AND (d_year#47 = 1998)) AND (d_moy#48 = 12))
+(71) CometFilter
+Input [3]: [d_month_seq#43, d_year#44, d_moy#45]
+Condition : (((isnotnull(d_year#44) AND isnotnull(d_moy#45)) AND (d_year#44 = 1998)) AND (d_moy#45 = 12))
 
-(68) CometProject
-Input [3]: [d_month_seq#46, d_year#47, d_moy#48]
-Arguments: [(d_month_seq + 1)#49], [(d_month_seq#46 + 1) AS (d_month_seq + 1)#49]
+(72) CometProject
+Input [3]: [d_month_seq#43, d_year#44, d_moy#45]
+Arguments: [(d_month_seq + 1)#46], [(d_month_seq#43 + 1) AS (d_month_seq + 1)#46]
 
-(69) CometHashAggregate
-Input [1]: [(d_month_seq + 1)#49]
-Keys [1]: [(d_month_seq + 1)#49]
+(73) CometHashAggregate
+Input [1]: [(d_month_seq + 1)#46]
+Keys [1]: [(d_month_seq + 1)#46]
 Functions: []
 
-(70) CometExchange
-Input [1]: [(d_month_seq + 1)#49]
-Arguments: hashpartitioning((d_month_seq + 1)#49, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=11]
+(74) CometColumnarExchange
+Input [1]: [(d_month_seq + 1)#46]
+Arguments: hashpartitioning((d_month_seq + 1)#46, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(71) CometHashAggregate
-Input [1]: [(d_month_seq + 1)#49]
-Keys [1]: [(d_month_seq + 1)#49]
+(75) CometHashAggregate
+Input [1]: [(d_month_seq + 1)#46]
+Keys [1]: [(d_month_seq + 1)#46]
 Functions: []
 
-(72) ColumnarToRow [codegen id : 1]
-Input [1]: [(d_month_seq + 1)#49]
+(76) ColumnarToRow [codegen id : 1]
+Input [1]: [(d_month_seq + 1)#46]
 
-Subquery:5 Hosting operator id = 62 Hosting Expression = Subquery scalar-subquery#44, [id=#45]
-* ColumnarToRow (79)
-+- CometHashAggregate (78)
-   +- CometExchange (77)
-      +- CometHashAggregate (76)
-         +- CometProject (75)
-            +- CometFilter (74)
-               +- CometScan parquet spark_catalog.default.date_dim (73)
+Subquery:5 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#41, [id=#42]
+* ColumnarToRow (83)
++- CometHashAggregate (82)
+   +- CometColumnarExchange (81)
+      +- CometHashAggregate (80)
+         +- CometProject (79)
+            +- CometFilter (78)
+               +- CometScan parquet spark_catalog.default.date_dim (77)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#50, d_year#51, d_moy#52]
+Output [3]: [d_month_seq#47, d_year#48, d_moy#49]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,12)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(74) CometFilter
-Input [3]: [d_month_seq#50, d_year#51, d_moy#52]
-Condition : (((isnotnull(d_year#51) AND isnotnull(d_moy#52)) AND (d_year#51 = 1998)) AND (d_moy#52 = 12))
+(78) CometFilter
+Input [3]: [d_month_seq#47, d_year#48, d_moy#49]
+Condition : (((isnotnull(d_year#48) AND isnotnull(d_moy#49)) AND (d_year#48 = 1998)) AND (d_moy#49 = 12))
 
-(75) CometProject
-Input [3]: [d_month_seq#50, d_year#51, d_moy#52]
-Arguments: [(d_month_seq + 3)#53], [(d_month_seq#50 + 3) AS (d_month_seq + 3)#53]
+(79) CometProject
+Input [3]: [d_month_seq#47, d_year#48, d_moy#49]
+Arguments: [(d_month_seq + 3)#50], [(d_month_seq#47 + 3) AS (d_month_seq + 3)#50]
 
-(76) CometHashAggregate
-Input [1]: [(d_month_seq + 3)#53]
-Keys [1]: [(d_month_seq + 3)#53]
+(80) CometHashAggregate
+Input [1]: [(d_month_seq + 3)#50]
+Keys [1]: [(d_month_seq + 3)#50]
 Functions: []
 
-(77) CometExchange
-Input [1]: [(d_month_seq + 3)#53]
-Arguments: hashpartitioning((d_month_seq + 3)#53, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
+(81) CometColumnarExchange
+Input [1]: [(d_month_seq + 3)#50]
+Arguments: hashpartitioning((d_month_seq + 3)#50, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(78) CometHashAggregate
-Input [1]: [(d_month_seq + 3)#53]
-Keys [1]: [(d_month_seq + 3)#53]
+(82) CometHashAggregate
+Input [1]: [(d_month_seq + 3)#50]
+Keys [1]: [(d_month_seq + 3)#50]
 Functions: []
 
-(79) ColumnarToRow [codegen id : 1]
-Input [1]: [(d_month_seq + 3)#53]
+(83) ColumnarToRow [codegen id : 1]
+Input [1]: [(d_month_seq + 3)#50]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt
index 90604339a2..0d8b894b24 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt
@@ -1,13 +1,13 @@
-TakeOrderedAndProject [segment,num_customers,segment_base]
-  WholeStageCodegen (11)
-    HashAggregate [segment,count] [count(1),num_customers,segment_base,count]
-      InputAdapter
-        Exchange [segment] #1
-          WholeStageCodegen (10)
-            HashAggregate [segment] [count,count]
-              HashAggregate [c_customer_sk,sum] [sum(UnscaledValue(ss_ext_sales_price)),segment,sum]
-                InputAdapter
-                  Exchange [c_customer_sk] #2
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [segment,num_customers,segment_base]
+        CometHashAggregate [segment,count]
+          CometColumnarExchange [segment] #1
+            CometHashAggregate [segment]
+              CometHashAggregate [c_customer_sk,sum]
+                CometColumnarExchange [c_customer_sk] #2
+                  RowToColumnar
                     WholeStageCodegen (9)
                       HashAggregate [c_customer_sk,ss_ext_sales_price] [sum,sum]
                         Project [c_customer_sk,ss_ext_sales_price]
@@ -18,52 +18,54 @@ TakeOrderedAndProject [segment,num_customers,segment_base]
                                   BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
                                     Project [c_customer_sk,c_current_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
                                       BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                        HashAggregate [c_customer_sk,c_current_addr_sk]
+                                        ColumnarToRow
                                           InputAdapter
-                                            Exchange [c_customer_sk,c_current_addr_sk] #3
-                                              WholeStageCodegen (4)
-                                                HashAggregate [c_customer_sk,c_current_addr_sk]
-                                                  Project [c_customer_sk,c_current_addr_sk]
-                                                    BroadcastHashJoin [customer_sk,c_customer_sk]
-                                                      Project [customer_sk]
-                                                        BroadcastHashJoin [sold_date_sk,d_date_sk]
-                                                          Project [sold_date_sk,customer_sk]
-                                                            BroadcastHashJoin [item_sk,i_item_sk]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometUnion
-                                                                    CometProject [cs_sold_date_sk,cs_bill_customer_sk,cs_item_sk] [sold_date_sk,customer_sk,item_sk]
-                                                                      CometFilter [cs_item_sk,cs_bill_customer_sk]
-                                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
-                                                                          SubqueryBroadcast [d_date_sk] #1
-                                                                            BroadcastExchange #4
-                                                                              WholeStageCodegen (1)
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometProject [d_date_sk]
-                                                                                      CometFilter [d_moy,d_year,d_date_sk]
-                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                                    CometProject [ws_sold_date_sk,ws_bill_customer_sk,ws_item_sk] [sold_date_sk,customer_sk,item_sk]
-                                                                      CometFilter [ws_item_sk,ws_bill_customer_sk]
-                                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sold_date_sk]
-                                                                          ReusedSubquery [d_date_sk] #1
+                                            CometHashAggregate [c_customer_sk,c_current_addr_sk]
+                                              CometColumnarExchange [c_customer_sk,c_current_addr_sk] #3
+                                                RowToColumnar
+                                                  WholeStageCodegen (4)
+                                                    HashAggregate [c_customer_sk,c_current_addr_sk]
+                                                      Project [c_customer_sk,c_current_addr_sk]
+                                                        BroadcastHashJoin [customer_sk,c_customer_sk]
+                                                          Project [customer_sk]
+                                                            BroadcastHashJoin [sold_date_sk,d_date_sk]
+                                                              Project [sold_date_sk,customer_sk]
+                                                                BroadcastHashJoin [item_sk,i_item_sk]
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometUnion
+                                                                        CometProject [cs_sold_date_sk,cs_bill_customer_sk,cs_item_sk] [sold_date_sk,customer_sk,item_sk]
+                                                                          CometFilter [cs_item_sk,cs_bill_customer_sk]
+                                                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
+                                                                              SubqueryBroadcast [d_date_sk] #1
+                                                                                BroadcastExchange #4
+                                                                                  WholeStageCodegen (1)
+                                                                                    ColumnarToRow
+                                                                                      InputAdapter
+                                                                                        CometProject [d_date_sk]
+                                                                                          CometFilter [d_moy,d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                        CometProject [ws_sold_date_sk,ws_bill_customer_sk,ws_item_sk] [sold_date_sk,customer_sk,item_sk]
+                                                                          CometFilter [ws_item_sk,ws_bill_customer_sk]
+                                                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sold_date_sk]
+                                                                              ReusedSubquery [d_date_sk] #1
+                                                                  InputAdapter
+                                                                    BroadcastExchange #5
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometProject [i_item_sk]
+                                                                              CometFilter [i_category,i_class,i_item_sk]
+                                                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
                                                               InputAdapter
-                                                                BroadcastExchange #5
-                                                                  WholeStageCodegen (1)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [i_item_sk]
-                                                                          CometFilter [i_category,i_class,i_item_sk]
-                                                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
+                                                                ReusedExchange [d_date_sk] #4
                                                           InputAdapter
-                                                            ReusedExchange [d_date_sk] #4
-                                                      InputAdapter
-                                                        BroadcastExchange #6
-                                                          WholeStageCodegen (3)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [c_customer_sk,c_current_addr_sk]
-                                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                                            BroadcastExchange #6
+                                                              WholeStageCodegen (3)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [c_customer_sk,c_current_addr_sk]
+                                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                                         InputAdapter
                                           BroadcastExchange #7
                                             WholeStageCodegen (5)
@@ -83,7 +85,7 @@ TakeOrderedAndProject [segment,num_customers,segment_base]
                                                                         ColumnarToRow
                                                                           InputAdapter
                                                                             CometHashAggregate [(d_month_seq + 1)]
-                                                                              CometExchange [(d_month_seq + 1)] #9
+                                                                              CometColumnarExchange [(d_month_seq + 1)] #9
                                                                                 CometHashAggregate [(d_month_seq + 1)]
                                                                                   CometProject [d_month_seq] [(d_month_seq + 1)]
                                                                                     CometFilter [d_year,d_moy]
@@ -93,7 +95,7 @@ TakeOrderedAndProject [segment,num_customers,segment_base]
                                                                         ColumnarToRow
                                                                           InputAdapter
                                                                             CometHashAggregate [(d_month_seq + 3)]
-                                                                              CometExchange [(d_month_seq + 3)] #10
+                                                                              CometColumnarExchange [(d_month_seq + 3)] #10
                                                                                 CometHashAggregate [(d_month_seq + 3)]
                                                                                   CometProject [d_month_seq] [(d_month_seq + 3)]
                                                                                     CometFilter [d_year,d_moy]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt
index 2efd757741..9dc4ba9896 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt
@@ -1,25 +1,27 @@
 == Physical Plan ==
-TakeOrderedAndProject (21)
-+- * HashAggregate (20)
-   +- Exchange (19)
-      +- * HashAggregate (18)
-         +- * Project (17)
-            +- * BroadcastHashJoin Inner BuildRight (16)
-               :- * Project (10)
-               :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :- * ColumnarToRow (4)
-               :     :  +- CometProject (3)
-               :     :     +- CometFilter (2)
-               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-               :     +- BroadcastExchange (8)
-               :        +- * ColumnarToRow (7)
-               :           +- CometFilter (6)
-               :              +- CometScan parquet spark_catalog.default.store_sales (5)
-               +- BroadcastExchange (15)
-                  +- * ColumnarToRow (14)
-                     +- CometProject (13)
-                        +- CometFilter (12)
-                           +- CometScan parquet spark_catalog.default.item (11)
+* ColumnarToRow (23)
++- CometTakeOrderedAndProject (22)
+   +- CometHashAggregate (21)
+      +- CometColumnarExchange (20)
+         +- RowToColumnar (19)
+            +- * HashAggregate (18)
+               +- * Project (17)
+                  +- * BroadcastHashJoin Inner BuildRight (16)
+                     :- * Project (10)
+                     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :- * ColumnarToRow (4)
+                     :     :  +- CometProject (3)
+                     :     :     +- CometFilter (2)
+                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+                     :     +- BroadcastExchange (8)
+                     :        +- * ColumnarToRow (7)
+                     :           +- CometFilter (6)
+                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                     +- BroadcastExchange (15)
+                        +- * ColumnarToRow (14)
+                           +- CometProject (13)
+                              +- CometFilter (12)
+                                 +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -108,18 +110,22 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [3]: [i_brand#9, i_brand_id#8, sum#12]
 
-(19) Exchange
+(19) RowToColumnar
 Input [3]: [i_brand#9, i_brand_id#8, sum#12]
-Arguments: hashpartitioning(i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [3]: [i_brand#9, i_brand_id#8, sum#12]
+Arguments: hashpartitioning(i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(21) CometHashAggregate
 Input [3]: [i_brand#9, i_brand_id#8, sum#12]
 Keys [2]: [i_brand#9, i_brand_id#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
-Results [3]: [i_brand_id#8 AS brand_id#14, i_brand#9 AS brand#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS ext_price#16]
 
-(21) TakeOrderedAndProject
-Input [3]: [brand_id#14, brand#15, ext_price#16]
-Arguments: 100, [ext_price#16 DESC NULLS LAST, brand_id#14 ASC NULLS FIRST], [brand_id#14, brand#15, ext_price#16]
+(22) CometTakeOrderedAndProject
+Input [3]: [brand_id#13, brand#14, ext_price#15]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ext_price#15 DESC NULLS LAST,brand_id#13 ASC NULLS FIRST], output=[brand_id#13,brand#14,ext_price#15]), 100, [ext_price#15 DESC NULLS LAST, brand_id#13 ASC NULLS FIRST], [brand_id#13, brand#14, ext_price#15]
+
+(23) ColumnarToRow [codegen id : 4]
+Input [3]: [brand_id#13, brand#14, ext_price#15]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt
index 7a0fe88633..368ca6f56a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt
@@ -1,31 +1,33 @@
-TakeOrderedAndProject [ext_price,brand_id,brand]
-  WholeStageCodegen (4)
-    HashAggregate [i_brand,i_brand_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,ext_price,sum]
-      InputAdapter
-        Exchange [i_brand,i_brand_id] #1
-          WholeStageCodegen (3)
-            HashAggregate [i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
-              Project [ss_ext_sales_price,i_brand_id,i_brand]
-                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                  Project [ss_item_sk,ss_ext_sales_price]
-                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [d_date_sk]
-                            CometFilter [d_moy,d_year,d_date_sk]
-                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (4)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ext_price,brand_id,brand]
+        CometHashAggregate [i_brand,i_brand_id,sum]
+          CometColumnarExchange [i_brand,i_brand_id] #1
+            RowToColumnar
+              WholeStageCodegen (3)
+                HashAggregate [i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
+                  Project [ss_ext_sales_price,i_brand_id,i_brand]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [ss_item_sk,ss_ext_sales_price]
+                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [d_date_sk]
+                                CometFilter [d_moy,d_year,d_date_sk]
+                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                          InputAdapter
+                            BroadcastExchange #2
+                              WholeStageCodegen (1)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
                       InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (1)
+                        BroadcastExchange #3
+                          WholeStageCodegen (2)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                  InputAdapter
-                    BroadcastExchange #3
-                      WholeStageCodegen (2)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [i_item_sk,i_brand_id,i_brand]
-                              CometFilter [i_manager_id,i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
+                                CometProject [i_item_sk,i_brand_id,i_brand]
+                                  CometFilter [i_manager_id,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt
index 0fb6eb172f..15d5137015 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt
@@ -1,67 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (63)
-+- * HashAggregate (62)
-   +- Exchange (61)
-      +- * HashAggregate (60)
-         +- Union (59)
-            :- * HashAggregate (28)
-            :  +- Exchange (27)
-            :     +- * HashAggregate (26)
-            :        +- * Project (25)
-            :           +- * BroadcastHashJoin Inner BuildRight (24)
-            :              :- * Project (13)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (12)
-            :              :     :- * Project (6)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-            :              :     :     :- * ColumnarToRow (3)
-            :              :     :     :  +- CometFilter (2)
-            :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :              :     :     +- ReusedExchange (4)
-            :              :     +- BroadcastExchange (11)
-            :              :        +- * ColumnarToRow (10)
-            :              :           +- CometProject (9)
-            :              :              +- CometFilter (8)
-            :              :                 +- CometScan parquet spark_catalog.default.customer_address (7)
-            :              +- BroadcastExchange (23)
-            :                 +- * BroadcastHashJoin LeftSemi BuildRight (22)
-            :                    :- * ColumnarToRow (16)
-            :                    :  +- CometFilter (15)
-            :                    :     +- CometScan parquet spark_catalog.default.item (14)
-            :                    +- BroadcastExchange (21)
-            :                       +- * ColumnarToRow (20)
-            :                          +- CometProject (19)
-            :                             +- CometFilter (18)
-            :                                +- CometScan parquet spark_catalog.default.item (17)
-            :- * HashAggregate (43)
-            :  +- Exchange (42)
-            :     +- * HashAggregate (41)
-            :        +- * Project (40)
-            :           +- * BroadcastHashJoin Inner BuildRight (39)
-            :              :- * Project (37)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (36)
-            :              :     :- * Project (34)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (33)
-            :              :     :     :- * ColumnarToRow (31)
-            :              :     :     :  +- CometFilter (30)
-            :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (29)
-            :              :     :     +- ReusedExchange (32)
-            :              :     +- ReusedExchange (35)
-            :              +- ReusedExchange (38)
-            +- * HashAggregate (58)
-               +- Exchange (57)
-                  +- * HashAggregate (56)
-                     +- * Project (55)
-                        +- * BroadcastHashJoin Inner BuildRight (54)
-                           :- * Project (52)
-                           :  +- * BroadcastHashJoin Inner BuildRight (51)
-                           :     :- * Project (49)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (48)
-                           :     :     :- * ColumnarToRow (46)
-                           :     :     :  +- CometFilter (45)
-                           :     :     :     +- CometScan parquet spark_catalog.default.web_sales (44)
-                           :     :     +- ReusedExchange (47)
-                           :     +- ReusedExchange (50)
-                           +- ReusedExchange (53)
+* ColumnarToRow (67)
++- CometTakeOrderedAndProject (66)
+   +- CometHashAggregate (65)
+      +- CometColumnarExchange (64)
+         +- CometHashAggregate (63)
+            +- CometUnion (62)
+               :- CometHashAggregate (29)
+               :  +- CometColumnarExchange (28)
+               :     +- RowToColumnar (27)
+               :        +- * HashAggregate (26)
+               :           +- * Project (25)
+               :              +- * BroadcastHashJoin Inner BuildRight (24)
+               :                 :- * Project (13)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :                 :     :- * Project (6)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :                 :     :     :- * ColumnarToRow (3)
+               :                 :     :     :  +- CometFilter (2)
+               :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                 :     :     +- ReusedExchange (4)
+               :                 :     +- BroadcastExchange (11)
+               :                 :        +- * ColumnarToRow (10)
+               :                 :           +- CometProject (9)
+               :                 :              +- CometFilter (8)
+               :                 :                 +- CometScan parquet spark_catalog.default.customer_address (7)
+               :                 +- BroadcastExchange (23)
+               :                    +- * BroadcastHashJoin LeftSemi BuildRight (22)
+               :                       :- * ColumnarToRow (16)
+               :                       :  +- CometFilter (15)
+               :                       :     +- CometScan parquet spark_catalog.default.item (14)
+               :                       +- BroadcastExchange (21)
+               :                          +- * ColumnarToRow (20)
+               :                             +- CometProject (19)
+               :                                +- CometFilter (18)
+               :                                   +- CometScan parquet spark_catalog.default.item (17)
+               :- CometHashAggregate (45)
+               :  +- CometColumnarExchange (44)
+               :     +- RowToColumnar (43)
+               :        +- * HashAggregate (42)
+               :           +- * Project (41)
+               :              +- * BroadcastHashJoin Inner BuildRight (40)
+               :                 :- * Project (38)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (37)
+               :                 :     :- * Project (35)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+               :                 :     :     :- * ColumnarToRow (32)
+               :                 :     :     :  +- CometFilter (31)
+               :                 :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
+               :                 :     :     +- ReusedExchange (33)
+               :                 :     +- ReusedExchange (36)
+               :                 +- ReusedExchange (39)
+               +- CometHashAggregate (61)
+                  +- CometColumnarExchange (60)
+                     +- RowToColumnar (59)
+                        +- * HashAggregate (58)
+                           +- * Project (57)
+                              +- * BroadcastHashJoin Inner BuildRight (56)
+                                 :- * Project (54)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (53)
+                                 :     :- * Project (51)
+                                 :     :  +- * BroadcastHashJoin Inner BuildRight (50)
+                                 :     :     :- * ColumnarToRow (48)
+                                 :     :     :  +- CometFilter (47)
+                                 :     :     :     +- CometScan parquet spark_catalog.default.web_sales (46)
+                                 :     :     +- ReusedExchange (49)
+                                 :     +- ReusedExchange (52)
+                                 +- ReusedExchange (55)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -79,7 +83,7 @@ Condition : (isnotnull(ss_addr_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_addr_sk#2, ss_ext_sales_price#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 68]
+(4) ReusedExchange [Reuses operator id: 72]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -187,219 +191,224 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#3))]
 Aggregate Attributes [1]: [sum#13]
 Results [2]: [i_item_id#10, sum#14]
 
-(27) Exchange
+(27) RowToColumnar
 Input [2]: [i_item_id#10, sum#14]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 6]
+(28) CometColumnarExchange
+Input [2]: [i_item_id#10, sum#14]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [2]: [i_item_id#10, sum#14]
 Keys [1]: [i_item_id#10]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#3))#15]
-Results [2]: [i_item_id#10, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#15,17,2) AS total_sales#16]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+Output [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#20), dynamicpruningexpression(cs_sold_date_sk#20 IN dynamicpruning#21)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#18), dynamicpruningexpression(cs_sold_date_sk#18 IN dynamicpruning#19)]
 PushedFilters: [IsNotNull(cs_bill_addr_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_addr_sk:int,cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(30) CometFilter
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
-Condition : (isnotnull(cs_bill_addr_sk#17) AND isnotnull(cs_item_sk#18))
+(31) CometFilter
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+Condition : (isnotnull(cs_bill_addr_sk#15) AND isnotnull(cs_item_sk#16))
 
-(31) ColumnarToRow [codegen id : 11]
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+(32) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
 
-(32) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#22]
+(33) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#20]
 
-(33) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_sold_date_sk#20]
-Right keys [1]: [d_date_sk#22]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#18]
+Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 11]
-Output [3]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19]
-Input [5]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20, d_date_sk#22]
+(35) Project [codegen id : 10]
+Output [3]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17]
+Input [5]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18, d_date_sk#20]
 
-(35) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#23]
+(36) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#21]
 
-(36) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_bill_addr_sk#17]
-Right keys [1]: [ca_address_sk#23]
+(37) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_bill_addr_sk#15]
+Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 11]
-Output [2]: [cs_item_sk#18, cs_ext_sales_price#19]
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, ca_address_sk#23]
+(38) Project [codegen id : 10]
+Output [2]: [cs_item_sk#16, cs_ext_sales_price#17]
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, ca_address_sk#21]
 
-(38) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#24, i_item_id#25]
+(39) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#22, i_item_id#23]
 
-(39) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_item_sk#18]
-Right keys [1]: [i_item_sk#24]
+(40) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_item_sk#16]
+Right keys [1]: [i_item_sk#22]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 11]
-Output [2]: [cs_ext_sales_price#19, i_item_id#25]
-Input [4]: [cs_item_sk#18, cs_ext_sales_price#19, i_item_sk#24, i_item_id#25]
+(41) Project [codegen id : 10]
+Output [2]: [cs_ext_sales_price#17, i_item_id#23]
+Input [4]: [cs_item_sk#16, cs_ext_sales_price#17, i_item_sk#22, i_item_id#23]
+
+(42) HashAggregate [codegen id : 10]
+Input [2]: [cs_ext_sales_price#17, i_item_id#23]
+Keys [1]: [i_item_id#23]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#17))]
+Aggregate Attributes [1]: [sum#24]
+Results [2]: [i_item_id#23, sum#25]
 
-(41) HashAggregate [codegen id : 11]
-Input [2]: [cs_ext_sales_price#19, i_item_id#25]
-Keys [1]: [i_item_id#25]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#19))]
-Aggregate Attributes [1]: [sum#26]
-Results [2]: [i_item_id#25, sum#27]
+(43) RowToColumnar
+Input [2]: [i_item_id#23, sum#25]
 
-(42) Exchange
-Input [2]: [i_item_id#25, sum#27]
-Arguments: hashpartitioning(i_item_id#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(44) CometColumnarExchange
+Input [2]: [i_item_id#23, sum#25]
+Arguments: hashpartitioning(i_item_id#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(43) HashAggregate [codegen id : 12]
-Input [2]: [i_item_id#25, sum#27]
-Keys [1]: [i_item_id#25]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#19))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#19))#28]
-Results [2]: [i_item_id#25, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#19))#28,17,2) AS total_sales#29]
+(45) CometHashAggregate
+Input [2]: [i_item_id#23, sum#25]
+Keys [1]: [i_item_id#23]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#17))]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+Output [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#29), dynamicpruningexpression(ws_sold_date_sk#29 IN dynamicpruning#30)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk), IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(45) CometFilter
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
-Condition : (isnotnull(ws_bill_addr_sk#31) AND isnotnull(ws_item_sk#30))
+(47) CometFilter
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+Condition : (isnotnull(ws_bill_addr_sk#27) AND isnotnull(ws_item_sk#26))
 
-(46) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+(48) ColumnarToRow [codegen id : 15]
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
 
-(47) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#35]
+(49) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#31]
 
-(48) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#33]
-Right keys [1]: [d_date_sk#35]
+(50) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_sold_date_sk#29]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 17]
-Output [3]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32]
-Input [5]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33, d_date_sk#35]
+(51) Project [codegen id : 15]
+Output [3]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28]
+Input [5]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29, d_date_sk#31]
 
-(50) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#36]
+(52) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#32]
 
-(51) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_bill_addr_sk#31]
-Right keys [1]: [ca_address_sk#36]
+(53) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_bill_addr_sk#27]
+Right keys [1]: [ca_address_sk#32]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 17]
-Output [2]: [ws_item_sk#30, ws_ext_sales_price#32]
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ca_address_sk#36]
+(54) Project [codegen id : 15]
+Output [2]: [ws_item_sk#26, ws_ext_sales_price#28]
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ca_address_sk#32]
 
-(53) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#37, i_item_id#38]
+(55) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#33, i_item_id#34]
 
-(54) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_item_sk#30]
-Right keys [1]: [i_item_sk#37]
+(56) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_item_sk#26]
+Right keys [1]: [i_item_sk#33]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 17]
-Output [2]: [ws_ext_sales_price#32, i_item_id#38]
-Input [4]: [ws_item_sk#30, ws_ext_sales_price#32, i_item_sk#37, i_item_id#38]
+(57) Project [codegen id : 15]
+Output [2]: [ws_ext_sales_price#28, i_item_id#34]
+Input [4]: [ws_item_sk#26, ws_ext_sales_price#28, i_item_sk#33, i_item_id#34]
 
-(56) HashAggregate [codegen id : 17]
-Input [2]: [ws_ext_sales_price#32, i_item_id#38]
-Keys [1]: [i_item_id#38]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#32))]
-Aggregate Attributes [1]: [sum#39]
-Results [2]: [i_item_id#38, sum#40]
+(58) HashAggregate [codegen id : 15]
+Input [2]: [ws_ext_sales_price#28, i_item_id#34]
+Keys [1]: [i_item_id#34]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#28))]
+Aggregate Attributes [1]: [sum#35]
+Results [2]: [i_item_id#34, sum#36]
 
-(57) Exchange
-Input [2]: [i_item_id#38, sum#40]
-Arguments: hashpartitioning(i_item_id#38, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(59) RowToColumnar
+Input [2]: [i_item_id#34, sum#36]
 
-(58) HashAggregate [codegen id : 18]
-Input [2]: [i_item_id#38, sum#40]
-Keys [1]: [i_item_id#38]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#32))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#32))#41]
-Results [2]: [i_item_id#38, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#32))#41,17,2) AS total_sales#42]
+(60) CometColumnarExchange
+Input [2]: [i_item_id#34, sum#36]
+Arguments: hashpartitioning(i_item_id#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(59) Union
+(61) CometHashAggregate
+Input [2]: [i_item_id#34, sum#36]
+Keys [1]: [i_item_id#34]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#28))]
 
-(60) HashAggregate [codegen id : 19]
-Input [2]: [i_item_id#10, total_sales#16]
+(62) CometUnion
+Child 0 Input [2]: [i_item_id#10, total_sales#37]
+Child 1 Input [2]: [i_item_id#23, total_sales#38]
+Child 2 Input [2]: [i_item_id#34, total_sales#39]
+
+(63) CometHashAggregate
+Input [2]: [i_item_id#10, total_sales#37]
 Keys [1]: [i_item_id#10]
-Functions [1]: [partial_sum(total_sales#16)]
-Aggregate Attributes [2]: [sum#43, isEmpty#44]
-Results [3]: [i_item_id#10, sum#45, isEmpty#46]
+Functions [1]: [partial_sum(total_sales#37)]
 
-(61) Exchange
-Input [3]: [i_item_id#10, sum#45, isEmpty#46]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(64) CometColumnarExchange
+Input [3]: [i_item_id#10, sum#40, isEmpty#41]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(62) HashAggregate [codegen id : 20]
-Input [3]: [i_item_id#10, sum#45, isEmpty#46]
+(65) CometHashAggregate
+Input [3]: [i_item_id#10, sum#40, isEmpty#41]
 Keys [1]: [i_item_id#10]
-Functions [1]: [sum(total_sales#16)]
-Aggregate Attributes [1]: [sum(total_sales#16)#47]
-Results [2]: [i_item_id#10, sum(total_sales#16)#47 AS total_sales#48]
+Functions [1]: [sum(total_sales#37)]
+
+(66) CometTakeOrderedAndProject
+Input [2]: [i_item_id#10, total_sales#42]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_sales#42 ASC NULLS FIRST], output=[i_item_id#10,total_sales#42]), 100, [total_sales#42 ASC NULLS FIRST], [i_item_id#10, total_sales#42]
 
-(63) TakeOrderedAndProject
-Input [2]: [i_item_id#10, total_sales#48]
-Arguments: 100, [total_sales#48 ASC NULLS FIRST], [i_item_id#10, total_sales#48]
+(67) ColumnarToRow [codegen id : 16]
+Input [2]: [i_item_id#10, total_sales#42]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (68)
-+- * ColumnarToRow (67)
-   +- CometProject (66)
-      +- CometFilter (65)
-         +- CometScan parquet spark_catalog.default.date_dim (64)
+BroadcastExchange (72)
++- * ColumnarToRow (71)
+   +- CometProject (70)
+      +- CometFilter (69)
+         +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#6, d_year#49, d_moy#50]
+Output [3]: [d_date_sk#6, d_year#43, d_moy#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(65) CometFilter
-Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
-Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 2001)) AND (d_moy#50 = 2)) AND isnotnull(d_date_sk#6))
+(69) CometFilter
+Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
+Condition : ((((isnotnull(d_year#43) AND isnotnull(d_moy#44)) AND (d_year#43 = 2001)) AND (d_moy#44 = 2)) AND isnotnull(d_date_sk#6))
 
-(66) CometProject
-Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
+(70) CometProject
+Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(67) ColumnarToRow [codegen id : 1]
+(71) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(68) BroadcastExchange
+(72) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 29 Hosting Expression = cs_sold_date_sk#20 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 44 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#29 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt
index f781ed1f7b..68bd217820 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt
@@ -1,105 +1,101 @@
-TakeOrderedAndProject [total_sales,i_item_id]
-  WholeStageCodegen (20)
-    HashAggregate [i_item_id,sum,isEmpty] [sum(total_sales),total_sales,sum,isEmpty]
-      InputAdapter
-        Exchange [i_item_id] #1
-          WholeStageCodegen (19)
-            HashAggregate [i_item_id,total_sales] [sum,isEmpty,sum,isEmpty]
-              InputAdapter
-                Union
-                  WholeStageCodegen (6)
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #2
-                          WholeStageCodegen (5)
-                            HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
-                              Project [ss_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                      Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_addr_sk,ss_item_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (16)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [total_sales,i_item_id]
+        CometHashAggregate [i_item_id,sum,isEmpty]
+          CometColumnarExchange [i_item_id] #1
+            CometHashAggregate [i_item_id,total_sales]
+              CometUnion
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #2
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
+                          Project [ss_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              Project [ss_item_sk,ss_ext_sales_price]
+                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                  Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_addr_sk,ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_year,d_moy,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                  InputAdapter
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
                                           InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                            CometProject [ca_address_sk]
+                                              CometFilter [ca_gmt_offset,ca_address_sk]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (4)
+                                    BroadcastHashJoin [i_item_id,i_item_id]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                                       InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (2)
+                                        BroadcastExchange #6
+                                          WholeStageCodegen (3)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [ca_address_sk]
-                                                  CometFilter [ca_gmt_offset,ca_address_sk]
-                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                                  InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (4)
-                                        BroadcastHashJoin [i_item_id,i_item_id]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [i_item_sk]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (3)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [i_item_id]
-                                                      CometFilter [i_color]
-                                                        CometScan parquet spark_catalog.default.item [i_item_id,i_color]
-                  WholeStageCodegen (12)
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #7
-                          WholeStageCodegen (11)
-                            HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
-                              Project [cs_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                  Project [cs_item_sk,cs_ext_sales_price]
-                                    BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
-                                      Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_bill_addr_sk,cs_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                                CometProject [i_item_id]
+                                                  CometFilter [i_color]
+                                                    CometScan parquet spark_catalog.default.item [i_item_id,i_color]
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #7
+                    RowToColumnar
+                      WholeStageCodegen (10)
+                        HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
+                          Project [cs_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [cs_item_sk,i_item_sk]
+                              Project [cs_item_sk,cs_ext_sales_price]
+                                BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
+                                  Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [cs_bill_addr_sk,cs_item_sk]
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        ReusedExchange [ca_address_sk] #4
+                                        ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    ReusedExchange [i_item_sk,i_item_id] #5
-                  WholeStageCodegen (18)
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #8
-                          WholeStageCodegen (17)
-                            HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
-                              Project [ws_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                  Project [ws_item_sk,ws_ext_sales_price]
-                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                      Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_addr_sk,ws_item_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                    ReusedExchange [ca_address_sk] #4
+                              InputAdapter
+                                ReusedExchange [i_item_sk,i_item_id] #5
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #8
+                    RowToColumnar
+                      WholeStageCodegen (15)
+                        HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
+                          Project [ws_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [ws_item_sk,i_item_sk]
+                              Project [ws_item_sk,ws_ext_sales_price]
+                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                  Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_addr_sk,ws_item_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        ReusedExchange [ca_address_sk] #4
+                                        ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    ReusedExchange [i_item_sk,i_item_id] #5
+                                    ReusedExchange [ca_address_sk] #4
+                              InputAdapter
+                                ReusedExchange [i_item_sk,i_item_id] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt
index 8302389585..70e5ea9d45 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-TakeOrderedAndProject (45)
-+- * Project (44)
-   +- * BroadcastHashJoin Inner BuildRight (43)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * Project (28)
-      :     :  +- * Filter (27)
-      :     :     +- Window (26)
-      :     :        +- * Filter (25)
-      :     :           +- Window (24)
-      :     :              +- * Sort (23)
-      :     :                 +- Exchange (22)
-      :     :                    +- * HashAggregate (21)
-      :     :                       +- Exchange (20)
-      :     :                          +- * HashAggregate (19)
-      :     :                             +- * Project (18)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                   :- * Project (12)
-      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                   :     :- * Project (9)
-      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                   :     :     :- * ColumnarToRow (3)
-      :     :                                   :     :     :  +- CometFilter (2)
-      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                   :     :     +- BroadcastExchange (7)
-      :     :                                   :     :        +- * ColumnarToRow (6)
-      :     :                                   :     :           +- CometFilter (5)
-      :     :                                   :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
-      :     :                                   :     +- ReusedExchange (10)
-      :     :                                   +- BroadcastExchange (16)
-      :     :                                      +- * ColumnarToRow (15)
-      :     :                                         +- CometFilter (14)
-      :     :                                            +- CometScan parquet spark_catalog.default.call_center (13)
-      :     +- BroadcastExchange (35)
-      :        +- * Project (34)
-      :           +- Window (33)
-      :              +- * Sort (32)
-      :                 +- Exchange (31)
-      :                    +- * HashAggregate (30)
-      :                       +- ReusedExchange (29)
-      +- BroadcastExchange (42)
-         +- * Project (41)
-            +- Window (40)
-               +- * Sort (39)
-                  +- ReusedExchange (38)
+TakeOrderedAndProject (47)
++- * Project (46)
+   +- * BroadcastHashJoin Inner BuildRight (45)
+      :- * Project (38)
+      :  +- * BroadcastHashJoin Inner BuildRight (37)
+      :     :- * Project (30)
+      :     :  +- * Filter (29)
+      :     :     +- Window (28)
+      :     :        +- * Filter (27)
+      :     :           +- Window (26)
+      :     :              +- * ColumnarToRow (25)
+      :     :                 +- CometSort (24)
+      :     :                    +- CometColumnarExchange (23)
+      :     :                       +- CometHashAggregate (22)
+      :     :                          +- CometColumnarExchange (21)
+      :     :                             +- RowToColumnar (20)
+      :     :                                +- * HashAggregate (19)
+      :     :                                   +- * Project (18)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                         :- * Project (12)
+      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                         :     :- * Project (9)
+      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                         :     :     :- * ColumnarToRow (3)
+      :     :                                         :     :     :  +- CometFilter (2)
+      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                         :     :     +- BroadcastExchange (7)
+      :     :                                         :     :        +- * ColumnarToRow (6)
+      :     :                                         :     :           +- CometFilter (5)
+      :     :                                         :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
+      :     :                                         :     +- ReusedExchange (10)
+      :     :                                         +- BroadcastExchange (16)
+      :     :                                            +- * ColumnarToRow (15)
+      :     :                                               +- CometFilter (14)
+      :     :                                                  +- CometScan parquet spark_catalog.default.call_center (13)
+      :     +- BroadcastExchange (36)
+      :        +- * Project (35)
+      :           +- Window (34)
+      :              +- * ColumnarToRow (33)
+      :                 +- CometSort (32)
+      :                    +- ReusedExchange (31)
+      +- BroadcastExchange (44)
+         +- * Project (43)
+            +- Window (42)
+               +- * ColumnarToRow (41)
+                  +- CometSort (40)
+                     +- ReusedExchange (39)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -89,7 +91,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, cs_call_center_sk#4, cs_sales_price#6, cs_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, cs_call_center_sk#4, cs_item_sk#5, cs_sales_price#6, cs_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 49]
+(10) ReusedExchange [Reuses operator id: 51]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -137,125 +139,124 @@ Functions [1]: [partial_sum(UnscaledValue(cs_sales_price#6))]
 Aggregate Attributes [1]: [sum#14]
 Results [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 
-(20) Exchange
+(20) RowToColumnar
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 Keys [5]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(cs_sales_price#6))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#6))#16]
-Results [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS sum_sales#17, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS _w0#18]
 
-(22) Exchange
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(23) CometColumnarExchange
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(23) Sort [codegen id : 6]
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
+(24) CometSort
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+Arguments: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(24) Window
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(25) ColumnarToRow [codegen id : 5]
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+
+(26) Window
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#18], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(25) Filter [codegen id : 7]
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+(27) Filter [codegen id : 6]
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(26) Window
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
-Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, cc_name#13, d_year#10]
-
-(27) Filter [codegen id : 22]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
-
-(28) Project [codegen id : 22]
-Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-
-(29) ReusedExchange [Reuses operator id: 20]
-Output [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
-
-(30) HashAggregate [codegen id : 12]
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
-Keys [5]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25]
-Functions [1]: [sum(UnscaledValue(cs_sales_price#27))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#27))#16]
-Results [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, MakeDecimal(sum(UnscaledValue(cs_sales_price#27))#16,17,2) AS sum_sales#17]
-
-(31) Exchange
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
-Arguments: hashpartitioning(i_category#21, i_brand#22, cc_name#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(32) Sort [codegen id : 13]
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
-Arguments: [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, cc_name#23 ASC NULLS FIRST, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST], false, 0
-
-(33) Window
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
-Arguments: [rank(d_year#24, d_moy#25) windowspecdefinition(i_category#21, i_brand#22, cc_name#23, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#28], [i_category#21, i_brand#22, cc_name#23], [d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST]
-
-(34) Project [codegen id : 14]
-Output [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#17 AS sum_sales#29, rn#28]
-Input [7]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17, rn#28]
-
-(35) BroadcastExchange
-Input [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=6]
-
-(36) BroadcastHashJoin [codegen id : 22]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
-Right keys [4]: [i_category#21, i_brand#22, cc_name#23, (rn#28 + 1)]
+(28) Window
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
+Arguments: [avg(_w0#17) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#19], [i_category#3, i_brand#2, cc_name#13, d_year#10]
+
+(29) Filter [codegen id : 19]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
+Condition : ((isnotnull(avg_monthly_sales#19) AND (avg_monthly_sales#19 > 0.000000)) AND CASE WHEN (avg_monthly_sales#19 > 0.000000) THEN ((abs((sum_sales#16 - avg_monthly_sales#19)) / avg_monthly_sales#19) > 0.1000000000000000) END)
+
+(30) Project [codegen id : 19]
+Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
+
+(31) ReusedExchange [Reuses operator id: 23]
+Output [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+
+(32) CometSort
+Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+Arguments: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16], [i_category#20 ASC NULLS FIRST, i_brand#21 ASC NULLS FIRST, cc_name#22 ASC NULLS FIRST, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
+
+(33) ColumnarToRow [codegen id : 11]
+Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+
+(34) Window
+Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+Arguments: [rank(d_year#23, d_moy#24) windowspecdefinition(i_category#20, i_brand#21, cc_name#22, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#25], [i_category#20, i_brand#21, cc_name#22], [d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
+
+(35) Project [codegen id : 12]
+Output [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#16 AS sum_sales#26, rn#25]
+Input [7]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16, rn#25]
+
+(36) BroadcastExchange
+Input [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=5]
+
+(37) BroadcastHashJoin [codegen id : 19]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
+Right keys [4]: [i_category#20, i_brand#21, cc_name#22, (rn#25 + 1)]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 22]
-Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29]
-Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
+(38) Project [codegen id : 19]
+Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26]
+Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
+
+(39) ReusedExchange [Reuses operator id: 23]
+Output [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
 
-(38) ReusedExchange [Reuses operator id: 31]
-Output [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
+(40) CometSort
+Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+Arguments: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16], [i_category#27 ASC NULLS FIRST, i_brand#28 ASC NULLS FIRST, cc_name#29 ASC NULLS FIRST, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
 
-(39) Sort [codegen id : 20]
-Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [i_category#30 ASC NULLS FIRST, i_brand#31 ASC NULLS FIRST, cc_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST], false, 0
+(41) ColumnarToRow [codegen id : 17]
+Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
 
-(40) Window
-Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#30, i_brand#31, cc_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#30, i_brand#31, cc_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
+(42) Window
+Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+Arguments: [rank(d_year#30, d_moy#31) windowspecdefinition(i_category#27, i_brand#28, cc_name#29, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#32], [i_category#27, i_brand#28, cc_name#29], [d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
 
-(41) Project [codegen id : 21]
-Output [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#17 AS sum_sales#36, rn#35]
-Input [7]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
+(43) Project [codegen id : 18]
+Output [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#16 AS sum_sales#33, rn#32]
+Input [7]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16, rn#32]
 
-(42) BroadcastExchange
-Input [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=7]
+(44) BroadcastExchange
+Input [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 22]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
-Right keys [4]: [i_category#30, i_brand#31, cc_name#32, (rn#35 - 1)]
+(45) BroadcastHashJoin [codegen id : 19]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
+Right keys [4]: [i_category#27, i_brand#28, cc_name#29, (rn#32 - 1)]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 22]
-Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#29 AS psum#37, sum_sales#36 AS nsum#38]
-Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29, i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
+(46) Project [codegen id : 19]
+Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, sum_sales#26 AS psum#34, sum_sales#33 AS nsum#35]
+Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26, i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
 
-(45) TakeOrderedAndProject
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
-Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+(47) TakeOrderedAndProject
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
+Arguments: 100, [(sum_sales#16 - avg_monthly_sales#19) ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = cs_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometFilter (47)
-      +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (51)
++- * ColumnarToRow (50)
+   +- CometFilter (49)
+      +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -265,15 +266,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
+(49) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(48) ColumnarToRow [codegen id : 1]
+(50) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(49) BroadcastExchange
+(51) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt
index 3bc01343ae..b9bd07df45 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,cc_name,i_category,i_brand,d_year,d_moy,psum,nsum]
-  WholeStageCodegen (22)
+  WholeStageCodegen (19)
     Project [i_category,i_brand,cc_name,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,cc_name,rn,i_category,i_brand,cc_name,rn]
         Project [i_category,i_brand,cc_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,cc_name,i_category,i_brand,d_
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,cc_name,d_year]
-                    WholeStageCodegen (7)
+                    WholeStageCodegen (6)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,cc_name]
-                            WholeStageCodegen (6)
-                              Sort [i_category,i_brand,cc_name,d_year,d_moy]
+                            WholeStageCodegen (5)
+                              ColumnarToRow
                                 InputAdapter
-                                  Exchange [i_category,i_brand,cc_name] #1
-                                    WholeStageCodegen (5)
-                                      HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,_w0,sum]
-                                        InputAdapter
-                                          Exchange [i_category,i_brand,cc_name,d_year,d_moy] #2
+                                  CometSort [i_category,i_brand,cc_name,d_year,d_moy]
+                                    CometColumnarExchange [i_category,i_brand,cc_name] #1
+                                      CometHashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum]
+                                        CometColumnarExchange [i_category,i_brand,cc_name,d_year,d_moy] #2
+                                          RowToColumnar
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,cs_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,cs_sales_price,d_year,d_moy,cc_name]
@@ -57,25 +57,23 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,cc_name,i_category,i_brand,d_
                                                                 CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (14)
+                WholeStageCodegen (12)
                   Project [i_category,i_brand,cc_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,cc_name]
-                        WholeStageCodegen (13)
-                          Sort [i_category,i_brand,cc_name,d_year,d_moy]
+                        WholeStageCodegen (11)
+                          ColumnarToRow
                             InputAdapter
-                              Exchange [i_category,i_brand,cc_name] #7
-                                WholeStageCodegen (12)
-                                  HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,sum]
-                                    InputAdapter
-                                      ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum] #2
+                              CometSort [i_category,i_brand,cc_name,d_year,d_moy]
+                                ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
         InputAdapter
-          BroadcastExchange #8
-            WholeStageCodegen (21)
+          BroadcastExchange #7
+            WholeStageCodegen (18)
               Project [i_category,i_brand,cc_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,cc_name]
-                    WholeStageCodegen (20)
-                      Sort [i_category,i_brand,cc_name,d_year,d_moy]
+                    WholeStageCodegen (17)
+                      ColumnarToRow
                         InputAdapter
-                          ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #7
+                          CometSort [i_category,i_brand,cc_name,d_year,d_moy]
+                            ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
index e3b68cabe2..d31d811d90 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
@@ -1,53 +1,59 @@
 == Physical Plan ==
-TakeOrderedAndProject (49)
-+- * Project (48)
-   +- * BroadcastHashJoin Inner BuildRight (47)
-      :- * Project (32)
-      :  +- * BroadcastHashJoin Inner BuildRight (31)
-      :     :- * Filter (16)
-      :     :  +- * HashAggregate (15)
-      :     :     +- Exchange (14)
-      :     :        +- * HashAggregate (13)
-      :     :           +- * Project (12)
-      :     :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                 :- * Project (9)
-      :     :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                 :     :- * ColumnarToRow (3)
-      :     :                 :     :  +- CometFilter (2)
-      :     :                 :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :                 :     +- BroadcastExchange (7)
-      :     :                 :        +- * ColumnarToRow (6)
-      :     :                 :           +- CometFilter (5)
-      :     :                 :              +- CometScan parquet spark_catalog.default.item (4)
-      :     :                 +- ReusedExchange (10)
-      :     +- BroadcastExchange (30)
-      :        +- * Filter (29)
-      :           +- * HashAggregate (28)
-      :              +- Exchange (27)
-      :                 +- * HashAggregate (26)
-      :                    +- * Project (25)
-      :                       +- * BroadcastHashJoin Inner BuildRight (24)
-      :                          :- * Project (22)
-      :                          :  +- * BroadcastHashJoin Inner BuildRight (21)
-      :                          :     :- * ColumnarToRow (19)
-      :                          :     :  +- CometFilter (18)
-      :                          :     :     +- CometScan parquet spark_catalog.default.catalog_sales (17)
-      :                          :     +- ReusedExchange (20)
-      :                          +- ReusedExchange (23)
-      +- BroadcastExchange (46)
-         +- * Filter (45)
-            +- * HashAggregate (44)
-               +- Exchange (43)
-                  +- * HashAggregate (42)
-                     +- * Project (41)
-                        +- * BroadcastHashJoin Inner BuildRight (40)
-                           :- * Project (38)
-                           :  +- * BroadcastHashJoin Inner BuildRight (37)
-                           :     :- * ColumnarToRow (35)
-                           :     :  +- CometFilter (34)
-                           :     :     +- CometScan parquet spark_catalog.default.web_sales (33)
-                           :     +- ReusedExchange (36)
-                           +- ReusedExchange (39)
+TakeOrderedAndProject (55)
++- * Project (54)
+   +- * BroadcastHashJoin Inner BuildRight (53)
+      :- * Project (36)
+      :  +- * BroadcastHashJoin Inner BuildRight (35)
+      :     :- * ColumnarToRow (18)
+      :     :  +- CometFilter (17)
+      :     :     +- CometHashAggregate (16)
+      :     :        +- CometColumnarExchange (15)
+      :     :           +- RowToColumnar (14)
+      :     :              +- * HashAggregate (13)
+      :     :                 +- * Project (12)
+      :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                       :- * Project (9)
+      :     :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                       :     :- * ColumnarToRow (3)
+      :     :                       :     :  +- CometFilter (2)
+      :     :                       :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :                       :     +- BroadcastExchange (7)
+      :     :                       :        +- * ColumnarToRow (6)
+      :     :                       :           +- CometFilter (5)
+      :     :                       :              +- CometScan parquet spark_catalog.default.item (4)
+      :     :                       +- ReusedExchange (10)
+      :     +- BroadcastExchange (34)
+      :        +- * ColumnarToRow (33)
+      :           +- CometFilter (32)
+      :              +- CometHashAggregate (31)
+      :                 +- CometColumnarExchange (30)
+      :                    +- RowToColumnar (29)
+      :                       +- * HashAggregate (28)
+      :                          +- * Project (27)
+      :                             +- * BroadcastHashJoin Inner BuildRight (26)
+      :                                :- * Project (24)
+      :                                :  +- * BroadcastHashJoin Inner BuildRight (23)
+      :                                :     :- * ColumnarToRow (21)
+      :                                :     :  +- CometFilter (20)
+      :                                :     :     +- CometScan parquet spark_catalog.default.catalog_sales (19)
+      :                                :     +- ReusedExchange (22)
+      :                                +- ReusedExchange (25)
+      +- BroadcastExchange (52)
+         +- * ColumnarToRow (51)
+            +- CometFilter (50)
+               +- CometHashAggregate (49)
+                  +- CometColumnarExchange (48)
+                     +- RowToColumnar (47)
+                        +- * HashAggregate (46)
+                           +- * Project (45)
+                              +- * BroadcastHashJoin Inner BuildRight (44)
+                                 :- * Project (42)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (41)
+                                 :     :- * ColumnarToRow (39)
+                                 :     :  +- CometFilter (38)
+                                 :     :     +- CometScan parquet spark_catalog.default.web_sales (37)
+                                 :     +- ReusedExchange (40)
+                                 +- ReusedExchange (43)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -93,7 +99,7 @@ Join condition: None
 Output [3]: [ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_id#6]
 Input [5]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#5, i_item_id#6]
 
-(10) ReusedExchange [Reuses operator id: 60]
+(10) ReusedExchange [Reuses operator id: 66]
 Output [1]: [d_date_sk#7]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -113,272 +119,284 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#8]
 Results [2]: [i_item_id#6, sum#9]
 
-(14) Exchange
+(14) RowToColumnar
 Input [2]: [i_item_id#6, sum#9]
-Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 15]
+(15) CometColumnarExchange
+Input [2]: [i_item_id#6, sum#9]
+Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [2]: [i_item_id#6, sum#9]
 Keys [1]: [i_item_id#6]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#10]
-Results [2]: [i_item_id#6 AS item_id#11, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#10,17,2) AS ss_item_rev#12]
 
-(16) Filter [codegen id : 15]
-Input [2]: [item_id#11, ss_item_rev#12]
-Condition : isnotnull(ss_item_rev#12)
+(17) CometFilter
+Input [2]: [item_id#10, ss_item_rev#11]
+Condition : isnotnull(ss_item_rev#11)
+
+(18) ColumnarToRow [codegen id : 15]
+Input [2]: [item_id#10, ss_item_rev#11]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15]
+Output [3]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#15), dynamicpruningexpression(cs_sold_date_sk#15 IN dynamicpruning#16)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#14), dynamicpruningexpression(cs_sold_date_sk#14 IN dynamicpruning#15)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(18) CometFilter
-Input [3]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15]
-Condition : isnotnull(cs_item_sk#13)
+(20) CometFilter
+Input [3]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14]
+Condition : isnotnull(cs_item_sk#12)
 
-(19) ColumnarToRow [codegen id : 8]
-Input [3]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15]
+(21) ColumnarToRow [codegen id : 8]
+Input [3]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14]
 
-(20) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#17, i_item_id#18]
+(22) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#16, i_item_id#17]
 
-(21) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [cs_item_sk#13]
-Right keys [1]: [i_item_sk#17]
+(23) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [cs_item_sk#12]
+Right keys [1]: [i_item_sk#16]
 Join type: Inner
 Join condition: None
 
-(22) Project [codegen id : 8]
-Output [3]: [cs_ext_sales_price#14, cs_sold_date_sk#15, i_item_id#18]
-Input [5]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15, i_item_sk#17, i_item_id#18]
+(24) Project [codegen id : 8]
+Output [3]: [cs_ext_sales_price#13, cs_sold_date_sk#14, i_item_id#17]
+Input [5]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14, i_item_sk#16, i_item_id#17]
 
-(23) ReusedExchange [Reuses operator id: 60]
-Output [1]: [d_date_sk#19]
+(25) ReusedExchange [Reuses operator id: 66]
+Output [1]: [d_date_sk#18]
 
-(24) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [cs_sold_date_sk#15]
-Right keys [1]: [d_date_sk#19]
+(26) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [cs_sold_date_sk#14]
+Right keys [1]: [d_date_sk#18]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 8]
-Output [2]: [cs_ext_sales_price#14, i_item_id#18]
-Input [4]: [cs_ext_sales_price#14, cs_sold_date_sk#15, i_item_id#18, d_date_sk#19]
-
-(26) HashAggregate [codegen id : 8]
-Input [2]: [cs_ext_sales_price#14, i_item_id#18]
-Keys [1]: [i_item_id#18]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#14))]
-Aggregate Attributes [1]: [sum#20]
-Results [2]: [i_item_id#18, sum#21]
-
-(27) Exchange
-Input [2]: [i_item_id#18, sum#21]
-Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, [plan_id=3]
-
-(28) HashAggregate [codegen id : 9]
-Input [2]: [i_item_id#18, sum#21]
-Keys [1]: [i_item_id#18]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#14))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#14))#22]
-Results [2]: [i_item_id#18 AS item_id#23, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#14))#22,17,2) AS cs_item_rev#24]
-
-(29) Filter [codegen id : 9]
-Input [2]: [item_id#23, cs_item_rev#24]
-Condition : isnotnull(cs_item_rev#24)
-
-(30) BroadcastExchange
-Input [2]: [item_id#23, cs_item_rev#24]
+(27) Project [codegen id : 8]
+Output [2]: [cs_ext_sales_price#13, i_item_id#17]
+Input [4]: [cs_ext_sales_price#13, cs_sold_date_sk#14, i_item_id#17, d_date_sk#18]
+
+(28) HashAggregate [codegen id : 8]
+Input [2]: [cs_ext_sales_price#13, i_item_id#17]
+Keys [1]: [i_item_id#17]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#13))]
+Aggregate Attributes [1]: [sum#19]
+Results [2]: [i_item_id#17, sum#20]
+
+(29) RowToColumnar
+Input [2]: [i_item_id#17, sum#20]
+
+(30) CometColumnarExchange
+Input [2]: [i_item_id#17, sum#20]
+Arguments: hashpartitioning(i_item_id#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(31) CometHashAggregate
+Input [2]: [i_item_id#17, sum#20]
+Keys [1]: [i_item_id#17]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#13))]
+
+(32) CometFilter
+Input [2]: [item_id#21, cs_item_rev#22]
+Condition : isnotnull(cs_item_rev#22)
+
+(33) ColumnarToRow [codegen id : 9]
+Input [2]: [item_id#21, cs_item_rev#22]
+
+(34) BroadcastExchange
+Input [2]: [item_id#21, cs_item_rev#22]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=4]
 
-(31) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [item_id#11]
-Right keys [1]: [item_id#23]
+(35) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [item_id#10]
+Right keys [1]: [item_id#21]
 Join type: Inner
-Join condition: ((((cast(ss_item_rev#12 as decimal(19,3)) >= (0.9 * cs_item_rev#24)) AND (cast(ss_item_rev#12 as decimal(20,3)) <= (1.1 * cs_item_rev#24))) AND (cast(cs_item_rev#24 as decimal(19,3)) >= (0.9 * ss_item_rev#12))) AND (cast(cs_item_rev#24 as decimal(20,3)) <= (1.1 * ss_item_rev#12)))
+Join condition: ((((cast(ss_item_rev#11 as decimal(19,3)) >= (0.9 * cs_item_rev#22)) AND (cast(ss_item_rev#11 as decimal(20,3)) <= (1.1 * cs_item_rev#22))) AND (cast(cs_item_rev#22 as decimal(19,3)) >= (0.9 * ss_item_rev#11))) AND (cast(cs_item_rev#22 as decimal(20,3)) <= (1.1 * ss_item_rev#11)))
 
-(32) Project [codegen id : 15]
-Output [3]: [item_id#11, ss_item_rev#12, cs_item_rev#24]
-Input [4]: [item_id#11, ss_item_rev#12, item_id#23, cs_item_rev#24]
+(36) Project [codegen id : 15]
+Output [3]: [item_id#10, ss_item_rev#11, cs_item_rev#22]
+Input [4]: [item_id#10, ss_item_rev#11, item_id#21, cs_item_rev#22]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27]
+Output [3]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#27), dynamicpruningexpression(ws_sold_date_sk#27 IN dynamicpruning#28)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#25), dynamicpruningexpression(ws_sold_date_sk#25 IN dynamicpruning#26)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(34) CometFilter
-Input [3]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27]
-Condition : isnotnull(ws_item_sk#25)
+(38) CometFilter
+Input [3]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25]
+Condition : isnotnull(ws_item_sk#23)
 
-(35) ColumnarToRow [codegen id : 13]
-Input [3]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27]
+(39) ColumnarToRow [codegen id : 13]
+Input [3]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25]
 
-(36) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#29, i_item_id#30]
+(40) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#27, i_item_id#28]
 
-(37) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ws_item_sk#25]
-Right keys [1]: [i_item_sk#29]
+(41) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ws_item_sk#23]
+Right keys [1]: [i_item_sk#27]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 13]
-Output [3]: [ws_ext_sales_price#26, ws_sold_date_sk#27, i_item_id#30]
-Input [5]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27, i_item_sk#29, i_item_id#30]
+(42) Project [codegen id : 13]
+Output [3]: [ws_ext_sales_price#24, ws_sold_date_sk#25, i_item_id#28]
+Input [5]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25, i_item_sk#27, i_item_id#28]
 
-(39) ReusedExchange [Reuses operator id: 60]
-Output [1]: [d_date_sk#31]
+(43) ReusedExchange [Reuses operator id: 66]
+Output [1]: [d_date_sk#29]
 
-(40) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ws_sold_date_sk#27]
-Right keys [1]: [d_date_sk#31]
+(44) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ws_sold_date_sk#25]
+Right keys [1]: [d_date_sk#29]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 13]
-Output [2]: [ws_ext_sales_price#26, i_item_id#30]
-Input [4]: [ws_ext_sales_price#26, ws_sold_date_sk#27, i_item_id#30, d_date_sk#31]
-
-(42) HashAggregate [codegen id : 13]
-Input [2]: [ws_ext_sales_price#26, i_item_id#30]
-Keys [1]: [i_item_id#30]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#26))]
-Aggregate Attributes [1]: [sum#32]
-Results [2]: [i_item_id#30, sum#33]
-
-(43) Exchange
-Input [2]: [i_item_id#30, sum#33]
-Arguments: hashpartitioning(i_item_id#30, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(44) HashAggregate [codegen id : 14]
-Input [2]: [i_item_id#30, sum#33]
-Keys [1]: [i_item_id#30]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#26))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#26))#34]
-Results [2]: [i_item_id#30 AS item_id#35, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#26))#34,17,2) AS ws_item_rev#36]
-
-(45) Filter [codegen id : 14]
-Input [2]: [item_id#35, ws_item_rev#36]
-Condition : isnotnull(ws_item_rev#36)
-
-(46) BroadcastExchange
-Input [2]: [item_id#35, ws_item_rev#36]
+(45) Project [codegen id : 13]
+Output [2]: [ws_ext_sales_price#24, i_item_id#28]
+Input [4]: [ws_ext_sales_price#24, ws_sold_date_sk#25, i_item_id#28, d_date_sk#29]
+
+(46) HashAggregate [codegen id : 13]
+Input [2]: [ws_ext_sales_price#24, i_item_id#28]
+Keys [1]: [i_item_id#28]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#24))]
+Aggregate Attributes [1]: [sum#30]
+Results [2]: [i_item_id#28, sum#31]
+
+(47) RowToColumnar
+Input [2]: [i_item_id#28, sum#31]
+
+(48) CometColumnarExchange
+Input [2]: [i_item_id#28, sum#31]
+Arguments: hashpartitioning(i_item_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(49) CometHashAggregate
+Input [2]: [i_item_id#28, sum#31]
+Keys [1]: [i_item_id#28]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#24))]
+
+(50) CometFilter
+Input [2]: [item_id#32, ws_item_rev#33]
+Condition : isnotnull(ws_item_rev#33)
+
+(51) ColumnarToRow [codegen id : 14]
+Input [2]: [item_id#32, ws_item_rev#33]
+
+(52) BroadcastExchange
+Input [2]: [item_id#32, ws_item_rev#33]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=6]
 
-(47) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [item_id#11]
-Right keys [1]: [item_id#35]
+(53) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [item_id#10]
+Right keys [1]: [item_id#32]
 Join type: Inner
-Join condition: ((((((((cast(ss_item_rev#12 as decimal(19,3)) >= (0.9 * ws_item_rev#36)) AND (cast(ss_item_rev#12 as decimal(20,3)) <= (1.1 * ws_item_rev#36))) AND (cast(cs_item_rev#24 as decimal(19,3)) >= (0.9 * ws_item_rev#36))) AND (cast(cs_item_rev#24 as decimal(20,3)) <= (1.1 * ws_item_rev#36))) AND (cast(ws_item_rev#36 as decimal(19,3)) >= (0.9 * ss_item_rev#12))) AND (cast(ws_item_rev#36 as decimal(20,3)) <= (1.1 * ss_item_rev#12))) AND (cast(ws_item_rev#36 as decimal(19,3)) >= (0.9 * cs_item_rev#24))) AND (cast(ws_item_rev#36 as decimal(20,3)) <= (1.1 * cs_item_rev#24)))
+Join condition: ((((((((cast(ss_item_rev#11 as decimal(19,3)) >= (0.9 * ws_item_rev#33)) AND (cast(ss_item_rev#11 as decimal(20,3)) <= (1.1 * ws_item_rev#33))) AND (cast(cs_item_rev#22 as decimal(19,3)) >= (0.9 * ws_item_rev#33))) AND (cast(cs_item_rev#22 as decimal(20,3)) <= (1.1 * ws_item_rev#33))) AND (cast(ws_item_rev#33 as decimal(19,3)) >= (0.9 * ss_item_rev#11))) AND (cast(ws_item_rev#33 as decimal(20,3)) <= (1.1 * ss_item_rev#11))) AND (cast(ws_item_rev#33 as decimal(19,3)) >= (0.9 * cs_item_rev#22))) AND (cast(ws_item_rev#33 as decimal(20,3)) <= (1.1 * cs_item_rev#22)))
 
-(48) Project [codegen id : 15]
-Output [8]: [item_id#11, ss_item_rev#12, (((ss_item_rev#12 / ((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36)) / 3) * 100) AS ss_dev#37, cs_item_rev#24, (((cs_item_rev#24 / ((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36)) / 3) * 100) AS cs_dev#38, ws_item_rev#36, (((ws_item_rev#36 / ((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36)) / 3) * 100) AS ws_dev#39, (((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36) / 3) AS average#40]
-Input [5]: [item_id#11, ss_item_rev#12, cs_item_rev#24, item_id#35, ws_item_rev#36]
+(54) Project [codegen id : 15]
+Output [8]: [item_id#10, ss_item_rev#11, (((ss_item_rev#11 / ((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33)) / 3) * 100) AS ss_dev#34, cs_item_rev#22, (((cs_item_rev#22 / ((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33)) / 3) * 100) AS cs_dev#35, ws_item_rev#33, (((ws_item_rev#33 / ((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33)) / 3) * 100) AS ws_dev#36, (((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33) / 3) AS average#37]
+Input [5]: [item_id#10, ss_item_rev#11, cs_item_rev#22, item_id#32, ws_item_rev#33]
 
-(49) TakeOrderedAndProject
-Input [8]: [item_id#11, ss_item_rev#12, ss_dev#37, cs_item_rev#24, cs_dev#38, ws_item_rev#36, ws_dev#39, average#40]
-Arguments: 100, [item_id#11 ASC NULLS FIRST, ss_item_rev#12 ASC NULLS FIRST], [item_id#11, ss_item_rev#12, ss_dev#37, cs_item_rev#24, cs_dev#38, ws_item_rev#36, ws_dev#39, average#40]
+(55) TakeOrderedAndProject
+Input [8]: [item_id#10, ss_item_rev#11, ss_dev#34, cs_item_rev#22, cs_dev#35, ws_item_rev#33, ws_dev#36, average#37]
+Arguments: 100, [item_id#10 ASC NULLS FIRST, ss_item_rev#11 ASC NULLS FIRST], [item_id#10, ss_item_rev#11, ss_dev#34, cs_item_rev#22, cs_dev#35, ws_item_rev#33, ws_dev#36, average#37]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (60)
-+- * Project (59)
-   +- * BroadcastHashJoin LeftSemi BuildRight (58)
-      :- * ColumnarToRow (52)
-      :  +- CometFilter (51)
-      :     +- CometScan parquet spark_catalog.default.date_dim (50)
-      +- BroadcastExchange (57)
-         +- * ColumnarToRow (56)
-            +- CometProject (55)
-               +- CometFilter (54)
-                  +- CometScan parquet spark_catalog.default.date_dim (53)
+BroadcastExchange (66)
++- * Project (65)
+   +- * BroadcastHashJoin LeftSemi BuildRight (64)
+      :- * ColumnarToRow (58)
+      :  +- CometFilter (57)
+      :     +- CometScan parquet spark_catalog.default.date_dim (56)
+      +- BroadcastExchange (63)
+         +- * ColumnarToRow (62)
+            +- CometProject (61)
+               +- CometFilter (60)
+                  +- CometScan parquet spark_catalog.default.date_dim (59)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_date#41]
+Output [2]: [d_date_sk#7, d_date#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(51) CometFilter
-Input [2]: [d_date_sk#7, d_date#41]
+(57) CometFilter
+Input [2]: [d_date_sk#7, d_date#38]
 Condition : isnotnull(d_date_sk#7)
 
-(52) ColumnarToRow [codegen id : 2]
-Input [2]: [d_date_sk#7, d_date#41]
+(58) ColumnarToRow [codegen id : 2]
+Input [2]: [d_date_sk#7, d_date#38]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#42, d_week_seq#43]
+Output [2]: [d_date#39, d_week_seq#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq)]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(54) CometFilter
-Input [2]: [d_date#42, d_week_seq#43]
-Condition : (isnotnull(d_week_seq#43) AND (d_week_seq#43 = Subquery scalar-subquery#44, [id=#45]))
+(60) CometFilter
+Input [2]: [d_date#39, d_week_seq#40]
+Condition : (isnotnull(d_week_seq#40) AND (d_week_seq#40 = Subquery scalar-subquery#41, [id=#42]))
 
-(55) CometProject
-Input [2]: [d_date#42, d_week_seq#43]
-Arguments: [d_date#42], [d_date#42]
+(61) CometProject
+Input [2]: [d_date#39, d_week_seq#40]
+Arguments: [d_date#39], [d_date#39]
 
-(56) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date#42]
+(62) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date#39]
 
-(57) BroadcastExchange
-Input [1]: [d_date#42]
+(63) BroadcastExchange
+Input [1]: [d_date#39]
 Arguments: HashedRelationBroadcastMode(List(input[0, date, true]),false), [plan_id=7]
 
-(58) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [d_date#41]
-Right keys [1]: [d_date#42]
+(64) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [d_date#38]
+Right keys [1]: [d_date#39]
 Join type: LeftSemi
 Join condition: None
 
-(59) Project [codegen id : 2]
+(65) Project [codegen id : 2]
 Output [1]: [d_date_sk#7]
-Input [2]: [d_date_sk#7, d_date#41]
+Input [2]: [d_date_sk#7, d_date#38]
 
-(60) BroadcastExchange
+(66) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 54 Hosting Expression = Subquery scalar-subquery#44, [id=#45]
-* ColumnarToRow (64)
-+- CometProject (63)
-   +- CometFilter (62)
-      +- CometScan parquet spark_catalog.default.date_dim (61)
+Subquery:2 Hosting operator id = 60 Hosting Expression = Subquery scalar-subquery#41, [id=#42]
+* ColumnarToRow (70)
++- CometProject (69)
+   +- CometFilter (68)
+      +- CometScan parquet spark_catalog.default.date_dim (67)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#46, d_week_seq#47]
+Output [2]: [d_date#43, d_week_seq#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), EqualTo(d_date,2000-01-03)]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(62) CometFilter
-Input [2]: [d_date#46, d_week_seq#47]
-Condition : (isnotnull(d_date#46) AND (d_date#46 = 2000-01-03))
+(68) CometFilter
+Input [2]: [d_date#43, d_week_seq#44]
+Condition : (isnotnull(d_date#43) AND (d_date#43 = 2000-01-03))
 
-(63) CometProject
-Input [2]: [d_date#46, d_week_seq#47]
-Arguments: [d_week_seq#47], [d_week_seq#47]
+(69) CometProject
+Input [2]: [d_date#43, d_week_seq#44]
+Arguments: [d_week_seq#44], [d_week_seq#44]
 
-(64) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#47]
+(70) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#44]
 
-Subquery:3 Hosting operator id = 17 Hosting Expression = cs_sold_date_sk#15 IN dynamicpruning#4
+Subquery:3 Hosting operator id = 19 Hosting Expression = cs_sold_date_sk#14 IN dynamicpruning#4
 
-Subquery:4 Hosting operator id = 33 Hosting Expression = ws_sold_date_sk#27 IN dynamicpruning#4
+Subquery:4 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#25 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt
index d3bb0dc388..63eb226bb0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt
@@ -4,94 +4,100 @@ TakeOrderedAndProject [item_id,ss_item_rev,ss_dev,cs_item_rev,cs_dev,ws_item_rev
       BroadcastHashJoin [item_id,item_id,ss_item_rev,ws_item_rev,cs_item_rev]
         Project [item_id,ss_item_rev,cs_item_rev]
           BroadcastHashJoin [item_id,item_id,ss_item_rev,cs_item_rev]
-            Filter [ss_item_rev]
-              HashAggregate [i_item_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),item_id,ss_item_rev,sum]
-                InputAdapter
-                  Exchange [i_item_id] #1
-                    WholeStageCodegen (4)
-                      HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
-                        Project [ss_ext_sales_price,i_item_id]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id]
-                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (2)
-                                              Project [d_date_sk]
-                                                BroadcastHashJoin [d_date,d_date]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [d_date_sk]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                  InputAdapter
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date]
-                                                              CometFilter [d_week_seq]
-                                                                Subquery #2
-                                                                  WholeStageCodegen (1)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [d_week_seq]
-                                                                          CometFilter [d_date]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+            ColumnarToRow
+              InputAdapter
+                CometFilter [ss_item_rev]
+                  CometHashAggregate [i_item_id,sum]
+                    CometColumnarExchange [i_item_id] #1
+                      RowToColumnar
+                        WholeStageCodegen (4)
+                          HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
+                            Project [ss_ext_sales_price,i_item_id]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id]
+                                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_item_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (2)
+                                                  Project [d_date_sk]
+                                                    BroadcastHashJoin [d_date,d_date]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                      InputAdapter
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date]
+                                                                  CometFilter [d_week_seq]
+                                                                    Subquery #2
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometProject [d_week_seq]
+                                                                              CometFilter [d_date]
+                                                                                CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                                    InputAdapter
+                                      BroadcastExchange #4
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [i_item_sk,i_item_id]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                                 InputAdapter
-                                  BroadcastExchange #4
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk,i_item_id]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                            InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                                  ReusedExchange [d_date_sk] #2
             InputAdapter
               BroadcastExchange #5
                 WholeStageCodegen (9)
-                  Filter [cs_item_rev]
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),item_id,cs_item_rev,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #6
-                          WholeStageCodegen (8)
-                            HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
-                              Project [cs_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                  Project [cs_ext_sales_price,cs_sold_date_sk,i_item_id]
-                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [cs_item_rev]
+                        CometHashAggregate [i_item_id,sum]
+                          CometColumnarExchange [i_item_id] #6
+                            RowToColumnar
+                              WholeStageCodegen (8)
+                                HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
+                                  Project [cs_ext_sales_price,i_item_id]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      Project [cs_ext_sales_price,cs_sold_date_sk,i_item_id]
+                                        BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [i_item_sk,i_item_id] #4
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #2
+        InputAdapter
+          BroadcastExchange #7
+            WholeStageCodegen (14)
+              ColumnarToRow
+                InputAdapter
+                  CometFilter [ws_item_rev]
+                    CometHashAggregate [i_item_id,sum]
+                      CometColumnarExchange [i_item_id] #8
+                        RowToColumnar
+                          WholeStageCodegen (13)
+                            HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
+                              Project [ws_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  Project [ws_ext_sales_price,ws_sold_date_sk,i_item_id]
+                                    BroadcastHashJoin [ws_item_sk,i_item_sk]
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [cs_item_sk]
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                          CometFilter [ws_item_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_sales_price,ws_sold_date_sk]
                                               ReusedSubquery [d_date_sk] #1
                                       InputAdapter
                                         ReusedExchange [i_item_sk,i_item_id] #4
                                   InputAdapter
                                     ReusedExchange [d_date_sk] #2
-        InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (14)
-              Filter [ws_item_rev]
-                HashAggregate [i_item_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),item_id,ws_item_rev,sum]
-                  InputAdapter
-                    Exchange [i_item_id] #8
-                      WholeStageCodegen (13)
-                        HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
-                          Project [ws_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                              Project [ws_ext_sales_price,ws_sold_date_sk,i_item_id]
-                                BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ws_item_sk]
-                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                          ReusedSubquery [d_date_sk] #1
-                                  InputAdapter
-                                    ReusedExchange [i_item_sk,i_item_id] #4
-                              InputAdapter
-                                ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt
index 62b3f58686..d2241863e3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt
@@ -1,48 +1,51 @@
 == Physical Plan ==
-TakeOrderedAndProject (44)
-+- * Project (43)
-   +- * BroadcastHashJoin Inner BuildRight (42)
-      :- * Project (25)
-      :  +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :- * Project (18)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :     :- * HashAggregate (12)
-      :     :     :  +- Exchange (11)
-      :     :     :     +- * HashAggregate (10)
-      :     :     :        +- * Project (9)
-      :     :     :           +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :     :              :- * ColumnarToRow (3)
-      :     :     :              :  +- CometFilter (2)
-      :     :     :              :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :     :              +- BroadcastExchange (7)
-      :     :     :                 +- * ColumnarToRow (6)
-      :     :     :                    +- CometFilter (5)
-      :     :     :                       +- CometScan parquet spark_catalog.default.date_dim (4)
-      :     :     +- BroadcastExchange (16)
-      :     :        +- * ColumnarToRow (15)
-      :     :           +- CometFilter (14)
-      :     :              +- CometScan parquet spark_catalog.default.store (13)
-      :     +- BroadcastExchange (23)
-      :        +- * ColumnarToRow (22)
-      :           +- CometProject (21)
-      :              +- CometFilter (20)
-      :                 +- CometScan parquet spark_catalog.default.date_dim (19)
-      +- BroadcastExchange (41)
-         +- * Project (40)
-            +- * BroadcastHashJoin Inner BuildRight (39)
-               :- * Project (33)
-               :  +- * BroadcastHashJoin Inner BuildRight (32)
-               :     :- * HashAggregate (27)
-               :     :  +- ReusedExchange (26)
-               :     +- BroadcastExchange (31)
-               :        +- * ColumnarToRow (30)
-               :           +- CometFilter (29)
-               :              +- CometScan parquet spark_catalog.default.store (28)
-               +- BroadcastExchange (38)
-                  +- * ColumnarToRow (37)
-                     +- CometProject (36)
-                        +- CometFilter (35)
-                           +- CometScan parquet spark_catalog.default.date_dim (34)
+TakeOrderedAndProject (47)
++- * Project (46)
+   +- * BroadcastHashJoin Inner BuildRight (45)
+      :- * Project (27)
+      :  +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :- * Project (20)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+      :     :     :- * ColumnarToRow (14)
+      :     :     :  +- CometHashAggregate (13)
+      :     :     :     +- CometColumnarExchange (12)
+      :     :     :        +- RowToColumnar (11)
+      :     :     :           +- * HashAggregate (10)
+      :     :     :              +- * Project (9)
+      :     :     :                 +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :     :                    :- * ColumnarToRow (3)
+      :     :     :                    :  +- CometFilter (2)
+      :     :     :                    :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :     :                    +- BroadcastExchange (7)
+      :     :     :                       +- * ColumnarToRow (6)
+      :     :     :                          +- CometFilter (5)
+      :     :     :                             +- CometScan parquet spark_catalog.default.date_dim (4)
+      :     :     +- BroadcastExchange (18)
+      :     :        +- * ColumnarToRow (17)
+      :     :           +- CometFilter (16)
+      :     :              +- CometScan parquet spark_catalog.default.store (15)
+      :     +- BroadcastExchange (25)
+      :        +- * ColumnarToRow (24)
+      :           +- CometProject (23)
+      :              +- CometFilter (22)
+      :                 +- CometScan parquet spark_catalog.default.date_dim (21)
+      +- BroadcastExchange (44)
+         +- * Project (43)
+            +- * BroadcastHashJoin Inner BuildRight (42)
+               :- * Project (36)
+               :  +- * BroadcastHashJoin Inner BuildRight (35)
+               :     :- * ColumnarToRow (30)
+               :     :  +- CometHashAggregate (29)
+               :     :     +- ReusedExchange (28)
+               :     +- BroadcastExchange (34)
+               :        +- * ColumnarToRow (33)
+               :           +- CometFilter (32)
+               :              +- CometScan parquet spark_catalog.default.store (31)
+               +- BroadcastExchange (41)
+                  +- * ColumnarToRow (40)
+                     +- CometProject (39)
+                        +- CometFilter (38)
+                           +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -95,162 +98,167 @@ Functions [7]: [partial_sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) T
 Aggregate Attributes [7]: [sum#7, sum#8, sum#9, sum#10, sum#11, sum#12, sum#13]
 Results [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
 
-(11) Exchange
+(11) RowToColumnar
 Input [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
-Arguments: hashpartitioning(d_week_seq#5, ss_store_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(12) HashAggregate [codegen id : 10]
+(12) CometColumnarExchange
+Input [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
+Arguments: hashpartitioning(d_week_seq#5, ss_store_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(13) CometHashAggregate
 Input [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
 Keys [2]: [d_week_seq#5, ss_store_sk#1]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))]
-Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27]
-Results [9]: [d_week_seq#5, ss_store_sk#1, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21,17,2) AS sun_sales#28, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22,17,2) AS mon_sales#29, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23,17,2) AS tue_sales#30, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24,17,2) AS wed_sales#31, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25,17,2) AS thu_sales#32, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26,17,2) AS fri_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27,17,2) AS sat_sales#34]
+
+(14) ColumnarToRow [codegen id : 10]
+Input [9]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27]
 
 (unknown) Scan parquet spark_catalog.default.store
-Output [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
+Output [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_id)]
 ReadSchema: struct<s_store_sk:int,s_store_id:string,s_store_name:string>
 
-(14) CometFilter
-Input [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
-Condition : (isnotnull(s_store_sk#35) AND isnotnull(s_store_id#36))
+(16) CometFilter
+Input [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
+Condition : (isnotnull(s_store_sk#28) AND isnotnull(s_store_id#29))
 
-(15) ColumnarToRow [codegen id : 3]
-Input [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
+(17) ColumnarToRow [codegen id : 3]
+Input [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
 
-(16) BroadcastExchange
-Input [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
+(18) BroadcastExchange
+Input [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(17) BroadcastHashJoin [codegen id : 10]
+(19) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ss_store_sk#1]
-Right keys [1]: [s_store_sk#35]
+Right keys [1]: [s_store_sk#28]
 Join type: Inner
 Join condition: None
 
-(18) Project [codegen id : 10]
-Output [10]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#36, s_store_name#37]
-Input [12]: [d_week_seq#5, ss_store_sk#1, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_sk#35, s_store_id#36, s_store_name#37]
+(20) Project [codegen id : 10]
+Output [10]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#29, s_store_name#30]
+Input [12]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_sk#28, s_store_id#29, s_store_name#30]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_month_seq#38, d_week_seq#39]
+Output [2]: [d_month_seq#31, d_week_seq#32]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_month_seq:int,d_week_seq:int>
 
-(20) CometFilter
-Input [2]: [d_month_seq#38, d_week_seq#39]
-Condition : (((isnotnull(d_month_seq#38) AND (d_month_seq#38 >= 1212)) AND (d_month_seq#38 <= 1223)) AND isnotnull(d_week_seq#39))
+(22) CometFilter
+Input [2]: [d_month_seq#31, d_week_seq#32]
+Condition : (((isnotnull(d_month_seq#31) AND (d_month_seq#31 >= 1212)) AND (d_month_seq#31 <= 1223)) AND isnotnull(d_week_seq#32))
 
-(21) CometProject
-Input [2]: [d_month_seq#38, d_week_seq#39]
-Arguments: [d_week_seq#39], [d_week_seq#39]
+(23) CometProject
+Input [2]: [d_month_seq#31, d_week_seq#32]
+Arguments: [d_week_seq#32], [d_week_seq#32]
 
-(22) ColumnarToRow [codegen id : 4]
-Input [1]: [d_week_seq#39]
+(24) ColumnarToRow [codegen id : 4]
+Input [1]: [d_week_seq#32]
 
-(23) BroadcastExchange
-Input [1]: [d_week_seq#39]
+(25) BroadcastExchange
+Input [1]: [d_week_seq#32]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(24) BroadcastHashJoin [codegen id : 10]
+(26) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [d_week_seq#5]
-Right keys [1]: [d_week_seq#39]
+Right keys [1]: [d_week_seq#32]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 10]
-Output [10]: [s_store_name#37 AS s_store_name1#40, d_week_seq#5 AS d_week_seq1#41, s_store_id#36 AS s_store_id1#42, sun_sales#28 AS sun_sales1#43, mon_sales#29 AS mon_sales1#44, tue_sales#30 AS tue_sales1#45, wed_sales#31 AS wed_sales1#46, thu_sales#32 AS thu_sales1#47, fri_sales#33 AS fri_sales1#48, sat_sales#34 AS sat_sales1#49]
-Input [11]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#36, s_store_name#37, d_week_seq#39]
+(27) Project [codegen id : 10]
+Output [10]: [s_store_name#30 AS s_store_name1#33, d_week_seq#5 AS d_week_seq1#34, s_store_id#29 AS s_store_id1#35, sun_sales#21 AS sun_sales1#36, mon_sales#22 AS mon_sales1#37, tue_sales#23 AS tue_sales1#38, wed_sales#24 AS wed_sales1#39, thu_sales#25 AS thu_sales1#40, fri_sales#26 AS fri_sales1#41, sat_sales#27 AS sat_sales1#42]
+Input [11]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#29, s_store_name#30, d_week_seq#32]
 
-(26) ReusedExchange [Reuses operator id: 11]
-Output [9]: [d_week_seq#5, ss_store_sk#1, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
+(28) ReusedExchange [Reuses operator id: 12]
+Output [9]: [d_week_seq#5, ss_store_sk#1, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
 
-(27) HashAggregate [codegen id : 9]
-Input [9]: [d_week_seq#5, ss_store_sk#1, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
+(29) CometHashAggregate
+Input [9]: [d_week_seq#5, ss_store_sk#1, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
 Keys [2]: [d_week_seq#5, ss_store_sk#1]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))]
-Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27]
-Results [9]: [d_week_seq#5, ss_store_sk#1, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21,17,2) AS sun_sales#28, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22,17,2) AS mon_sales#29, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23,17,2) AS tue_sales#30, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24,17,2) AS wed_sales#31, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25,17,2) AS thu_sales#32, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26,17,2) AS fri_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27,17,2) AS sat_sales#34]
+
+(30) ColumnarToRow [codegen id : 9]
+Input [9]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27]
 
 (unknown) Scan parquet spark_catalog.default.store
-Output [2]: [s_store_sk#57, s_store_id#58]
+Output [2]: [s_store_sk#50, s_store_id#51]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_id)]
 ReadSchema: struct<s_store_sk:int,s_store_id:string>
 
-(29) CometFilter
-Input [2]: [s_store_sk#57, s_store_id#58]
-Condition : (isnotnull(s_store_sk#57) AND isnotnull(s_store_id#58))
+(32) CometFilter
+Input [2]: [s_store_sk#50, s_store_id#51]
+Condition : (isnotnull(s_store_sk#50) AND isnotnull(s_store_id#51))
 
-(30) ColumnarToRow [codegen id : 7]
-Input [2]: [s_store_sk#57, s_store_id#58]
+(33) ColumnarToRow [codegen id : 7]
+Input [2]: [s_store_sk#50, s_store_id#51]
 
-(31) BroadcastExchange
-Input [2]: [s_store_sk#57, s_store_id#58]
+(34) BroadcastExchange
+Input [2]: [s_store_sk#50, s_store_id#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(32) BroadcastHashJoin [codegen id : 9]
+(35) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_store_sk#1]
-Right keys [1]: [s_store_sk#57]
+Right keys [1]: [s_store_sk#50]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 9]
-Output [9]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#58]
-Input [11]: [d_week_seq#5, ss_store_sk#1, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_sk#57, s_store_id#58]
+(36) Project [codegen id : 9]
+Output [9]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#51]
+Input [11]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_sk#50, s_store_id#51]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_month_seq#59, d_week_seq#60]
+Output [2]: [d_month_seq#52, d_week_seq#53]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1224), LessThanOrEqual(d_month_seq,1235), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_month_seq:int,d_week_seq:int>
 
-(35) CometFilter
-Input [2]: [d_month_seq#59, d_week_seq#60]
-Condition : (((isnotnull(d_month_seq#59) AND (d_month_seq#59 >= 1224)) AND (d_month_seq#59 <= 1235)) AND isnotnull(d_week_seq#60))
+(38) CometFilter
+Input [2]: [d_month_seq#52, d_week_seq#53]
+Condition : (((isnotnull(d_month_seq#52) AND (d_month_seq#52 >= 1224)) AND (d_month_seq#52 <= 1235)) AND isnotnull(d_week_seq#53))
 
-(36) CometProject
-Input [2]: [d_month_seq#59, d_week_seq#60]
-Arguments: [d_week_seq#60], [d_week_seq#60]
+(39) CometProject
+Input [2]: [d_month_seq#52, d_week_seq#53]
+Arguments: [d_week_seq#53], [d_week_seq#53]
 
-(37) ColumnarToRow [codegen id : 8]
-Input [1]: [d_week_seq#60]
+(40) ColumnarToRow [codegen id : 8]
+Input [1]: [d_week_seq#53]
 
-(38) BroadcastExchange
-Input [1]: [d_week_seq#60]
+(41) BroadcastExchange
+Input [1]: [d_week_seq#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
-(39) BroadcastHashJoin [codegen id : 9]
+(42) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [d_week_seq#5]
-Right keys [1]: [d_week_seq#60]
+Right keys [1]: [d_week_seq#53]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 9]
-Output [9]: [d_week_seq#5 AS d_week_seq2#61, s_store_id#58 AS s_store_id2#62, sun_sales#28 AS sun_sales2#63, mon_sales#29 AS mon_sales2#64, tue_sales#30 AS tue_sales2#65, wed_sales#31 AS wed_sales2#66, thu_sales#32 AS thu_sales2#67, fri_sales#33 AS fri_sales2#68, sat_sales#34 AS sat_sales2#69]
-Input [10]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#58, d_week_seq#60]
+(43) Project [codegen id : 9]
+Output [9]: [d_week_seq#5 AS d_week_seq2#54, s_store_id#51 AS s_store_id2#55, sun_sales#21 AS sun_sales2#56, mon_sales#22 AS mon_sales2#57, tue_sales#23 AS tue_sales2#58, wed_sales#24 AS wed_sales2#59, thu_sales#25 AS thu_sales2#60, fri_sales#26 AS fri_sales2#61, sat_sales#27 AS sat_sales2#62]
+Input [10]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#51, d_week_seq#53]
 
-(41) BroadcastExchange
-Input [9]: [d_week_seq2#61, s_store_id2#62, sun_sales2#63, mon_sales2#64, tue_sales2#65, wed_sales2#66, thu_sales2#67, fri_sales2#68, sat_sales2#69]
+(44) BroadcastExchange
+Input [9]: [d_week_seq2#54, s_store_id2#55, sun_sales2#56, mon_sales2#57, tue_sales2#58, wed_sales2#59, thu_sales2#60, fri_sales2#61, sat_sales2#62]
 Arguments: HashedRelationBroadcastMode(List(input[1, string, true], (input[0, int, true] - 52)),false), [plan_id=7]
 
-(42) BroadcastHashJoin [codegen id : 10]
-Left keys [2]: [s_store_id1#42, d_week_seq1#41]
-Right keys [2]: [s_store_id2#62, (d_week_seq2#61 - 52)]
+(45) BroadcastHashJoin [codegen id : 10]
+Left keys [2]: [s_store_id1#35, d_week_seq1#34]
+Right keys [2]: [s_store_id2#55, (d_week_seq2#54 - 52)]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 10]
-Output [10]: [s_store_name1#40, s_store_id1#42, d_week_seq1#41, (sun_sales1#43 / sun_sales2#63) AS (sun_sales1 / sun_sales2)#70, (mon_sales1#44 / mon_sales2#64) AS (mon_sales1 / mon_sales2)#71, (tue_sales1#45 / tue_sales2#65) AS (tue_sales1 / tue_sales2)#72, (wed_sales1#46 / wed_sales2#66) AS (wed_sales1 / wed_sales2)#73, (thu_sales1#47 / thu_sales2#67) AS (thu_sales1 / thu_sales2)#74, (fri_sales1#48 / fri_sales2#68) AS (fri_sales1 / fri_sales2)#75, (sat_sales1#49 / sat_sales2#69) AS (sat_sales1 / sat_sales2)#76]
-Input [19]: [s_store_name1#40, d_week_seq1#41, s_store_id1#42, sun_sales1#43, mon_sales1#44, tue_sales1#45, wed_sales1#46, thu_sales1#47, fri_sales1#48, sat_sales1#49, d_week_seq2#61, s_store_id2#62, sun_sales2#63, mon_sales2#64, tue_sales2#65, wed_sales2#66, thu_sales2#67, fri_sales2#68, sat_sales2#69]
+(46) Project [codegen id : 10]
+Output [10]: [s_store_name1#33, s_store_id1#35, d_week_seq1#34, (sun_sales1#36 / sun_sales2#56) AS (sun_sales1 / sun_sales2)#63, (mon_sales1#37 / mon_sales2#57) AS (mon_sales1 / mon_sales2)#64, (tue_sales1#38 / tue_sales2#58) AS (tue_sales1 / tue_sales2)#65, (wed_sales1#39 / wed_sales2#59) AS (wed_sales1 / wed_sales2)#66, (thu_sales1#40 / thu_sales2#60) AS (thu_sales1 / thu_sales2)#67, (fri_sales1#41 / fri_sales2#61) AS (fri_sales1 / fri_sales2)#68, (sat_sales1#42 / sat_sales2#62) AS (sat_sales1 / sat_sales2)#69]
+Input [19]: [s_store_name1#33, d_week_seq1#34, s_store_id1#35, sun_sales1#36, mon_sales1#37, tue_sales1#38, wed_sales1#39, thu_sales1#40, fri_sales1#41, sat_sales1#42, d_week_seq2#54, s_store_id2#55, sun_sales2#56, mon_sales2#57, tue_sales2#58, wed_sales2#59, thu_sales2#60, fri_sales2#61, sat_sales2#62]
 
-(44) TakeOrderedAndProject
-Input [10]: [s_store_name1#40, s_store_id1#42, d_week_seq1#41, (sun_sales1 / sun_sales2)#70, (mon_sales1 / mon_sales2)#71, (tue_sales1 / tue_sales2)#72, (wed_sales1 / wed_sales2)#73, (thu_sales1 / thu_sales2)#74, (fri_sales1 / fri_sales2)#75, (sat_sales1 / sat_sales2)#76]
-Arguments: 100, [s_store_name1#40 ASC NULLS FIRST, s_store_id1#42 ASC NULLS FIRST, d_week_seq1#41 ASC NULLS FIRST], [s_store_name1#40, s_store_id1#42, d_week_seq1#41, (sun_sales1 / sun_sales2)#70, (mon_sales1 / mon_sales2)#71, (tue_sales1 / tue_sales2)#72, (wed_sales1 / wed_sales2)#73, (thu_sales1 / thu_sales2)#74, (fri_sales1 / fri_sales2)#75, (sat_sales1 / sat_sales2)#76]
+(47) TakeOrderedAndProject
+Input [10]: [s_store_name1#33, s_store_id1#35, d_week_seq1#34, (sun_sales1 / sun_sales2)#63, (mon_sales1 / mon_sales2)#64, (tue_sales1 / tue_sales2)#65, (wed_sales1 / wed_sales2)#66, (thu_sales1 / thu_sales2)#67, (fri_sales1 / fri_sales2)#68, (sat_sales1 / sat_sales2)#69]
+Arguments: 100, [s_store_name1#33 ASC NULLS FIRST, s_store_id1#35 ASC NULLS FIRST, d_week_seq1#34 ASC NULLS FIRST], [s_store_name1#33, s_store_id1#35, d_week_seq1#34, (sun_sales1 / sun_sales2)#63, (mon_sales1 / mon_sales2)#64, (tue_sales1 / tue_sales2)#65, (wed_sales1 / wed_sales2)#66, (thu_sales1 / thu_sales2)#67, (fri_sales1 / fri_sales2)#68, (sat_sales1 / sat_sales2)#69]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt
index 9ad61e946e..6a17e8b98b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt
@@ -6,24 +6,26 @@ TakeOrderedAndProject [s_store_name1,s_store_id1,d_week_seq1,(sun_sales1 / sun_s
           BroadcastHashJoin [d_week_seq,d_week_seq]
             Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,s_store_id,s_store_name]
               BroadcastHashJoin [ss_store_sk,s_store_sk]
-                HashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN ss_sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
+                ColumnarToRow
                   InputAdapter
-                    Exchange [d_week_seq,ss_store_sk] #1
-                      WholeStageCodegen (2)
-                        HashAggregate [d_week_seq,ss_store_sk,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                          Project [ss_store_sk,ss_sales_price,d_week_seq,d_day_name]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [ss_store_sk]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
-                              InputAdapter
-                                BroadcastExchange #2
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [d_date_sk,d_week_seq]
-                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
+                    CometHashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum]
+                      CometColumnarExchange [d_week_seq,ss_store_sk] #1
+                        RowToColumnar
+                          WholeStageCodegen (2)
+                            HashAggregate [d_week_seq,ss_store_sk,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                              Project [ss_store_sk,ss_sales_price,d_week_seq,d_day_name]
+                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ss_store_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [d_date_sk,d_week_seq]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
                 InputAdapter
                   BroadcastExchange #3
                     WholeStageCodegen (3)
@@ -46,9 +48,10 @@ TakeOrderedAndProject [s_store_name1,s_store_id1,d_week_seq1,(sun_sales1 / sun_s
                 BroadcastHashJoin [d_week_seq,d_week_seq]
                   Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,s_store_id]
                     BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      HashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN ss_sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
+                      ColumnarToRow
                         InputAdapter
-                          ReusedExchange [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] #1
+                          CometHashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum]
+                            ReusedExchange [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] #1
                       InputAdapter
                         BroadcastExchange #6
                           WholeStageCodegen (7)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt
index 5f34aa3df9..6ae031c893 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt
@@ -1,43 +1,45 @@
 == Physical Plan ==
-TakeOrderedAndProject (39)
-+- * Filter (38)
-   +- * HashAggregate (37)
-      +- Exchange (36)
-         +- * HashAggregate (35)
-            +- * Project (34)
-               +- * BroadcastHashJoin Inner BuildRight (33)
-                  :- * Project (18)
-                  :  +- * BroadcastHashJoin Inner BuildRight (17)
-                  :     :- * Project (15)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :     :     :- * Project (9)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
-                  :     :     :     +- BroadcastExchange (7)
-                  :     :     :        +- * ColumnarToRow (6)
-                  :     :     :           +- CometFilter (5)
-                  :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                  :     :     +- BroadcastExchange (13)
-                  :     :        +- * ColumnarToRow (12)
-                  :     :           +- CometFilter (11)
-                  :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
-                  :     +- ReusedExchange (16)
-                  +- BroadcastExchange (32)
-                     +- * Project (31)
-                        +- * BroadcastHashJoin Inner BuildRight (30)
-                           :- * ColumnarToRow (21)
-                           :  +- CometFilter (20)
-                           :     +- CometScan parquet spark_catalog.default.item (19)
-                           +- BroadcastExchange (29)
-                              +- * ColumnarToRow (28)
-                                 +- CometFilter (27)
-                                    +- CometHashAggregate (26)
-                                       +- CometExchange (25)
-                                          +- CometHashAggregate (24)
-                                             +- CometFilter (23)
-                                                +- CometScan parquet spark_catalog.default.item (22)
+* ColumnarToRow (41)
++- CometTakeOrderedAndProject (40)
+   +- CometFilter (39)
+      +- CometHashAggregate (38)
+         +- CometColumnarExchange (37)
+            +- RowToColumnar (36)
+               +- * HashAggregate (35)
+                  +- * Project (34)
+                     +- * BroadcastHashJoin Inner BuildRight (33)
+                        :- * Project (18)
+                        :  +- * BroadcastHashJoin Inner BuildRight (17)
+                        :     :- * Project (15)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                        :     :     :- * Project (9)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                        :     :     :     :- * ColumnarToRow (3)
+                        :     :     :     :  +- CometFilter (2)
+                        :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
+                        :     :     :     +- BroadcastExchange (7)
+                        :     :     :        +- * ColumnarToRow (6)
+                        :     :     :           +- CometFilter (5)
+                        :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                        :     :     +- BroadcastExchange (13)
+                        :     :        +- * ColumnarToRow (12)
+                        :     :           +- CometFilter (11)
+                        :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
+                        :     +- ReusedExchange (16)
+                        +- BroadcastExchange (32)
+                           +- * Project (31)
+                              +- * BroadcastHashJoin Inner BuildRight (30)
+                                 :- * ColumnarToRow (21)
+                                 :  +- CometFilter (20)
+                                 :     +- CometScan parquet spark_catalog.default.item (19)
+                                 +- BroadcastExchange (29)
+                                    +- * ColumnarToRow (28)
+                                       +- CometFilter (27)
+                                          +- CometHashAggregate (26)
+                                             +- CometColumnarExchange (25)
+                                                +- CometHashAggregate (24)
+                                                   +- CometFilter (23)
+                                                      +- CometScan parquet spark_catalog.default.item (22)
 
 
 (unknown) Scan parquet spark_catalog.default.customer_address
@@ -111,7 +113,7 @@ Join condition: None
 Output [3]: [ca_state#2, ss_item_sk#5, ss_sold_date_sk#7]
 Input [5]: [ca_state#2, c_customer_sk#3, ss_item_sk#5, ss_customer_sk#6, ss_sold_date_sk#7]
 
-(16) ReusedExchange [Reuses operator id: 44]
+(16) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#9]
 
 (17) BroadcastHashJoin [codegen id : 6]
@@ -154,9 +156,9 @@ Input [2]: [i_current_price#13, i_category#14]
 Keys [1]: [i_category#14]
 Functions [1]: [partial_avg(UnscaledValue(i_current_price#13))]
 
-(25) CometExchange
+(25) CometColumnarExchange
 Input [3]: [i_category#14, sum#15, count#16]
-Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
 (26) CometHashAggregate
 Input [3]: [i_category#14, sum#15, count#16]
@@ -205,97 +207,101 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#18]
 Results [2]: [ca_state#2, count#19]
 
-(36) Exchange
+(36) RowToColumnar
 Input [2]: [ca_state#2, count#19]
-Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(37) HashAggregate [codegen id : 7]
+(37) CometColumnarExchange
+Input [2]: [ca_state#2, count#19]
+Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(38) CometHashAggregate
 Input [2]: [ca_state#2, count#19]
 Keys [1]: [ca_state#2]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#20]
-Results [2]: [ca_state#2 AS state#21, count(1)#20 AS cnt#22]
 
-(38) Filter [codegen id : 7]
-Input [2]: [state#21, cnt#22]
-Condition : (cnt#22 >= 10)
+(39) CometFilter
+Input [2]: [state#20, cnt#21]
+Condition : (cnt#21 >= 10)
+
+(40) CometTakeOrderedAndProject
+Input [2]: [state#20, cnt#21]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[cnt#21 ASC NULLS FIRST], output=[state#20,cnt#21]), 100, [cnt#21 ASC NULLS FIRST], [state#20, cnt#21]
 
-(39) TakeOrderedAndProject
-Input [2]: [state#21, cnt#22]
-Arguments: 100, [cnt#22 ASC NULLS FIRST], [state#21, cnt#22]
+(41) ColumnarToRow [codegen id : 7]
+Input [2]: [state#20, cnt#21]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 10 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (44)
-+- * ColumnarToRow (43)
-   +- CometProject (42)
-      +- CometFilter (41)
-         +- CometScan parquet spark_catalog.default.date_dim (40)
+BroadcastExchange (46)
++- * ColumnarToRow (45)
+   +- CometProject (44)
+      +- CometFilter (43)
+         +- CometScan parquet spark_catalog.default.date_dim (42)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#9, d_month_seq#23]
+Output [2]: [d_date_sk#9, d_month_seq#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(41) CometFilter
-Input [2]: [d_date_sk#9, d_month_seq#23]
-Condition : ((isnotnull(d_month_seq#23) AND (d_month_seq#23 = Subquery scalar-subquery#24, [id=#25])) AND isnotnull(d_date_sk#9))
+(43) CometFilter
+Input [2]: [d_date_sk#9, d_month_seq#22]
+Condition : ((isnotnull(d_month_seq#22) AND (d_month_seq#22 = Subquery scalar-subquery#23, [id=#24])) AND isnotnull(d_date_sk#9))
 
-(42) CometProject
-Input [2]: [d_date_sk#9, d_month_seq#23]
+(44) CometProject
+Input [2]: [d_date_sk#9, d_month_seq#22]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(43) ColumnarToRow [codegen id : 1]
+(45) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(44) BroadcastExchange
+(46) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 41 Hosting Expression = Subquery scalar-subquery#24, [id=#25]
-* ColumnarToRow (51)
-+- CometHashAggregate (50)
-   +- CometExchange (49)
-      +- CometHashAggregate (48)
-         +- CometProject (47)
-            +- CometFilter (46)
-               +- CometScan parquet spark_catalog.default.date_dim (45)
+Subquery:2 Hosting operator id = 43 Hosting Expression = Subquery scalar-subquery#23, [id=#24]
+* ColumnarToRow (53)
++- CometHashAggregate (52)
+   +- CometColumnarExchange (51)
+      +- CometHashAggregate (50)
+         +- CometProject (49)
+            +- CometFilter (48)
+               +- CometScan parquet spark_catalog.default.date_dim (47)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#26, d_year#27, d_moy#28]
+Output [3]: [d_month_seq#25, d_year#26, d_moy#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,1)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(46) CometFilter
-Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
-Condition : (((isnotnull(d_year#27) AND isnotnull(d_moy#28)) AND (d_year#27 = 2000)) AND (d_moy#28 = 1))
+(48) CometFilter
+Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
+Condition : (((isnotnull(d_year#26) AND isnotnull(d_moy#27)) AND (d_year#26 = 2000)) AND (d_moy#27 = 1))
 
-(47) CometProject
-Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
-Arguments: [d_month_seq#26], [d_month_seq#26]
+(49) CometProject
+Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
+Arguments: [d_month_seq#25], [d_month_seq#25]
 
-(48) CometHashAggregate
-Input [1]: [d_month_seq#26]
-Keys [1]: [d_month_seq#26]
+(50) CometHashAggregate
+Input [1]: [d_month_seq#25]
+Keys [1]: [d_month_seq#25]
 Functions: []
 
-(49) CometExchange
-Input [1]: [d_month_seq#26]
-Arguments: hashpartitioning(d_month_seq#26, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
+(51) CometColumnarExchange
+Input [1]: [d_month_seq#25]
+Arguments: hashpartitioning(d_month_seq#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(50) CometHashAggregate
-Input [1]: [d_month_seq#26]
-Keys [1]: [d_month_seq#26]
+(52) CometHashAggregate
+Input [1]: [d_month_seq#25]
+Keys [1]: [d_month_seq#25]
 Functions: []
 
-(51) ColumnarToRow [codegen id : 1]
-Input [1]: [d_month_seq#26]
+(53) ColumnarToRow [codegen id : 1]
+Input [1]: [d_month_seq#25]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt
index 24a40f8040..b855d42f90 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt
@@ -1,74 +1,76 @@
-TakeOrderedAndProject [cnt,state]
-  WholeStageCodegen (7)
-    Filter [cnt]
-      HashAggregate [ca_state,count] [count(1),state,cnt,count]
-        InputAdapter
-          Exchange [ca_state] #1
-            WholeStageCodegen (6)
-              HashAggregate [ca_state] [count,count]
-                Project [ca_state]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ca_state,ss_item_sk]
-                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                        Project [ca_state,ss_item_sk,ss_sold_date_sk]
-                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                            Project [ca_state,c_customer_sk]
-                              BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+WholeStageCodegen (7)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [cnt,state]
+        CometFilter [cnt]
+          CometHashAggregate [ca_state,count]
+            CometColumnarExchange [ca_state] #1
+              RowToColumnar
+                WholeStageCodegen (6)
+                  HashAggregate [ca_state] [count,count]
+                    Project [ca_state]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ca_state,ss_item_sk]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ca_state,ss_item_sk,ss_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                Project [ca_state,c_customer_sk]
+                                  BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                    InputAdapter
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_current_addr_sk,c_customer_sk]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                                 InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (1)
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (2)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [c_current_addr_sk,c_customer_sk]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                          CometFilter [ss_customer_sk,ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #4
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_month_seq,d_date_sk]
+                                                            Subquery #2
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometHashAggregate [d_month_seq]
+                                                                      CometColumnarExchange [d_month_seq] #5
+                                                                        CometHashAggregate [d_month_seq]
+                                                                          CometProject [d_month_seq]
+                                                                            CometFilter [d_year,d_moy]
+                                                                              CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
+                              ReusedExchange [d_date_sk] #4
+                        InputAdapter
+                          BroadcastExchange #6
+                            WholeStageCodegen (5)
+                              Project [i_item_sk]
+                                BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [ss_customer_sk,ss_item_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_month_seq,d_date_sk]
-                                                        Subquery #2
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometHashAggregate [d_month_seq]
-                                                                  CometExchange [d_month_seq] #5
-                                                                    CometHashAggregate [d_month_seq]
-                                                                      CometProject [d_month_seq]
-                                                                        CometFilter [d_year,d_moy]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                        InputAdapter
-                          ReusedExchange [d_date_sk] #4
-                    InputAdapter
-                      BroadcastExchange #6
-                        WholeStageCodegen (5)
-                          Project [i_item_sk]
-                            BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [i_current_price,i_category,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
-                              InputAdapter
-                                BroadcastExchange #7
-                                  WholeStageCodegen (4)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [avg(i_current_price)]
-                                          CometHashAggregate [i_category,sum,count]
-                                            CometExchange [i_category] #8
-                                              CometHashAggregate [i_category,i_current_price]
-                                                CometFilter [i_category]
-                                                  CometScan parquet spark_catalog.default.item [i_current_price,i_category]
+                                      CometFilter [i_current_price,i_category,i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
+                                  InputAdapter
+                                    BroadcastExchange #7
+                                      WholeStageCodegen (4)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [avg(i_current_price)]
+                                              CometHashAggregate [i_category,sum,count]
+                                                CometColumnarExchange [i_category] #8
+                                                  CometHashAggregate [i_category,i_current_price]
+                                                    CometFilter [i_category]
+                                                      CometScan parquet spark_catalog.default.item [i_current_price,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt
index 8885bc8e5b..accdce467d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt
@@ -1,67 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (63)
-+- * HashAggregate (62)
-   +- Exchange (61)
-      +- * HashAggregate (60)
-         +- Union (59)
-            :- * HashAggregate (28)
-            :  +- Exchange (27)
-            :     +- * HashAggregate (26)
-            :        +- * Project (25)
-            :           +- * BroadcastHashJoin Inner BuildRight (24)
-            :              :- * Project (13)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (12)
-            :              :     :- * Project (6)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-            :              :     :     :- * ColumnarToRow (3)
-            :              :     :     :  +- CometFilter (2)
-            :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :              :     :     +- ReusedExchange (4)
-            :              :     +- BroadcastExchange (11)
-            :              :        +- * ColumnarToRow (10)
-            :              :           +- CometProject (9)
-            :              :              +- CometFilter (8)
-            :              :                 +- CometScan parquet spark_catalog.default.customer_address (7)
-            :              +- BroadcastExchange (23)
-            :                 +- * BroadcastHashJoin LeftSemi BuildRight (22)
-            :                    :- * ColumnarToRow (16)
-            :                    :  +- CometFilter (15)
-            :                    :     +- CometScan parquet spark_catalog.default.item (14)
-            :                    +- BroadcastExchange (21)
-            :                       +- * ColumnarToRow (20)
-            :                          +- CometProject (19)
-            :                             +- CometFilter (18)
-            :                                +- CometScan parquet spark_catalog.default.item (17)
-            :- * HashAggregate (43)
-            :  +- Exchange (42)
-            :     +- * HashAggregate (41)
-            :        +- * Project (40)
-            :           +- * BroadcastHashJoin Inner BuildRight (39)
-            :              :- * Project (37)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (36)
-            :              :     :- * Project (34)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (33)
-            :              :     :     :- * ColumnarToRow (31)
-            :              :     :     :  +- CometFilter (30)
-            :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (29)
-            :              :     :     +- ReusedExchange (32)
-            :              :     +- ReusedExchange (35)
-            :              +- ReusedExchange (38)
-            +- * HashAggregate (58)
-               +- Exchange (57)
-                  +- * HashAggregate (56)
-                     +- * Project (55)
-                        +- * BroadcastHashJoin Inner BuildRight (54)
-                           :- * Project (52)
-                           :  +- * BroadcastHashJoin Inner BuildRight (51)
-                           :     :- * Project (49)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (48)
-                           :     :     :- * ColumnarToRow (46)
-                           :     :     :  +- CometFilter (45)
-                           :     :     :     +- CometScan parquet spark_catalog.default.web_sales (44)
-                           :     :     +- ReusedExchange (47)
-                           :     +- ReusedExchange (50)
-                           +- ReusedExchange (53)
+* ColumnarToRow (67)
++- CometTakeOrderedAndProject (66)
+   +- CometHashAggregate (65)
+      +- CometColumnarExchange (64)
+         +- CometHashAggregate (63)
+            +- CometUnion (62)
+               :- CometHashAggregate (29)
+               :  +- CometColumnarExchange (28)
+               :     +- RowToColumnar (27)
+               :        +- * HashAggregate (26)
+               :           +- * Project (25)
+               :              +- * BroadcastHashJoin Inner BuildRight (24)
+               :                 :- * Project (13)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :                 :     :- * Project (6)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :                 :     :     :- * ColumnarToRow (3)
+               :                 :     :     :  +- CometFilter (2)
+               :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                 :     :     +- ReusedExchange (4)
+               :                 :     +- BroadcastExchange (11)
+               :                 :        +- * ColumnarToRow (10)
+               :                 :           +- CometProject (9)
+               :                 :              +- CometFilter (8)
+               :                 :                 +- CometScan parquet spark_catalog.default.customer_address (7)
+               :                 +- BroadcastExchange (23)
+               :                    +- * BroadcastHashJoin LeftSemi BuildRight (22)
+               :                       :- * ColumnarToRow (16)
+               :                       :  +- CometFilter (15)
+               :                       :     +- CometScan parquet spark_catalog.default.item (14)
+               :                       +- BroadcastExchange (21)
+               :                          +- * ColumnarToRow (20)
+               :                             +- CometProject (19)
+               :                                +- CometFilter (18)
+               :                                   +- CometScan parquet spark_catalog.default.item (17)
+               :- CometHashAggregate (45)
+               :  +- CometColumnarExchange (44)
+               :     +- RowToColumnar (43)
+               :        +- * HashAggregate (42)
+               :           +- * Project (41)
+               :              +- * BroadcastHashJoin Inner BuildRight (40)
+               :                 :- * Project (38)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (37)
+               :                 :     :- * Project (35)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+               :                 :     :     :- * ColumnarToRow (32)
+               :                 :     :     :  +- CometFilter (31)
+               :                 :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
+               :                 :     :     +- ReusedExchange (33)
+               :                 :     +- ReusedExchange (36)
+               :                 +- ReusedExchange (39)
+               +- CometHashAggregate (61)
+                  +- CometColumnarExchange (60)
+                     +- RowToColumnar (59)
+                        +- * HashAggregate (58)
+                           +- * Project (57)
+                              +- * BroadcastHashJoin Inner BuildRight (56)
+                                 :- * Project (54)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (53)
+                                 :     :- * Project (51)
+                                 :     :  +- * BroadcastHashJoin Inner BuildRight (50)
+                                 :     :     :- * ColumnarToRow (48)
+                                 :     :     :  +- CometFilter (47)
+                                 :     :     :     +- CometScan parquet spark_catalog.default.web_sales (46)
+                                 :     :     +- ReusedExchange (49)
+                                 :     +- ReusedExchange (52)
+                                 +- ReusedExchange (55)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -79,7 +83,7 @@ Condition : (isnotnull(ss_addr_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_addr_sk#2, ss_ext_sales_price#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 68]
+(4) ReusedExchange [Reuses operator id: 72]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -187,219 +191,224 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#3))]
 Aggregate Attributes [1]: [sum#13]
 Results [2]: [i_item_id#10, sum#14]
 
-(27) Exchange
+(27) RowToColumnar
 Input [2]: [i_item_id#10, sum#14]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 6]
+(28) CometColumnarExchange
+Input [2]: [i_item_id#10, sum#14]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [2]: [i_item_id#10, sum#14]
 Keys [1]: [i_item_id#10]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#3))#15]
-Results [2]: [i_item_id#10, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#15,17,2) AS total_sales#16]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+Output [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#20), dynamicpruningexpression(cs_sold_date_sk#20 IN dynamicpruning#21)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#18), dynamicpruningexpression(cs_sold_date_sk#18 IN dynamicpruning#19)]
 PushedFilters: [IsNotNull(cs_bill_addr_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_addr_sk:int,cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(30) CometFilter
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
-Condition : (isnotnull(cs_bill_addr_sk#17) AND isnotnull(cs_item_sk#18))
+(31) CometFilter
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+Condition : (isnotnull(cs_bill_addr_sk#15) AND isnotnull(cs_item_sk#16))
 
-(31) ColumnarToRow [codegen id : 11]
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+(32) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
 
-(32) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#22]
+(33) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#20]
 
-(33) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_sold_date_sk#20]
-Right keys [1]: [d_date_sk#22]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#18]
+Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 11]
-Output [3]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19]
-Input [5]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20, d_date_sk#22]
+(35) Project [codegen id : 10]
+Output [3]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17]
+Input [5]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18, d_date_sk#20]
 
-(35) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#23]
+(36) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#21]
 
-(36) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_bill_addr_sk#17]
-Right keys [1]: [ca_address_sk#23]
+(37) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_bill_addr_sk#15]
+Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 11]
-Output [2]: [cs_item_sk#18, cs_ext_sales_price#19]
-Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, ca_address_sk#23]
+(38) Project [codegen id : 10]
+Output [2]: [cs_item_sk#16, cs_ext_sales_price#17]
+Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, ca_address_sk#21]
 
-(38) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#24, i_item_id#25]
+(39) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#22, i_item_id#23]
 
-(39) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_item_sk#18]
-Right keys [1]: [i_item_sk#24]
+(40) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_item_sk#16]
+Right keys [1]: [i_item_sk#22]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 11]
-Output [2]: [cs_ext_sales_price#19, i_item_id#25]
-Input [4]: [cs_item_sk#18, cs_ext_sales_price#19, i_item_sk#24, i_item_id#25]
+(41) Project [codegen id : 10]
+Output [2]: [cs_ext_sales_price#17, i_item_id#23]
+Input [4]: [cs_item_sk#16, cs_ext_sales_price#17, i_item_sk#22, i_item_id#23]
+
+(42) HashAggregate [codegen id : 10]
+Input [2]: [cs_ext_sales_price#17, i_item_id#23]
+Keys [1]: [i_item_id#23]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#17))]
+Aggregate Attributes [1]: [sum#24]
+Results [2]: [i_item_id#23, sum#25]
 
-(41) HashAggregate [codegen id : 11]
-Input [2]: [cs_ext_sales_price#19, i_item_id#25]
-Keys [1]: [i_item_id#25]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#19))]
-Aggregate Attributes [1]: [sum#26]
-Results [2]: [i_item_id#25, sum#27]
+(43) RowToColumnar
+Input [2]: [i_item_id#23, sum#25]
 
-(42) Exchange
-Input [2]: [i_item_id#25, sum#27]
-Arguments: hashpartitioning(i_item_id#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(44) CometColumnarExchange
+Input [2]: [i_item_id#23, sum#25]
+Arguments: hashpartitioning(i_item_id#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(43) HashAggregate [codegen id : 12]
-Input [2]: [i_item_id#25, sum#27]
-Keys [1]: [i_item_id#25]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#19))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#19))#28]
-Results [2]: [i_item_id#25, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#19))#28,17,2) AS total_sales#29]
+(45) CometHashAggregate
+Input [2]: [i_item_id#23, sum#25]
+Keys [1]: [i_item_id#23]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#17))]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+Output [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#29), dynamicpruningexpression(ws_sold_date_sk#29 IN dynamicpruning#30)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk), IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(45) CometFilter
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
-Condition : (isnotnull(ws_bill_addr_sk#31) AND isnotnull(ws_item_sk#30))
+(47) CometFilter
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+Condition : (isnotnull(ws_bill_addr_sk#27) AND isnotnull(ws_item_sk#26))
 
-(46) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+(48) ColumnarToRow [codegen id : 15]
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
 
-(47) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#35]
+(49) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#31]
 
-(48) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#33]
-Right keys [1]: [d_date_sk#35]
+(50) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_sold_date_sk#29]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 17]
-Output [3]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32]
-Input [5]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33, d_date_sk#35]
+(51) Project [codegen id : 15]
+Output [3]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28]
+Input [5]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29, d_date_sk#31]
 
-(50) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#36]
+(52) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#32]
 
-(51) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_bill_addr_sk#31]
-Right keys [1]: [ca_address_sk#36]
+(53) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_bill_addr_sk#27]
+Right keys [1]: [ca_address_sk#32]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 17]
-Output [2]: [ws_item_sk#30, ws_ext_sales_price#32]
-Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ca_address_sk#36]
+(54) Project [codegen id : 15]
+Output [2]: [ws_item_sk#26, ws_ext_sales_price#28]
+Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ca_address_sk#32]
 
-(53) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#37, i_item_id#38]
+(55) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#33, i_item_id#34]
 
-(54) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_item_sk#30]
-Right keys [1]: [i_item_sk#37]
+(56) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ws_item_sk#26]
+Right keys [1]: [i_item_sk#33]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 17]
-Output [2]: [ws_ext_sales_price#32, i_item_id#38]
-Input [4]: [ws_item_sk#30, ws_ext_sales_price#32, i_item_sk#37, i_item_id#38]
+(57) Project [codegen id : 15]
+Output [2]: [ws_ext_sales_price#28, i_item_id#34]
+Input [4]: [ws_item_sk#26, ws_ext_sales_price#28, i_item_sk#33, i_item_id#34]
 
-(56) HashAggregate [codegen id : 17]
-Input [2]: [ws_ext_sales_price#32, i_item_id#38]
-Keys [1]: [i_item_id#38]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#32))]
-Aggregate Attributes [1]: [sum#39]
-Results [2]: [i_item_id#38, sum#40]
+(58) HashAggregate [codegen id : 15]
+Input [2]: [ws_ext_sales_price#28, i_item_id#34]
+Keys [1]: [i_item_id#34]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#28))]
+Aggregate Attributes [1]: [sum#35]
+Results [2]: [i_item_id#34, sum#36]
 
-(57) Exchange
-Input [2]: [i_item_id#38, sum#40]
-Arguments: hashpartitioning(i_item_id#38, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(59) RowToColumnar
+Input [2]: [i_item_id#34, sum#36]
 
-(58) HashAggregate [codegen id : 18]
-Input [2]: [i_item_id#38, sum#40]
-Keys [1]: [i_item_id#38]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#32))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#32))#41]
-Results [2]: [i_item_id#38, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#32))#41,17,2) AS total_sales#42]
+(60) CometColumnarExchange
+Input [2]: [i_item_id#34, sum#36]
+Arguments: hashpartitioning(i_item_id#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(59) Union
+(61) CometHashAggregate
+Input [2]: [i_item_id#34, sum#36]
+Keys [1]: [i_item_id#34]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#28))]
 
-(60) HashAggregate [codegen id : 19]
-Input [2]: [i_item_id#10, total_sales#16]
+(62) CometUnion
+Child 0 Input [2]: [i_item_id#10, total_sales#37]
+Child 1 Input [2]: [i_item_id#23, total_sales#38]
+Child 2 Input [2]: [i_item_id#34, total_sales#39]
+
+(63) CometHashAggregate
+Input [2]: [i_item_id#10, total_sales#37]
 Keys [1]: [i_item_id#10]
-Functions [1]: [partial_sum(total_sales#16)]
-Aggregate Attributes [2]: [sum#43, isEmpty#44]
-Results [3]: [i_item_id#10, sum#45, isEmpty#46]
+Functions [1]: [partial_sum(total_sales#37)]
 
-(61) Exchange
-Input [3]: [i_item_id#10, sum#45, isEmpty#46]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(64) CometColumnarExchange
+Input [3]: [i_item_id#10, sum#40, isEmpty#41]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(62) HashAggregate [codegen id : 20]
-Input [3]: [i_item_id#10, sum#45, isEmpty#46]
+(65) CometHashAggregate
+Input [3]: [i_item_id#10, sum#40, isEmpty#41]
 Keys [1]: [i_item_id#10]
-Functions [1]: [sum(total_sales#16)]
-Aggregate Attributes [1]: [sum(total_sales#16)#47]
-Results [2]: [i_item_id#10, sum(total_sales#16)#47 AS total_sales#48]
+Functions [1]: [sum(total_sales#37)]
+
+(66) CometTakeOrderedAndProject
+Input [2]: [i_item_id#10, total_sales#42]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#10 ASC NULLS FIRST,total_sales#42 ASC NULLS FIRST], output=[i_item_id#10,total_sales#42]), 100, [i_item_id#10 ASC NULLS FIRST, total_sales#42 ASC NULLS FIRST], [i_item_id#10, total_sales#42]
 
-(63) TakeOrderedAndProject
-Input [2]: [i_item_id#10, total_sales#48]
-Arguments: 100, [i_item_id#10 ASC NULLS FIRST, total_sales#48 ASC NULLS FIRST], [i_item_id#10, total_sales#48]
+(67) ColumnarToRow [codegen id : 16]
+Input [2]: [i_item_id#10, total_sales#42]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (68)
-+- * ColumnarToRow (67)
-   +- CometProject (66)
-      +- CometFilter (65)
-         +- CometScan parquet spark_catalog.default.date_dim (64)
+BroadcastExchange (72)
++- * ColumnarToRow (71)
+   +- CometProject (70)
+      +- CometFilter (69)
+         +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#6, d_year#49, d_moy#50]
+Output [3]: [d_date_sk#6, d_year#43, d_moy#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,9), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(65) CometFilter
-Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
-Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 1998)) AND (d_moy#50 = 9)) AND isnotnull(d_date_sk#6))
+(69) CometFilter
+Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
+Condition : ((((isnotnull(d_year#43) AND isnotnull(d_moy#44)) AND (d_year#43 = 1998)) AND (d_moy#44 = 9)) AND isnotnull(d_date_sk#6))
 
-(66) CometProject
-Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
+(70) CometProject
+Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(67) ColumnarToRow [codegen id : 1]
+(71) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(68) BroadcastExchange
+(72) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 29 Hosting Expression = cs_sold_date_sk#20 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 44 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#29 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt
index b010414a86..bad7cbf2b4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt
@@ -1,105 +1,101 @@
-TakeOrderedAndProject [i_item_id,total_sales]
-  WholeStageCodegen (20)
-    HashAggregate [i_item_id,sum,isEmpty] [sum(total_sales),total_sales,sum,isEmpty]
-      InputAdapter
-        Exchange [i_item_id] #1
-          WholeStageCodegen (19)
-            HashAggregate [i_item_id,total_sales] [sum,isEmpty,sum,isEmpty]
-              InputAdapter
-                Union
-                  WholeStageCodegen (6)
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #2
-                          WholeStageCodegen (5)
-                            HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
-                              Project [ss_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                      Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_addr_sk,ss_item_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+WholeStageCodegen (16)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,total_sales]
+        CometHashAggregate [i_item_id,sum,isEmpty]
+          CometColumnarExchange [i_item_id] #1
+            CometHashAggregate [i_item_id,total_sales]
+              CometUnion
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #2
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
+                          Project [ss_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              Project [ss_item_sk,ss_ext_sales_price]
+                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                  Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_addr_sk,ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_year,d_moy,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                  InputAdapter
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
                                           InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                            CometProject [ca_address_sk]
+                                              CometFilter [ca_gmt_offset,ca_address_sk]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (4)
+                                    BroadcastHashJoin [i_item_id,i_item_id]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                                       InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (2)
+                                        BroadcastExchange #6
+                                          WholeStageCodegen (3)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [ca_address_sk]
-                                                  CometFilter [ca_gmt_offset,ca_address_sk]
-                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                                  InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (4)
-                                        BroadcastHashJoin [i_item_id,i_item_id]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [i_item_sk]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (3)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [i_item_id]
-                                                      CometFilter [i_category]
-                                                        CometScan parquet spark_catalog.default.item [i_item_id,i_category]
-                  WholeStageCodegen (12)
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #7
-                          WholeStageCodegen (11)
-                            HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
-                              Project [cs_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                  Project [cs_item_sk,cs_ext_sales_price]
-                                    BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
-                                      Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_bill_addr_sk,cs_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                                CometProject [i_item_id]
+                                                  CometFilter [i_category]
+                                                    CometScan parquet spark_catalog.default.item [i_item_id,i_category]
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #7
+                    RowToColumnar
+                      WholeStageCodegen (10)
+                        HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
+                          Project [cs_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [cs_item_sk,i_item_sk]
+                              Project [cs_item_sk,cs_ext_sales_price]
+                                BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
+                                  Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [cs_bill_addr_sk,cs_item_sk]
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        ReusedExchange [ca_address_sk] #4
+                                        ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    ReusedExchange [i_item_sk,i_item_id] #5
-                  WholeStageCodegen (18)
-                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),total_sales,sum]
-                      InputAdapter
-                        Exchange [i_item_id] #8
-                          WholeStageCodegen (17)
-                            HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
-                              Project [ws_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                  Project [ws_item_sk,ws_ext_sales_price]
-                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                      Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_addr_sk,ws_item_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                    ReusedExchange [ca_address_sk] #4
+                              InputAdapter
+                                ReusedExchange [i_item_sk,i_item_id] #5
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #8
+                    RowToColumnar
+                      WholeStageCodegen (15)
+                        HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
+                          Project [ws_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [ws_item_sk,i_item_sk]
+                              Project [ws_item_sk,ws_ext_sales_price]
+                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                  Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_addr_sk,ws_item_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        ReusedExchange [ca_address_sk] #4
+                                        ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    ReusedExchange [i_item_sk,i_item_id] #5
+                                    ReusedExchange [ca_address_sk] #4
+                              InputAdapter
+                                ReusedExchange [i_item_sk,i_item_id] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt
index ee9a8409a2..69767b1f68 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt
@@ -1,71 +1,75 @@
 == Physical Plan ==
-* Project (67)
-+- * BroadcastNestedLoopJoin Inner BuildRight (66)
-   :- * HashAggregate (43)
-   :  +- Exchange (42)
-   :     +- * HashAggregate (41)
-   :        +- * Project (40)
-   :           +- * BroadcastHashJoin Inner BuildRight (39)
-   :              :- * Project (33)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (32)
-   :              :     :- * Project (26)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-   :              :     :     :- * Project (20)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-   :              :     :     :     :- * Project (17)
-   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-   :              :     :     :     :     :- * Project (10)
-   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-   :              :     :     :     :     :     :- * ColumnarToRow (3)
-   :              :     :     :     :     :     :  +- CometFilter (2)
-   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :              :     :     :     :     :     +- BroadcastExchange (8)
-   :              :     :     :     :     :        +- * ColumnarToRow (7)
-   :              :     :     :     :     :           +- CometProject (6)
-   :              :     :     :     :     :              +- CometFilter (5)
-   :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.store (4)
-   :              :     :     :     :     +- BroadcastExchange (15)
-   :              :     :     :     :        +- * ColumnarToRow (14)
-   :              :     :     :     :           +- CometProject (13)
-   :              :     :     :     :              +- CometFilter (12)
-   :              :     :     :     :                 +- CometScan parquet spark_catalog.default.promotion (11)
-   :              :     :     :     +- ReusedExchange (18)
-   :              :     :     +- BroadcastExchange (24)
-   :              :     :        +- * ColumnarToRow (23)
-   :              :     :           +- CometFilter (22)
-   :              :     :              +- CometScan parquet spark_catalog.default.customer (21)
-   :              :     +- BroadcastExchange (31)
-   :              :        +- * ColumnarToRow (30)
-   :              :           +- CometProject (29)
-   :              :              +- CometFilter (28)
-   :              :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-   :              +- BroadcastExchange (38)
-   :                 +- * ColumnarToRow (37)
-   :                    +- CometProject (36)
-   :                       +- CometFilter (35)
-   :                          +- CometScan parquet spark_catalog.default.item (34)
-   +- BroadcastExchange (65)
-      +- * HashAggregate (64)
-         +- Exchange (63)
-            +- * HashAggregate (62)
-               +- * Project (61)
-                  +- * BroadcastHashJoin Inner BuildRight (60)
-                     :- * Project (58)
-                     :  +- * BroadcastHashJoin Inner BuildRight (57)
-                     :     :- * Project (55)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-                     :     :     :- * Project (52)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (51)
-                     :     :     :     :- * Project (49)
-                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (48)
-                     :     :     :     :     :- * ColumnarToRow (46)
-                     :     :     :     :     :  +- CometFilter (45)
-                     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (44)
-                     :     :     :     :     +- ReusedExchange (47)
-                     :     :     :     +- ReusedExchange (50)
-                     :     :     +- ReusedExchange (53)
-                     :     +- ReusedExchange (56)
-                     +- ReusedExchange (59)
+* Project (71)
++- * BroadcastNestedLoopJoin Inner BuildRight (70)
+   :- * ColumnarToRow (45)
+   :  +- CometHashAggregate (44)
+   :     +- CometColumnarExchange (43)
+   :        +- RowToColumnar (42)
+   :           +- * HashAggregate (41)
+   :              +- * Project (40)
+   :                 +- * BroadcastHashJoin Inner BuildRight (39)
+   :                    :- * Project (33)
+   :                    :  +- * BroadcastHashJoin Inner BuildRight (32)
+   :                    :     :- * Project (26)
+   :                    :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+   :                    :     :     :- * Project (20)
+   :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+   :                    :     :     :     :- * Project (17)
+   :                    :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+   :                    :     :     :     :     :- * Project (10)
+   :                    :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+   :                    :     :     :     :     :     :- * ColumnarToRow (3)
+   :                    :     :     :     :     :     :  +- CometFilter (2)
+   :                    :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :                    :     :     :     :     :     +- BroadcastExchange (8)
+   :                    :     :     :     :     :        +- * ColumnarToRow (7)
+   :                    :     :     :     :     :           +- CometProject (6)
+   :                    :     :     :     :     :              +- CometFilter (5)
+   :                    :     :     :     :     :                 +- CometScan parquet spark_catalog.default.store (4)
+   :                    :     :     :     :     +- BroadcastExchange (15)
+   :                    :     :     :     :        +- * ColumnarToRow (14)
+   :                    :     :     :     :           +- CometProject (13)
+   :                    :     :     :     :              +- CometFilter (12)
+   :                    :     :     :     :                 +- CometScan parquet spark_catalog.default.promotion (11)
+   :                    :     :     :     +- ReusedExchange (18)
+   :                    :     :     +- BroadcastExchange (24)
+   :                    :     :        +- * ColumnarToRow (23)
+   :                    :     :           +- CometFilter (22)
+   :                    :     :              +- CometScan parquet spark_catalog.default.customer (21)
+   :                    :     +- BroadcastExchange (31)
+   :                    :        +- * ColumnarToRow (30)
+   :                    :           +- CometProject (29)
+   :                    :              +- CometFilter (28)
+   :                    :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+   :                    +- BroadcastExchange (38)
+   :                       +- * ColumnarToRow (37)
+   :                          +- CometProject (36)
+   :                             +- CometFilter (35)
+   :                                +- CometScan parquet spark_catalog.default.item (34)
+   +- BroadcastExchange (69)
+      +- * ColumnarToRow (68)
+         +- CometHashAggregate (67)
+            +- CometColumnarExchange (66)
+               +- RowToColumnar (65)
+                  +- * HashAggregate (64)
+                     +- * Project (63)
+                        +- * BroadcastHashJoin Inner BuildRight (62)
+                           :- * Project (60)
+                           :  +- * BroadcastHashJoin Inner BuildRight (59)
+                           :     :- * Project (57)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+                           :     :     :- * Project (54)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
+                           :     :     :     :- * Project (51)
+                           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (50)
+                           :     :     :     :     :- * ColumnarToRow (48)
+                           :     :     :     :     :  +- CometFilter (47)
+                           :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (46)
+                           :     :     :     :     +- ReusedExchange (49)
+                           :     :     :     +- ReusedExchange (52)
+                           :     :     +- ReusedExchange (55)
+                           :     +- ReusedExchange (58)
+                           +- ReusedExchange (61)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -147,7 +151,7 @@ Join condition: None
 Output [4]: [ss_item_sk#1, ss_customer_sk#2, ss_ext_sales_price#5, ss_sold_date_sk#6]
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_promo_sk#4, ss_ext_sales_price#5, ss_sold_date_sk#6, p_promo_sk#10]
 
-(18) ReusedExchange [Reuses operator id: 72]
+(18) ReusedExchange [Reuses operator id: 76]
 Output [1]: [d_date_sk#14]
 
 (19) BroadcastHashJoin [codegen id : 7]
@@ -259,159 +263,167 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#21]
 Results [1]: [sum#22]
 
-(42) Exchange
+(42) RowToColumnar
 Input [1]: [sum#22]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
 
-(43) HashAggregate [codegen id : 15]
+(43) CometColumnarExchange
+Input [1]: [sum#22]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(44) CometHashAggregate
 Input [1]: [sum#22]
 Keys: []
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#23]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#23,17,2) AS promotions#24]
+
+(45) ColumnarToRow [codegen id : 15]
+Input [1]: [promotions#23]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [5]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29]
+Output [5]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#29), dynamicpruningexpression(ss_sold_date_sk#29 IN dynamicpruning#30)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#28), dynamicpruningexpression(ss_sold_date_sk#28 IN dynamicpruning#29)]
 PushedFilters: [IsNotNull(ss_store_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_store_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(45) CometFilter
-Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29]
-Condition : ((isnotnull(ss_store_sk#27) AND isnotnull(ss_customer_sk#26)) AND isnotnull(ss_item_sk#25))
+(47) CometFilter
+Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
+Condition : ((isnotnull(ss_store_sk#26) AND isnotnull(ss_customer_sk#25)) AND isnotnull(ss_item_sk#24))
 
-(46) ColumnarToRow [codegen id : 13]
-Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29]
+(48) ColumnarToRow [codegen id : 13]
+Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
 
-(47) ReusedExchange [Reuses operator id: 8]
-Output [1]: [s_store_sk#31]
+(49) ReusedExchange [Reuses operator id: 8]
+Output [1]: [s_store_sk#30]
 
-(48) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_store_sk#27]
-Right keys [1]: [s_store_sk#31]
+(50) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_store_sk#26]
+Right keys [1]: [s_store_sk#30]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 13]
-Output [4]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28, ss_sold_date_sk#29]
-Input [6]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29, s_store_sk#31]
+(51) Project [codegen id : 13]
+Output [4]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27, ss_sold_date_sk#28]
+Input [6]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28, s_store_sk#30]
 
-(50) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#32]
+(52) ReusedExchange [Reuses operator id: 76]
+Output [1]: [d_date_sk#31]
 
-(51) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_sold_date_sk#29]
-Right keys [1]: [d_date_sk#32]
+(53) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_sold_date_sk#28]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 13]
-Output [3]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28]
-Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28, ss_sold_date_sk#29, d_date_sk#32]
+(54) Project [codegen id : 13]
+Output [3]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27]
+Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27, ss_sold_date_sk#28, d_date_sk#31]
 
-(53) ReusedExchange [Reuses operator id: 24]
-Output [2]: [c_customer_sk#33, c_current_addr_sk#34]
+(55) ReusedExchange [Reuses operator id: 24]
+Output [2]: [c_customer_sk#32, c_current_addr_sk#33]
 
-(54) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_customer_sk#26]
-Right keys [1]: [c_customer_sk#33]
+(56) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_customer_sk#25]
+Right keys [1]: [c_customer_sk#32]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 13]
-Output [3]: [ss_item_sk#25, ss_ext_sales_price#28, c_current_addr_sk#34]
-Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28, c_customer_sk#33, c_current_addr_sk#34]
+(57) Project [codegen id : 13]
+Output [3]: [ss_item_sk#24, ss_ext_sales_price#27, c_current_addr_sk#33]
+Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27, c_customer_sk#32, c_current_addr_sk#33]
 
-(56) ReusedExchange [Reuses operator id: 31]
-Output [1]: [ca_address_sk#35]
+(58) ReusedExchange [Reuses operator id: 31]
+Output [1]: [ca_address_sk#34]
 
-(57) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [c_current_addr_sk#34]
-Right keys [1]: [ca_address_sk#35]
+(59) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [c_current_addr_sk#33]
+Right keys [1]: [ca_address_sk#34]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 13]
-Output [2]: [ss_item_sk#25, ss_ext_sales_price#28]
-Input [4]: [ss_item_sk#25, ss_ext_sales_price#28, c_current_addr_sk#34, ca_address_sk#35]
+(60) Project [codegen id : 13]
+Output [2]: [ss_item_sk#24, ss_ext_sales_price#27]
+Input [4]: [ss_item_sk#24, ss_ext_sales_price#27, c_current_addr_sk#33, ca_address_sk#34]
 
-(59) ReusedExchange [Reuses operator id: 38]
-Output [1]: [i_item_sk#36]
+(61) ReusedExchange [Reuses operator id: 38]
+Output [1]: [i_item_sk#35]
 
-(60) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_item_sk#25]
-Right keys [1]: [i_item_sk#36]
+(62) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_item_sk#24]
+Right keys [1]: [i_item_sk#35]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 13]
-Output [1]: [ss_ext_sales_price#28]
-Input [3]: [ss_item_sk#25, ss_ext_sales_price#28, i_item_sk#36]
+(63) Project [codegen id : 13]
+Output [1]: [ss_ext_sales_price#27]
+Input [3]: [ss_item_sk#24, ss_ext_sales_price#27, i_item_sk#35]
 
-(62) HashAggregate [codegen id : 13]
-Input [1]: [ss_ext_sales_price#28]
+(64) HashAggregate [codegen id : 13]
+Input [1]: [ss_ext_sales_price#27]
 Keys: []
-Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#28))]
-Aggregate Attributes [1]: [sum#37]
-Results [1]: [sum#38]
+Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#27))]
+Aggregate Attributes [1]: [sum#36]
+Results [1]: [sum#37]
 
-(63) Exchange
-Input [1]: [sum#38]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
+(65) RowToColumnar
+Input [1]: [sum#37]
 
-(64) HashAggregate [codegen id : 14]
-Input [1]: [sum#38]
+(66) CometColumnarExchange
+Input [1]: [sum#37]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(67) CometHashAggregate
+Input [1]: [sum#37]
 Keys: []
-Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#28))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#28))#39]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#28))#39,17,2) AS total#40]
+Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#27))]
+
+(68) ColumnarToRow [codegen id : 14]
+Input [1]: [total#38]
 
-(65) BroadcastExchange
-Input [1]: [total#40]
+(69) BroadcastExchange
+Input [1]: [total#38]
 Arguments: IdentityBroadcastMode, [plan_id=8]
 
-(66) BroadcastNestedLoopJoin [codegen id : 15]
+(70) BroadcastNestedLoopJoin [codegen id : 15]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 15]
-Output [3]: [promotions#24, total#40, ((cast(promotions#24 as decimal(15,4)) / cast(total#40 as decimal(15,4))) * 100) AS ((CAST(promotions AS DECIMAL(15,4)) / CAST(total AS DECIMAL(15,4))) * 100)#41]
-Input [2]: [promotions#24, total#40]
+(71) Project [codegen id : 15]
+Output [3]: [promotions#23, total#38, ((cast(promotions#23 as decimal(15,4)) / cast(total#38 as decimal(15,4))) * 100) AS ((CAST(promotions AS DECIMAL(15,4)) / CAST(total AS DECIMAL(15,4))) * 100)#39]
+Input [2]: [promotions#23, total#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (72)
-+- * ColumnarToRow (71)
-   +- CometProject (70)
-      +- CometFilter (69)
-         +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (76)
++- * ColumnarToRow (75)
+   +- CometProject (74)
+      +- CometFilter (73)
+         +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#14, d_year#42, d_moy#43]
+Output [3]: [d_date_sk#14, d_year#40, d_moy#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(69) CometFilter
-Input [3]: [d_date_sk#14, d_year#42, d_moy#43]
-Condition : ((((isnotnull(d_year#42) AND isnotnull(d_moy#43)) AND (d_year#42 = 1998)) AND (d_moy#43 = 11)) AND isnotnull(d_date_sk#14))
+(73) CometFilter
+Input [3]: [d_date_sk#14, d_year#40, d_moy#41]
+Condition : ((((isnotnull(d_year#40) AND isnotnull(d_moy#41)) AND (d_year#40 = 1998)) AND (d_moy#41 = 11)) AND isnotnull(d_date_sk#14))
 
-(70) CometProject
-Input [3]: [d_date_sk#14, d_year#42, d_moy#43]
+(74) CometProject
+Input [3]: [d_date_sk#14, d_year#40, d_moy#41]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(71) ColumnarToRow [codegen id : 1]
+(75) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(72) BroadcastExchange
+(76) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-Subquery:2 Hosting operator id = 44 Hosting Expression = ss_sold_date_sk#29 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 46 Hosting Expression = ss_sold_date_sk#28 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt
index 2c3d07ac64..ddedbe1379 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt
@@ -1,106 +1,110 @@
 WholeStageCodegen (15)
   Project [promotions,total]
     BroadcastNestedLoopJoin
-      HashAggregate [sum] [sum(UnscaledValue(ss_ext_sales_price)),promotions,sum]
+      ColumnarToRow
         InputAdapter
-          Exchange #1
-            WholeStageCodegen (7)
-              HashAggregate [ss_ext_sales_price] [sum,sum]
-                Project [ss_ext_sales_price]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ss_item_sk,ss_ext_sales_price]
-                      BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                        Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
-                          BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                            Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                  BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                    Project [ss_item_sk,ss_customer_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ss_store_sk,ss_promo_sk,ss_customer_sk,ss_item_sk]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+          CometHashAggregate [sum]
+            CometColumnarExchange #1
+              RowToColumnar
+                WholeStageCodegen (7)
+                  HashAggregate [ss_ext_sales_price] [sum,sum]
+                    Project [ss_ext_sales_price]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ss_item_sk,ss_ext_sales_price]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
+                              BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                      BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                        Project [ss_item_sk,ss_customer_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_store_sk,ss_promo_sk,ss_customer_sk,ss_item_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #2
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                            InputAdapter
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [s_store_sk]
+                                                        CometFilter [s_gmt_offset,s_store_sk]
+                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_gmt_offset]
                                         InputAdapter
-                                          BroadcastExchange #3
-                                            WholeStageCodegen (1)
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometProject [s_store_sk]
-                                                    CometFilter [s_gmt_offset,s_store_sk]
-                                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_gmt_offset]
+                                                  CometProject [p_promo_sk]
+                                                    CometFilter [p_channel_dmail,p_channel_email,p_channel_tv,p_promo_sk]
+                                                      CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_dmail,p_channel_email,p_channel_tv]
                                     InputAdapter
-                                      BroadcastExchange #4
-                                        WholeStageCodegen (2)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [p_promo_sk]
-                                                CometFilter [p_channel_dmail,p_channel_email,p_channel_tv,p_promo_sk]
-                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_dmail,p_channel_email,p_channel_tv]
+                                      ReusedExchange [d_date_sk] #2
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (4)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk,c_current_addr_sk]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                             InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (4)
+                              BroadcastExchange #6
+                                WholeStageCodegen (5)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [c_customer_sk,c_current_addr_sk]
-                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                      CometProject [ca_address_sk]
+                                        CometFilter [ca_gmt_offset,ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
                         InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (5)
+                          BroadcastExchange #7
+                            WholeStageCodegen (6)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [ca_address_sk]
-                                    CometFilter [ca_gmt_offset,ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (6)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [i_item_sk]
-                                CometFilter [i_category,i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
+                                  CometProject [i_item_sk]
+                                    CometFilter [i_category,i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
       InputAdapter
         BroadcastExchange #8
           WholeStageCodegen (14)
-            HashAggregate [sum] [sum(UnscaledValue(ss_ext_sales_price)),total,sum]
+            ColumnarToRow
               InputAdapter
-                Exchange #9
-                  WholeStageCodegen (13)
-                    HashAggregate [ss_ext_sales_price] [sum,sum]
-                      Project [ss_ext_sales_price]
-                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                          Project [ss_item_sk,ss_ext_sales_price]
-                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                              Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
-                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                  Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_store_sk,ss_customer_sk,ss_item_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
+                CometHashAggregate [sum]
+                  CometColumnarExchange #9
+                    RowToColumnar
+                      WholeStageCodegen (13)
+                        HashAggregate [ss_ext_sales_price] [sum,sum]
+                          Project [ss_ext_sales_price]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              Project [ss_item_sk,ss_ext_sales_price]
+                                BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                  Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
+                                    BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                      Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_store_sk,ss_customer_sk,ss_item_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [s_store_sk] #3
                                           InputAdapter
-                                            ReusedExchange [s_store_sk] #3
+                                            ReusedExchange [d_date_sk] #2
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #2
+                                        ReusedExchange [c_customer_sk,c_current_addr_sk] #5
                                   InputAdapter
-                                    ReusedExchange [c_customer_sk,c_current_addr_sk] #5
+                                    ReusedExchange [ca_address_sk] #6
                               InputAdapter
-                                ReusedExchange [ca_address_sk] #6
-                          InputAdapter
-                            ReusedExchange [i_item_sk] #7
+                                ReusedExchange [i_item_sk] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt
index 82ded1c507..427bce7dff 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt
@@ -1,36 +1,38 @@
 == Physical Plan ==
-TakeOrderedAndProject (32)
-+- * HashAggregate (31)
-   +- Exchange (30)
-      +- * HashAggregate (29)
-         +- * Project (28)
-            +- * BroadcastHashJoin Inner BuildRight (27)
-               :- * Project (21)
-               :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :     :- * Project (15)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :- * Project (9)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :  +- CometFilter (2)
-               :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-               :     :     :     +- BroadcastExchange (7)
-               :     :     :        +- * ColumnarToRow (6)
-               :     :     :           +- CometFilter (5)
-               :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-               :     :     +- BroadcastExchange (13)
-               :     :        +- * ColumnarToRow (12)
-               :     :           +- CometFilter (11)
-               :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
-               :     +- BroadcastExchange (19)
-               :        +- * ColumnarToRow (18)
-               :           +- CometFilter (17)
-               :              +- CometScan parquet spark_catalog.default.web_site (16)
-               +- BroadcastExchange (26)
-                  +- * ColumnarToRow (25)
-                     +- CometProject (24)
-                        +- CometFilter (23)
-                           +- CometScan parquet spark_catalog.default.date_dim (22)
+* ColumnarToRow (34)
++- CometTakeOrderedAndProject (33)
+   +- CometHashAggregate (32)
+      +- CometColumnarExchange (31)
+         +- RowToColumnar (30)
+            +- * HashAggregate (29)
+               +- * Project (28)
+                  +- * BroadcastHashJoin Inner BuildRight (27)
+                     :- * Project (21)
+                     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :     :- * Project (15)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :- * Project (9)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                     :     :     :     +- BroadcastExchange (7)
+                     :     :     :        +- * ColumnarToRow (6)
+                     :     :     :           +- CometFilter (5)
+                     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+                     :     :     +- BroadcastExchange (13)
+                     :     :        +- * ColumnarToRow (12)
+                     :     :           +- CometFilter (11)
+                     :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
+                     :     +- BroadcastExchange (19)
+                     :        +- * ColumnarToRow (18)
+                     :           +- CometFilter (17)
+                     :              +- CometScan parquet spark_catalog.default.web_site (16)
+                     +- BroadcastExchange (26)
+                        +- * ColumnarToRow (25)
+                           +- CometProject (24)
+                              +- CometFilter (23)
+                                 +- CometScan parquet spark_catalog.default.date_dim (22)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -170,18 +172,22 @@ Functions [5]: [partial_sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <
 Aggregate Attributes [5]: [sum#15, sum#16, sum#17, sum#18, sum#19]
 Results [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 
-(30) Exchange
+(30) RowToColumnar
 Input [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, web_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(31) HashAggregate [codegen id : 6]
+(31) CometColumnarExchange
+Input [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, web_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(32) CometHashAggregate
 Input [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 Keys [3]: [_groupingexpression#14, sm_type#9, web_name#11]
 Functions [5]: [sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END), sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 30) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END), sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 60) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END), sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 90) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END), sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)]
-Aggregate Attributes [5]: [sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 30) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 60) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 90) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28, sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29]
-Results [8]: [_groupingexpression#14 AS substr(w_warehouse_name, 1, 20)#30, sm_type#9, web_name#11, sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25 AS 30 days #31, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 30) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26 AS 31 - 60 days #32, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 60) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27 AS 61 - 90 days #33, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 90) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28 AS 91 - 120 days #34, sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29 AS >120 days #35]
 
-(32) TakeOrderedAndProject
-Input [8]: [substr(w_warehouse_name, 1, 20)#30, sm_type#9, web_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
-Arguments: 100, [substr(w_warehouse_name, 1, 20)#30 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, web_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#30, sm_type#9, web_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
+(33) CometTakeOrderedAndProject
+Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, web_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST,sm_type#9 ASC NULLS FIRST,web_name#11 ASC NULLS FIRST], output=[substr(w_warehouse_name, 1, 20)#25,sm_type#9,web_name#11,30 days #26,31 - 60 days #27,61 - 90 days #28,91 - 120 days #29,>120 days #30]), 100, [substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, web_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#25, sm_type#9, web_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
+
+(34) ColumnarToRow [codegen id : 6]
+Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, web_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt
index 5ae522ce1c..4fe012742f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt
@@ -1,48 +1,50 @@
-TakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,web_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
-  WholeStageCodegen (6)
-    HashAggregate [_groupingexpression,sm_type,web_name,sum,sum,sum,sum,sum] [sum(CASE WHEN ((ws_ship_date_sk - ws_sold_date_sk) <= 30) THEN 1 ELSE 0 END),sum(CASE WHEN (((ws_ship_date_sk - ws_sold_date_sk) > 30) AND ((ws_ship_date_sk - ws_sold_date_sk) <= 60)) THEN 1 ELSE 0 END),sum(CASE WHEN (((ws_ship_date_sk - ws_sold_date_sk) > 60) AND ((ws_ship_date_sk - ws_sold_date_sk) <= 90)) THEN 1 ELSE 0 END),sum(CASE WHEN (((ws_ship_date_sk - ws_sold_date_sk) > 90) AND ((ws_ship_date_sk - ws_sold_date_sk) <= 120)) THEN 1 ELSE 0 END),sum(CASE WHEN ((ws_ship_date_sk - ws_sold_date_sk) > 120) THEN 1 ELSE 0 END),substr(w_warehouse_name, 1, 20),30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ,sum,sum,sum,sum,sum]
-      InputAdapter
-        Exchange [_groupingexpression,sm_type,web_name] #1
-          WholeStageCodegen (5)
-            HashAggregate [_groupingexpression,sm_type,web_name,ws_ship_date_sk,ws_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-              Project [ws_ship_date_sk,ws_sold_date_sk,sm_type,web_name,w_warehouse_name]
-                BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
-                  Project [ws_ship_date_sk,ws_sold_date_sk,w_warehouse_name,sm_type,web_name]
-                    BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                      Project [ws_ship_date_sk,ws_web_site_sk,ws_sold_date_sk,w_warehouse_name,sm_type]
-                        BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
-                          Project [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_sold_date_sk,w_warehouse_name]
-                            BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [ws_warehouse_sk,ws_ship_mode_sk,ws_web_site_sk,ws_ship_date_sk]
-                                    CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_sold_date_sk]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,web_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
+        CometHashAggregate [_groupingexpression,sm_type,web_name,sum,sum,sum,sum,sum]
+          CometColumnarExchange [_groupingexpression,sm_type,web_name] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                HashAggregate [_groupingexpression,sm_type,web_name,ws_ship_date_sk,ws_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                  Project [ws_ship_date_sk,ws_sold_date_sk,sm_type,web_name,w_warehouse_name]
+                    BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
+                      Project [ws_ship_date_sk,ws_sold_date_sk,w_warehouse_name,sm_type,web_name]
+                        BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                          Project [ws_ship_date_sk,ws_web_site_sk,ws_sold_date_sk,w_warehouse_name,sm_type]
+                            BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
+                              Project [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_sold_date_sk,w_warehouse_name]
+                                BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ws_warehouse_sk,ws_ship_mode_sk,ws_web_site_sk,ws_ship_date_sk]
+                                        CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_sold_date_sk]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [w_warehouse_sk]
+                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                               InputAdapter
-                                BroadcastExchange #2
-                                  WholeStageCodegen (1)
+                                BroadcastExchange #3
+                                  WholeStageCodegen (2)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [w_warehouse_sk]
-                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                        CometFilter [sm_ship_mode_sk]
+                                          CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
                           InputAdapter
-                            BroadcastExchange #3
-                              WholeStageCodegen (2)
+                            BroadcastExchange #4
+                              WholeStageCodegen (3)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [sm_ship_mode_sk]
-                                      CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
+                                    CometFilter [web_site_sk]
+                                      CometScan parquet spark_catalog.default.web_site [web_site_sk,web_name]
                       InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (3)
+                        BroadcastExchange #5
+                          WholeStageCodegen (4)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [web_site_sk]
-                                  CometScan parquet spark_catalog.default.web_site [web_site_sk,web_name]
-                  InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (4)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [d_date_sk]
-                              CometFilter [d_month_seq,d_date_sk]
-                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                CometProject [d_date_sk]
+                                  CometFilter [d_month_seq,d_date_sk]
+                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt
index 458a35b388..18ed395704 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt
@@ -1,32 +1,34 @@
 == Physical Plan ==
-TakeOrderedAndProject (28)
-+- * Project (27)
-   +- * Filter (26)
-      +- Window (25)
-         +- * Sort (24)
-            +- Exchange (23)
-               +- * HashAggregate (22)
-                  +- Exchange (21)
-                     +- * HashAggregate (20)
-                        +- * Project (19)
-                           +- * BroadcastHashJoin Inner BuildRight (18)
-                              :- * Project (13)
-                              :  +- * BroadcastHashJoin Inner BuildRight (12)
-                              :     :- * Project (10)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                              :     :     :- * ColumnarToRow (4)
-                              :     :     :  +- CometProject (3)
-                              :     :     :     +- CometFilter (2)
-                              :     :     :        +- CometScan parquet spark_catalog.default.item (1)
-                              :     :     +- BroadcastExchange (8)
-                              :     :        +- * ColumnarToRow (7)
-                              :     :           +- CometFilter (6)
-                              :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                              :     +- ReusedExchange (11)
-                              +- BroadcastExchange (17)
-                                 +- * ColumnarToRow (16)
-                                    +- CometFilter (15)
-                                       +- CometScan parquet spark_catalog.default.store (14)
+TakeOrderedAndProject (30)
++- * Project (29)
+   +- * Filter (28)
+      +- Window (27)
+         +- * ColumnarToRow (26)
+            +- CometSort (25)
+               +- CometColumnarExchange (24)
+                  +- CometHashAggregate (23)
+                     +- CometColumnarExchange (22)
+                        +- RowToColumnar (21)
+                           +- * HashAggregate (20)
+                              +- * Project (19)
+                                 +- * BroadcastHashJoin Inner BuildRight (18)
+                                    :- * Project (13)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (12)
+                                    :     :- * Project (10)
+                                    :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                                    :     :     :- * ColumnarToRow (4)
+                                    :     :     :  +- CometProject (3)
+                                    :     :     :     +- CometFilter (2)
+                                    :     :     :        +- CometScan parquet spark_catalog.default.item (1)
+                                    :     :     +- BroadcastExchange (8)
+                                    :     :        +- * ColumnarToRow (7)
+                                    :     :           +- CometFilter (6)
+                                    :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                                    :     +- ReusedExchange (11)
+                                    +- BroadcastExchange (17)
+                                       +- * ColumnarToRow (16)
+                                          +- CometFilter (15)
+                                             +- CometScan parquet spark_catalog.default.store (14)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -76,7 +78,7 @@ Join condition: None
 Output [4]: [i_manager_id#5, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 Input [6]: [i_item_sk#1, i_manager_id#5, ss_item_sk#10, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 
-(11) ReusedExchange [Reuses operator id: 33]
+(11) ReusedExchange [Reuses operator id: 35]
 Output [2]: [d_date_sk#15, d_moy#16]
 
 (12) BroadcastHashJoin [codegen id : 4]
@@ -124,70 +126,74 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#12))]
 Aggregate Attributes [1]: [sum#18]
 Results [3]: [i_manager_id#5, d_moy#16, sum#19]
 
-(21) Exchange
+(21) RowToColumnar
 Input [3]: [i_manager_id#5, d_moy#16, sum#19]
-Arguments: hashpartitioning(i_manager_id#5, d_moy#16, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) HashAggregate [codegen id : 5]
+(22) CometColumnarExchange
+Input [3]: [i_manager_id#5, d_moy#16, sum#19]
+Arguments: hashpartitioning(i_manager_id#5, d_moy#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(23) CometHashAggregate
 Input [3]: [i_manager_id#5, d_moy#16, sum#19]
 Keys [2]: [i_manager_id#5, d_moy#16]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#12))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#12))#20]
-Results [3]: [i_manager_id#5, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS sum_sales#21, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS _w0#22]
 
-(23) Exchange
-Input [3]: [i_manager_id#5, sum_sales#21, _w0#22]
-Arguments: hashpartitioning(i_manager_id#5, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(24) CometColumnarExchange
+Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
+Arguments: hashpartitioning(i_manager_id#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(25) CometSort
+Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
+Arguments: [i_manager_id#5, sum_sales#20, _w0#21], [i_manager_id#5 ASC NULLS FIRST]
 
-(24) Sort [codegen id : 6]
-Input [3]: [i_manager_id#5, sum_sales#21, _w0#22]
-Arguments: [i_manager_id#5 ASC NULLS FIRST], false, 0
+(26) ColumnarToRow [codegen id : 5]
+Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
 
-(25) Window
-Input [3]: [i_manager_id#5, sum_sales#21, _w0#22]
-Arguments: [avg(_w0#22) windowspecdefinition(i_manager_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#23], [i_manager_id#5]
+(27) Window
+Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
+Arguments: [avg(_w0#21) windowspecdefinition(i_manager_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#22], [i_manager_id#5]
 
-(26) Filter [codegen id : 7]
-Input [4]: [i_manager_id#5, sum_sales#21, _w0#22, avg_monthly_sales#23]
-Condition : CASE WHEN (avg_monthly_sales#23 > 0.000000) THEN ((abs((sum_sales#21 - avg_monthly_sales#23)) / avg_monthly_sales#23) > 0.1000000000000000) ELSE false END
+(28) Filter [codegen id : 6]
+Input [4]: [i_manager_id#5, sum_sales#20, _w0#21, avg_monthly_sales#22]
+Condition : CASE WHEN (avg_monthly_sales#22 > 0.000000) THEN ((abs((sum_sales#20 - avg_monthly_sales#22)) / avg_monthly_sales#22) > 0.1000000000000000) ELSE false END
 
-(27) Project [codegen id : 7]
-Output [3]: [i_manager_id#5, sum_sales#21, avg_monthly_sales#23]
-Input [4]: [i_manager_id#5, sum_sales#21, _w0#22, avg_monthly_sales#23]
+(29) Project [codegen id : 6]
+Output [3]: [i_manager_id#5, sum_sales#20, avg_monthly_sales#22]
+Input [4]: [i_manager_id#5, sum_sales#20, _w0#21, avg_monthly_sales#22]
 
-(28) TakeOrderedAndProject
-Input [3]: [i_manager_id#5, sum_sales#21, avg_monthly_sales#23]
-Arguments: 100, [i_manager_id#5 ASC NULLS FIRST, avg_monthly_sales#23 ASC NULLS FIRST, sum_sales#21 ASC NULLS FIRST], [i_manager_id#5, sum_sales#21, avg_monthly_sales#23]
+(30) TakeOrderedAndProject
+Input [3]: [i_manager_id#5, sum_sales#20, avg_monthly_sales#22]
+Arguments: 100, [i_manager_id#5 ASC NULLS FIRST, avg_monthly_sales#22 ASC NULLS FIRST, sum_sales#20 ASC NULLS FIRST], [i_manager_id#5, sum_sales#20, avg_monthly_sales#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = ss_sold_date_sk#13 IN dynamicpruning#14
-BroadcastExchange (33)
-+- * ColumnarToRow (32)
-   +- CometProject (31)
-      +- CometFilter (30)
-         +- CometScan parquet spark_catalog.default.date_dim (29)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#15, d_month_seq#24, d_moy#16]
+Output [3]: [d_date_sk#15, d_month_seq#23, d_moy#16]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_month_seq, [1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_moy:int>
 
-(30) CometFilter
-Input [3]: [d_date_sk#15, d_month_seq#24, d_moy#16]
-Condition : (d_month_seq#24 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
+(32) CometFilter
+Input [3]: [d_date_sk#15, d_month_seq#23, d_moy#16]
+Condition : (d_month_seq#23 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
 
-(31) CometProject
-Input [3]: [d_date_sk#15, d_month_seq#24, d_moy#16]
+(33) CometProject
+Input [3]: [d_date_sk#15, d_month_seq#23, d_moy#16]
 Arguments: [d_date_sk#15, d_moy#16], [d_date_sk#15, d_moy#16]
 
-(32) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#15, d_moy#16]
 
-(33) BroadcastExchange
+(35) BroadcastExchange
 Input [2]: [d_date_sk#15, d_moy#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt
index 7f6f8c1370..cd9cffbd1c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [i_manager_id,avg_monthly_sales,sum_sales]
-  WholeStageCodegen (7)
+  WholeStageCodegen (6)
     Project [i_manager_id,sum_sales,avg_monthly_sales]
       Filter [avg_monthly_sales,sum_sales]
         InputAdapter
           Window [_w0,i_manager_id]
-            WholeStageCodegen (6)
-              Sort [i_manager_id]
+            WholeStageCodegen (5)
+              ColumnarToRow
                 InputAdapter
-                  Exchange [i_manager_id] #1
-                    WholeStageCodegen (5)
-                      HashAggregate [i_manager_id,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
-                        InputAdapter
-                          Exchange [i_manager_id,d_moy] #2
+                  CometSort [i_manager_id]
+                    CometColumnarExchange [i_manager_id] #1
+                      CometHashAggregate [i_manager_id,d_moy,sum]
+                        CometColumnarExchange [i_manager_id,d_moy] #2
+                          RowToColumnar
                             WholeStageCodegen (4)
                               HashAggregate [i_manager_id,d_moy,ss_sales_price] [sum,sum]
                                 Project [i_manager_id,ss_sales_price,d_moy]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt
index c6911fbe5a..5f442e277a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt
@@ -1,187 +1,195 @@
 == Physical Plan ==
-* Sort (183)
-+- Exchange (182)
-   +- * Project (181)
-      +- * SortMergeJoin Inner (180)
-         :- * Sort (110)
-         :  +- Exchange (109)
-         :     +- * HashAggregate (108)
-         :        +- * HashAggregate (107)
-         :           +- * Project (106)
-         :              +- * BroadcastHashJoin Inner BuildRight (105)
-         :                 :- * Project (99)
-         :                 :  +- * BroadcastHashJoin Inner BuildRight (98)
-         :                 :     :- * Project (96)
-         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (95)
-         :                 :     :     :- * Project (90)
-         :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (89)
-         :                 :     :     :     :- * Project (87)
-         :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
-         :                 :     :     :     :     :- * Project (81)
-         :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (80)
-         :                 :     :     :     :     :     :- * Project (78)
-         :                 :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (77)
-         :                 :     :     :     :     :     :     :- * Project (72)
-         :                 :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (71)
-         :                 :     :     :     :     :     :     :     :- * Project (66)
-         :                 :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (65)
-         :                 :     :     :     :     :     :     :     :     :- * Project (63)
-         :                 :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (62)
-         :                 :     :     :     :     :     :     :     :     :     :- * Project (57)
-         :                 :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-         :                 :     :     :     :     :     :     :     :     :     :     :- * Project (54)
-         :                 :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :- * Project (48)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (47)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (42)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (41)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (36)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (35)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (33)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (32)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (12)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (11)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (10)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (9)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (4)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (3)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (2)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (8)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (7)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (6)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (31)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (30)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (29)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (28)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (27)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometExchange (26)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (25)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (24)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (23)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (17)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometExchange (16)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (15)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (14)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (13)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (22)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometExchange (21)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (20)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (19)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (18)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (34)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (40)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (39)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (38)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (37)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (46)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (45)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (44)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (43)
-         :                 :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (52)
-         :                 :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (51)
-         :                 :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (50)
-         :                 :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (49)
-         :                 :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (55)
-         :                 :     :     :     :     :     :     :     :     :     +- BroadcastExchange (61)
-         :                 :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (60)
-         :                 :     :     :     :     :     :     :     :     :           +- CometFilter (59)
-         :                 :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (58)
-         :                 :     :     :     :     :     :     :     :     +- ReusedExchange (64)
-         :                 :     :     :     :     :     :     :     +- BroadcastExchange (70)
-         :                 :     :     :     :     :     :     :        +- * ColumnarToRow (69)
-         :                 :     :     :     :     :     :     :           +- CometFilter (68)
-         :                 :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (67)
-         :                 :     :     :     :     :     :     +- BroadcastExchange (76)
-         :                 :     :     :     :     :     :        +- * ColumnarToRow (75)
-         :                 :     :     :     :     :     :           +- CometFilter (74)
-         :                 :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (73)
-         :                 :     :     :     :     :     +- ReusedExchange (79)
-         :                 :     :     :     :     +- BroadcastExchange (85)
-         :                 :     :     :     :        +- * ColumnarToRow (84)
-         :                 :     :     :     :           +- CometFilter (83)
-         :                 :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (82)
-         :                 :     :     :     +- ReusedExchange (88)
-         :                 :     :     +- BroadcastExchange (94)
-         :                 :     :        +- * ColumnarToRow (93)
-         :                 :     :           +- CometFilter (92)
-         :                 :     :              +- CometScan parquet spark_catalog.default.income_band (91)
-         :                 :     +- ReusedExchange (97)
-         :                 +- BroadcastExchange (104)
-         :                    +- * ColumnarToRow (103)
-         :                       +- CometProject (102)
-         :                          +- CometFilter (101)
-         :                             +- CometScan parquet spark_catalog.default.item (100)
-         +- * Sort (179)
-            +- Exchange (178)
-               +- * HashAggregate (177)
-                  +- * HashAggregate (176)
-                     +- * Project (175)
-                        +- * BroadcastHashJoin Inner BuildRight (174)
-                           :- * Project (172)
-                           :  +- * BroadcastHashJoin Inner BuildRight (171)
-                           :     :- * Project (169)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (168)
-                           :     :     :- * Project (166)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (165)
-                           :     :     :     :- * Project (163)
-                           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (162)
-                           :     :     :     :     :- * Project (160)
-                           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (159)
-                           :     :     :     :     :     :- * Project (157)
-                           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (156)
-                           :     :     :     :     :     :     :- * Project (154)
-                           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (153)
-                           :     :     :     :     :     :     :     :- * Project (151)
-                           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (150)
-                           :     :     :     :     :     :     :     :     :- * Project (148)
-                           :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (147)
-                           :     :     :     :     :     :     :     :     :     :- * Project (145)
-                           :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (144)
-                           :     :     :     :     :     :     :     :     :     :     :- * Project (142)
-                           :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (141)
-                           :     :     :     :     :     :     :     :     :     :     :     :- * Project (139)
-                           :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (138)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (136)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (135)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (133)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (132)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (130)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (129)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (122)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (121)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (120)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (119)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (114)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (113)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (112)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (111)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (118)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (117)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (116)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (115)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (128)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (127)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (126)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (125)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (124)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (123)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (131)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (134)
-                           :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (137)
-                           :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (140)
-                           :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (143)
-                           :     :     :     :     :     :     :     :     :     +- ReusedExchange (146)
-                           :     :     :     :     :     :     :     :     +- ReusedExchange (149)
-                           :     :     :     :     :     :     :     +- ReusedExchange (152)
-                           :     :     :     :     :     :     +- ReusedExchange (155)
-                           :     :     :     :     :     +- ReusedExchange (158)
-                           :     :     :     :     +- ReusedExchange (161)
-                           :     :     :     +- ReusedExchange (164)
-                           :     :     +- ReusedExchange (167)
-                           :     +- ReusedExchange (170)
-                           +- ReusedExchange (173)
+* ColumnarToRow (191)
++- CometSort (190)
+   +- CometColumnarExchange (189)
+      +- RowToColumnar (188)
+         +- * Project (187)
+            +- * SortMergeJoin Inner (186)
+               :- * ColumnarToRow (113)
+               :  +- CometSort (112)
+               :     +- CometColumnarExchange (111)
+               :        +- RowToColumnar (110)
+               :           +- * HashAggregate (109)
+               :              +- * HashAggregate (108)
+               :                 +- * Project (107)
+               :                    +- * BroadcastHashJoin Inner BuildRight (106)
+               :                       :- * Project (100)
+               :                       :  +- * BroadcastHashJoin Inner BuildRight (99)
+               :                       :     :- * Project (97)
+               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (96)
+               :                       :     :     :- * Project (91)
+               :                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (90)
+               :                       :     :     :     :- * Project (88)
+               :                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (87)
+               :                       :     :     :     :     :- * Project (82)
+               :                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (81)
+               :                       :     :     :     :     :     :- * Project (79)
+               :                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (78)
+               :                       :     :     :     :     :     :     :- * Project (73)
+               :                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (72)
+               :                       :     :     :     :     :     :     :     :- * Project (67)
+               :                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (66)
+               :                       :     :     :     :     :     :     :     :     :- * Project (64)
+               :                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (63)
+               :                       :     :     :     :     :     :     :     :     :     :- * Project (58)
+               :                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
+               :                       :     :     :     :     :     :     :     :     :     :     :- * Project (55)
+               :                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (49)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (48)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (43)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (42)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (37)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (36)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (34)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (33)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (32)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (13)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (12)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (11)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (10)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (9)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (4)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (3)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (2)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (8)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (7)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (6)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (5)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (31)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (30)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (29)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (28)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometColumnarExchange (27)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (26)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (25)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (24)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (18)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometColumnarExchange (17)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (16)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (15)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (14)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (23)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometColumnarExchange (22)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (21)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (20)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (19)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (35)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (41)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (40)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (39)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (38)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (47)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (46)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (45)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (44)
+               :                       :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (53)
+               :                       :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (52)
+               :                       :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (51)
+               :                       :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (50)
+               :                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (56)
+               :                       :     :     :     :     :     :     :     :     :     +- BroadcastExchange (62)
+               :                       :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (61)
+               :                       :     :     :     :     :     :     :     :     :           +- CometFilter (60)
+               :                       :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (59)
+               :                       :     :     :     :     :     :     :     :     +- ReusedExchange (65)
+               :                       :     :     :     :     :     :     :     +- BroadcastExchange (71)
+               :                       :     :     :     :     :     :     :        +- * ColumnarToRow (70)
+               :                       :     :     :     :     :     :     :           +- CometFilter (69)
+               :                       :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (68)
+               :                       :     :     :     :     :     :     +- BroadcastExchange (77)
+               :                       :     :     :     :     :     :        +- * ColumnarToRow (76)
+               :                       :     :     :     :     :     :           +- CometFilter (75)
+               :                       :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (74)
+               :                       :     :     :     :     :     +- ReusedExchange (80)
+               :                       :     :     :     :     +- BroadcastExchange (86)
+               :                       :     :     :     :        +- * ColumnarToRow (85)
+               :                       :     :     :     :           +- CometFilter (84)
+               :                       :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (83)
+               :                       :     :     :     +- ReusedExchange (89)
+               :                       :     :     +- BroadcastExchange (95)
+               :                       :     :        +- * ColumnarToRow (94)
+               :                       :     :           +- CometFilter (93)
+               :                       :     :              +- CometScan parquet spark_catalog.default.income_band (92)
+               :                       :     +- ReusedExchange (98)
+               :                       +- BroadcastExchange (105)
+               :                          +- * ColumnarToRow (104)
+               :                             +- CometProject (103)
+               :                                +- CometFilter (102)
+               :                                   +- CometScan parquet spark_catalog.default.item (101)
+               +- * ColumnarToRow (185)
+                  +- CometSort (184)
+                     +- CometColumnarExchange (183)
+                        +- RowToColumnar (182)
+                           +- * HashAggregate (181)
+                              +- * HashAggregate (180)
+                                 +- * Project (179)
+                                    +- * BroadcastHashJoin Inner BuildRight (178)
+                                       :- * Project (176)
+                                       :  +- * BroadcastHashJoin Inner BuildRight (175)
+                                       :     :- * Project (173)
+                                       :     :  +- * BroadcastHashJoin Inner BuildRight (172)
+                                       :     :     :- * Project (170)
+                                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (169)
+                                       :     :     :     :- * Project (167)
+                                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (166)
+                                       :     :     :     :     :- * Project (164)
+                                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (163)
+                                       :     :     :     :     :     :- * Project (161)
+                                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (160)
+                                       :     :     :     :     :     :     :- * Project (158)
+                                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (157)
+                                       :     :     :     :     :     :     :     :- * Project (155)
+                                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (154)
+                                       :     :     :     :     :     :     :     :     :- * Project (152)
+                                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (151)
+                                       :     :     :     :     :     :     :     :     :     :- * Project (149)
+                                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (148)
+                                       :     :     :     :     :     :     :     :     :     :     :- * Project (146)
+                                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (145)
+                                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (143)
+                                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (142)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (140)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (139)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (137)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (136)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (134)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (133)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (132)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (126)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (125)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (124)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (123)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (122)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (117)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (116)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (115)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (114)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (121)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (120)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (119)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (118)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (131)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (130)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (129)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (128)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (127)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (135)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (138)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (141)
+                                       :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (144)
+                                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (147)
+                                       :     :     :     :     :     :     :     :     :     +- ReusedExchange (150)
+                                       :     :     :     :     :     :     :     :     +- ReusedExchange (153)
+                                       :     :     :     :     :     :     :     +- ReusedExchange (156)
+                                       :     :     :     :     :     :     +- ReusedExchange (159)
+                                       :     :     :     :     :     +- ReusedExchange (162)
+                                       :     :     :     :     +- ReusedExchange (165)
+                                       :     :     :     +- ReusedExchange (168)
+                                       :     :     +- ReusedExchange (171)
+                                       :     +- ReusedExchange (174)
+                                       +- ReusedExchange (177)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -231,13 +239,16 @@ Join condition: None
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_ticket_number#8, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, sr_item_sk#14, sr_ticket_number#15]
 
-(11) Exchange
+(11) RowToColumnar
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(12) Sort [codegen id : 3]
+(12) CometColumnarExchange
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: [ss_item_sk#1 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(13) CometSort
+Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
@@ -246,19 +257,19 @@ Location [not included in comparison]/{warehouse_dir}/catalog_sales]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_order_number)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_ext_list_price:decimal(7,2)>
 
-(14) CometFilter
+(15) CometFilter
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Condition : (isnotnull(cs_item_sk#17) AND isnotnull(cs_order_number#18))
 
-(15) CometProject
+(16) CometProject
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 
-(16) CometExchange
+(17) CometColumnarExchange
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
-Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(17) CometSort
+(18) CometSort
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17 ASC NULLS FIRST, cs_order_number#18 ASC NULLS FIRST]
 
@@ -269,80 +280,79 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_refunded_cash:decimal(7,2),cr_reversed_charge:decimal(7,2),cr_store_credit:decimal(7,2)>
 
-(19) CometFilter
+(20) CometFilter
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Condition : (isnotnull(cr_item_sk#21) AND isnotnull(cr_order_number#22))
 
-(20) CometProject
+(21) CometProject
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(21) CometExchange
+(22) CometColumnarExchange
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
-Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
+Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(22) CometSort
+(23) CometSort
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21 ASC NULLS FIRST, cr_order_number#22 ASC NULLS FIRST]
 
-(23) CometSortMergeJoin
+(24) CometSortMergeJoin
 Left output [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Right output [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_order_number#18], [cr_item_sk#21, cr_order_number#22], Inner
 
-(24) CometProject
+(25) CometProject
 Input [8]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(25) CometHashAggregate
+(26) CometHashAggregate
 Input [5]: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [partial_sum(UnscaledValue(cs_ext_list_price#19)), partial_sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(26) CometExchange
+(27) CometColumnarExchange
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
-Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(27) CometHashAggregate
+(28) CometHashAggregate
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#19)), sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(28) CometFilter
+(29) CometFilter
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(29) CometProject
+(30) CometProject
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Arguments: [cs_item_sk#17], [cs_item_sk#17]
 
-(30) CometSort
+(31) CometSort
 Input [1]: [cs_item_sk#17]
 Arguments: [cs_item_sk#17], [cs_item_sk#17 ASC NULLS FIRST]
 
-(31) ColumnarToRow [codegen id : 4]
-Input [1]: [cs_item_sk#17]
-
-(32) SortMergeJoin [codegen id : 20]
-Left keys [1]: [ss_item_sk#1]
-Right keys [1]: [cs_item_sk#17]
-Join type: Inner
-Join condition: None
+(32) CometSortMergeJoin
+Left output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Right output [1]: [cs_item_sk#17]
+Arguments: [ss_item_sk#1], [cs_item_sk#17], Inner
 
-(33) Project [codegen id : 20]
-Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+(33) CometProject
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, cs_item_sk#17]
+Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
 
-(34) ReusedExchange [Reuses operator id: 187]
+(34) ColumnarToRow [codegen id : 18]
+Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+
+(35) ReusedExchange [Reuses operator id: 195]
 Output [2]: [d_date_sk#32, d_year#33]
 
-(35) BroadcastHashJoin [codegen id : 20]
+(36) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_sold_date_sk#12]
 Right keys [1]: [d_date_sk#32]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 20]
+(37) Project [codegen id : 18]
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33]
 Input [13]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, d_date_sk#32, d_year#33]
 
@@ -353,24 +363,24 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_name), IsNotNull(s_zip)]
 ReadSchema: struct<s_store_sk:int,s_store_name:string,s_zip:string>
 
-(38) CometFilter
+(39) CometFilter
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Condition : ((isnotnull(s_store_sk#34) AND isnotnull(s_store_name#35)) AND isnotnull(s_zip#36))
 
-(39) ColumnarToRow [codegen id : 6]
+(40) ColumnarToRow [codegen id : 4]
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 
-(40) BroadcastExchange
+(41) BroadcastExchange
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 20]
+(42) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_store_sk#6]
 Right keys [1]: [s_store_sk#34]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 20]
+(43) Project [codegen id : 18]
 Output [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_sk#34, s_store_name#35, s_zip#36]
 
@@ -381,24 +391,24 @@ Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_first_sales_date_sk), IsNotNull(c_first_shipto_date_sk), IsNotNull(c_current_cdemo_sk), IsNotNull(c_current_hdemo_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_cdemo_sk:int,c_current_hdemo_sk:int,c_current_addr_sk:int,c_first_shipto_date_sk:int,c_first_sales_date_sk:int>
 
-(44) CometFilter
+(45) CometFilter
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Condition : (((((isnotnull(c_customer_sk#37) AND isnotnull(c_first_sales_date_sk#42)) AND isnotnull(c_first_shipto_date_sk#41)) AND isnotnull(c_current_cdemo_sk#38)) AND isnotnull(c_current_hdemo_sk#39)) AND isnotnull(c_current_addr_sk#40))
 
-(45) ColumnarToRow [codegen id : 7]
+(46) ColumnarToRow [codegen id : 5]
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
-(46) BroadcastExchange
+(47) BroadcastExchange
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(47) BroadcastHashJoin [codegen id : 20]
+(48) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#37]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 20]
+(49) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Input [18]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
@@ -409,37 +419,37 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(50) CometFilter
+(51) CometFilter
 Input [2]: [d_date_sk#43, d_year#44]
 Condition : isnotnull(d_date_sk#43)
 
-(51) ColumnarToRow [codegen id : 8]
+(52) ColumnarToRow [codegen id : 6]
 Input [2]: [d_date_sk#43, d_year#44]
 
-(52) BroadcastExchange
+(53) BroadcastExchange
 Input [2]: [d_date_sk#43, d_year#44]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(53) BroadcastHashJoin [codegen id : 20]
+(54) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_first_sales_date_sk#42]
 Right keys [1]: [d_date_sk#43]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 20]
+(55) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42, d_date_sk#43, d_year#44]
 
-(55) ReusedExchange [Reuses operator id: 52]
+(56) ReusedExchange [Reuses operator id: 53]
 Output [2]: [d_date_sk#45, d_year#46]
 
-(56) BroadcastHashJoin [codegen id : 20]
+(57) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_first_shipto_date_sk#41]
 Right keys [1]: [d_date_sk#45]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 20]
+(58) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44, d_date_sk#45, d_year#46]
 
@@ -450,37 +460,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_demographics]
 PushedFilters: [IsNotNull(cd_demo_sk), IsNotNull(cd_marital_status)]
 ReadSchema: struct<cd_demo_sk:int,cd_marital_status:string>
 
-(59) CometFilter
+(60) CometFilter
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Condition : (isnotnull(cd_demo_sk#47) AND isnotnull(cd_marital_status#48))
 
-(60) ColumnarToRow [codegen id : 10]
+(61) ColumnarToRow [codegen id : 8]
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 
-(61) BroadcastExchange
+(62) BroadcastExchange
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(62) BroadcastHashJoin [codegen id : 20]
+(63) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_cdemo_sk#3]
 Right keys [1]: [cd_demo_sk#47]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 20]
+(64) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_demo_sk#47, cd_marital_status#48]
 
-(64) ReusedExchange [Reuses operator id: 61]
+(65) ReusedExchange [Reuses operator id: 62]
 Output [2]: [cd_demo_sk#49, cd_marital_status#50]
 
-(65) BroadcastHashJoin [codegen id : 20]
+(66) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_current_cdemo_sk#38]
 Right keys [1]: [cd_demo_sk#49]
 Join type: Inner
 Join condition: NOT (cd_marital_status#48 = cd_marital_status#50)
 
-(66) Project [codegen id : 20]
+(67) Project [codegen id : 18]
 Output [14]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48, cd_demo_sk#49, cd_marital_status#50]
 
@@ -491,24 +501,24 @@ Location [not included in comparison]/{warehouse_dir}/promotion]
 PushedFilters: [IsNotNull(p_promo_sk)]
 ReadSchema: struct<p_promo_sk:int>
 
-(68) CometFilter
+(69) CometFilter
 Input [1]: [p_promo_sk#51]
 Condition : isnotnull(p_promo_sk#51)
 
-(69) ColumnarToRow [codegen id : 12]
+(70) ColumnarToRow [codegen id : 10]
 Input [1]: [p_promo_sk#51]
 
-(70) BroadcastExchange
+(71) BroadcastExchange
 Input [1]: [p_promo_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-(71) BroadcastHashJoin [codegen id : 20]
+(72) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_promo_sk#7]
 Right keys [1]: [p_promo_sk#51]
 Join type: Inner
 Join condition: None
 
-(72) Project [codegen id : 20]
+(73) Project [codegen id : 18]
 Output [13]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, p_promo_sk#51]
 
@@ -519,37 +529,37 @@ Location [not included in comparison]/{warehouse_dir}/household_demographics]
 PushedFilters: [IsNotNull(hd_demo_sk), IsNotNull(hd_income_band_sk)]
 ReadSchema: struct<hd_demo_sk:int,hd_income_band_sk:int>
 
-(74) CometFilter
+(75) CometFilter
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Condition : (isnotnull(hd_demo_sk#52) AND isnotnull(hd_income_band_sk#53))
 
-(75) ColumnarToRow [codegen id : 13]
+(76) ColumnarToRow [codegen id : 11]
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 
-(76) BroadcastExchange
+(77) BroadcastExchange
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=11]
 
-(77) BroadcastHashJoin [codegen id : 20]
+(78) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_hdemo_sk#4]
 Right keys [1]: [hd_demo_sk#52]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 20]
+(79) Project [codegen id : 18]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_demo_sk#52, hd_income_band_sk#53]
 
-(79) ReusedExchange [Reuses operator id: 76]
+(80) ReusedExchange [Reuses operator id: 77]
 Output [2]: [hd_demo_sk#54, hd_income_band_sk#55]
 
-(80) BroadcastHashJoin [codegen id : 20]
+(81) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_current_hdemo_sk#39]
 Right keys [1]: [hd_demo_sk#54]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 20]
+(82) Project [codegen id : 18]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55]
 Input [15]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_demo_sk#54, hd_income_band_sk#55]
 
@@ -560,37 +570,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_street_number:string,ca_street_name:string,ca_city:string,ca_zip:string>
 
-(83) CometFilter
+(84) CometFilter
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Condition : isnotnull(ca_address_sk#56)
 
-(84) ColumnarToRow [codegen id : 15]
+(85) ColumnarToRow [codegen id : 13]
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(85) BroadcastExchange
+(86) BroadcastExchange
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-(86) BroadcastHashJoin [codegen id : 20]
+(87) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_addr_sk#5]
 Right keys [1]: [ca_address_sk#56]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 20]
+(88) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Input [18]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(88) ReusedExchange [Reuses operator id: 85]
+(89) ReusedExchange [Reuses operator id: 86]
 Output [5]: [ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
-(89) BroadcastHashJoin [codegen id : 20]
+(90) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_current_addr_sk#40]
 Right keys [1]: [ca_address_sk#61]
 Join type: Inner
 Join condition: None
 
-(90) Project [codegen id : 20]
+(91) Project [codegen id : 18]
 Output [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [21]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
@@ -601,37 +611,37 @@ Location [not included in comparison]/{warehouse_dir}/income_band]
 PushedFilters: [IsNotNull(ib_income_band_sk)]
 ReadSchema: struct<ib_income_band_sk:int>
 
-(92) CometFilter
+(93) CometFilter
 Input [1]: [ib_income_band_sk#66]
 Condition : isnotnull(ib_income_band_sk#66)
 
-(93) ColumnarToRow [codegen id : 17]
+(94) ColumnarToRow [codegen id : 15]
 Input [1]: [ib_income_band_sk#66]
 
-(94) BroadcastExchange
+(95) BroadcastExchange
 Input [1]: [ib_income_band_sk#66]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(95) BroadcastHashJoin [codegen id : 20]
+(96) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [hd_income_band_sk#53]
 Right keys [1]: [ib_income_band_sk#66]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 20]
+(97) Project [codegen id : 18]
 Output [18]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [20]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#66]
 
-(97) ReusedExchange [Reuses operator id: 94]
+(98) ReusedExchange [Reuses operator id: 95]
 Output [1]: [ib_income_band_sk#67]
 
-(98) BroadcastHashJoin [codegen id : 20]
+(99) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [hd_income_band_sk#55]
 Right keys [1]: [ib_income_band_sk#67]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 20]
+(100) Project [codegen id : 18]
 Output [17]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#67]
 
@@ -642,52 +652,58 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_current_price), In(i_color, [burlywood           ,floral              ,indian              ,medium              ,purple              ,spring              ]), GreaterThanOrEqual(i_current_price,64.00), LessThanOrEqual(i_current_price,74.00), GreaterThanOrEqual(i_current_price,65.00), LessThanOrEqual(i_current_price,79.00), IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_color:string,i_product_name:string>
 
-(101) CometFilter
+(102) CometFilter
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Condition : ((((((isnotnull(i_current_price#69) AND i_color#70 IN (purple              ,burlywood           ,indian              ,spring              ,floral              ,medium              )) AND (i_current_price#69 >= 64.00)) AND (i_current_price#69 <= 74.00)) AND (i_current_price#69 >= 65.00)) AND (i_current_price#69 <= 79.00)) AND isnotnull(i_item_sk#68))
 
-(102) CometProject
+(103) CometProject
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Arguments: [i_item_sk#68, i_product_name#71], [i_item_sk#68, i_product_name#71]
 
-(103) ColumnarToRow [codegen id : 19]
+(104) ColumnarToRow [codegen id : 17]
 Input [2]: [i_item_sk#68, i_product_name#71]
 
-(104) BroadcastExchange
+(105) BroadcastExchange
 Input [2]: [i_item_sk#68, i_product_name#71]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
-(105) BroadcastHashJoin [codegen id : 20]
+(106) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#68]
 Join type: Inner
 Join condition: None
 
-(106) Project [codegen id : 20]
+(107) Project [codegen id : 18]
 Output [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 
-(107) HashAggregate [codegen id : 20]
+(108) HashAggregate [codegen id : 18]
 Input [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#9)), partial_sum(UnscaledValue(ss_list_price#10)), partial_sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count#72, sum#73, sum#74, sum#75]
 Results [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 
-(108) HashAggregate [codegen id : 20]
+(109) HashAggregate [codegen id : 18]
 Input [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#9)), sum(UnscaledValue(ss_list_price#10)), sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#9))#81, sum(UnscaledValue(ss_list_price#10))#82, sum(UnscaledValue(ss_coupon_amt#11))#83]
 Results [17]: [i_product_name#71 AS product_name#84, i_item_sk#68 AS item_sk#85, s_store_name#35 AS store_name#86, s_zip#36 AS store_zip#87, ca_street_number#57 AS b_street_number#88, ca_street_name#58 AS b_streen_name#89, ca_city#59 AS b_city#90, ca_zip#60 AS b_zip#91, ca_street_number#62 AS c_street_number#92, ca_street_name#63 AS c_street_name#93, ca_city#64 AS c_city#94, ca_zip#65 AS c_zip#95, d_year#33 AS syear#96, count(1)#80 AS cnt#97, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#9))#81,17,2) AS s1#98, MakeDecimal(sum(UnscaledValue(ss_list_price#10))#82,17,2) AS s2#99, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#11))#83,17,2) AS s3#100]
 
-(109) Exchange
+(110) RowToColumnar
+Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
+
+(111) CometColumnarExchange
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(110) Sort [codegen id : 21]
+(112) CometSort
+Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
+Arguments: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100], [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST]
+
+(113) ColumnarToRow [codegen id : 19]
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
@@ -697,14 +713,14 @@ PartitionFilters: [isnotnull(ss_sold_date_sk#112), dynamicpruningexpression(ss_s
 PushedFilters: [IsNotNull(ss_item_sk), IsNotNull(ss_ticket_number), IsNotNull(ss_store_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_cdemo_sk), IsNotNull(ss_promo_sk), IsNotNull(ss_hdemo_sk), IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_cdemo_sk:int,ss_hdemo_sk:int,ss_addr_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_number:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(112) CometFilter
+(115) CometFilter
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Condition : (((((((isnotnull(ss_item_sk#101) AND isnotnull(ss_ticket_number#108)) AND isnotnull(ss_store_sk#106)) AND isnotnull(ss_customer_sk#102)) AND isnotnull(ss_cdemo_sk#103)) AND isnotnull(ss_promo_sk#107)) AND isnotnull(ss_hdemo_sk#104)) AND isnotnull(ss_addr_sk#105))
 
-(113) ColumnarToRow [codegen id : 22]
+(116) ColumnarToRow [codegen id : 20]
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 
-(114) BroadcastExchange
+(117) BroadcastExchange
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, false] as bigint), 32) | (cast(input[7, int, false] as bigint) & 4294967295))),false), [plan_id=16]
 
@@ -715,310 +731,324 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_item_sk), IsNotNull(sr_ticket_number)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int>
 
-(116) CometFilter
+(119) CometFilter
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Condition : (isnotnull(sr_item_sk#114) AND isnotnull(sr_ticket_number#115))
 
-(117) CometProject
+(120) CometProject
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Arguments: [sr_item_sk#114, sr_ticket_number#115], [sr_item_sk#114, sr_ticket_number#115]
 
-(118) ColumnarToRow
+(121) ColumnarToRow
 Input [2]: [sr_item_sk#114, sr_ticket_number#115]
 
-(119) BroadcastHashJoin [codegen id : 23]
+(122) BroadcastHashJoin [codegen id : 21]
 Left keys [2]: [ss_item_sk#101, ss_ticket_number#108]
 Right keys [2]: [sr_item_sk#114, sr_ticket_number#115]
 Join type: Inner
 Join condition: None
 
-(120) Project [codegen id : 23]
+(123) Project [codegen id : 21]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, sr_item_sk#114, sr_ticket_number#115]
 
-(121) Exchange
+(124) RowToColumnar
+Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+
+(125) CometColumnarExchange
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, [plan_id=17]
+Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
 
-(122) Sort [codegen id : 24]
+(126) CometSort
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: [ss_item_sk#101 ASC NULLS FIRST], false, 0
+Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101 ASC NULLS FIRST]
 
-(123) ReusedExchange [Reuses operator id: 26]
+(127) ReusedExchange [Reuses operator id: 27]
 Output [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 
-(124) CometHashAggregate
+(128) CometHashAggregate
 Input [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 Keys [1]: [cs_item_sk#117]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#121)), sum(((cr_refunded_cash#122 + cr_reversed_charge#123) + cr_store_credit#124))]
 
-(125) CometFilter
+(129) CometFilter
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(126) CometProject
+(130) CometProject
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Arguments: [cs_item_sk#117], [cs_item_sk#117]
 
-(127) CometSort
+(131) CometSort
 Input [1]: [cs_item_sk#117]
 Arguments: [cs_item_sk#117], [cs_item_sk#117 ASC NULLS FIRST]
 
-(128) ColumnarToRow [codegen id : 25]
-Input [1]: [cs_item_sk#117]
-
-(129) SortMergeJoin [codegen id : 41]
-Left keys [1]: [ss_item_sk#101]
-Right keys [1]: [cs_item_sk#117]
-Join type: Inner
-Join condition: None
+(132) CometSortMergeJoin
+Left output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+Right output [1]: [cs_item_sk#117]
+Arguments: [ss_item_sk#101], [cs_item_sk#117], Inner
 
-(130) Project [codegen id : 41]
-Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+(133) CometProject
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, cs_item_sk#117]
+Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+
+(134) ColumnarToRow [codegen id : 37]
+Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 
-(131) ReusedExchange [Reuses operator id: 191]
+(135) ReusedExchange [Reuses operator id: 199]
 Output [2]: [d_date_sk#125, d_year#126]
 
-(132) BroadcastHashJoin [codegen id : 41]
+(136) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_sold_date_sk#112]
 Right keys [1]: [d_date_sk#125]
 Join type: Inner
 Join condition: None
 
-(133) Project [codegen id : 41]
+(137) Project [codegen id : 37]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126]
 Input [13]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, d_date_sk#125, d_year#126]
 
-(134) ReusedExchange [Reuses operator id: 40]
+(138) ReusedExchange [Reuses operator id: 41]
 Output [3]: [s_store_sk#127, s_store_name#128, s_zip#129]
 
-(135) BroadcastHashJoin [codegen id : 41]
+(139) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_store_sk#106]
 Right keys [1]: [s_store_sk#127]
 Join type: Inner
 Join condition: None
 
-(136) Project [codegen id : 41]
+(140) Project [codegen id : 37]
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_sk#127, s_store_name#128, s_zip#129]
 
-(137) ReusedExchange [Reuses operator id: 46]
+(141) ReusedExchange [Reuses operator id: 47]
 Output [6]: [c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(138) BroadcastHashJoin [codegen id : 41]
+(142) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_customer_sk#102]
 Right keys [1]: [c_customer_sk#130]
 Join type: Inner
 Join condition: None
 
-(139) Project [codegen id : 41]
+(143) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 Input [18]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(140) ReusedExchange [Reuses operator id: 52]
+(144) ReusedExchange [Reuses operator id: 53]
 Output [2]: [d_date_sk#136, d_year#137]
 
-(141) BroadcastHashJoin [codegen id : 41]
+(145) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_first_sales_date_sk#135]
 Right keys [1]: [d_date_sk#136]
 Join type: Inner
 Join condition: None
 
-(142) Project [codegen id : 41]
+(146) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135, d_date_sk#136, d_year#137]
 
-(143) ReusedExchange [Reuses operator id: 52]
+(147) ReusedExchange [Reuses operator id: 53]
 Output [2]: [d_date_sk#138, d_year#139]
 
-(144) BroadcastHashJoin [codegen id : 41]
+(148) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_first_shipto_date_sk#134]
 Right keys [1]: [d_date_sk#138]
 Join type: Inner
 Join condition: None
 
-(145) Project [codegen id : 41]
+(149) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137, d_date_sk#138, d_year#139]
 
-(146) ReusedExchange [Reuses operator id: 61]
+(150) ReusedExchange [Reuses operator id: 62]
 Output [2]: [cd_demo_sk#140, cd_marital_status#141]
 
-(147) BroadcastHashJoin [codegen id : 41]
+(151) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_cdemo_sk#103]
 Right keys [1]: [cd_demo_sk#140]
 Join type: Inner
 Join condition: None
 
-(148) Project [codegen id : 41]
+(152) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_demo_sk#140, cd_marital_status#141]
 
-(149) ReusedExchange [Reuses operator id: 61]
+(153) ReusedExchange [Reuses operator id: 62]
 Output [2]: [cd_demo_sk#142, cd_marital_status#143]
 
-(150) BroadcastHashJoin [codegen id : 41]
+(154) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_current_cdemo_sk#131]
 Right keys [1]: [cd_demo_sk#142]
 Join type: Inner
 Join condition: NOT (cd_marital_status#141 = cd_marital_status#143)
 
-(151) Project [codegen id : 41]
+(155) Project [codegen id : 37]
 Output [14]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141, cd_demo_sk#142, cd_marital_status#143]
 
-(152) ReusedExchange [Reuses operator id: 70]
+(156) ReusedExchange [Reuses operator id: 71]
 Output [1]: [p_promo_sk#144]
 
-(153) BroadcastHashJoin [codegen id : 41]
+(157) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_promo_sk#107]
 Right keys [1]: [p_promo_sk#144]
 Join type: Inner
 Join condition: None
 
-(154) Project [codegen id : 41]
+(158) Project [codegen id : 37]
 Output [13]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, p_promo_sk#144]
 
-(155) ReusedExchange [Reuses operator id: 76]
+(159) ReusedExchange [Reuses operator id: 77]
 Output [2]: [hd_demo_sk#145, hd_income_band_sk#146]
 
-(156) BroadcastHashJoin [codegen id : 41]
+(160) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_hdemo_sk#104]
 Right keys [1]: [hd_demo_sk#145]
 Join type: Inner
 Join condition: None
 
-(157) Project [codegen id : 41]
+(161) Project [codegen id : 37]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_demo_sk#145, hd_income_band_sk#146]
 
-(158) ReusedExchange [Reuses operator id: 76]
+(162) ReusedExchange [Reuses operator id: 77]
 Output [2]: [hd_demo_sk#147, hd_income_band_sk#148]
 
-(159) BroadcastHashJoin [codegen id : 41]
+(163) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_current_hdemo_sk#132]
 Right keys [1]: [hd_demo_sk#147]
 Join type: Inner
 Join condition: None
 
-(160) Project [codegen id : 41]
+(164) Project [codegen id : 37]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148]
 Input [15]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_demo_sk#147, hd_income_band_sk#148]
 
-(161) ReusedExchange [Reuses operator id: 85]
+(165) ReusedExchange [Reuses operator id: 86]
 Output [5]: [ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(162) BroadcastHashJoin [codegen id : 41]
+(166) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_addr_sk#105]
 Right keys [1]: [ca_address_sk#149]
 Join type: Inner
 Join condition: None
 
-(163) Project [codegen id : 41]
+(167) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 Input [18]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(164) ReusedExchange [Reuses operator id: 85]
+(168) ReusedExchange [Reuses operator id: 86]
 Output [5]: [ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(165) BroadcastHashJoin [codegen id : 41]
+(169) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_current_addr_sk#133]
 Right keys [1]: [ca_address_sk#154]
 Join type: Inner
 Join condition: None
 
-(166) Project [codegen id : 41]
+(170) Project [codegen id : 37]
 Output [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [21]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(167) ReusedExchange [Reuses operator id: 94]
+(171) ReusedExchange [Reuses operator id: 95]
 Output [1]: [ib_income_band_sk#159]
 
-(168) BroadcastHashJoin [codegen id : 41]
+(172) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [hd_income_band_sk#146]
 Right keys [1]: [ib_income_band_sk#159]
 Join type: Inner
 Join condition: None
 
-(169) Project [codegen id : 41]
+(173) Project [codegen id : 37]
 Output [18]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [20]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#159]
 
-(170) ReusedExchange [Reuses operator id: 94]
+(174) ReusedExchange [Reuses operator id: 95]
 Output [1]: [ib_income_band_sk#160]
 
-(171) BroadcastHashJoin [codegen id : 41]
+(175) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [hd_income_band_sk#148]
 Right keys [1]: [ib_income_band_sk#160]
 Join type: Inner
 Join condition: None
 
-(172) Project [codegen id : 41]
+(176) Project [codegen id : 37]
 Output [17]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#160]
 
-(173) ReusedExchange [Reuses operator id: 104]
+(177) ReusedExchange [Reuses operator id: 105]
 Output [2]: [i_item_sk#161, i_product_name#162]
 
-(174) BroadcastHashJoin [codegen id : 41]
+(178) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_item_sk#101]
 Right keys [1]: [i_item_sk#161]
 Join type: Inner
 Join condition: None
 
-(175) Project [codegen id : 41]
+(179) Project [codegen id : 37]
 Output [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 
-(176) HashAggregate [codegen id : 41]
+(180) HashAggregate [codegen id : 37]
 Input [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#109)), partial_sum(UnscaledValue(ss_list_price#110)), partial_sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count#72, sum#163, sum#164, sum#165]
 Results [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 
-(177) HashAggregate [codegen id : 41]
+(181) HashAggregate [codegen id : 37]
 Input [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#109)), sum(UnscaledValue(ss_list_price#110)), sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#109))#81, sum(UnscaledValue(ss_list_price#110))#82, sum(UnscaledValue(ss_coupon_amt#111))#83]
 Results [8]: [i_item_sk#161 AS item_sk#169, s_store_name#128 AS store_name#170, s_zip#129 AS store_zip#171, d_year#126 AS syear#172, count(1)#80 AS cnt#173, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#109))#81,17,2) AS s1#174, MakeDecimal(sum(UnscaledValue(ss_list_price#110))#82,17,2) AS s2#175, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#111))#83,17,2) AS s3#176]
 
-(178) Exchange
+(182) RowToColumnar
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, [plan_id=18]
 
-(179) Sort [codegen id : 42]
+(183) CometColumnarExchange
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
 
-(180) SortMergeJoin [codegen id : 43]
+(184) CometSort
+Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
+Arguments: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176], [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST]
+
+(185) ColumnarToRow [codegen id : 38]
+Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
+
+(186) SortMergeJoin [codegen id : 39]
 Left keys [3]: [item_sk#85, store_name#86, store_zip#87]
 Right keys [3]: [item_sk#169, store_name#170, store_zip#171]
 Join type: Inner
 Join condition: (cnt#173 <= cnt#97)
 
-(181) Project [codegen id : 43]
+(187) Project [codegen id : 39]
 Output [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
 Input [25]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
 
-(182) Exchange
+(188) RowToColumnar
+Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
+
+(189) CometColumnarExchange
+Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
+Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=19]
+
+(190) CometSort
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=19]
+Arguments: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173], [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST]
 
-(183) Sort [codegen id : 44]
+(191) ColumnarToRow [codegen id : 40]
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (187)
-+- * ColumnarToRow (186)
-   +- CometFilter (185)
-      +- CometScan parquet spark_catalog.default.date_dim (184)
+BroadcastExchange (195)
++- * ColumnarToRow (194)
+   +- CometFilter (193)
+      +- CometScan parquet spark_catalog.default.date_dim (192)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1028,22 +1058,22 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(185) CometFilter
+(193) CometFilter
 Input [2]: [d_date_sk#32, d_year#33]
 Condition : ((isnotnull(d_year#33) AND (d_year#33 = 1999)) AND isnotnull(d_date_sk#32))
 
-(186) ColumnarToRow [codegen id : 1]
+(194) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#32, d_year#33]
 
-(187) BroadcastExchange
+(195) BroadcastExchange
 Input [2]: [d_date_sk#32, d_year#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=20]
 
-Subquery:2 Hosting operator id = 111 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
-BroadcastExchange (191)
-+- * ColumnarToRow (190)
-   +- CometFilter (189)
-      +- CometScan parquet spark_catalog.default.date_dim (188)
+Subquery:2 Hosting operator id = 114 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
+BroadcastExchange (199)
++- * ColumnarToRow (198)
+   +- CometFilter (197)
+      +- CometScan parquet spark_catalog.default.date_dim (196)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1053,14 +1083,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(189) CometFilter
+(197) CometFilter
 Input [2]: [d_date_sk#125, d_year#126]
 Condition : ((isnotnull(d_year#126) AND (d_year#126 = 2000)) AND isnotnull(d_date_sk#125))
 
-(190) ColumnarToRow [codegen id : 1]
+(198) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#125, d_year#126]
 
-(191) BroadcastExchange
+(199) BroadcastExchange
 Input [2]: [d_date_sk#125, d_year#126]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=21]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt
index 9529a3b000..a11dd2497a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt
@@ -1,278 +1,276 @@
-WholeStageCodegen (44)
-  Sort [product_name,store_name,cnt]
+WholeStageCodegen (40)
+  ColumnarToRow
     InputAdapter
-      Exchange [product_name,store_name,cnt] #1
-        WholeStageCodegen (43)
-          Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
-            SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
-              InputAdapter
-                WholeStageCodegen (21)
-                  Sort [item_sk,store_name,store_zip]
-                    InputAdapter
-                      Exchange [item_sk,store_name,store_zip] #2
-                        WholeStageCodegen (20)
-                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                              InputAdapter
-                                                                                                WholeStageCodegen (3)
-                                                                                                  Sort [ss_item_sk]
+      CometSort [product_name,store_name,cnt]
+        CometColumnarExchange [product_name,store_name,cnt] #1
+          RowToColumnar
+            WholeStageCodegen (39)
+              Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
+                SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
+                  InputAdapter
+                    WholeStageCodegen (19)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [item_sk,store_name,store_zip]
+                            CometColumnarExchange [item_sk,store_name,store_zip] #2
+                              RowToColumnar
+                                WholeStageCodegen (18)
+                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                                  ColumnarToRow
                                                                                                     InputAdapter
-                                                                                                      Exchange [ss_item_sk] #3
-                                                                                                        WholeStageCodegen (2)
-                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                                                                                                              InputAdapter
-                                                                                                                BroadcastExchange #4
-                                                                                                                  WholeStageCodegen (1)
-                                                                                                                    ColumnarToRow
+                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                                          CometSort [ss_item_sk]
+                                                                                                            CometColumnarExchange [ss_item_sk] #3
+                                                                                                              RowToColumnar
+                                                                                                                WholeStageCodegen (2)
+                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
                                                                                                                       InputAdapter
-                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                            SubqueryBroadcast [d_date_sk] #1
-                                                                                                                              BroadcastExchange #5
-                                                                                                                                WholeStageCodegen (1)
-                                                                                                                                  ColumnarToRow
-                                                                                                                                    InputAdapter
-                                                                                                                                      CometFilter [d_year,d_date_sk]
-                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                              ColumnarToRow
-                                                                                                                InputAdapter
-                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                                        BroadcastExchange #4
+                                                                                                                          WholeStageCodegen (1)
+                                                                                                                            ColumnarToRow
+                                                                                                                              InputAdapter
+                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                                    SubqueryBroadcast [d_date_sk] #1
+                                                                                                                                      BroadcastExchange #5
+                                                                                                                                        WholeStageCodegen (1)
+                                                                                                                                          ColumnarToRow
+                                                                                                                                            InputAdapter
+                                                                                                                                              CometFilter [d_year,d_date_sk]
+                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                                      ColumnarToRow
+                                                                                                                        InputAdapter
+                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                          CometSort [cs_item_sk]
+                                                                                                            CometProject [cs_item_sk]
+                                                                                                              CometFilter [sale,refund]
+                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                                  CometColumnarExchange [cs_item_sk] #6
+                                                                                                                    CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                      CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                        CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                                                                                                                          CometSort [cs_item_sk,cs_order_number]
+                                                                                                                            CometColumnarExchange [cs_item_sk,cs_order_number] #7
+                                                                                                                              CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
+                                                                                                                                CometFilter [cs_item_sk,cs_order_number]
+                                                                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
+                                                                                                                          CometSort [cr_item_sk,cr_order_number]
+                                                                                                                            CometColumnarExchange [cr_item_sk,cr_order_number] #8
+                                                                                                                              CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                                CometFilter [cr_item_sk,cr_order_number]
+                                                                                                                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
+                                                                                                  InputAdapter
+                                                                                                    ReusedExchange [d_date_sk,d_year] #5
                                                                                               InputAdapter
-                                                                                                WholeStageCodegen (4)
-                                                                                                  ColumnarToRow
-                                                                                                    InputAdapter
-                                                                                                      CometSort [cs_item_sk]
-                                                                                                        CometProject [cs_item_sk]
-                                                                                                          CometFilter [sale,refund]
-                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                              CometExchange [cs_item_sk] #6
-                                                                                                                CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                  CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                    CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                                                                                                                      CometSort [cs_item_sk,cs_order_number]
-                                                                                                                        CometExchange [cs_item_sk,cs_order_number] #7
-                                                                                                                          CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
-                                                                                                                            CometFilter [cs_item_sk,cs_order_number]
-                                                                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
-                                                                                                                      CometSort [cr_item_sk,cr_order_number]
-                                                                                                                        CometExchange [cr_item_sk,cr_order_number] #8
-                                                                                                                          CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                            CometFilter [cr_item_sk,cr_order_number]
-                                                                                                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
+                                                                                                BroadcastExchange #9
+                                                                                                  WholeStageCodegen (4)
+                                                                                                    ColumnarToRow
+                                                                                                      InputAdapter
+                                                                                                        CometFilter [s_store_sk,s_store_name,s_zip]
+                                                                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
                                                                                           InputAdapter
-                                                                                            ReusedExchange [d_date_sk,d_year] #5
+                                                                                            BroadcastExchange #10
+                                                                                              WholeStageCodegen (5)
+                                                                                                ColumnarToRow
+                                                                                                  InputAdapter
+                                                                                                    CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
+                                                                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
                                                                                       InputAdapter
-                                                                                        BroadcastExchange #9
+                                                                                        BroadcastExchange #11
                                                                                           WholeStageCodegen (6)
                                                                                             ColumnarToRow
                                                                                               InputAdapter
-                                                                                                CometFilter [s_store_sk,s_store_name,s_zip]
-                                                                                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
+                                                                                                CometFilter [d_date_sk]
+                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                                   InputAdapter
-                                                                                    BroadcastExchange #10
-                                                                                      WholeStageCodegen (7)
-                                                                                        ColumnarToRow
-                                                                                          InputAdapter
-                                                                                            CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
-                                                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                    ReusedExchange [d_date_sk,d_year] #11
                                                                               InputAdapter
-                                                                                BroadcastExchange #11
+                                                                                BroadcastExchange #12
                                                                                   WholeStageCodegen (8)
                                                                                     ColumnarToRow
                                                                                       InputAdapter
-                                                                                        CometFilter [d_date_sk]
-                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                        CometFilter [cd_demo_sk,cd_marital_status]
+                                                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                                                           InputAdapter
-                                                                            ReusedExchange [d_date_sk,d_year] #11
+                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                       InputAdapter
-                                                                        BroadcastExchange #12
+                                                                        BroadcastExchange #13
                                                                           WholeStageCodegen (10)
                                                                             ColumnarToRow
                                                                               InputAdapter
-                                                                                CometFilter [cd_demo_sk,cd_marital_status]
-                                                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                                                CometFilter [p_promo_sk]
+                                                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk]
                                                                   InputAdapter
-                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                    BroadcastExchange #14
+                                                                      WholeStageCodegen (11)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [hd_demo_sk,hd_income_band_sk]
+                                                                              CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
                                                               InputAdapter
-                                                                BroadcastExchange #13
-                                                                  WholeStageCodegen (12)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometFilter [p_promo_sk]
-                                                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                           InputAdapter
-                                                            BroadcastExchange #14
+                                                            BroadcastExchange #15
                                                               WholeStageCodegen (13)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [hd_demo_sk,hd_income_band_sk]
-                                                                      CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
+                                                                    CometFilter [ca_address_sk]
+                                                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
                                                       InputAdapter
-                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                                   InputAdapter
-                                                    BroadcastExchange #15
+                                                    BroadcastExchange #16
                                                       WholeStageCodegen (15)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ca_address_sk]
-                                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                            CometFilter [ib_income_band_sk]
+                                                              CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
                                               InputAdapter
-                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                ReusedExchange [ib_income_band_sk] #16
                                           InputAdapter
-                                            BroadcastExchange #16
+                                            BroadcastExchange #17
                                               WholeStageCodegen (17)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [ib_income_band_sk]
-                                                      CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
-                                      InputAdapter
-                                        ReusedExchange [ib_income_band_sk] #16
-                                  InputAdapter
-                                    BroadcastExchange #17
-                                      WholeStageCodegen (19)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [i_item_sk,i_product_name]
-                                              CometFilter [i_current_price,i_color,i_item_sk]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
-              InputAdapter
-                WholeStageCodegen (42)
-                  Sort [item_sk,store_name,store_zip]
-                    InputAdapter
-                      Exchange [item_sk,store_name,store_zip] #18
-                        WholeStageCodegen (41)
-                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                              InputAdapter
-                                                                                                WholeStageCodegen (24)
-                                                                                                  Sort [ss_item_sk]
+                                                    CometProject [i_item_sk,i_product_name]
+                                                      CometFilter [i_current_price,i_color,i_item_sk]
+                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
+                  InputAdapter
+                    WholeStageCodegen (38)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [item_sk,store_name,store_zip]
+                            CometColumnarExchange [item_sk,store_name,store_zip] #18
+                              RowToColumnar
+                                WholeStageCodegen (37)
+                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                                  ColumnarToRow
                                                                                                     InputAdapter
-                                                                                                      Exchange [ss_item_sk] #19
-                                                                                                        WholeStageCodegen (23)
-                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                                                                                                              InputAdapter
-                                                                                                                BroadcastExchange #20
-                                                                                                                  WholeStageCodegen (22)
-                                                                                                                    ColumnarToRow
+                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                                          CometSort [ss_item_sk]
+                                                                                                            CometColumnarExchange [ss_item_sk] #19
+                                                                                                              RowToColumnar
+                                                                                                                WholeStageCodegen (21)
+                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
                                                                                                                       InputAdapter
-                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                            SubqueryBroadcast [d_date_sk] #2
-                                                                                                                              BroadcastExchange #21
-                                                                                                                                WholeStageCodegen (1)
-                                                                                                                                  ColumnarToRow
-                                                                                                                                    InputAdapter
-                                                                                                                                      CometFilter [d_year,d_date_sk]
-                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                              ColumnarToRow
-                                                                                                                InputAdapter
-                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                                        BroadcastExchange #20
+                                                                                                                          WholeStageCodegen (20)
+                                                                                                                            ColumnarToRow
+                                                                                                                              InputAdapter
+                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                                    SubqueryBroadcast [d_date_sk] #2
+                                                                                                                                      BroadcastExchange #21
+                                                                                                                                        WholeStageCodegen (1)
+                                                                                                                                          ColumnarToRow
+                                                                                                                                            InputAdapter
+                                                                                                                                              CometFilter [d_year,d_date_sk]
+                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                                      ColumnarToRow
+                                                                                                                        InputAdapter
+                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                          CometSort [cs_item_sk]
+                                                                                                            CometProject [cs_item_sk]
+                                                                                                              CometFilter [sale,refund]
+                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                                  ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
+                                                                                                  InputAdapter
+                                                                                                    ReusedExchange [d_date_sk,d_year] #21
                                                                                               InputAdapter
-                                                                                                WholeStageCodegen (25)
-                                                                                                  ColumnarToRow
-                                                                                                    InputAdapter
-                                                                                                      CometSort [cs_item_sk]
-                                                                                                        CometProject [cs_item_sk]
-                                                                                                          CometFilter [sale,refund]
-                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                              ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
+                                                                                                ReusedExchange [s_store_sk,s_store_name,s_zip] #9
                                                                                           InputAdapter
-                                                                                            ReusedExchange [d_date_sk,d_year] #21
+                                                                                            ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
                                                                                       InputAdapter
-                                                                                        ReusedExchange [s_store_sk,s_store_name,s_zip] #9
+                                                                                        ReusedExchange [d_date_sk,d_year] #11
                                                                                   InputAdapter
-                                                                                    ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
+                                                                                    ReusedExchange [d_date_sk,d_year] #11
                                                                               InputAdapter
-                                                                                ReusedExchange [d_date_sk,d_year] #11
+                                                                                ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                           InputAdapter
-                                                                            ReusedExchange [d_date_sk,d_year] #11
+                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                       InputAdapter
-                                                                        ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                        ReusedExchange [p_promo_sk] #13
                                                                   InputAdapter
-                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                    ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                               InputAdapter
-                                                                ReusedExchange [p_promo_sk] #13
+                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                           InputAdapter
-                                                            ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                            ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                                       InputAdapter
-                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                                   InputAdapter
-                                                    ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                    ReusedExchange [ib_income_band_sk] #16
                                               InputAdapter
-                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                ReusedExchange [ib_income_band_sk] #16
                                           InputAdapter
-                                            ReusedExchange [ib_income_band_sk] #16
-                                      InputAdapter
-                                        ReusedExchange [ib_income_band_sk] #16
-                                  InputAdapter
-                                    ReusedExchange [i_item_sk,i_product_name] #17
+                                            ReusedExchange [i_item_sk,i_product_name] #17
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt
index 1a06f27fb9..3ef59799a9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt
@@ -1,43 +1,47 @@
 == Physical Plan ==
-TakeOrderedAndProject (39)
-+- * Project (38)
-   +- * BroadcastHashJoin Inner BuildRight (37)
-      :- * Project (22)
-      :  +- * BroadcastHashJoin Inner BuildRight (21)
-      :     :- * Project (16)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (15)
+TakeOrderedAndProject (43)
++- * Project (42)
+   +- * BroadcastHashJoin Inner BuildRight (41)
+      :- * Project (24)
+      :  +- * BroadcastHashJoin Inner BuildRight (23)
+      :     :- * Project (18)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (17)
       :     :     :- * ColumnarToRow (3)
       :     :     :  +- CometFilter (2)
       :     :     :     +- CometScan parquet spark_catalog.default.store (1)
-      :     :     +- BroadcastExchange (14)
-      :     :        +- * Filter (13)
-      :     :           +- * HashAggregate (12)
-      :     :              +- Exchange (11)
-      :     :                 +- * HashAggregate (10)
-      :     :                    +- * Project (9)
-      :     :                       +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                          :- * ColumnarToRow (6)
-      :     :                          :  +- CometFilter (5)
-      :     :                          :     +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :                          +- ReusedExchange (7)
-      :     +- BroadcastExchange (20)
-      :        +- * ColumnarToRow (19)
-      :           +- CometFilter (18)
-      :              +- CometScan parquet spark_catalog.default.item (17)
-      +- BroadcastExchange (36)
-         +- * Filter (35)
-            +- * HashAggregate (34)
-               +- Exchange (33)
-                  +- * HashAggregate (32)
-                     +- * HashAggregate (31)
-                        +- Exchange (30)
-                           +- * HashAggregate (29)
-                              +- * Project (28)
-                                 +- * BroadcastHashJoin Inner BuildRight (27)
-                                    :- * ColumnarToRow (25)
-                                    :  +- CometFilter (24)
-                                    :     +- CometScan parquet spark_catalog.default.store_sales (23)
-                                    +- ReusedExchange (26)
+      :     :     +- BroadcastExchange (16)
+      :     :        +- * ColumnarToRow (15)
+      :     :           +- CometFilter (14)
+      :     :              +- CometHashAggregate (13)
+      :     :                 +- CometColumnarExchange (12)
+      :     :                    +- RowToColumnar (11)
+      :     :                       +- * HashAggregate (10)
+      :     :                          +- * Project (9)
+      :     :                             +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                :- * ColumnarToRow (6)
+      :     :                                :  +- CometFilter (5)
+      :     :                                :     +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :                                +- ReusedExchange (7)
+      :     +- BroadcastExchange (22)
+      :        +- * ColumnarToRow (21)
+      :           +- CometFilter (20)
+      :              +- CometScan parquet spark_catalog.default.item (19)
+      +- BroadcastExchange (40)
+         +- * ColumnarToRow (39)
+            +- CometFilter (38)
+               +- CometHashAggregate (37)
+                  +- CometColumnarExchange (36)
+                     +- CometHashAggregate (35)
+                        +- CometHashAggregate (34)
+                           +- CometColumnarExchange (33)
+                              +- RowToColumnar (32)
+                                 +- * HashAggregate (31)
+                                    +- * Project (30)
+                                       +- * BroadcastHashJoin Inner BuildRight (29)
+                                          :- * ColumnarToRow (27)
+                                          :  +- CometFilter (26)
+                                          :     +- CometScan parquet spark_catalog.default.store_sales (25)
+                                          +- ReusedExchange (28)
 
 
 (unknown) Scan parquet spark_catalog.default.store
@@ -51,7 +55,7 @@ ReadSchema: struct<s_store_sk:int,s_store_name:string>
 Input [2]: [s_store_sk#1, s_store_name#2]
 Condition : isnotnull(s_store_sk#1)
 
-(3) ColumnarToRow [codegen id : 9]
+(3) ColumnarToRow [codegen id : 8]
 Input [2]: [s_store_sk#1, s_store_name#2]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -69,7 +73,7 @@ Condition : (isnotnull(ss_store_sk#4) AND isnotnull(ss_item_sk#3))
 (6) ColumnarToRow [codegen id : 2]
 Input [4]: [ss_item_sk#3, ss_store_sk#4, ss_sales_price#5, ss_sold_date_sk#6]
 
-(7) ReusedExchange [Reuses operator id: 44]
+(7) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#8]
 
 (8) BroadcastHashJoin [codegen id : 2]
@@ -89,181 +93,185 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#5))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
 
-(11) Exchange
+(11) RowToColumnar
 Input [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
-Arguments: hashpartitioning(ss_store_sk#4, ss_item_sk#3, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(12) HashAggregate [codegen id : 3]
+(12) CometColumnarExchange
+Input [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
+Arguments: hashpartitioning(ss_store_sk#4, ss_item_sk#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+
+(13) CometHashAggregate
 Input [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
 Keys [2]: [ss_store_sk#4, ss_item_sk#3]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#5))#11]
-Results [3]: [ss_store_sk#4, ss_item_sk#3, MakeDecimal(sum(UnscaledValue(ss_sales_price#5))#11,17,2) AS revenue#12]
 
-(13) Filter [codegen id : 3]
-Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#12]
-Condition : isnotnull(revenue#12)
+(14) CometFilter
+Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#11]
+Condition : isnotnull(revenue#11)
 
-(14) BroadcastExchange
-Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#12]
+(15) ColumnarToRow [codegen id : 3]
+Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#11]
+
+(16) BroadcastExchange
+Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=2]
 
-(15) BroadcastHashJoin [codegen id : 9]
+(17) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [s_store_sk#1]
 Right keys [1]: [ss_store_sk#4]
 Join type: Inner
 Join condition: None
 
-(16) Project [codegen id : 9]
-Output [4]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#12]
-Input [5]: [s_store_sk#1, s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#12]
+(18) Project [codegen id : 8]
+Output [4]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#11]
+Input [5]: [s_store_sk#1, s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#11]
 
 (unknown) Scan parquet spark_catalog.default.item
-Output [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+Output [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_item_desc:string,i_current_price:decimal(7,2),i_wholesale_cost:decimal(7,2),i_brand:string>
 
-(18) CometFilter
-Input [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
-Condition : isnotnull(i_item_sk#13)
+(20) CometFilter
+Input [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+Condition : isnotnull(i_item_sk#12)
 
-(19) ColumnarToRow [codegen id : 4]
-Input [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+(21) ColumnarToRow [codegen id : 4]
+Input [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
 
-(20) BroadcastExchange
-Input [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+(22) BroadcastExchange
+Input [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(21) BroadcastHashJoin [codegen id : 9]
+(23) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_item_sk#3]
-Right keys [1]: [i_item_sk#13]
+Right keys [1]: [i_item_sk#12]
 Join type: Inner
 Join condition: None
 
-(22) Project [codegen id : 9]
-Output [7]: [s_store_name#2, ss_store_sk#4, revenue#12, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
-Input [9]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#12, i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+(24) Project [codegen id : 8]
+Output [7]: [s_store_name#2, ss_store_sk#4, revenue#11, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+Input [9]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#11, i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21]
+Output [4]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#21), dynamicpruningexpression(ss_sold_date_sk#21 IN dynamicpruning#22)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#20), dynamicpruningexpression(ss_sold_date_sk#20 IN dynamicpruning#21)]
 PushedFilters: [IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_store_sk:int,ss_sales_price:decimal(7,2)>
 
-(24) CometFilter
-Input [4]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21]
-Condition : isnotnull(ss_store_sk#19)
+(26) CometFilter
+Input [4]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20]
+Condition : isnotnull(ss_store_sk#18)
 
-(25) ColumnarToRow [codegen id : 6]
-Input [4]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21]
+(27) ColumnarToRow [codegen id : 6]
+Input [4]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20]
 
-(26) ReusedExchange [Reuses operator id: 44]
-Output [1]: [d_date_sk#23]
+(28) ReusedExchange [Reuses operator id: 48]
+Output [1]: [d_date_sk#22]
 
-(27) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#21]
-Right keys [1]: [d_date_sk#23]
+(29) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#20]
+Right keys [1]: [d_date_sk#22]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
-Output [3]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20]
-Input [5]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21, d_date_sk#23]
-
-(29) HashAggregate [codegen id : 6]
-Input [3]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20]
-Keys [2]: [ss_store_sk#19, ss_item_sk#18]
-Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#20))]
-Aggregate Attributes [1]: [sum#24]
-Results [3]: [ss_store_sk#19, ss_item_sk#18, sum#25]
-
-(30) Exchange
-Input [3]: [ss_store_sk#19, ss_item_sk#18, sum#25]
-Arguments: hashpartitioning(ss_store_sk#19, ss_item_sk#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 7]
-Input [3]: [ss_store_sk#19, ss_item_sk#18, sum#25]
-Keys [2]: [ss_store_sk#19, ss_item_sk#18]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#20))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#20))#26]
-Results [2]: [ss_store_sk#19, MakeDecimal(sum(UnscaledValue(ss_sales_price#20))#26,17,2) AS revenue#27]
-
-(32) HashAggregate [codegen id : 7]
-Input [2]: [ss_store_sk#19, revenue#27]
-Keys [1]: [ss_store_sk#19]
-Functions [1]: [partial_avg(revenue#27)]
-Aggregate Attributes [2]: [sum#28, count#29]
-Results [3]: [ss_store_sk#19, sum#30, count#31]
-
-(33) Exchange
-Input [3]: [ss_store_sk#19, sum#30, count#31]
-Arguments: hashpartitioning(ss_store_sk#19, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(34) HashAggregate [codegen id : 8]
-Input [3]: [ss_store_sk#19, sum#30, count#31]
-Keys [1]: [ss_store_sk#19]
-Functions [1]: [avg(revenue#27)]
-Aggregate Attributes [1]: [avg(revenue#27)#32]
-Results [2]: [ss_store_sk#19, avg(revenue#27)#32 AS ave#33]
-
-(35) Filter [codegen id : 8]
-Input [2]: [ss_store_sk#19, ave#33]
-Condition : isnotnull(ave#33)
-
-(36) BroadcastExchange
-Input [2]: [ss_store_sk#19, ave#33]
+(30) Project [codegen id : 6]
+Output [3]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19]
+Input [5]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20, d_date_sk#22]
+
+(31) HashAggregate [codegen id : 6]
+Input [3]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19]
+Keys [2]: [ss_store_sk#18, ss_item_sk#17]
+Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#19))]
+Aggregate Attributes [1]: [sum#23]
+Results [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
+
+(32) RowToColumnar
+Input [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
+
+(33) CometColumnarExchange
+Input [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
+Arguments: hashpartitioning(ss_store_sk#18, ss_item_sk#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
+Keys [2]: [ss_store_sk#18, ss_item_sk#17]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#19))]
+
+(35) CometHashAggregate
+Input [2]: [ss_store_sk#18, revenue#25]
+Keys [1]: [ss_store_sk#18]
+Functions [1]: [partial_avg(revenue#25)]
+
+(36) CometColumnarExchange
+Input [3]: [ss_store_sk#18, sum#26, count#27]
+Arguments: hashpartitioning(ss_store_sk#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(37) CometHashAggregate
+Input [3]: [ss_store_sk#18, sum#26, count#27]
+Keys [1]: [ss_store_sk#18]
+Functions [1]: [avg(revenue#25)]
+
+(38) CometFilter
+Input [2]: [ss_store_sk#18, ave#28]
+Condition : isnotnull(ave#28)
+
+(39) ColumnarToRow [codegen id : 7]
+Input [2]: [ss_store_sk#18, ave#28]
+
+(40) BroadcastExchange
+Input [2]: [ss_store_sk#18, ave#28]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
-(37) BroadcastHashJoin [codegen id : 9]
+(41) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_store_sk#4]
-Right keys [1]: [ss_store_sk#19]
+Right keys [1]: [ss_store_sk#18]
 Join type: Inner
-Join condition: (cast(revenue#12 as decimal(23,7)) <= (0.1 * ave#33))
+Join condition: (cast(revenue#11 as decimal(23,7)) <= (0.1 * ave#28))
 
-(38) Project [codegen id : 9]
-Output [6]: [s_store_name#2, i_item_desc#14, revenue#12, i_current_price#15, i_wholesale_cost#16, i_brand#17]
-Input [9]: [s_store_name#2, ss_store_sk#4, revenue#12, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17, ss_store_sk#19, ave#33]
+(42) Project [codegen id : 8]
+Output [6]: [s_store_name#2, i_item_desc#13, revenue#11, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+Input [9]: [s_store_name#2, ss_store_sk#4, revenue#11, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16, ss_store_sk#18, ave#28]
 
-(39) TakeOrderedAndProject
-Input [6]: [s_store_name#2, i_item_desc#14, revenue#12, i_current_price#15, i_wholesale_cost#16, i_brand#17]
-Arguments: 100, [s_store_name#2 ASC NULLS FIRST, i_item_desc#14 ASC NULLS FIRST], [s_store_name#2, i_item_desc#14, revenue#12, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+(43) TakeOrderedAndProject
+Input [6]: [s_store_name#2, i_item_desc#13, revenue#11, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+Arguments: 100, [s_store_name#2 ASC NULLS FIRST, i_item_desc#13 ASC NULLS FIRST], [s_store_name#2, i_item_desc#13, revenue#11, i_current_price#14, i_wholesale_cost#15, i_brand#16]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (44)
-+- * ColumnarToRow (43)
-   +- CometProject (42)
-      +- CometFilter (41)
-         +- CometScan parquet spark_catalog.default.date_dim (40)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#8, d_month_seq#34]
+Output [2]: [d_date_sk#8, d_month_seq#29]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1176), LessThanOrEqual(d_month_seq,1187), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(41) CometFilter
-Input [2]: [d_date_sk#8, d_month_seq#34]
-Condition : (((isnotnull(d_month_seq#34) AND (d_month_seq#34 >= 1176)) AND (d_month_seq#34 <= 1187)) AND isnotnull(d_date_sk#8))
+(45) CometFilter
+Input [2]: [d_date_sk#8, d_month_seq#29]
+Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1176)) AND (d_month_seq#29 <= 1187)) AND isnotnull(d_date_sk#8))
 
-(42) CometProject
-Input [2]: [d_date_sk#8, d_month_seq#34]
+(46) CometProject
+Input [2]: [d_date_sk#8, d_month_seq#29]
 Arguments: [d_date_sk#8], [d_date_sk#8]
 
-(43) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#8]
 
-(44) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#8]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 23 Hosting Expression = ss_sold_date_sk#21 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 25 Hosting Expression = ss_sold_date_sk#20 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt
index 33b695e811..5a65234a30 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [s_store_name,i_item_desc,revenue,i_current_price,i_wholesale_cost,i_brand]
-  WholeStageCodegen (9)
+  WholeStageCodegen (8)
     Project [s_store_name,i_item_desc,revenue,i_current_price,i_wholesale_cost,i_brand]
       BroadcastHashJoin [ss_store_sk,ss_store_sk,revenue,ave]
         Project [s_store_name,ss_store_sk,revenue,i_item_desc,i_current_price,i_wholesale_cost,i_brand]
@@ -13,28 +13,30 @@ TakeOrderedAndProject [s_store_name,i_item_desc,revenue,i_current_price,i_wholes
                 InputAdapter
                   BroadcastExchange #1
                     WholeStageCodegen (3)
-                      Filter [revenue]
-                        HashAggregate [ss_store_sk,ss_item_sk,sum] [sum(UnscaledValue(ss_sales_price)),revenue,sum]
-                          InputAdapter
-                            Exchange [ss_store_sk,ss_item_sk] #2
-                              WholeStageCodegen (2)
-                                HashAggregate [ss_store_sk,ss_item_sk,ss_sales_price] [sum,sum]
-                                  Project [ss_item_sk,ss_store_sk,ss_sales_price]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_store_sk,ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_sales_price,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_month_seq,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                      ColumnarToRow
+                        InputAdapter
+                          CometFilter [revenue]
+                            CometHashAggregate [ss_store_sk,ss_item_sk,sum]
+                              CometColumnarExchange [ss_store_sk,ss_item_sk] #2
+                                RowToColumnar
+                                  WholeStageCodegen (2)
+                                    HashAggregate [ss_store_sk,ss_item_sk,ss_sales_price] [sum,sum]
+                                      Project [ss_item_sk,ss_store_sk,ss_sales_price]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_store_sk,ss_item_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_sales_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_month_seq,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
             InputAdapter
               BroadcastExchange #4
                 WholeStageCodegen (4)
@@ -44,16 +46,16 @@ TakeOrderedAndProject [s_store_name,i_item_desc,revenue,i_current_price,i_wholes
                         CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc,i_current_price,i_wholesale_cost,i_brand]
         InputAdapter
           BroadcastExchange #5
-            WholeStageCodegen (8)
-              Filter [ave]
-                HashAggregate [ss_store_sk,sum,count] [avg(revenue),ave,sum,count]
-                  InputAdapter
-                    Exchange [ss_store_sk] #6
-                      WholeStageCodegen (7)
-                        HashAggregate [ss_store_sk,revenue] [sum,count,sum,count]
-                          HashAggregate [ss_store_sk,ss_item_sk,sum] [sum(UnscaledValue(ss_sales_price)),revenue,sum]
-                            InputAdapter
-                              Exchange [ss_store_sk,ss_item_sk] #7
+            WholeStageCodegen (7)
+              ColumnarToRow
+                InputAdapter
+                  CometFilter [ave]
+                    CometHashAggregate [ss_store_sk,sum,count]
+                      CometColumnarExchange [ss_store_sk] #6
+                        CometHashAggregate [ss_store_sk,revenue]
+                          CometHashAggregate [ss_store_sk,ss_item_sk,sum]
+                            CometColumnarExchange [ss_store_sk,ss_item_sk] #7
+                              RowToColumnar
                                 WholeStageCodegen (6)
                                   HashAggregate [ss_store_sk,ss_item_sk,ss_sales_price] [sum,sum]
                                     Project [ss_item_sk,ss_store_sk,ss_sales_price]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt
index 41e783d134..f4614e57bf 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt
@@ -1,56 +1,59 @@
 == Physical Plan ==
-TakeOrderedAndProject (52)
-+- * HashAggregate (51)
-   +- Exchange (50)
-      +- * HashAggregate (49)
-         +- Union (48)
-            :- * HashAggregate (29)
-            :  +- Exchange (28)
-            :     +- * HashAggregate (27)
-            :        +- * Project (26)
-            :           +- * BroadcastHashJoin Inner BuildRight (25)
-            :              :- * Project (19)
-            :              :  +- * BroadcastHashJoin Inner BuildRight (18)
-            :              :     :- * Project (12)
-            :              :     :  +- * BroadcastHashJoin Inner BuildRight (11)
-            :              :     :     :- * Project (9)
-            :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-            :              :     :     :     :- * ColumnarToRow (3)
-            :              :     :     :     :  +- CometFilter (2)
-            :              :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-            :              :     :     :     +- BroadcastExchange (7)
-            :              :     :     :        +- * ColumnarToRow (6)
-            :              :     :     :           +- CometFilter (5)
-            :              :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-            :              :     :     +- ReusedExchange (10)
-            :              :     +- BroadcastExchange (17)
-            :              :        +- * ColumnarToRow (16)
-            :              :           +- CometProject (15)
-            :              :              +- CometFilter (14)
-            :              :                 +- CometScan parquet spark_catalog.default.time_dim (13)
-            :              +- BroadcastExchange (24)
-            :                 +- * ColumnarToRow (23)
-            :                    +- CometProject (22)
-            :                       +- CometFilter (21)
-            :                          +- CometScan parquet spark_catalog.default.ship_mode (20)
-            +- * HashAggregate (47)
-               +- Exchange (46)
-                  +- * HashAggregate (45)
-                     +- * Project (44)
-                        +- * BroadcastHashJoin Inner BuildRight (43)
-                           :- * Project (41)
-                           :  +- * BroadcastHashJoin Inner BuildRight (40)
-                           :     :- * Project (38)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-                           :     :     :- * Project (35)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-                           :     :     :     :- * ColumnarToRow (32)
-                           :     :     :     :  +- CometFilter (31)
-                           :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
-                           :     :     :     +- ReusedExchange (33)
-                           :     :     +- ReusedExchange (36)
-                           :     +- ReusedExchange (39)
-                           +- ReusedExchange (42)
+* ColumnarToRow (55)
++- CometTakeOrderedAndProject (54)
+   +- CometHashAggregate (53)
+      +- CometColumnarExchange (52)
+         +- CometHashAggregate (51)
+            +- CometUnion (50)
+               :- CometHashAggregate (30)
+               :  +- CometColumnarExchange (29)
+               :     +- RowToColumnar (28)
+               :        +- * HashAggregate (27)
+               :           +- * Project (26)
+               :              +- * BroadcastHashJoin Inner BuildRight (25)
+               :                 :- * Project (19)
+               :                 :  +- * BroadcastHashJoin Inner BuildRight (18)
+               :                 :     :- * Project (12)
+               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (11)
+               :                 :     :     :- * Project (9)
+               :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :                 :     :     :     :- * ColumnarToRow (3)
+               :                 :     :     :     :  +- CometFilter (2)
+               :                 :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+               :                 :     :     :     +- BroadcastExchange (7)
+               :                 :     :     :        +- * ColumnarToRow (6)
+               :                 :     :     :           +- CometFilter (5)
+               :                 :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+               :                 :     :     +- ReusedExchange (10)
+               :                 :     +- BroadcastExchange (17)
+               :                 :        +- * ColumnarToRow (16)
+               :                 :           +- CometProject (15)
+               :                 :              +- CometFilter (14)
+               :                 :                 +- CometScan parquet spark_catalog.default.time_dim (13)
+               :                 +- BroadcastExchange (24)
+               :                    +- * ColumnarToRow (23)
+               :                       +- CometProject (22)
+               :                          +- CometFilter (21)
+               :                             +- CometScan parquet spark_catalog.default.ship_mode (20)
+               +- CometHashAggregate (49)
+                  +- CometColumnarExchange (48)
+                     +- RowToColumnar (47)
+                        +- * HashAggregate (46)
+                           +- * Project (45)
+                              +- * BroadcastHashJoin Inner BuildRight (44)
+                                 :- * Project (42)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (41)
+                                 :     :- * Project (39)
+                                 :     :  +- * BroadcastHashJoin Inner BuildRight (38)
+                                 :     :     :- * Project (36)
+                                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (35)
+                                 :     :     :     :- * ColumnarToRow (33)
+                                 :     :     :     :  +- CometFilter (32)
+                                 :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (31)
+                                 :     :     :     +- ReusedExchange (34)
+                                 :     :     +- ReusedExchange (37)
+                                 :     +- ReusedExchange (40)
+                                 +- ReusedExchange (43)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -96,7 +99,7 @@ Join condition: None
 Output [12]: [ws_sold_time_sk#1, ws_ship_mode_sk#2, ws_quantity#4, ws_ext_sales_price#5, ws_net_paid#6, ws_sold_date_sk#7, w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15]
 Input [14]: [ws_sold_time_sk#1, ws_ship_mode_sk#2, ws_warehouse_sk#3, ws_quantity#4, ws_ext_sales_price#5, ws_net_paid#6, ws_sold_date_sk#7, w_warehouse_sk#9, w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15]
 
-(10) ReusedExchange [Reuses operator id: 56]
+(10) ReusedExchange [Reuses operator id: 59]
 Output [3]: [d_date_sk#16, d_year#17, d_moy#18]
 
 (11) BroadcastHashJoin [codegen id : 5]
@@ -180,133 +183,136 @@ Functions [24]: [partial_sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5
 Aggregate Attributes [48]: [sum#23, isEmpty#24, sum#25, isEmpty#26, sum#27, isEmpty#28, sum#29, isEmpty#30, sum#31, isEmpty#32, sum#33, isEmpty#34, sum#35, isEmpty#36, sum#37, isEmpty#38, sum#39, isEmpty#40, sum#41, isEmpty#42, sum#43, isEmpty#44, sum#45, isEmpty#46, sum#47, isEmpty#48, sum#49, isEmpty#50, sum#51, isEmpty#52, sum#53, isEmpty#54, sum#55, isEmpty#56, sum#57, isEmpty#58, sum#59, isEmpty#60, sum#61, isEmpty#62, sum#63, isEmpty#64, sum#65, isEmpty#66, sum#67, isEmpty#68, sum#69, isEmpty#70]
 Results [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
 
-(28) Exchange
+(28) RowToColumnar
 Input [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
-Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) HashAggregate [codegen id : 6]
+(29) CometColumnarExchange
+Input [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
+Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(30) CometHashAggregate
 Input [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
 Keys [7]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17]
 Functions [24]: [sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 2) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 3) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 4) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 5) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 6) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 7) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 8) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 9) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 10) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 11) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 12) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 1) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 2) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 3) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 4) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 5) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 6) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 7) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 8) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 9) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 10) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 11) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 12) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)]
-Aggregate Attributes [24]: [sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#119, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#120, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#121, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#122, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#123, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#124, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#125, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#126, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#127, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#128, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#129, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#130, sum(CASE WHEN (d_moy#18 = 1) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#131, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#132, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#133, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#134, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#135, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#136, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#137, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#138, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#139, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#140, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#141, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#142]
-Results [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, DHL,BARIAN AS ship_carriers#143, d_year#17 AS year#144, sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#119 AS jan_sales#145, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#120 AS feb_sales#146, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#121 AS mar_sales#147, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#122 AS apr_sales#148, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#123 AS may_sales#149, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#124 AS jun_sales#150, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#125 AS jul_sales#151, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#126 AS aug_sales#152, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#127 AS sep_sales#153, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#128 AS oct_sales#154, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#129 AS nov_sales#155, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#130 AS dec_sales#156, sum(CASE WHEN (d_moy#18 = 1) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#131 AS jan_net#157, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#132 AS feb_net#158, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#133 AS mar_net#159, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#134 AS apr_net#160, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#135 AS may_net#161, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#136 AS jun_net#162, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#137 AS jul_net#163, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#138 AS aug_net#164, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#139 AS sep_net#165, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#140 AS oct_net#166, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#141 AS nov_net#167, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#142 AS dec_net#168]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [7]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175]
+Output [7]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#175), dynamicpruningexpression(cs_sold_date_sk#175 IN dynamicpruning#176)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#125), dynamicpruningexpression(cs_sold_date_sk#125 IN dynamicpruning#126)]
 PushedFilters: [IsNotNull(cs_warehouse_sk), IsNotNull(cs_sold_time_sk), IsNotNull(cs_ship_mode_sk)]
 ReadSchema: struct<cs_sold_time_sk:int,cs_ship_mode_sk:int,cs_warehouse_sk:int,cs_quantity:int,cs_sales_price:decimal(7,2),cs_net_paid_inc_tax:decimal(7,2)>
 
-(31) CometFilter
-Input [7]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175]
-Condition : ((isnotnull(cs_warehouse_sk#171) AND isnotnull(cs_sold_time_sk#169)) AND isnotnull(cs_ship_mode_sk#170))
+(32) CometFilter
+Input [7]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125]
+Condition : ((isnotnull(cs_warehouse_sk#121) AND isnotnull(cs_sold_time_sk#119)) AND isnotnull(cs_ship_mode_sk#120))
 
-(32) ColumnarToRow [codegen id : 11]
-Input [7]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175]
+(33) ColumnarToRow [codegen id : 10]
+Input [7]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125]
 
-(33) ReusedExchange [Reuses operator id: 7]
-Output [7]: [w_warehouse_sk#177, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183]
+(34) ReusedExchange [Reuses operator id: 7]
+Output [7]: [w_warehouse_sk#127, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133]
 
-(34) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_warehouse_sk#171]
-Right keys [1]: [w_warehouse_sk#177]
+(35) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_warehouse_sk#121]
+Right keys [1]: [w_warehouse_sk#127]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 11]
-Output [12]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183]
-Input [14]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175, w_warehouse_sk#177, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183]
+(36) Project [codegen id : 10]
+Output [12]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133]
+Input [14]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125, w_warehouse_sk#127, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133]
 
-(36) ReusedExchange [Reuses operator id: 56]
-Output [3]: [d_date_sk#184, d_year#185, d_moy#186]
+(37) ReusedExchange [Reuses operator id: 59]
+Output [3]: [d_date_sk#134, d_year#135, d_moy#136]
 
-(37) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_sold_date_sk#175]
-Right keys [1]: [d_date_sk#184]
+(38) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#125]
+Right keys [1]: [d_date_sk#134]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 11]
-Output [13]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
-Input [15]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_date_sk#184, d_year#185, d_moy#186]
+(39) Project [codegen id : 10]
+Output [13]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
+Input [15]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_date_sk#134, d_year#135, d_moy#136]
 
-(39) ReusedExchange [Reuses operator id: 17]
-Output [1]: [t_time_sk#187]
+(40) ReusedExchange [Reuses operator id: 17]
+Output [1]: [t_time_sk#137]
 
-(40) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_sold_time_sk#169]
-Right keys [1]: [t_time_sk#187]
+(41) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_time_sk#119]
+Right keys [1]: [t_time_sk#137]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 11]
-Output [12]: [cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
-Input [14]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186, t_time_sk#187]
+(42) Project [codegen id : 10]
+Output [12]: [cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
+Input [14]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136, t_time_sk#137]
 
-(42) ReusedExchange [Reuses operator id: 24]
-Output [1]: [sm_ship_mode_sk#188]
+(43) ReusedExchange [Reuses operator id: 24]
+Output [1]: [sm_ship_mode_sk#138]
 
-(43) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [cs_ship_mode_sk#170]
-Right keys [1]: [sm_ship_mode_sk#188]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_ship_mode_sk#120]
+Right keys [1]: [sm_ship_mode_sk#138]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 11]
-Output [11]: [cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
-Input [13]: [cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186, sm_ship_mode_sk#188]
-
-(45) HashAggregate [codegen id : 11]
-Input [11]: [cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
-Keys [7]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185]
-Functions [24]: [partial_sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)]
-Aggregate Attributes [48]: [sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234, sum#235, isEmpty#236]
-Results [55]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, sum#237, isEmpty#238, sum#239, isEmpty#240, sum#241, isEmpty#242, sum#243, isEmpty#244, sum#245, isEmpty#246, sum#247, isEmpty#248, sum#249, isEmpty#250, sum#251, isEmpty#252, sum#253, isEmpty#254, sum#255, isEmpty#256, sum#257, isEmpty#258, sum#259, isEmpty#260, sum#261, isEmpty#262, sum#263, isEmpty#264, sum#265, isEmpty#266, sum#267, isEmpty#268, sum#269, isEmpty#270, sum#271, isEmpty#272, sum#273, isEmpty#274, sum#275, isEmpty#276, sum#277, isEmpty#278, sum#279, isEmpty#280, sum#281, isEmpty#282, sum#283, isEmpty#284]
-
-(46) Exchange
-Input [55]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, sum#237, isEmpty#238, sum#239, isEmpty#240, sum#241, isEmpty#242, sum#243, isEmpty#244, sum#245, isEmpty#246, sum#247, isEmpty#248, sum#249, isEmpty#250, sum#251, isEmpty#252, sum#253, isEmpty#254, sum#255, isEmpty#256, sum#257, isEmpty#258, sum#259, isEmpty#260, sum#261, isEmpty#262, sum#263, isEmpty#264, sum#265, isEmpty#266, sum#267, isEmpty#268, sum#269, isEmpty#270, sum#271, isEmpty#272, sum#273, isEmpty#274, sum#275, isEmpty#276, sum#277, isEmpty#278, sum#279, isEmpty#280, sum#281, isEmpty#282, sum#283, isEmpty#284]
-Arguments: hashpartitioning(w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(47) HashAggregate [codegen id : 12]
-Input [55]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, sum#237, isEmpty#238, sum#239, isEmpty#240, sum#241, isEmpty#242, sum#243, isEmpty#244, sum#245, isEmpty#246, sum#247, isEmpty#248, sum#249, isEmpty#250, sum#251, isEmpty#252, sum#253, isEmpty#254, sum#255, isEmpty#256, sum#257, isEmpty#258, sum#259, isEmpty#260, sum#261, isEmpty#262, sum#263, isEmpty#264, sum#265, isEmpty#266, sum#267, isEmpty#268, sum#269, isEmpty#270, sum#271, isEmpty#272, sum#273, isEmpty#274, sum#275, isEmpty#276, sum#277, isEmpty#278, sum#279, isEmpty#280, sum#281, isEmpty#282, sum#283, isEmpty#284]
-Keys [7]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185]
-Functions [24]: [sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)]
-Aggregate Attributes [24]: [sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#285, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#286, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#287, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#288, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#289, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#290, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#291, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#292, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#293, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#294, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#295, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#296, sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#297, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#298, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#299, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#300, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#301, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#302, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#303, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#304, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#305, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#306, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#307, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#308]
-Results [32]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, DHL,BARIAN AS ship_carriers#309, d_year#185 AS year#310, sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#285 AS jan_sales#311, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#286 AS feb_sales#312, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#287 AS mar_sales#313, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#288 AS apr_sales#314, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#289 AS may_sales#315, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#290 AS jun_sales#316, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#291 AS jul_sales#317, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#292 AS aug_sales#318, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#293 AS sep_sales#319, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#294 AS oct_sales#320, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#295 AS nov_sales#321, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#296 AS dec_sales#322, sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#297 AS jan_net#323, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#298 AS feb_net#324, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#299 AS mar_net#325, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#300 AS apr_net#326, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#301 AS may_net#327, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#302 AS jun_net#328, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#303 AS jul_net#329, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#304 AS aug_net#330, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#305 AS sep_net#331, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#306 AS oct_net#332, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#307 AS nov_net#333, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#308 AS dec_net#334]
-
-(48) Union
-
-(49) HashAggregate [codegen id : 13]
-Input [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, jan_sales#145, feb_sales#146, mar_sales#147, apr_sales#148, may_sales#149, jun_sales#150, jul_sales#151, aug_sales#152, sep_sales#153, oct_sales#154, nov_sales#155, dec_sales#156, jan_net#157, feb_net#158, mar_net#159, apr_net#160, may_net#161, jun_net#162, jul_net#163, aug_net#164, sep_net#165, oct_net#166, nov_net#167, dec_net#168]
-Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144]
-Functions [36]: [partial_sum(jan_sales#145), partial_sum(feb_sales#146), partial_sum(mar_sales#147), partial_sum(apr_sales#148), partial_sum(may_sales#149), partial_sum(jun_sales#150), partial_sum(jul_sales#151), partial_sum(aug_sales#152), partial_sum(sep_sales#153), partial_sum(oct_sales#154), partial_sum(nov_sales#155), partial_sum(dec_sales#156), partial_sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum(jan_net#157), partial_sum(feb_net#158), partial_sum(mar_net#159), partial_sum(apr_net#160), partial_sum(may_net#161), partial_sum(jun_net#162), partial_sum(jul_net#163), partial_sum(aug_net#164), partial_sum(sep_net#165), partial_sum(oct_net#166), partial_sum(nov_net#167), partial_sum(dec_net#168)]
-Aggregate Attributes [72]: [sum#335, isEmpty#336, sum#337, isEmpty#338, sum#339, isEmpty#340, sum#341, isEmpty#342, sum#343, isEmpty#344, sum#345, isEmpty#346, sum#347, isEmpty#348, sum#349, isEmpty#350, sum#351, isEmpty#352, sum#353, isEmpty#354, sum#355, isEmpty#356, sum#357, isEmpty#358, sum#359, isEmpty#360, sum#361, isEmpty#362, sum#363, isEmpty#364, sum#365, isEmpty#366, sum#367, isEmpty#368, sum#369, isEmpty#370, sum#371, isEmpty#372, sum#373, isEmpty#374, sum#375, isEmpty#376, sum#377, isEmpty#378, sum#379, isEmpty#380, sum#381, isEmpty#382, sum#383, isEmpty#384, sum#385, isEmpty#386, sum#387, isEmpty#388, sum#389, isEmpty#390, sum#391, isEmpty#392, sum#393, isEmpty#394, sum#395, isEmpty#396, sum#397, isEmpty#398, sum#399, isEmpty#400, sum#401, isEmpty#402, sum#403, isEmpty#404, sum#405, isEmpty#406]
-Results [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum#407, isEmpty#408, sum#409, isEmpty#410, sum#411, isEmpty#412, sum#413, isEmpty#414, sum#415, isEmpty#416, sum#417, isEmpty#418, sum#419, isEmpty#420, sum#421, isEmpty#422, sum#423, isEmpty#424, sum#425, isEmpty#426, sum#427, isEmpty#428, sum#429, isEmpty#430, sum#431, isEmpty#432, sum#433, isEmpty#434, sum#435, isEmpty#436, sum#437, isEmpty#438, sum#439, isEmpty#440, sum#441, isEmpty#442, sum#443, isEmpty#444, sum#445, isEmpty#446, sum#447, isEmpty#448, sum#449, isEmpty#450, sum#451, isEmpty#452, sum#453, isEmpty#454, sum#455, isEmpty#456, sum#457, isEmpty#458, sum#459, isEmpty#460, sum#461, isEmpty#462, sum#463, isEmpty#464, sum#465, isEmpty#466, sum#467, isEmpty#468, sum#469, isEmpty#470, sum#471, isEmpty#472, sum#473, isEmpty#474, sum#475, isEmpty#476, sum#477, isEmpty#478]
-
-(50) Exchange
-Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum#407, isEmpty#408, sum#409, isEmpty#410, sum#411, isEmpty#412, sum#413, isEmpty#414, sum#415, isEmpty#416, sum#417, isEmpty#418, sum#419, isEmpty#420, sum#421, isEmpty#422, sum#423, isEmpty#424, sum#425, isEmpty#426, sum#427, isEmpty#428, sum#429, isEmpty#430, sum#431, isEmpty#432, sum#433, isEmpty#434, sum#435, isEmpty#436, sum#437, isEmpty#438, sum#439, isEmpty#440, sum#441, isEmpty#442, sum#443, isEmpty#444, sum#445, isEmpty#446, sum#447, isEmpty#448, sum#449, isEmpty#450, sum#451, isEmpty#452, sum#453, isEmpty#454, sum#455, isEmpty#456, sum#457, isEmpty#458, sum#459, isEmpty#460, sum#461, isEmpty#462, sum#463, isEmpty#464, sum#465, isEmpty#466, sum#467, isEmpty#468, sum#469, isEmpty#470, sum#471, isEmpty#472, sum#473, isEmpty#474, sum#475, isEmpty#476, sum#477, isEmpty#478]
-Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(51) HashAggregate [codegen id : 14]
-Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum#407, isEmpty#408, sum#409, isEmpty#410, sum#411, isEmpty#412, sum#413, isEmpty#414, sum#415, isEmpty#416, sum#417, isEmpty#418, sum#419, isEmpty#420, sum#421, isEmpty#422, sum#423, isEmpty#424, sum#425, isEmpty#426, sum#427, isEmpty#428, sum#429, isEmpty#430, sum#431, isEmpty#432, sum#433, isEmpty#434, sum#435, isEmpty#436, sum#437, isEmpty#438, sum#439, isEmpty#440, sum#441, isEmpty#442, sum#443, isEmpty#444, sum#445, isEmpty#446, sum#447, isEmpty#448, sum#449, isEmpty#450, sum#451, isEmpty#452, sum#453, isEmpty#454, sum#455, isEmpty#456, sum#457, isEmpty#458, sum#459, isEmpty#460, sum#461, isEmpty#462, sum#463, isEmpty#464, sum#465, isEmpty#466, sum#467, isEmpty#468, sum#469, isEmpty#470, sum#471, isEmpty#472, sum#473, isEmpty#474, sum#475, isEmpty#476, sum#477, isEmpty#478]
-Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144]
-Functions [36]: [sum(jan_sales#145), sum(feb_sales#146), sum(mar_sales#147), sum(apr_sales#148), sum(may_sales#149), sum(jun_sales#150), sum(jul_sales#151), sum(aug_sales#152), sum(sep_sales#153), sum(oct_sales#154), sum(nov_sales#155), sum(dec_sales#156), sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum(jan_net#157), sum(feb_net#158), sum(mar_net#159), sum(apr_net#160), sum(may_net#161), sum(jun_net#162), sum(jul_net#163), sum(aug_net#164), sum(sep_net#165), sum(oct_net#166), sum(nov_net#167), sum(dec_net#168)]
-Aggregate Attributes [36]: [sum(jan_sales#145)#479, sum(feb_sales#146)#480, sum(mar_sales#147)#481, sum(apr_sales#148)#482, sum(may_sales#149)#483, sum(jun_sales#150)#484, sum(jul_sales#151)#485, sum(aug_sales#152)#486, sum(sep_sales#153)#487, sum(oct_sales#154)#488, sum(nov_sales#155)#489, sum(dec_sales#156)#490, sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#491, sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#492, sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#493, sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#494, sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#495, sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#496, sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#497, sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#498, sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#499, sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#500, sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#501, sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#502, sum(jan_net#157)#503, sum(feb_net#158)#504, sum(mar_net#159)#505, sum(apr_net#160)#506, sum(may_net#161)#507, sum(jun_net#162)#508, sum(jul_net#163)#509, sum(aug_net#164)#510, sum(sep_net#165)#511, sum(oct_net#166)#512, sum(nov_net#167)#513, sum(dec_net#168)#514]
-Results [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum(jan_sales#145)#479 AS jan_sales#515, sum(feb_sales#146)#480 AS feb_sales#516, sum(mar_sales#147)#481 AS mar_sales#517, sum(apr_sales#148)#482 AS apr_sales#518, sum(may_sales#149)#483 AS may_sales#519, sum(jun_sales#150)#484 AS jun_sales#520, sum(jul_sales#151)#485 AS jul_sales#521, sum(aug_sales#152)#486 AS aug_sales#522, sum(sep_sales#153)#487 AS sep_sales#523, sum(oct_sales#154)#488 AS oct_sales#524, sum(nov_sales#155)#489 AS nov_sales#525, sum(dec_sales#156)#490 AS dec_sales#526, sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#491 AS jan_sales_per_sq_foot#527, sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#492 AS feb_sales_per_sq_foot#528, sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#493 AS mar_sales_per_sq_foot#529, sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#494 AS apr_sales_per_sq_foot#530, sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#495 AS may_sales_per_sq_foot#531, sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#496 AS jun_sales_per_sq_foot#532, sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#497 AS jul_sales_per_sq_foot#533, sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#498 AS aug_sales_per_sq_foot#534, sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#499 AS sep_sales_per_sq_foot#535, sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#500 AS oct_sales_per_sq_foot#536, sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#501 AS nov_sales_per_sq_foot#537, sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#502 AS dec_sales_per_sq_foot#538, sum(jan_net#157)#503 AS jan_net#539, sum(feb_net#158)#504 AS feb_net#540, sum(mar_net#159)#505 AS mar_net#541, sum(apr_net#160)#506 AS apr_net#542, sum(may_net#161)#507 AS may_net#543, sum(jun_net#162)#508 AS jun_net#544, sum(jul_net#163)#509 AS jul_net#545, sum(aug_net#164)#510 AS aug_net#546, sum(sep_net#165)#511 AS sep_net#547, sum(oct_net#166)#512 AS oct_net#548, sum(nov_net#167)#513 AS nov_net#549, sum(dec_net#168)#514 AS dec_net#550]
-
-(52) TakeOrderedAndProject
-Input [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, jan_sales#515, feb_sales#516, mar_sales#517, apr_sales#518, may_sales#519, jun_sales#520, jul_sales#521, aug_sales#522, sep_sales#523, oct_sales#524, nov_sales#525, dec_sales#526, jan_sales_per_sq_foot#527, feb_sales_per_sq_foot#528, mar_sales_per_sq_foot#529, apr_sales_per_sq_foot#530, may_sales_per_sq_foot#531, jun_sales_per_sq_foot#532, jul_sales_per_sq_foot#533, aug_sales_per_sq_foot#534, sep_sales_per_sq_foot#535, oct_sales_per_sq_foot#536, nov_sales_per_sq_foot#537, dec_sales_per_sq_foot#538, jan_net#539, feb_net#540, mar_net#541, apr_net#542, may_net#543, jun_net#544, jul_net#545, aug_net#546, sep_net#547, oct_net#548, nov_net#549, dec_net#550]
-Arguments: 100, [w_warehouse_name#10 ASC NULLS FIRST], [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, jan_sales#515, feb_sales#516, mar_sales#517, apr_sales#518, may_sales#519, jun_sales#520, jul_sales#521, aug_sales#522, sep_sales#523, oct_sales#524, nov_sales#525, dec_sales#526, jan_sales_per_sq_foot#527, feb_sales_per_sq_foot#528, mar_sales_per_sq_foot#529, apr_sales_per_sq_foot#530, may_sales_per_sq_foot#531, jun_sales_per_sq_foot#532, jul_sales_per_sq_foot#533, aug_sales_per_sq_foot#534, sep_sales_per_sq_foot#535, oct_sales_per_sq_foot#536, nov_sales_per_sq_foot#537, dec_sales_per_sq_foot#538, jan_net#539, feb_net#540, mar_net#541, apr_net#542, may_net#543, jun_net#544, jul_net#545, aug_net#546, sep_net#547, oct_net#548, nov_net#549, dec_net#550]
+(45) Project [codegen id : 10]
+Output [11]: [cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
+Input [13]: [cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136, sm_ship_mode_sk#138]
+
+(46) HashAggregate [codegen id : 10]
+Input [11]: [cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
+Keys [7]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135]
+Functions [24]: [partial_sum(CASE WHEN (d_moy#136 = 1) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 2) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 3) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 4) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 5) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 6) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 7) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 8) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 9) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 10) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 11) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 12) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 1) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 2) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 3) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 4) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 5) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 6) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 7) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 8) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 9) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 10) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 11) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 12) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END)]
+Aggregate Attributes [48]: [sum#139, isEmpty#140, sum#141, isEmpty#142, sum#143, isEmpty#144, sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150, sum#151, isEmpty#152, sum#153, isEmpty#154, sum#155, isEmpty#156, sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162, sum#163, isEmpty#164, sum#165, isEmpty#166, sum#167, isEmpty#168, sum#169, isEmpty#170, sum#171, isEmpty#172, sum#173, isEmpty#174, sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180, sum#181, isEmpty#182, sum#183, isEmpty#184, sum#185, isEmpty#186]
+Results [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
+
+(47) RowToColumnar
+Input [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
+
+(48) CometColumnarExchange
+Input [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
+Arguments: hashpartitioning(w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(49) CometHashAggregate
+Input [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
+Keys [7]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135]
+Functions [24]: [sum(CASE WHEN (d_moy#136 = 1) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 2) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 3) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 4) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 5) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 6) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 7) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 8) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 9) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 10) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 11) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 12) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 1) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 2) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 3) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 4) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 5) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 6) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 7) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 8) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 9) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 10) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 11) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 12) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END)]
+
+(50) CometUnion
+Child 0 Input [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#237, feb_sales#238, mar_sales#239, apr_sales#240, may_sales#241, jun_sales#242, jul_sales#243, aug_sales#244, sep_sales#245, oct_sales#246, nov_sales#247, dec_sales#248, jan_net#249, feb_net#250, mar_net#251, apr_net#252, may_net#253, jun_net#254, jul_net#255, aug_net#256, sep_net#257, oct_net#258, nov_net#259, dec_net#260]
+Child 1 Input [32]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, ship_carriers#261, year#262, jan_sales#263, feb_sales#264, mar_sales#265, apr_sales#266, may_sales#267, jun_sales#268, jul_sales#269, aug_sales#270, sep_sales#271, oct_sales#272, nov_sales#273, dec_sales#274, jan_net#275, feb_net#276, mar_net#277, apr_net#278, may_net#279, jun_net#280, jul_net#281, aug_net#282, sep_net#283, oct_net#284, nov_net#285, dec_net#286]
+
+(51) CometHashAggregate
+Input [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#237, feb_sales#238, mar_sales#239, apr_sales#240, may_sales#241, jun_sales#242, jul_sales#243, aug_sales#244, sep_sales#245, oct_sales#246, nov_sales#247, dec_sales#248, jan_net#249, feb_net#250, mar_net#251, apr_net#252, may_net#253, jun_net#254, jul_net#255, aug_net#256, sep_net#257, oct_net#258, nov_net#259, dec_net#260]
+Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236]
+Functions [36]: [partial_sum(jan_sales#237), partial_sum(feb_sales#238), partial_sum(mar_sales#239), partial_sum(apr_sales#240), partial_sum(may_sales#241), partial_sum(jun_sales#242), partial_sum(jul_sales#243), partial_sum(aug_sales#244), partial_sum(sep_sales#245), partial_sum(oct_sales#246), partial_sum(nov_sales#247), partial_sum(dec_sales#248), partial_sum((jan_sales#237 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((feb_sales#238 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((mar_sales#239 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((apr_sales#240 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((may_sales#241 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jun_sales#242 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jul_sales#243 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((aug_sales#244 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((sep_sales#245 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((oct_sales#246 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((nov_sales#247 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((dec_sales#248 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum(jan_net#249), partial_sum(feb_net#250), partial_sum(mar_net#251), partial_sum(apr_net#252), partial_sum(may_net#253), partial_sum(jun_net#254), partial_sum(jul_net#255), partial_sum(aug_net#256), partial_sum(sep_net#257), partial_sum(oct_net#258), partial_sum(nov_net#259), partial_sum(dec_net#260)]
+
+(52) CometColumnarExchange
+Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, sum#287, isEmpty#288, sum#289, isEmpty#290, sum#291, isEmpty#292, sum#293, isEmpty#294, sum#295, isEmpty#296, sum#297, isEmpty#298, sum#299, isEmpty#300, sum#301, isEmpty#302, sum#303, isEmpty#304, sum#305, isEmpty#306, sum#307, isEmpty#308, sum#309, isEmpty#310, sum#311, isEmpty#312, sum#313, isEmpty#314, sum#315, isEmpty#316, sum#317, isEmpty#318, sum#319, isEmpty#320, sum#321, isEmpty#322, sum#323, isEmpty#324, sum#325, isEmpty#326, sum#327, isEmpty#328, sum#329, isEmpty#330, sum#331, isEmpty#332, sum#333, isEmpty#334, sum#335, isEmpty#336, sum#337, isEmpty#338, sum#339, isEmpty#340, sum#341, isEmpty#342, sum#343, isEmpty#344, sum#345, isEmpty#346, sum#347, isEmpty#348, sum#349, isEmpty#350, sum#351, isEmpty#352, sum#353, isEmpty#354, sum#355, isEmpty#356, sum#357, isEmpty#358]
+Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(53) CometHashAggregate
+Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, sum#287, isEmpty#288, sum#289, isEmpty#290, sum#291, isEmpty#292, sum#293, isEmpty#294, sum#295, isEmpty#296, sum#297, isEmpty#298, sum#299, isEmpty#300, sum#301, isEmpty#302, sum#303, isEmpty#304, sum#305, isEmpty#306, sum#307, isEmpty#308, sum#309, isEmpty#310, sum#311, isEmpty#312, sum#313, isEmpty#314, sum#315, isEmpty#316, sum#317, isEmpty#318, sum#319, isEmpty#320, sum#321, isEmpty#322, sum#323, isEmpty#324, sum#325, isEmpty#326, sum#327, isEmpty#328, sum#329, isEmpty#330, sum#331, isEmpty#332, sum#333, isEmpty#334, sum#335, isEmpty#336, sum#337, isEmpty#338, sum#339, isEmpty#340, sum#341, isEmpty#342, sum#343, isEmpty#344, sum#345, isEmpty#346, sum#347, isEmpty#348, sum#349, isEmpty#350, sum#351, isEmpty#352, sum#353, isEmpty#354, sum#355, isEmpty#356, sum#357, isEmpty#358]
+Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236]
+Functions [36]: [sum(jan_sales#237), sum(feb_sales#238), sum(mar_sales#239), sum(apr_sales#240), sum(may_sales#241), sum(jun_sales#242), sum(jul_sales#243), sum(aug_sales#244), sum(sep_sales#245), sum(oct_sales#246), sum(nov_sales#247), sum(dec_sales#248), sum((jan_sales#237 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((feb_sales#238 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((mar_sales#239 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((apr_sales#240 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((may_sales#241 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jun_sales#242 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jul_sales#243 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((aug_sales#244 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((sep_sales#245 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((oct_sales#246 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((nov_sales#247 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((dec_sales#248 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum(jan_net#249), sum(feb_net#250), sum(mar_net#251), sum(apr_net#252), sum(may_net#253), sum(jun_net#254), sum(jul_net#255), sum(aug_net#256), sum(sep_net#257), sum(oct_net#258), sum(nov_net#259), sum(dec_net#260)]
+
+(54) CometTakeOrderedAndProject
+Input [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#359, feb_sales#360, mar_sales#361, apr_sales#362, may_sales#363, jun_sales#364, jul_sales#365, aug_sales#366, sep_sales#367, oct_sales#368, nov_sales#369, dec_sales#370, jan_sales_per_sq_foot#371, feb_sales_per_sq_foot#372, mar_sales_per_sq_foot#373, apr_sales_per_sq_foot#374, may_sales_per_sq_foot#375, jun_sales_per_sq_foot#376, jul_sales_per_sq_foot#377, aug_sales_per_sq_foot#378, sep_sales_per_sq_foot#379, oct_sales_per_sq_foot#380, nov_sales_per_sq_foot#381, dec_sales_per_sq_foot#382, jan_net#383, feb_net#384, mar_net#385, apr_net#386, may_net#387, jun_net#388, jul_net#389, aug_net#390, sep_net#391, oct_net#392, nov_net#393, dec_net#394]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[w_warehouse_name#10 ASC NULLS FIRST], output=[w_warehouse_name#10,w_warehouse_sq_ft#11,w_city#12,w_county#13,w_state#14,w_country#15,ship_carriers#235,year#236,jan_sales#359,feb_sales#360,mar_sales#361,apr_sales#362,may_sales#363,jun_sales#364,jul_sales#365,aug_sales#366,sep_sales#367,oct_sales#368,nov_sales#369,dec_sales#370,jan_sales_per_sq_foot#371,feb_sales_per_sq_foot#372,mar_sales_per_sq_foot#373,apr_sales_per_sq_foot#374,may_sales_per_sq_foot#375,jun_sales_per_sq_foot#376,jul_sales_per_sq_foot#377,aug_sales_per_sq_foot#378,sep_sales_per_sq_foot#379,oct_sales_per_sq_foot#380,nov_sales_per_sq_foot#381,dec_sales_per_sq_foot#382,jan_net#383,feb_net#384,mar_net#385,apr_net#386,may_net#387,jun_net#388,jul_net#389,aug_net#390,sep_net#391,oct_net#392,nov_net#393,dec_net#394]), 100, [w_warehouse_name#10 ASC NULLS FIRST], [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#359, feb_sales#360, mar_sales#361, apr_sales#362, may_sales#363, jun_sales#364, jul_sales#365, aug_sales#366, sep_sales#367, oct_sales#368, nov_sales#369, dec_sales#370, jan_sales_per_sq_foot#371, feb_sales_per_sq_foot#372, mar_sales_per_sq_foot#373, apr_sales_per_sq_foot#374, may_sales_per_sq_foot#375, jun_sales_per_sq_foot#376, jul_sales_per_sq_foot#377, aug_sales_per_sq_foot#378, sep_sales_per_sq_foot#379, oct_sales_per_sq_foot#380, nov_sales_per_sq_foot#381, dec_sales_per_sq_foot#382, jan_net#383, feb_net#384, mar_net#385, apr_net#386, may_net#387, jun_net#388, jul_net#389, aug_net#390, sep_net#391, oct_net#392, nov_net#393, dec_net#394]
+
+(55) ColumnarToRow [codegen id : 11]
+Input [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#359, feb_sales#360, mar_sales#361, apr_sales#362, may_sales#363, jun_sales#364, jul_sales#365, aug_sales#366, sep_sales#367, oct_sales#368, nov_sales#369, dec_sales#370, jan_sales_per_sq_foot#371, feb_sales_per_sq_foot#372, mar_sales_per_sq_foot#373, apr_sales_per_sq_foot#374, may_sales_per_sq_foot#375, jun_sales_per_sq_foot#376, jul_sales_per_sq_foot#377, aug_sales_per_sq_foot#378, sep_sales_per_sq_foot#379, oct_sales_per_sq_foot#380, nov_sales_per_sq_foot#381, dec_sales_per_sq_foot#382, jan_net#383, feb_net#384, mar_net#385, apr_net#386, may_net#387, jun_net#388, jul_net#389, aug_net#390, sep_net#391, oct_net#392, nov_net#393, dec_net#394]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (56)
-+- * ColumnarToRow (55)
-   +- CometFilter (54)
-      +- CometScan parquet spark_catalog.default.date_dim (53)
+BroadcastExchange (59)
++- * ColumnarToRow (58)
+   +- CometFilter (57)
+      +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -316,17 +322,17 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(54) CometFilter
+(57) CometFilter
 Input [3]: [d_date_sk#16, d_year#17, d_moy#18]
 Condition : ((isnotnull(d_year#17) AND (d_year#17 = 2001)) AND isnotnull(d_date_sk#16))
 
-(55) ColumnarToRow [codegen id : 1]
+(58) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#16, d_year#17, d_moy#18]
 
-(56) BroadcastExchange
+(59) BroadcastExchange
 Input [3]: [d_date_sk#16, d_year#17, d_moy#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#175 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 31 Hosting Expression = cs_sold_date_sk#125 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt
index 8ed74582f0..025a2b9d4d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt
@@ -1,86 +1,83 @@
-TakeOrderedAndProject [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_sales_per_sq_foot,feb_sales_per_sq_foot,mar_sales_per_sq_foot,apr_sales_per_sq_foot,may_sales_per_sq_foot,jun_sales_per_sq_foot,jul_sales_per_sq_foot,aug_sales_per_sq_foot,sep_sales_per_sq_foot,oct_sales_per_sq_foot,nov_sales_per_sq_foot,dec_sales_per_sq_foot,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net]
-  WholeStageCodegen (14)
-    HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(jan_sales),sum(feb_sales),sum(mar_sales),sum(apr_sales),sum(may_sales),sum(jun_sales),sum(jul_sales),sum(aug_sales),sum(sep_sales),sum(oct_sales),sum(nov_sales),sum(dec_sales),sum((jan_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((feb_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((mar_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((apr_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((may_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((jun_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((jul_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((aug_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((sep_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((oct_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((nov_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((dec_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum(jan_net),sum(feb_net),sum(mar_net),sum(apr_net),sum(may_net),sum(jun_net),sum(jul_net),sum(aug_net),sum(sep_net),sum(oct_net),sum(nov_net),sum(dec_net),jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_sales_per_sq_foot,feb_sales_per_sq_foot,mar_sales_per_sq_foot,apr_sales_per_sq_foot,may_sales_per_sq_foot,jun_sales_per_sq_foot,jul_sales_per_sq_foot,aug_sales_per_sq_foot,sep_sales_per_sq_foot,oct_sales_per_sq_foot,nov_sales_per_sq_foot,dec_sales_per_sq_foot,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-      InputAdapter
-        Exchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year] #1
-          WholeStageCodegen (13)
-            HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-              InputAdapter
-                Union
-                  WholeStageCodegen (6)
-                    HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(CASE WHEN (d_moy = 1) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 1) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #2
-                          WholeStageCodegen (5)
-                            HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,ws_ext_sales_price,ws_quantity,ws_net_paid] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              Project [ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
-                                  Project [ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                    BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
-                                      Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
-                                            BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ws_warehouse_sk,ws_sold_time_sk,ws_ship_mode_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [d_year,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #4
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [w_warehouse_sk]
-                                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
+WholeStageCodegen (11)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_sales_per_sq_foot,feb_sales_per_sq_foot,mar_sales_per_sq_foot,apr_sales_per_sq_foot,may_sales_per_sq_foot,jun_sales_per_sq_foot,jul_sales_per_sq_foot,aug_sales_per_sq_foot,sep_sales_per_sq_foot,oct_sales_per_sq_foot,nov_sales_per_sq_foot,dec_sales_per_sq_foot,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net]
+        CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+          CometColumnarExchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year] #1
+            CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net]
+              CometUnion
+                CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #2
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,ws_ext_sales_price,ws_quantity,ws_net_paid] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                          Project [ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                            BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
+                              Project [ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
+                                  Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
+                                        BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_warehouse_sk,ws_sold_time_sk,ws_ship_mode_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_year,d_moy] #3
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [w_warehouse_sk]
+                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (3)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [t_time_sk]
-                                                  CometFilter [t_time,t_time_sk]
-                                                    CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_time]
+                                        ReusedExchange [d_date_sk,d_year,d_moy] #3
                                   InputAdapter
-                                    BroadcastExchange #6
-                                      WholeStageCodegen (4)
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (3)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [sm_ship_mode_sk]
-                                              CometFilter [sm_carrier,sm_ship_mode_sk]
-                                                CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_carrier]
-                  WholeStageCodegen (12)
-                    HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(CASE WHEN (d_moy = 1) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 1) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #7
-                          WholeStageCodegen (11)
-                            HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,cs_sales_price,cs_quantity,cs_net_paid_inc_tax] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              Project [cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
-                                  Project [cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                    BroadcastHashJoin [cs_sold_time_sk,t_time_sk]
-                                      Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
-                                            BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [cs_warehouse_sk,cs_sold_time_sk,cs_ship_mode_sk]
-                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_sold_time_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country] #4
+                                            CometProject [t_time_sk]
+                                              CometFilter [t_time,t_time_sk]
+                                                CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_time]
+                              InputAdapter
+                                BroadcastExchange #6
+                                  WholeStageCodegen (4)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [sm_ship_mode_sk]
+                                          CometFilter [sm_carrier,sm_ship_mode_sk]
+                                            CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_carrier]
+                CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #7
+                    RowToColumnar
+                      WholeStageCodegen (10)
+                        HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,cs_sales_price,cs_quantity,cs_net_paid_inc_tax] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                          Project [cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                            BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
+                              Project [cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                BroadcastHashJoin [cs_sold_time_sk,t_time_sk]
+                                  Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
+                                        BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_warehouse_sk,cs_sold_time_sk,cs_ship_mode_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_sold_time_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_year,d_moy] #3
+                                            ReusedExchange [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country] #4
                                       InputAdapter
-                                        ReusedExchange [t_time_sk] #5
+                                        ReusedExchange [d_date_sk,d_year,d_moy] #3
                                   InputAdapter
-                                    ReusedExchange [sm_ship_mode_sk] #6
+                                    ReusedExchange [t_time_sk] #5
+                              InputAdapter
+                                ReusedExchange [sm_ship_mode_sk] #6
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt
index 5dabc82d2c..fc5ae3bc19 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt
@@ -1,31 +1,33 @@
 == Physical Plan ==
-TakeOrderedAndProject (27)
-+- * Filter (26)
-   +- Window (25)
-      +- * Sort (24)
-         +- Exchange (23)
-            +- * HashAggregate (22)
-               +- Exchange (21)
-                  +- * HashAggregate (20)
-                     +- * Expand (19)
-                        +- * Project (18)
-                           +- * BroadcastHashJoin Inner BuildRight (17)
-                              :- * Project (12)
-                              :  +- * BroadcastHashJoin Inner BuildRight (11)
-                              :     :- * Project (6)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                              :     :     :- * ColumnarToRow (3)
-                              :     :     :  +- CometFilter (2)
-                              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     :     +- ReusedExchange (4)
-                              :     +- BroadcastExchange (10)
-                              :        +- * ColumnarToRow (9)
-                              :           +- CometFilter (8)
-                              :              +- CometScan parquet spark_catalog.default.store (7)
-                              +- BroadcastExchange (16)
-                                 +- * ColumnarToRow (15)
-                                    +- CometFilter (14)
-                                       +- CometScan parquet spark_catalog.default.item (13)
+TakeOrderedAndProject (29)
++- * Filter (28)
+   +- Window (27)
+      +- * ColumnarToRow (26)
+         +- CometSort (25)
+            +- CometColumnarExchange (24)
+               +- CometHashAggregate (23)
+                  +- CometColumnarExchange (22)
+                     +- RowToColumnar (21)
+                        +- * HashAggregate (20)
+                           +- * Expand (19)
+                              +- * Project (18)
+                                 +- * BroadcastHashJoin Inner BuildRight (17)
+                                    :- * Project (12)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (11)
+                                    :     :- * Project (6)
+                                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                                    :     :     :- * ColumnarToRow (3)
+                                    :     :     :  +- CometFilter (2)
+                                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                                    :     :     +- ReusedExchange (4)
+                                    :     +- BroadcastExchange (10)
+                                    :        +- * ColumnarToRow (9)
+                                    :           +- CometFilter (8)
+                                    :              +- CometScan parquet spark_catalog.default.store (7)
+                                    +- BroadcastExchange (16)
+                                       +- * ColumnarToRow (15)
+                                          +- CometFilter (14)
+                                             +- CometScan parquet spark_catalog.default.item (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -43,7 +45,7 @@ Condition : (isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_quantity#3, ss_sales_price#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 32]
+(4) ReusedExchange [Reuses operator id: 34]
 Output [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -123,66 +125,70 @@ Functions [1]: [partial_sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as d
 Aggregate Attributes [2]: [sum#27, isEmpty#28]
 Results [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
 
-(21) Exchange
+(21) RowToColumnar
 Input [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
-Arguments: hashpartitioning(i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) HashAggregate [codegen id : 5]
+(22) CometColumnarExchange
+Input [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
+Arguments: hashpartitioning(i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(23) CometHashAggregate
 Input [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
 Keys [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#31]
-Results [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#31 AS sumsales#32]
 
-(23) Exchange
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32]
-Arguments: hashpartitioning(i_category#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(24) CometColumnarExchange
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
+Arguments: hashpartitioning(i_category#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(25) CometSort
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
+Arguments: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31], [i_category#18 ASC NULLS FIRST, sumsales#31 DESC NULLS LAST]
 
-(24) Sort [codegen id : 6]
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32]
-Arguments: [i_category#18 ASC NULLS FIRST, sumsales#32 DESC NULLS LAST], false, 0
+(26) ColumnarToRow [codegen id : 5]
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
 
-(25) Window
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32]
-Arguments: [rank(sumsales#32) windowspecdefinition(i_category#18, sumsales#32 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#33], [i_category#18], [sumsales#32 DESC NULLS LAST]
+(27) Window
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
+Arguments: [rank(sumsales#31) windowspecdefinition(i_category#18, sumsales#31 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#32], [i_category#18], [sumsales#31 DESC NULLS LAST]
 
-(26) Filter [codegen id : 7]
-Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32, rk#33]
-Condition : (rk#33 <= 100)
+(28) Filter [codegen id : 6]
+Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31, rk#32]
+Condition : (rk#32 <= 100)
 
-(27) TakeOrderedAndProject
-Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32, rk#33]
-Arguments: 100, [i_category#18 ASC NULLS FIRST, i_class#19 ASC NULLS FIRST, i_brand#20 ASC NULLS FIRST, i_product_name#21 ASC NULLS FIRST, d_year#22 ASC NULLS FIRST, d_qoy#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, s_store_id#25 ASC NULLS FIRST, sumsales#32 ASC NULLS FIRST, rk#33 ASC NULLS FIRST], [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32, rk#33]
+(29) TakeOrderedAndProject
+Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31, rk#32]
+Arguments: 100, [i_category#18 ASC NULLS FIRST, i_class#19 ASC NULLS FIRST, i_brand#20 ASC NULLS FIRST, i_product_name#21 ASC NULLS FIRST, d_year#22 ASC NULLS FIRST, d_qoy#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, s_store_id#25 ASC NULLS FIRST, sumsales#31 ASC NULLS FIRST, rk#32 ASC NULLS FIRST], [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31, rk#32]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (32)
-+- * ColumnarToRow (31)
-   +- CometProject (30)
-      +- CometFilter (29)
-         +- CometScan parquet spark_catalog.default.date_dim (28)
+BroadcastExchange (34)
++- * ColumnarToRow (33)
+   +- CometProject (32)
+      +- CometFilter (31)
+         +- CometScan parquet spark_catalog.default.date_dim (30)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [5]: [d_date_sk#7, d_month_seq#34, d_year#8, d_moy#9, d_qoy#10]
+Output [5]: [d_date_sk#7, d_month_seq#33, d_year#8, d_moy#9, d_qoy#10]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_year:int,d_moy:int,d_qoy:int>
 
-(29) CometFilter
-Input [5]: [d_date_sk#7, d_month_seq#34, d_year#8, d_moy#9, d_qoy#10]
-Condition : (((isnotnull(d_month_seq#34) AND (d_month_seq#34 >= 1200)) AND (d_month_seq#34 <= 1211)) AND isnotnull(d_date_sk#7))
+(31) CometFilter
+Input [5]: [d_date_sk#7, d_month_seq#33, d_year#8, d_moy#9, d_qoy#10]
+Condition : (((isnotnull(d_month_seq#33) AND (d_month_seq#33 >= 1200)) AND (d_month_seq#33 <= 1211)) AND isnotnull(d_date_sk#7))
 
-(30) CometProject
-Input [5]: [d_date_sk#7, d_month_seq#34, d_year#8, d_moy#9, d_qoy#10]
+(32) CometProject
+Input [5]: [d_date_sk#7, d_month_seq#33, d_year#8, d_moy#9, d_qoy#10]
 Arguments: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10], [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(31) ColumnarToRow [codegen id : 1]
+(33) ColumnarToRow [codegen id : 1]
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(32) BroadcastExchange
+(34) BroadcastExchange
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt
index 119ae71840..3fd090f51e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,rk]
-  WholeStageCodegen (7)
+  WholeStageCodegen (6)
     Filter [rk]
       InputAdapter
         Window [sumsales,i_category]
-          WholeStageCodegen (6)
-            Sort [i_category,sumsales]
+          WholeStageCodegen (5)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_category] #1
-                  WholeStageCodegen (5)
-                    HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                      InputAdapter
-                        Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id] #2
+                CometSort [i_category,sumsales]
+                  CometColumnarExchange [i_category] #1
+                    CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id,sum,isEmpty]
+                      CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id] #2
+                        RowToColumnar
                           WholeStageCodegen (4)
                             HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id,ss_sales_price,ss_quantity] [sum,isEmpty,sum,isEmpty]
                               Expand [ss_quantity,ss_sales_price,i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt
index d87d02e87b..5b01bcc0da 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt
@@ -1,43 +1,45 @@
 == Physical Plan ==
-TakeOrderedAndProject (39)
-+- * Project (38)
-   +- * BroadcastHashJoin Inner BuildRight (37)
-      :- * Project (35)
-      :  +- * BroadcastHashJoin Inner BuildRight (34)
-      :     :- * HashAggregate (29)
-      :     :  +- Exchange (28)
-      :     :     +- * HashAggregate (27)
-      :     :        +- * Project (26)
-      :     :           +- * BroadcastHashJoin Inner BuildRight (25)
-      :     :              :- * Project (20)
-      :     :              :  +- * BroadcastHashJoin Inner BuildRight (19)
-      :     :              :     :- * Project (13)
-      :     :              :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :     :              :     :     :- * Project (6)
-      :     :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :              :     :     :     :- * ColumnarToRow (3)
-      :     :              :     :     :     :  +- CometFilter (2)
-      :     :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :              :     :     :     +- ReusedExchange (4)
-      :     :              :     :     +- BroadcastExchange (11)
-      :     :              :     :        +- * ColumnarToRow (10)
-      :     :              :     :           +- CometProject (9)
-      :     :              :     :              +- CometFilter (8)
-      :     :              :     :                 +- CometScan parquet spark_catalog.default.store (7)
-      :     :              :     +- BroadcastExchange (18)
-      :     :              :        +- * ColumnarToRow (17)
-      :     :              :           +- CometProject (16)
-      :     :              :              +- CometFilter (15)
-      :     :              :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
-      :     :              +- BroadcastExchange (24)
-      :     :                 +- * ColumnarToRow (23)
-      :     :                    +- CometFilter (22)
-      :     :                       +- CometScan parquet spark_catalog.default.customer_address (21)
-      :     +- BroadcastExchange (33)
-      :        +- * ColumnarToRow (32)
-      :           +- CometFilter (31)
-      :              +- CometScan parquet spark_catalog.default.customer (30)
-      +- ReusedExchange (36)
+TakeOrderedAndProject (41)
++- * Project (40)
+   +- * BroadcastHashJoin Inner BuildRight (39)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * ColumnarToRow (31)
+      :     :  +- CometHashAggregate (30)
+      :     :     +- CometColumnarExchange (29)
+      :     :        +- RowToColumnar (28)
+      :     :           +- * HashAggregate (27)
+      :     :              +- * Project (26)
+      :     :                 +- * BroadcastHashJoin Inner BuildRight (25)
+      :     :                    :- * Project (20)
+      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (19)
+      :     :                    :     :- * Project (13)
+      :     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :     :                    :     :     :- * Project (6)
+      :     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :                    :     :     :     :- * ColumnarToRow (3)
+      :     :                    :     :     :     :  +- CometFilter (2)
+      :     :                    :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :                    :     :     :     +- ReusedExchange (4)
+      :     :                    :     :     +- BroadcastExchange (11)
+      :     :                    :     :        +- * ColumnarToRow (10)
+      :     :                    :     :           +- CometProject (9)
+      :     :                    :     :              +- CometFilter (8)
+      :     :                    :     :                 +- CometScan parquet spark_catalog.default.store (7)
+      :     :                    :     +- BroadcastExchange (18)
+      :     :                    :        +- * ColumnarToRow (17)
+      :     :                    :           +- CometProject (16)
+      :     :                    :              +- CometFilter (15)
+      :     :                    :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
+      :     :                    +- BroadcastExchange (24)
+      :     :                       +- * ColumnarToRow (23)
+      :     :                          +- CometFilter (22)
+      :     :                             +- CometScan parquet spark_catalog.default.customer_address (21)
+      :     +- BroadcastExchange (35)
+      :        +- * ColumnarToRow (34)
+      :           +- CometFilter (33)
+      :              +- CometScan parquet spark_catalog.default.customer (32)
+      +- ReusedExchange (38)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -55,7 +57,7 @@ Condition : (((isnotnull(ss_store_sk#4) AND isnotnull(ss_hdemo_sk#2)) AND isnotn
 (3) ColumnarToRow [codegen id : 5]
 Input [9]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_store_sk#4, ss_ticket_number#5, ss_ext_sales_price#6, ss_ext_list_price#7, ss_ext_tax#8, ss_sold_date_sk#9]
 
-(4) ReusedExchange [Reuses operator id: 44]
+(4) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#11]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -167,91 +169,95 @@ Functions [3]: [partial_sum(UnscaledValue(ss_ext_sales_price#6)), partial_sum(Un
 Aggregate Attributes [3]: [sum#19, sum#20, sum#21]
 Results [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
 
-(28) Exchange
+(28) RowToColumnar
 Input [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) HashAggregate [codegen id : 8]
+(29) CometColumnarExchange
+Input [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(30) CometHashAggregate
 Input [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
 Keys [4]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18]
 Functions [3]: [sum(UnscaledValue(ss_ext_sales_price#6)), sum(UnscaledValue(ss_ext_list_price#7)), sum(UnscaledValue(ss_ext_tax#8))]
-Aggregate Attributes [3]: [sum(UnscaledValue(ss_ext_sales_price#6))#25, sum(UnscaledValue(ss_ext_list_price#7))#26, sum(UnscaledValue(ss_ext_tax#8))#27]
-Results [6]: [ss_ticket_number#5, ss_customer_sk#1, ca_city#18 AS bought_city#28, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#6))#25,17,2) AS extended_price#29, MakeDecimal(sum(UnscaledValue(ss_ext_list_price#7))#26,17,2) AS list_price#30, MakeDecimal(sum(UnscaledValue(ss_ext_tax#8))#27,17,2) AS extended_tax#31]
+
+(31) ColumnarToRow [codegen id : 8]
+Input [6]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#25, extended_price#26, list_price#27, extended_tax#28]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
+Output [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_addr_sk:int,c_first_name:string,c_last_name:string>
 
-(31) CometFilter
-Input [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
-Condition : (isnotnull(c_customer_sk#32) AND isnotnull(c_current_addr_sk#33))
+(33) CometFilter
+Input [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
+Condition : (isnotnull(c_customer_sk#29) AND isnotnull(c_current_addr_sk#30))
 
-(32) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
+(34) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
 
-(33) BroadcastExchange
-Input [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
+(35) BroadcastExchange
+Input [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(34) BroadcastHashJoin [codegen id : 8]
+(36) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#32]
+Right keys [1]: [c_customer_sk#29]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
-Output [8]: [ss_ticket_number#5, bought_city#28, extended_price#29, list_price#30, extended_tax#31, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
-Input [10]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#28, extended_price#29, list_price#30, extended_tax#31, c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
+(37) Project [codegen id : 8]
+Output [8]: [ss_ticket_number#5, bought_city#25, extended_price#26, list_price#27, extended_tax#28, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
+Input [10]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#25, extended_price#26, list_price#27, extended_tax#28, c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
 
-(36) ReusedExchange [Reuses operator id: 24]
-Output [2]: [ca_address_sk#36, ca_city#37]
+(38) ReusedExchange [Reuses operator id: 24]
+Output [2]: [ca_address_sk#33, ca_city#34]
 
-(37) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [c_current_addr_sk#33]
-Right keys [1]: [ca_address_sk#36]
+(39) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [c_current_addr_sk#30]
+Right keys [1]: [ca_address_sk#33]
 Join type: Inner
-Join condition: NOT (ca_city#37 = bought_city#28)
+Join condition: NOT (ca_city#34 = bought_city#25)
 
-(38) Project [codegen id : 8]
-Output [8]: [c_last_name#35, c_first_name#34, ca_city#37, bought_city#28, ss_ticket_number#5, extended_price#29, extended_tax#31, list_price#30]
-Input [10]: [ss_ticket_number#5, bought_city#28, extended_price#29, list_price#30, extended_tax#31, c_current_addr_sk#33, c_first_name#34, c_last_name#35, ca_address_sk#36, ca_city#37]
+(40) Project [codegen id : 8]
+Output [8]: [c_last_name#32, c_first_name#31, ca_city#34, bought_city#25, ss_ticket_number#5, extended_price#26, extended_tax#28, list_price#27]
+Input [10]: [ss_ticket_number#5, bought_city#25, extended_price#26, list_price#27, extended_tax#28, c_current_addr_sk#30, c_first_name#31, c_last_name#32, ca_address_sk#33, ca_city#34]
 
-(39) TakeOrderedAndProject
-Input [8]: [c_last_name#35, c_first_name#34, ca_city#37, bought_city#28, ss_ticket_number#5, extended_price#29, extended_tax#31, list_price#30]
-Arguments: 100, [c_last_name#35 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#35, c_first_name#34, ca_city#37, bought_city#28, ss_ticket_number#5, extended_price#29, extended_tax#31, list_price#30]
+(41) TakeOrderedAndProject
+Input [8]: [c_last_name#32, c_first_name#31, ca_city#34, bought_city#25, ss_ticket_number#5, extended_price#26, extended_tax#28, list_price#27]
+Arguments: 100, [c_last_name#32 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#32, c_first_name#31, ca_city#34, bought_city#25, ss_ticket_number#5, extended_price#26, extended_tax#28, list_price#27]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (44)
-+- * ColumnarToRow (43)
-   +- CometProject (42)
-      +- CometFilter (41)
-         +- CometScan parquet spark_catalog.default.date_dim (40)
+BroadcastExchange (46)
++- * ColumnarToRow (45)
+   +- CometProject (44)
+      +- CometFilter (43)
+         +- CometScan parquet spark_catalog.default.date_dim (42)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#11, d_year#38, d_dom#39]
+Output [3]: [d_date_sk#11, d_year#35, d_dom#36]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_dom), GreaterThanOrEqual(d_dom,1), LessThanOrEqual(d_dom,2), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(41) CometFilter
-Input [3]: [d_date_sk#11, d_year#38, d_dom#39]
-Condition : ((((isnotnull(d_dom#39) AND (d_dom#39 >= 1)) AND (d_dom#39 <= 2)) AND d_year#38 IN (1999,2000,2001)) AND isnotnull(d_date_sk#11))
+(43) CometFilter
+Input [3]: [d_date_sk#11, d_year#35, d_dom#36]
+Condition : ((((isnotnull(d_dom#36) AND (d_dom#36 >= 1)) AND (d_dom#36 <= 2)) AND d_year#35 IN (1999,2000,2001)) AND isnotnull(d_date_sk#11))
 
-(42) CometProject
-Input [3]: [d_date_sk#11, d_year#38, d_dom#39]
+(44) CometProject
+Input [3]: [d_date_sk#11, d_year#35, d_dom#36]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(43) ColumnarToRow [codegen id : 1]
+(45) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(44) BroadcastExchange
+(46) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt
index f2680bebb0..a4396d582b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt
@@ -4,56 +4,58 @@ TakeOrderedAndProject [c_last_name,ss_ticket_number,c_first_name,ca_city,bought_
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_city,bought_city]
         Project [ss_ticket_number,bought_city,extended_price,list_price,extended_tax,c_current_addr_sk,c_first_name,c_last_name]
           BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-            HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(UnscaledValue(ss_ext_list_price)),sum(UnscaledValue(ss_ext_tax)),bought_city,extended_price,list_price,extended_tax,sum,sum,sum]
+            ColumnarToRow
               InputAdapter
-                Exchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
-                  WholeStageCodegen (5)
-                    HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax] [sum,sum,sum,sum,sum,sum]
-                      Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ca_city]
-                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
-                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                              Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
-                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #2
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_dom,d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                CometHashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum,sum]
+                  CometColumnarExchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax] [sum,sum,sum,sum,sum,sum]
+                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ca_city]
+                            BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                              Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
+                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
+                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                      Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #2
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_dom,d_year,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #2
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #2
+                                        BroadcastExchange #3
+                                          WholeStageCodegen (2)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [s_store_sk]
+                                                  CometFilter [s_city,s_store_sk]
+                                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
                                   InputAdapter
-                                    BroadcastExchange #3
-                                      WholeStageCodegen (2)
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (3)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [s_store_sk]
-                                              CometFilter [s_city,s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
+                                            CometProject [hd_demo_sk]
+                                              CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
                               InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (3)
+                                BroadcastExchange #5
+                                  WholeStageCodegen (4)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometProject [hd_demo_sk]
-                                          CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
-                          InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (4)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk,ca_city]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
+                                        CometFilter [ca_address_sk,ca_city]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
             InputAdapter
               BroadcastExchange #6
                 WholeStageCodegen (6)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt
index 9a32627233..6c289ac77b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt
@@ -1,46 +1,48 @@
 == Physical Plan ==
-TakeOrderedAndProject (42)
-+- * HashAggregate (41)
-   +- Exchange (40)
-      +- * HashAggregate (39)
-         +- * Project (38)
-            +- * BroadcastHashJoin Inner BuildRight (37)
-               :- * Project (32)
-               :  +- * BroadcastHashJoin Inner BuildRight (31)
-               :     :- * Project (25)
-               :     :  +- * BroadcastHashJoin LeftAnti BuildRight (24)
-               :     :     :- * BroadcastHashJoin LeftAnti BuildRight (17)
-               :     :     :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-               :     :     :  :  :- * ColumnarToRow (3)
-               :     :     :  :  :  +- CometFilter (2)
-               :     :     :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-               :     :     :  :  +- BroadcastExchange (9)
-               :     :     :  :     +- * Project (8)
-               :     :     :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :     :  :           :- * ColumnarToRow (5)
-               :     :     :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-               :     :     :  :           +- ReusedExchange (6)
-               :     :     :  +- BroadcastExchange (16)
-               :     :     :     +- * Project (15)
-               :     :     :        +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :           :- * ColumnarToRow (12)
-               :     :     :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-               :     :     :           +- ReusedExchange (13)
-               :     :     +- BroadcastExchange (23)
-               :     :        +- * Project (22)
-               :     :           +- * BroadcastHashJoin Inner BuildRight (21)
-               :     :              :- * ColumnarToRow (19)
-               :     :              :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-               :     :              +- ReusedExchange (20)
-               :     +- BroadcastExchange (30)
-               :        +- * ColumnarToRow (29)
-               :           +- CometProject (28)
-               :              +- CometFilter (27)
-               :                 +- CometScan parquet spark_catalog.default.customer_address (26)
-               +- BroadcastExchange (36)
-                  +- * ColumnarToRow (35)
-                     +- CometFilter (34)
-                        +- CometScan parquet spark_catalog.default.customer_demographics (33)
+* ColumnarToRow (44)
++- CometTakeOrderedAndProject (43)
+   +- CometHashAggregate (42)
+      +- CometColumnarExchange (41)
+         +- RowToColumnar (40)
+            +- * HashAggregate (39)
+               +- * Project (38)
+                  +- * BroadcastHashJoin Inner BuildRight (37)
+                     :- * Project (32)
+                     :  +- * BroadcastHashJoin Inner BuildRight (31)
+                     :     :- * Project (25)
+                     :     :  +- * BroadcastHashJoin LeftAnti BuildRight (24)
+                     :     :     :- * BroadcastHashJoin LeftAnti BuildRight (17)
+                     :     :     :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+                     :     :     :  :  :- * ColumnarToRow (3)
+                     :     :     :  :  :  +- CometFilter (2)
+                     :     :     :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+                     :     :     :  :  +- BroadcastExchange (9)
+                     :     :     :  :     +- * Project (8)
+                     :     :     :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+                     :     :     :  :           :- * ColumnarToRow (5)
+                     :     :     :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+                     :     :     :  :           +- ReusedExchange (6)
+                     :     :     :  +- BroadcastExchange (16)
+                     :     :     :     +- * Project (15)
+                     :     :     :        +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :           :- * ColumnarToRow (12)
+                     :     :     :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+                     :     :     :           +- ReusedExchange (13)
+                     :     :     +- BroadcastExchange (23)
+                     :     :        +- * Project (22)
+                     :     :           +- * BroadcastHashJoin Inner BuildRight (21)
+                     :     :              :- * ColumnarToRow (19)
+                     :     :              :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+                     :     :              +- ReusedExchange (20)
+                     :     +- BroadcastExchange (30)
+                     :        +- * ColumnarToRow (29)
+                     :           +- CometProject (28)
+                     :              +- CometFilter (27)
+                     :                 +- CometScan parquet spark_catalog.default.customer_address (26)
+                     +- BroadcastExchange (36)
+                        +- * ColumnarToRow (35)
+                           +- CometFilter (34)
+                              +- CometScan parquet spark_catalog.default.customer_demographics (33)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -67,7 +69,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#4, ss_sold_date_sk#5]
 
-(6) ReusedExchange [Reuses operator id: 47]
+(6) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#7]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -100,7 +102,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#8, ws_sold_date_sk#9]
 
-(13) ReusedExchange [Reuses operator id: 47]
+(13) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#11]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -133,7 +135,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#12, cs_sold_date_sk#13]
 
-(20) ReusedExchange [Reuses operator id: 47]
+(20) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#15]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -227,50 +229,54 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#24]
 Results [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
 
-(40) Exchange
+(40) RowToColumnar
 Input [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
-Arguments: hashpartitioning(cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) HashAggregate [codegen id : 10]
+(41) CometColumnarExchange
+Input [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
+Arguments: hashpartitioning(cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometHashAggregate
 Input [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
 Keys [5]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#26]
-Results [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, count(1)#26 AS cnt1#27, cd_purchase_estimate#22, count(1)#26 AS cnt2#28, cd_credit_rating#23, count(1)#26 AS cnt3#29]
 
-(42) TakeOrderedAndProject
-Input [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#27, cd_purchase_estimate#22, cnt2#28, cd_credit_rating#23, cnt3#29]
-Arguments: 100, [cd_gender#19 ASC NULLS FIRST, cd_marital_status#20 ASC NULLS FIRST, cd_education_status#21 ASC NULLS FIRST, cd_purchase_estimate#22 ASC NULLS FIRST, cd_credit_rating#23 ASC NULLS FIRST], [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#27, cd_purchase_estimate#22, cnt2#28, cd_credit_rating#23, cnt3#29]
+(43) CometTakeOrderedAndProject
+Input [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#26, cd_purchase_estimate#22, cnt2#27, cd_credit_rating#23, cnt3#28]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[cd_gender#19 ASC NULLS FIRST,cd_marital_status#20 ASC NULLS FIRST,cd_education_status#21 ASC NULLS FIRST,cd_purchase_estimate#22 ASC NULLS FIRST,cd_credit_rating#23 ASC NULLS FIRST], output=[cd_gender#19,cd_marital_status#20,cd_education_status#21,cnt1#26,cd_purchase_estimate#22,cnt2#27,cd_credit_rating#23,cnt3#28]), 100, [cd_gender#19 ASC NULLS FIRST, cd_marital_status#20 ASC NULLS FIRST, cd_education_status#21 ASC NULLS FIRST, cd_purchase_estimate#22 ASC NULLS FIRST, cd_credit_rating#23 ASC NULLS FIRST], [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#26, cd_purchase_estimate#22, cnt2#27, cd_credit_rating#23, cnt3#28]
+
+(44) ColumnarToRow [codegen id : 10]
+Input [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#26, cd_purchase_estimate#22, cnt2#27, cd_credit_rating#23, cnt3#28]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#30, d_moy#31]
+Output [3]: [d_date_sk#7, d_year#29, d_moy#30]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,6), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(44) CometFilter
-Input [3]: [d_date_sk#7, d_year#30, d_moy#31]
-Condition : (((((isnotnull(d_year#30) AND isnotnull(d_moy#31)) AND (d_year#30 = 2001)) AND (d_moy#31 >= 4)) AND (d_moy#31 <= 6)) AND isnotnull(d_date_sk#7))
+(46) CometFilter
+Input [3]: [d_date_sk#7, d_year#29, d_moy#30]
+Condition : (((((isnotnull(d_year#29) AND isnotnull(d_moy#30)) AND (d_year#29 = 2001)) AND (d_moy#30 >= 4)) AND (d_moy#30 <= 6)) AND isnotnull(d_date_sk#7))
 
-(45) CometProject
-Input [3]: [d_date_sk#7, d_year#30, d_moy#31]
+(47) CometProject
+Input [3]: [d_date_sk#7, d_year#29, d_moy#30]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(46) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt
index f5b4eccfbe..410950aeb0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt
@@ -1,74 +1,76 @@
-TakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cnt1,cnt2,cnt3]
-  WholeStageCodegen (10)
-    HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,count] [count(1),cnt1,cnt2,cnt3,count]
-      InputAdapter
-        Exchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] #1
-          WholeStageCodegen (9)
-            HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] [count,count]
-              Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
-                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                  Project [c_current_cdemo_sk]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [c_current_cdemo_sk,c_current_addr_sk]
-                        BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                          BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                            BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                              ColumnarToRow
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cnt1,cnt2,cnt3]
+        CometHashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,count]
+          CometColumnarExchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] #1
+            RowToColumnar
+              WholeStageCodegen (9)
+                HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] [count,count]
+                  Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
+                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                      Project [c_current_cdemo_sk]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [c_current_cdemo_sk,c_current_addr_sk]
+                            BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (2)
+                                        Project [ss_customer_sk]
+                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk] #3
                                 InputAdapter
-                                  CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                  BroadcastExchange #4
+                                    WholeStageCodegen (4)
+                                      Project [ws_bill_customer_sk]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                               InputAdapter
-                                BroadcastExchange #2
-                                  WholeStageCodegen (2)
-                                    Project [ss_customer_sk]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                BroadcastExchange #5
+                                  WholeStageCodegen (6)
+                                    Project [cs_ship_customer_sk]
+                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
                                         ColumnarToRow
                                           InputAdapter
-                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_year,d_moy,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
                                         InputAdapter
                                           ReusedExchange [d_date_sk] #3
-                            InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (4)
-                                  Project [ws_bill_customer_sk]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
                           InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (6)
-                                Project [cs_ship_customer_sk]
-                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                          ReusedSubquery [d_date_sk] #1
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #3
+                            BroadcastExchange #6
+                              WholeStageCodegen (7)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ca_address_sk]
+                                      CometFilter [ca_state,ca_address_sk]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (7)
+                        BroadcastExchange #7
+                          WholeStageCodegen (8)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [ca_address_sk]
-                                  CometFilter [ca_state,ca_address_sk]
-                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                  InputAdapter
-                    BroadcastExchange #7
-                      WholeStageCodegen (8)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cd_demo_sk]
-                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
+                                CometFilter [cd_demo_sk]
+                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt
index 18ff7c4590..31a4d6acdb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt
@@ -1,34 +1,36 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * HashAggregate (29)
-   +- Exchange (28)
-      +- * HashAggregate (27)
-         +- * Project (26)
-            +- * BroadcastHashJoin Inner BuildRight (25)
-               :- * Project (19)
-               :  +- * BroadcastHashJoin Inner BuildRight (18)
-               :     :- * Project (13)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :     :     :- * Project (10)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-               :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :  +- CometFilter (2)
-               :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :     :     +- BroadcastExchange (8)
-               :     :     :        +- * ColumnarToRow (7)
-               :     :     :           +- CometProject (6)
-               :     :     :              +- CometFilter (5)
-               :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-               :     :     +- ReusedExchange (11)
-               :     +- BroadcastExchange (17)
-               :        +- * ColumnarToRow (16)
-               :           +- CometFilter (15)
-               :              +- CometScan parquet spark_catalog.default.item (14)
-               +- BroadcastExchange (24)
-                  +- * ColumnarToRow (23)
-                     +- CometProject (22)
-                        +- CometFilter (21)
-                           +- CometScan parquet spark_catalog.default.promotion (20)
+* ColumnarToRow (32)
++- CometTakeOrderedAndProject (31)
+   +- CometHashAggregate (30)
+      +- CometColumnarExchange (29)
+         +- RowToColumnar (28)
+            +- * HashAggregate (27)
+               +- * Project (26)
+                  +- * BroadcastHashJoin Inner BuildRight (25)
+                     :- * Project (19)
+                     :  +- * BroadcastHashJoin Inner BuildRight (18)
+                     :     :- * Project (13)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+                     :     :     :- * Project (10)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :     :     +- BroadcastExchange (8)
+                     :     :     :        +- * ColumnarToRow (7)
+                     :     :     :           +- CometProject (6)
+                     :     :     :              +- CometFilter (5)
+                     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+                     :     :     +- ReusedExchange (11)
+                     :     +- BroadcastExchange (17)
+                     :        +- * ColumnarToRow (16)
+                     :           +- CometFilter (15)
+                     :              +- CometScan parquet spark_catalog.default.item (14)
+                     +- BroadcastExchange (24)
+                        +- * ColumnarToRow (23)
+                           +- CometProject (22)
+                              +- CometFilter (21)
+                                 +- CometScan parquet spark_catalog.default.promotion (20)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -78,7 +80,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_promo_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_promo_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 35]
+(11) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -158,50 +160,54 @@ Functions [4]: [partial_avg(ss_quantity#4), partial_avg(UnscaledValue(ss_list_pr
 Aggregate Attributes [8]: [sum#20, count#21, sum#22, count#23, sum#24, count#25, sum#26, count#27]
 Results [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 
-(28) Exchange
+(28) RowToColumnar
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
-Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) HashAggregate [codegen id : 6]
+(29) CometColumnarExchange
+Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
+Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(30) CometHashAggregate
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 Keys [1]: [i_item_id#16]
 Functions [4]: [avg(ss_quantity#4), avg(UnscaledValue(ss_list_price#5)), avg(UnscaledValue(ss_coupon_amt#7)), avg(UnscaledValue(ss_sales_price#6))]
-Aggregate Attributes [4]: [avg(ss_quantity#4)#36, avg(UnscaledValue(ss_list_price#5))#37, avg(UnscaledValue(ss_coupon_amt#7))#38, avg(UnscaledValue(ss_sales_price#6))#39]
-Results [5]: [i_item_id#16, avg(ss_quantity#4)#36 AS agg1#40, cast((avg(UnscaledValue(ss_list_price#5))#37 / 100.0) as decimal(11,6)) AS agg2#41, cast((avg(UnscaledValue(ss_coupon_amt#7))#38 / 100.0) as decimal(11,6)) AS agg3#42, cast((avg(UnscaledValue(ss_sales_price#6))#39 / 100.0) as decimal(11,6)) AS agg4#43]
 
-(30) TakeOrderedAndProject
-Input [5]: [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
-Arguments: 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
+(31) CometTakeOrderedAndProject
+Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#16 ASC NULLS FIRST], output=[i_item_id#16,agg1#36,agg2#37,agg3#38,agg4#39]), 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
+
+(32) ColumnarToRow [codegen id : 6]
+Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#44]
+Output [2]: [d_date_sk#14, d_year#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(32) CometFilter
-Input [2]: [d_date_sk#14, d_year#44]
-Condition : ((isnotnull(d_year#44) AND (d_year#44 = 2000)) AND isnotnull(d_date_sk#14))
+(34) CometFilter
+Input [2]: [d_date_sk#14, d_year#40]
+Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2000)) AND isnotnull(d_date_sk#14))
 
-(33) CometProject
-Input [2]: [d_date_sk#14, d_year#44]
+(35) CometProject
+Input [2]: [d_date_sk#14, d_year#40]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(34) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(35) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt
index 2471de20a3..37d5a50ae0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt
@@ -1,52 +1,54 @@
-TakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
-  WholeStageCodegen (6)
-    HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count] [avg(ss_quantity),avg(UnscaledValue(ss_list_price)),avg(UnscaledValue(ss_coupon_amt)),avg(UnscaledValue(ss_sales_price)),agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
-      InputAdapter
-        Exchange [i_item_id] #1
-          WholeStageCodegen (5)
-            HashAggregate [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-              Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
-                BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                  Project [ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                          Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [ss_cdemo_sk,ss_item_sk,ss_promo_sk]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [d_date_sk]
-                                                  CometFilter [d_year,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
+        CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count]
+          CometColumnarExchange [i_item_id] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                HashAggregate [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                  Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
+                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                      Project [ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
+                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                          Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ss_cdemo_sk,ss_item_sk,ss_promo_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_year,d_date_sk]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                  InputAdapter
+                                    BroadcastExchange #3
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [cd_demo_sk]
+                                              CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                               InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [cd_demo_sk]
-                                          CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+                                ReusedExchange [d_date_sk] #2
                           InputAdapter
-                            ReusedExchange [d_date_sk] #2
+                            BroadcastExchange #4
+                              WholeStageCodegen (3)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                       InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (3)
+                        BroadcastExchange #5
+                          WholeStageCodegen (4)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                  InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (4)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [p_promo_sk]
-                              CometFilter [p_channel_email,p_channel_event,p_promo_sk]
-                                CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
+                                CometProject [p_promo_sk]
+                                  CometFilter [p_channel_email,p_channel_event,p_promo_sk]
+                                    CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt
index 32499fad8a..8387487b4f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt
@@ -1,46 +1,50 @@
 == Physical Plan ==
-TakeOrderedAndProject (42)
-+- * Project (41)
-   +- Window (40)
-      +- * Sort (39)
-         +- Exchange (38)
-            +- * HashAggregate (37)
-               +- Exchange (36)
-                  +- * HashAggregate (35)
-                     +- * Expand (34)
-                        +- * Project (33)
-                           +- * BroadcastHashJoin Inner BuildRight (32)
-                              :- * Project (6)
-                              :  +- * BroadcastHashJoin Inner BuildRight (5)
-                              :     :- * ColumnarToRow (3)
-                              :     :  +- CometFilter (2)
-                              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     +- ReusedExchange (4)
-                              +- BroadcastExchange (31)
-                                 +- * BroadcastHashJoin LeftSemi BuildRight (30)
-                                    :- * ColumnarToRow (9)
-                                    :  +- CometFilter (8)
-                                    :     +- CometScan parquet spark_catalog.default.store (7)
-                                    +- BroadcastExchange (29)
-                                       +- * Project (28)
-                                          +- * Filter (27)
-                                             +- Window (26)
-                                                +- * Sort (25)
-                                                   +- * HashAggregate (24)
-                                                      +- Exchange (23)
-                                                         +- * HashAggregate (22)
-                                                            +- * Project (21)
-                                                               +- * BroadcastHashJoin Inner BuildRight (20)
-                                                                  :- * Project (18)
-                                                                  :  +- * BroadcastHashJoin Inner BuildRight (17)
-                                                                  :     :- * ColumnarToRow (12)
-                                                                  :     :  +- CometFilter (11)
-                                                                  :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
-                                                                  :     +- BroadcastExchange (16)
-                                                                  :        +- * ColumnarToRow (15)
-                                                                  :           +- CometFilter (14)
-                                                                  :              +- CometScan parquet spark_catalog.default.store (13)
-                                                                  +- ReusedExchange (19)
+TakeOrderedAndProject (46)
++- * Project (45)
+   +- Window (44)
+      +- * ColumnarToRow (43)
+         +- CometSort (42)
+            +- CometColumnarExchange (41)
+               +- CometHashAggregate (40)
+                  +- CometColumnarExchange (39)
+                     +- RowToColumnar (38)
+                        +- * HashAggregate (37)
+                           +- * Expand (36)
+                              +- * Project (35)
+                                 +- * BroadcastHashJoin Inner BuildRight (34)
+                                    :- * Project (6)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+                                    :     :- * ColumnarToRow (3)
+                                    :     :  +- CometFilter (2)
+                                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                                    :     +- ReusedExchange (4)
+                                    +- BroadcastExchange (33)
+                                       +- * BroadcastHashJoin LeftSemi BuildRight (32)
+                                          :- * ColumnarToRow (9)
+                                          :  +- CometFilter (8)
+                                          :     +- CometScan parquet spark_catalog.default.store (7)
+                                          +- BroadcastExchange (31)
+                                             +- * Project (30)
+                                                +- * Filter (29)
+                                                   +- Window (28)
+                                                      +- * ColumnarToRow (27)
+                                                         +- CometSort (26)
+                                                            +- CometHashAggregate (25)
+                                                               +- CometColumnarExchange (24)
+                                                                  +- RowToColumnar (23)
+                                                                     +- * HashAggregate (22)
+                                                                        +- * Project (21)
+                                                                           +- * BroadcastHashJoin Inner BuildRight (20)
+                                                                              :- * Project (18)
+                                                                              :  +- * BroadcastHashJoin Inner BuildRight (17)
+                                                                              :     :- * ColumnarToRow (12)
+                                                                              :     :  +- CometFilter (11)
+                                                                              :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
+                                                                              :     +- BroadcastExchange (16)
+                                                                              :        +- * ColumnarToRow (15)
+                                                                              :           +- CometFilter (14)
+                                                                              :              +- CometScan parquet spark_catalog.default.store (13)
+                                                                              +- ReusedExchange (19)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -58,7 +62,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 8]
 Input [3]: [ss_store_sk#1, ss_net_profit#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 47]
+(4) ReusedExchange [Reuses operator id: 51]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 8]
@@ -128,7 +132,7 @@ Join condition: None
 Output [3]: [ss_net_profit#10, ss_sold_date_sk#11, s_state#14]
 Input [5]: [ss_store_sk#9, ss_net_profit#10, ss_sold_date_sk#11, s_store_sk#13, s_state#14]
 
-(19) ReusedExchange [Reuses operator id: 47]
+(19) ReusedExchange [Reuses operator id: 51]
 Output [1]: [d_date_sk#15]
 
 (20) BroadcastHashJoin [codegen id : 4]
@@ -148,128 +152,136 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#10))]
 Aggregate Attributes [1]: [sum#16]
 Results [2]: [s_state#14, sum#17]
 
-(23) Exchange
+(23) RowToColumnar
 Input [2]: [s_state#14, sum#17]
-Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(24) HashAggregate [codegen id : 5]
+(24) CometColumnarExchange
+Input [2]: [s_state#14, sum#17]
+Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(25) CometHashAggregate
 Input [2]: [s_state#14, sum#17]
 Keys [1]: [s_state#14]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#10))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#10))#18]
-Results [3]: [s_state#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#10))#18,17,2) AS _w0#19, s_state#14]
 
-(25) Sort [codegen id : 5]
-Input [3]: [s_state#14, _w0#19, s_state#14]
-Arguments: [s_state#14 ASC NULLS FIRST, _w0#19 DESC NULLS LAST], false, 0
+(26) CometSort
+Input [3]: [s_state#14, _w0#18, s_state#14]
+Arguments: [s_state#14, _w0#18, s_state#14], [s_state#14 ASC NULLS FIRST, _w0#18 DESC NULLS LAST]
 
-(26) Window
-Input [3]: [s_state#14, _w0#19, s_state#14]
-Arguments: [rank(_w0#19) windowspecdefinition(s_state#14, _w0#19 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#20], [s_state#14], [_w0#19 DESC NULLS LAST]
+(27) ColumnarToRow [codegen id : 5]
+Input [3]: [s_state#14, _w0#18, s_state#14]
 
-(27) Filter [codegen id : 6]
-Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
-Condition : (ranking#20 <= 5)
+(28) Window
+Input [3]: [s_state#14, _w0#18, s_state#14]
+Arguments: [rank(_w0#18) windowspecdefinition(s_state#14, _w0#18 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#19], [s_state#14], [_w0#18 DESC NULLS LAST]
 
-(28) Project [codegen id : 6]
+(29) Filter [codegen id : 6]
+Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
+Condition : (ranking#19 <= 5)
+
+(30) Project [codegen id : 6]
 Output [1]: [s_state#14]
-Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
+Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
 
-(29) BroadcastExchange
+(31) BroadcastExchange
 Input [1]: [s_state#14]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=3]
 
-(30) BroadcastHashJoin [codegen id : 7]
+(32) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [s_state#8]
 Right keys [1]: [s_state#14]
 Join type: LeftSemi
 Join condition: None
 
-(31) BroadcastExchange
+(33) BroadcastExchange
 Input [3]: [s_store_sk#6, s_county#7, s_state#8]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(32) BroadcastHashJoin [codegen id : 8]
+(34) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_store_sk#1]
 Right keys [1]: [s_store_sk#6]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 8]
+(35) Project [codegen id : 8]
 Output [3]: [ss_net_profit#2, s_state#8, s_county#7]
 Input [5]: [ss_store_sk#1, ss_net_profit#2, s_store_sk#6, s_county#7, s_state#8]
 
-(34) Expand [codegen id : 8]
+(36) Expand [codegen id : 8]
 Input [3]: [ss_net_profit#2, s_state#8, s_county#7]
-Arguments: [[ss_net_profit#2, s_state#8, s_county#7, 0], [ss_net_profit#2, s_state#8, null, 1], [ss_net_profit#2, null, null, 3]], [ss_net_profit#2, s_state#21, s_county#22, spark_grouping_id#23]
+Arguments: [[ss_net_profit#2, s_state#8, s_county#7, 0], [ss_net_profit#2, s_state#8, null, 1], [ss_net_profit#2, null, null, 3]], [ss_net_profit#2, s_state#20, s_county#21, spark_grouping_id#22]
 
-(35) HashAggregate [codegen id : 8]
-Input [4]: [ss_net_profit#2, s_state#21, s_county#22, spark_grouping_id#23]
-Keys [3]: [s_state#21, s_county#22, spark_grouping_id#23]
+(37) HashAggregate [codegen id : 8]
+Input [4]: [ss_net_profit#2, s_state#20, s_county#21, spark_grouping_id#22]
+Keys [3]: [s_state#20, s_county#21, spark_grouping_id#22]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum#24]
-Results [4]: [s_state#21, s_county#22, spark_grouping_id#23, sum#25]
+Aggregate Attributes [1]: [sum#23]
+Results [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
+
+(38) RowToColumnar
+Input [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
 
-(36) Exchange
-Input [4]: [s_state#21, s_county#22, spark_grouping_id#23, sum#25]
-Arguments: hashpartitioning(s_state#21, s_county#22, spark_grouping_id#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(39) CometColumnarExchange
+Input [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
+Arguments: hashpartitioning(s_state#20, s_county#21, spark_grouping_id#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(37) HashAggregate [codegen id : 9]
-Input [4]: [s_state#21, s_county#22, spark_grouping_id#23, sum#25]
-Keys [3]: [s_state#21, s_county#22, spark_grouping_id#23]
+(40) CometHashAggregate
+Input [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
+Keys [3]: [s_state#20, s_county#21, spark_grouping_id#22]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#26]
-Results [7]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#26,17,2) AS total_sum#27, s_state#21, s_county#22, (cast((shiftright(spark_grouping_id#23, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#23, 0) & 1) as tinyint)) AS lochierarchy#28, MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#26,17,2) AS _w0#29, (cast((shiftright(spark_grouping_id#23, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#23, 0) & 1) as tinyint)) AS _w1#30, CASE WHEN (cast((shiftright(spark_grouping_id#23, 0) & 1) as tinyint) = 0) THEN s_state#21 END AS _w2#31]
 
-(38) Exchange
-Input [7]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31]
-Arguments: hashpartitioning(_w1#30, _w2#31, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(41) CometColumnarExchange
+Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
+Arguments: hashpartitioning(_w1#28, _w2#29, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometSort
+Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
+Arguments: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29], [_w1#28 ASC NULLS FIRST, _w2#29 ASC NULLS FIRST, _w0#27 DESC NULLS LAST]
 
-(39) Sort [codegen id : 10]
-Input [7]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31]
-Arguments: [_w1#30 ASC NULLS FIRST, _w2#31 ASC NULLS FIRST, _w0#29 DESC NULLS LAST], false, 0
+(43) ColumnarToRow [codegen id : 9]
+Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
 
-(40) Window
-Input [7]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31]
-Arguments: [rank(_w0#29) windowspecdefinition(_w1#30, _w2#31, _w0#29 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#32], [_w1#30, _w2#31], [_w0#29 DESC NULLS LAST]
+(44) Window
+Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
+Arguments: [rank(_w0#27) windowspecdefinition(_w1#28, _w2#29, _w0#27 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#30], [_w1#28, _w2#29], [_w0#27 DESC NULLS LAST]
 
-(41) Project [codegen id : 11]
-Output [5]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, rank_within_parent#32]
-Input [8]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31, rank_within_parent#32]
+(45) Project [codegen id : 10]
+Output [5]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, rank_within_parent#30]
+Input [8]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29, rank_within_parent#30]
 
-(42) TakeOrderedAndProject
-Input [5]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, rank_within_parent#32]
-Arguments: 100, [lochierarchy#28 DESC NULLS LAST, CASE WHEN (lochierarchy#28 = 0) THEN s_state#21 END ASC NULLS FIRST, rank_within_parent#32 ASC NULLS FIRST], [total_sum#27, s_state#21, s_county#22, lochierarchy#28, rank_within_parent#32]
+(46) TakeOrderedAndProject
+Input [5]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, rank_within_parent#30]
+Arguments: 100, [lochierarchy#26 DESC NULLS LAST, CASE WHEN (lochierarchy#26 = 0) THEN s_state#20 END ASC NULLS FIRST, rank_within_parent#30 ASC NULLS FIRST], [total_sum#25, s_state#20, s_county#21, lochierarchy#26, rank_within_parent#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (51)
++- * ColumnarToRow (50)
+   +- CometProject (49)
+      +- CometFilter (48)
+         +- CometScan parquet spark_catalog.default.date_dim (47)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#33]
+Output [2]: [d_date_sk#5, d_month_seq#31]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(44) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#33]
-Condition : (((isnotnull(d_month_seq#33) AND (d_month_seq#33 >= 1200)) AND (d_month_seq#33 <= 1211)) AND isnotnull(d_date_sk#5))
+(48) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#31]
+Condition : (((isnotnull(d_month_seq#31) AND (d_month_seq#31 >= 1200)) AND (d_month_seq#31 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(45) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#33]
+(49) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#31]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(46) ColumnarToRow [codegen id : 1]
+(50) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(47) BroadcastExchange
+(51) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt
index 0e01c5f710..53a93dc43f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [lochierarchy,s_state,rank_within_parent,total_sum,s_county]
-  WholeStageCodegen (11)
+  WholeStageCodegen (10)
     Project [total_sum,s_state,s_county,lochierarchy,rank_within_parent]
       InputAdapter
         Window [_w0,_w1,_w2]
-          WholeStageCodegen (10)
-            Sort [_w1,_w2,_w0]
+          WholeStageCodegen (9)
+            ColumnarToRow
               InputAdapter
-                Exchange [_w1,_w2] #1
-                  WholeStageCodegen (9)
-                    HashAggregate [s_state,s_county,spark_grouping_id,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,lochierarchy,_w0,_w1,_w2,sum]
-                      InputAdapter
-                        Exchange [s_state,s_county,spark_grouping_id] #2
+                CometSort [_w1,_w2,_w0]
+                  CometColumnarExchange [_w1,_w2] #1
+                    CometHashAggregate [s_state,s_county,spark_grouping_id,sum]
+                      CometColumnarExchange [s_state,s_county,spark_grouping_id] #2
+                        RowToColumnar
                           WholeStageCodegen (8)
                             HashAggregate [s_state,s_county,spark_grouping_id,ss_net_profit] [sum,sum]
                               Expand [ss_net_profit,s_state,s_county]
@@ -48,27 +48,29 @@ TakeOrderedAndProject [lochierarchy,s_state,rank_within_parent,total_sum,s_count
                                                       InputAdapter
                                                         Window [_w0,s_state]
                                                           WholeStageCodegen (5)
-                                                            Sort [s_state,_w0]
-                                                              HashAggregate [sum] [sum(UnscaledValue(ss_net_profit)),_w0,s_state,sum]
-                                                                InputAdapter
-                                                                  Exchange [s_state] #6
-                                                                    WholeStageCodegen (4)
-                                                                      HashAggregate [s_state,ss_net_profit] [sum,sum]
-                                                                        Project [ss_net_profit,s_state]
-                                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                            Project [ss_net_profit,ss_sold_date_sk,s_state]
-                                                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometFilter [ss_store_sk]
-                                                                                      CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                                                                        ReusedSubquery [d_date_sk] #1
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometSort [s_state,_w0]
+                                                                  CometHashAggregate [s_state,sum]
+                                                                    CometColumnarExchange [s_state] #6
+                                                                      RowToColumnar
+                                                                        WholeStageCodegen (4)
+                                                                          HashAggregate [s_state,ss_net_profit] [sum,sum]
+                                                                            Project [ss_net_profit,s_state]
+                                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                Project [ss_net_profit,ss_sold_date_sk,s_state]
+                                                                                  BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                    ColumnarToRow
+                                                                                      InputAdapter
+                                                                                        CometFilter [ss_store_sk]
+                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                                                                            ReusedSubquery [d_date_sk] #1
+                                                                                    InputAdapter
+                                                                                      BroadcastExchange #7
+                                                                                        WholeStageCodegen (2)
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometFilter [s_store_sk]
+                                                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
                                                                                 InputAdapter
-                                                                                  BroadcastExchange #7
-                                                                                    WholeStageCodegen (2)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometFilter [s_store_sk]
-                                                                                            CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                                                                            InputAdapter
-                                                                              ReusedExchange [d_date_sk] #3
+                                                                                  ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt
index 39bedd1f2c..172f460c8a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt
@@ -1,42 +1,44 @@
 == Physical Plan ==
-* Sort (38)
-+- Exchange (37)
-   +- * HashAggregate (36)
-      +- Exchange (35)
-         +- * HashAggregate (34)
-            +- * Project (33)
-               +- * BroadcastHashJoin Inner BuildRight (32)
-                  :- * Project (26)
-                  :  +- * BroadcastHashJoin Inner BuildLeft (25)
-                  :     :- BroadcastExchange (5)
-                  :     :  +- * ColumnarToRow (4)
-                  :     :     +- CometProject (3)
-                  :     :        +- CometFilter (2)
-                  :     :           +- CometScan parquet spark_catalog.default.item (1)
-                  :     +- Union (24)
-                  :        :- * Project (11)
-                  :        :  +- * BroadcastHashJoin Inner BuildRight (10)
-                  :        :     :- * ColumnarToRow (8)
-                  :        :     :  +- CometFilter (7)
-                  :        :     :     +- CometScan parquet spark_catalog.default.web_sales (6)
-                  :        :     +- ReusedExchange (9)
-                  :        :- * Project (17)
-                  :        :  +- * BroadcastHashJoin Inner BuildRight (16)
-                  :        :     :- * ColumnarToRow (14)
-                  :        :     :  +- CometFilter (13)
-                  :        :     :     +- CometScan parquet spark_catalog.default.catalog_sales (12)
-                  :        :     +- ReusedExchange (15)
-                  :        +- * Project (23)
-                  :           +- * BroadcastHashJoin Inner BuildRight (22)
-                  :              :- * ColumnarToRow (20)
-                  :              :  +- CometFilter (19)
-                  :              :     +- CometScan parquet spark_catalog.default.store_sales (18)
-                  :              +- ReusedExchange (21)
-                  +- BroadcastExchange (31)
-                     +- * ColumnarToRow (30)
-                        +- CometProject (29)
-                           +- CometFilter (28)
-                              +- CometScan parquet spark_catalog.default.time_dim (27)
+* ColumnarToRow (40)
++- CometSort (39)
+   +- CometColumnarExchange (38)
+      +- CometHashAggregate (37)
+         +- CometColumnarExchange (36)
+            +- RowToColumnar (35)
+               +- * HashAggregate (34)
+                  +- * Project (33)
+                     +- * BroadcastHashJoin Inner BuildRight (32)
+                        :- * Project (26)
+                        :  +- * BroadcastHashJoin Inner BuildLeft (25)
+                        :     :- BroadcastExchange (5)
+                        :     :  +- * ColumnarToRow (4)
+                        :     :     +- CometProject (3)
+                        :     :        +- CometFilter (2)
+                        :     :           +- CometScan parquet spark_catalog.default.item (1)
+                        :     +- Union (24)
+                        :        :- * Project (11)
+                        :        :  +- * BroadcastHashJoin Inner BuildRight (10)
+                        :        :     :- * ColumnarToRow (8)
+                        :        :     :  +- CometFilter (7)
+                        :        :     :     +- CometScan parquet spark_catalog.default.web_sales (6)
+                        :        :     +- ReusedExchange (9)
+                        :        :- * Project (17)
+                        :        :  +- * BroadcastHashJoin Inner BuildRight (16)
+                        :        :     :- * ColumnarToRow (14)
+                        :        :     :  +- CometFilter (13)
+                        :        :     :     +- CometScan parquet spark_catalog.default.catalog_sales (12)
+                        :        :     +- ReusedExchange (15)
+                        :        +- * Project (23)
+                        :           +- * BroadcastHashJoin Inner BuildRight (22)
+                        :              :- * ColumnarToRow (20)
+                        :              :  +- CometFilter (19)
+                        :              :     +- CometScan parquet spark_catalog.default.store_sales (18)
+                        :              +- ReusedExchange (21)
+                        +- BroadcastExchange (31)
+                           +- * ColumnarToRow (30)
+                              +- CometProject (29)
+                                 +- CometFilter (28)
+                                    +- CometScan parquet spark_catalog.default.time_dim (27)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -76,7 +78,7 @@ Condition : (isnotnull(ws_item_sk#6) AND isnotnull(ws_sold_time_sk#5))
 (8) ColumnarToRow [codegen id : 3]
 Input [4]: [ws_sold_time_sk#5, ws_item_sk#6, ws_ext_sales_price#7, ws_sold_date_sk#8]
 
-(9) ReusedExchange [Reuses operator id: 43]
+(9) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#10]
 
 (10) BroadcastHashJoin [codegen id : 3]
@@ -104,7 +106,7 @@ Condition : (isnotnull(cs_item_sk#15) AND isnotnull(cs_sold_time_sk#14))
 (14) ColumnarToRow [codegen id : 5]
 Input [4]: [cs_sold_time_sk#14, cs_item_sk#15, cs_ext_sales_price#16, cs_sold_date_sk#17]
 
-(15) ReusedExchange [Reuses operator id: 43]
+(15) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#19]
 
 (16) BroadcastHashJoin [codegen id : 5]
@@ -132,7 +134,7 @@ Condition : (isnotnull(ss_item_sk#24) AND isnotnull(ss_sold_time_sk#23))
 (20) ColumnarToRow [codegen id : 7]
 Input [4]: [ss_sold_time_sk#23, ss_item_sk#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 
-(21) ReusedExchange [Reuses operator id: 43]
+(21) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#28]
 
 (22) BroadcastHashJoin [codegen id : 7]
@@ -196,54 +198,58 @@ Functions [1]: [partial_sum(UnscaledValue(ext_price#11))]
 Aggregate Attributes [1]: [sum#36]
 Results [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
 
-(35) Exchange
+(35) RowToColumnar
 Input [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
-Arguments: hashpartitioning(i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(36) HashAggregate [codegen id : 10]
+(36) CometColumnarExchange
+Input [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
+Arguments: hashpartitioning(i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(37) CometHashAggregate
 Input [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
 Keys [4]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34]
 Functions [1]: [sum(UnscaledValue(ext_price#11))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ext_price#11))#38]
-Results [5]: [i_brand_id#2 AS brand_id#39, i_brand#3 AS brand#40, t_hour#33, t_minute#34, MakeDecimal(sum(UnscaledValue(ext_price#11))#38,17,2) AS ext_price#41]
 
-(37) Exchange
-Input [5]: [brand_id#39, brand#40, t_hour#33, t_minute#34, ext_price#41]
-Arguments: rangepartitioning(ext_price#41 DESC NULLS LAST, brand_id#39 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(38) CometColumnarExchange
+Input [5]: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40]
+Arguments: rangepartitioning(ext_price#40 DESC NULLS LAST, brand_id#38 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(39) CometSort
+Input [5]: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40]
+Arguments: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40], [ext_price#40 DESC NULLS LAST, brand_id#38 ASC NULLS FIRST]
 
-(38) Sort [codegen id : 11]
-Input [5]: [brand_id#39, brand#40, t_hour#33, t_minute#34, ext_price#41]
-Arguments: [ext_price#41 DESC NULLS LAST, brand_id#39 ASC NULLS FIRST], true, 0
+(40) ColumnarToRow [codegen id : 10]
+Input [5]: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 6 Hosting Expression = ws_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (43)
-+- * ColumnarToRow (42)
-   +- CometProject (41)
-      +- CometFilter (40)
-         +- CometScan parquet spark_catalog.default.date_dim (39)
+BroadcastExchange (45)
++- * ColumnarToRow (44)
+   +- CometProject (43)
+      +- CometFilter (42)
+         +- CometScan parquet spark_catalog.default.date_dim (41)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#42, d_moy#43]
+Output [3]: [d_date_sk#10, d_year#41, d_moy#42]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,11), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(40) CometFilter
-Input [3]: [d_date_sk#10, d_year#42, d_moy#43]
-Condition : ((((isnotnull(d_moy#43) AND isnotnull(d_year#42)) AND (d_moy#43 = 11)) AND (d_year#42 = 1999)) AND isnotnull(d_date_sk#10))
+(42) CometFilter
+Input [3]: [d_date_sk#10, d_year#41, d_moy#42]
+Condition : ((((isnotnull(d_moy#42) AND isnotnull(d_year#41)) AND (d_moy#42 = 11)) AND (d_year#41 = 1999)) AND isnotnull(d_date_sk#10))
 
-(41) CometProject
-Input [3]: [d_date_sk#10, d_year#42, d_moy#43]
+(43) CometProject
+Input [3]: [d_date_sk#10, d_year#41, d_moy#42]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(42) ColumnarToRow [codegen id : 1]
+(44) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(43) BroadcastExchange
+(45) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt
index bea5376a00..b5c6e96d6f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt
@@ -1,11 +1,11 @@
-WholeStageCodegen (11)
-  Sort [ext_price,brand_id]
+WholeStageCodegen (10)
+  ColumnarToRow
     InputAdapter
-      Exchange [ext_price,brand_id] #1
-        WholeStageCodegen (10)
-          HashAggregate [i_brand,i_brand_id,t_hour,t_minute,sum] [sum(UnscaledValue(ext_price)),brand_id,brand,ext_price,sum]
-            InputAdapter
-              Exchange [i_brand,i_brand_id,t_hour,t_minute] #2
+      CometSort [ext_price,brand_id]
+        CometColumnarExchange [ext_price,brand_id] #1
+          CometHashAggregate [i_brand,i_brand_id,t_hour,t_minute,sum]
+            CometColumnarExchange [i_brand,i_brand_id,t_hour,t_minute] #2
+              RowToColumnar
                 WholeStageCodegen (9)
                   HashAggregate [i_brand,i_brand_id,t_hour,t_minute,ext_price] [sum,sum]
                     Project [i_brand_id,i_brand,ext_price,t_hour,t_minute]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt
index c0d1f949a8..dbc785238b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt
@@ -1,74 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (70)
-+- * HashAggregate (69)
-   +- Exchange (68)
-      +- * HashAggregate (67)
-         +- * Project (66)
-            +- * SortMergeJoin LeftOuter (65)
-               :- * Sort (58)
-               :  +- Exchange (57)
-               :     +- * Project (56)
-               :        +- * BroadcastHashJoin LeftOuter BuildRight (55)
-               :           :- * Project (50)
-               :           :  +- * BroadcastHashJoin Inner BuildRight (49)
-               :           :     :- * Project (44)
-               :           :     :  +- * BroadcastHashJoin Inner BuildRight (43)
-               :           :     :     :- * Project (38)
-               :           :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-               :           :     :     :     :- * Project (35)
-               :           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-               :           :     :     :     :     :- * Project (28)
-               :           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
-               :           :     :     :     :     :     :- * Project (21)
-               :           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :           :     :     :     :     :     :     :- * Project (15)
-               :           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :           :     :     :     :     :     :     :     :- * Project (9)
-               :           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :           :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
-               :           :     :     :     :     :     :     :     :     :  +- CometFilter (2)
-               :           :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :           :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
-               :           :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
-               :           :     :     :     :     :     :     :     :           +- CometFilter (5)
-               :           :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
-               :           :     :     :     :     :     :     :     +- BroadcastExchange (13)
-               :           :     :     :     :     :     :     :        +- * ColumnarToRow (12)
-               :           :     :     :     :     :     :     :           +- CometFilter (11)
-               :           :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
-               :           :     :     :     :     :     :     +- BroadcastExchange (19)
-               :           :     :     :     :     :     :        +- * ColumnarToRow (18)
-               :           :     :     :     :     :     :           +- CometFilter (17)
-               :           :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
-               :           :     :     :     :     :     +- BroadcastExchange (26)
-               :           :     :     :     :     :        +- * ColumnarToRow (25)
-               :           :     :     :     :     :           +- CometProject (24)
-               :           :     :     :     :     :              +- CometFilter (23)
-               :           :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
-               :           :     :     :     :     +- BroadcastExchange (33)
-               :           :     :     :     :        +- * ColumnarToRow (32)
-               :           :     :     :     :           +- CometProject (31)
-               :           :     :     :     :              +- CometFilter (30)
-               :           :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
-               :           :     :     :     +- ReusedExchange (36)
-               :           :     :     +- BroadcastExchange (42)
-               :           :     :        +- * ColumnarToRow (41)
-               :           :     :           +- CometFilter (40)
-               :           :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
-               :           :     +- BroadcastExchange (48)
-               :           :        +- * ColumnarToRow (47)
-               :           :           +- CometFilter (46)
-               :           :              +- CometScan parquet spark_catalog.default.date_dim (45)
-               :           +- BroadcastExchange (54)
-               :              +- * ColumnarToRow (53)
-               :                 +- CometFilter (52)
-               :                    +- CometScan parquet spark_catalog.default.promotion (51)
-               +- * ColumnarToRow (64)
-                  +- CometSort (63)
-                     +- CometExchange (62)
-                        +- CometProject (61)
-                           +- CometFilter (60)
-                              +- CometScan parquet spark_catalog.default.catalog_returns (59)
+* ColumnarToRow (71)
++- CometTakeOrderedAndProject (70)
+   +- CometHashAggregate (69)
+      +- CometColumnarExchange (68)
+         +- CometHashAggregate (67)
+            +- CometProject (66)
+               +- CometSortMergeJoin (65)
+                  :- CometSort (59)
+                  :  +- CometColumnarExchange (58)
+                  :     +- RowToColumnar (57)
+                  :        +- * Project (56)
+                  :           +- * BroadcastHashJoin LeftOuter BuildRight (55)
+                  :              :- * Project (50)
+                  :              :  +- * BroadcastHashJoin Inner BuildRight (49)
+                  :              :     :- * Project (44)
+                  :              :     :  +- * BroadcastHashJoin Inner BuildRight (43)
+                  :              :     :     :- * Project (38)
+                  :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+                  :              :     :     :     :- * Project (35)
+                  :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+                  :              :     :     :     :     :- * Project (28)
+                  :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
+                  :              :     :     :     :     :     :- * Project (21)
+                  :              :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                  :              :     :     :     :     :     :     :- * Project (15)
+                  :              :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :              :     :     :     :     :     :     :     :- * Project (9)
+                  :              :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :              :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
+                  :              :     :     :     :     :     :     :     :     :  +- CometFilter (2)
+                  :              :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                  :              :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
+                  :              :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
+                  :              :     :     :     :     :     :     :     :           +- CometFilter (5)
+                  :              :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
+                  :              :     :     :     :     :     :     :     +- BroadcastExchange (13)
+                  :              :     :     :     :     :     :     :        +- * ColumnarToRow (12)
+                  :              :     :     :     :     :     :     :           +- CometFilter (11)
+                  :              :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
+                  :              :     :     :     :     :     :     +- BroadcastExchange (19)
+                  :              :     :     :     :     :     :        +- * ColumnarToRow (18)
+                  :              :     :     :     :     :     :           +- CometFilter (17)
+                  :              :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
+                  :              :     :     :     :     :     +- BroadcastExchange (26)
+                  :              :     :     :     :     :        +- * ColumnarToRow (25)
+                  :              :     :     :     :     :           +- CometProject (24)
+                  :              :     :     :     :     :              +- CometFilter (23)
+                  :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
+                  :              :     :     :     :     +- BroadcastExchange (33)
+                  :              :     :     :     :        +- * ColumnarToRow (32)
+                  :              :     :     :     :           +- CometProject (31)
+                  :              :     :     :     :              +- CometFilter (30)
+                  :              :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
+                  :              :     :     :     +- ReusedExchange (36)
+                  :              :     :     +- BroadcastExchange (42)
+                  :              :     :        +- * ColumnarToRow (41)
+                  :              :     :           +- CometFilter (40)
+                  :              :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
+                  :              :     +- BroadcastExchange (48)
+                  :              :        +- * ColumnarToRow (47)
+                  :              :           +- CometFilter (46)
+                  :              :              +- CometScan parquet spark_catalog.default.date_dim (45)
+                  :              +- BroadcastExchange (54)
+                  :                 +- * ColumnarToRow (53)
+                  :                    +- CometFilter (52)
+                  :                       +- CometScan parquet spark_catalog.default.promotion (51)
+                  +- CometSort (64)
+                     +- CometColumnarExchange (63)
+                        +- CometProject (62)
+                           +- CometFilter (61)
+                              +- CometScan parquet spark_catalog.default.catalog_returns (60)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -235,7 +236,7 @@ Join condition: None
 Output [8]: [cs_ship_date_sk#1, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17]
 Input [10]: [cs_ship_date_sk#1, cs_bill_hdemo_sk#3, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17, hd_demo_sk#20]
 
-(36) ReusedExchange [Reuses operator id: 75]
+(36) ReusedExchange [Reuses operator id: 76]
 Output [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
 (37) BroadcastHashJoin [codegen id : 10]
@@ -332,13 +333,16 @@ Join condition: None
 Output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Input [7]: [cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, p_promo_sk#29]
 
-(57) Exchange
+(57) RowToColumnar
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(58) Sort [codegen id : 11]
+(58) CometColumnarExchange
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(59) CometSort
+Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+Arguments: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
@@ -347,86 +351,81 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(60) CometFilter
+(61) CometFilter
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Condition : (isnotnull(cr_item_sk#30) AND isnotnull(cr_order_number#31))
 
-(61) CometProject
+(62) CometProject
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30, cr_order_number#31]
 
-(62) CometExchange
+(63) CometColumnarExchange
 Input [2]: [cr_item_sk#30, cr_order_number#31]
-Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=10]
+Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(63) CometSort
+(64) CometSort
 Input [2]: [cr_item_sk#30, cr_order_number#31]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30 ASC NULLS FIRST, cr_order_number#31 ASC NULLS FIRST]
 
-(64) ColumnarToRow [codegen id : 12]
-Input [2]: [cr_item_sk#30, cr_order_number#31]
+(65) CometSortMergeJoin
+Left output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+Right output [2]: [cr_item_sk#30, cr_order_number#31]
+Arguments: [cs_item_sk#4, cs_order_number#6], [cr_item_sk#30, cr_order_number#31], LeftOuter
 
-(65) SortMergeJoin [codegen id : 13]
-Left keys [2]: [cs_item_sk#4, cs_order_number#6]
-Right keys [2]: [cr_item_sk#30, cr_order_number#31]
-Join type: LeftOuter
-Join condition: None
-
-(66) Project [codegen id : 13]
-Output [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+(66) CometProject
 Input [7]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, cr_item_sk#30, cr_order_number#31]
+Arguments: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 
-(67) HashAggregate [codegen id : 13]
+(67) CometHashAggregate
 Input [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#33]
-Results [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
 
-(68) Exchange
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
-Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(68) CometColumnarExchange
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
+Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(69) HashAggregate [codegen id : 14]
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
+(69) CometHashAggregate
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#35]
-Results [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count(1)#35 AS no_promo#36, count(1)#35 AS promo#37, count(1)#35 AS total_cnt#38]
 
-(70) TakeOrderedAndProject
-Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
-Arguments: 100, [total_cnt#38 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
+(70) CometTakeOrderedAndProject
+Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_cnt#36 DESC NULLS LAST,i_item_desc#17 ASC NULLS FIRST,w_warehouse_name#15 ASC NULLS FIRST,d_week_seq#24 ASC NULLS FIRST], output=[i_item_desc#17,w_warehouse_name#15,d_week_seq#24,no_promo#34,promo#35,total_cnt#36]), 100, [total_cnt#36 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
+
+(71) ColumnarToRow [codegen id : 11]
+Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometProject (73)
-      +- CometFilter (72)
-         +- CometScan parquet spark_catalog.default.date_dim (71)
+BroadcastExchange (76)
++- * ColumnarToRow (75)
+   +- CometProject (74)
+      +- CometFilter (73)
+         +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
+Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk), IsNotNull(d_week_seq), IsNotNull(d_date)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_week_seq:int,d_year:int>
 
-(72) CometFilter
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
-Condition : ((((isnotnull(d_year#39) AND (d_year#39 = 1999)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
+(73) CometFilter
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
+Condition : ((((isnotnull(d_year#37) AND (d_year#37 = 1999)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
 
-(73) CometProject
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
+(74) CometProject
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
 Arguments: [d_date_sk#22, d_date#23, d_week_seq#24], [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(74) ColumnarToRow [codegen id : 1]
+(75) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(75) BroadcastExchange
+(76) BroadcastExchange
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt
index 5eb8ea5275..5bf7ab343a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt
@@ -1,114 +1,108 @@
-TakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
-  WholeStageCodegen (14)
-    HashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count] [count(1),no_promo,promo,total_cnt,count]
-      InputAdapter
-        Exchange [i_item_desc,w_warehouse_name,d_week_seq] #1
-          WholeStageCodegen (13)
-            HashAggregate [i_item_desc,w_warehouse_name,d_week_seq] [count,count]
-              Project [w_warehouse_name,i_item_desc,d_week_seq]
-                SortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                  InputAdapter
-                    WholeStageCodegen (11)
-                      Sort [cs_item_sk,cs_order_number]
-                        InputAdapter
-                          Exchange [cs_item_sk,cs_order_number] #2
-                            WholeStageCodegen (10)
-                              Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                                BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                                  Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                                    BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
-                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                        BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
-                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                              Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
-                                                  Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                    BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                        BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
-                                                            BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                                              Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
-                                                                BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
-                                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
-                                                                          SubqueryBroadcast [d_date_sk] #1
-                                                                            BroadcastExchange #3
-                                                                              WholeStageCodegen (1)
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometProject [d_date_sk,d_date,d_week_seq]
-                                                                                      CometFilter [d_year,d_date_sk,d_week_seq,d_date]
-                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
-                                                                  InputAdapter
-                                                                    BroadcastExchange #4
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
-                                                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+WholeStageCodegen (11)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
+        CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count]
+          CometColumnarExchange [i_item_desc,w_warehouse_name,d_week_seq] #1
+            CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq]
+              CometProject [w_warehouse_name,i_item_desc,d_week_seq]
+                CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                  CometSort [cs_item_sk,cs_order_number]
+                    CometColumnarExchange [cs_item_sk,cs_order_number] #2
+                      RowToColumnar
+                        WholeStageCodegen (10)
+                          Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                            BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                              Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                                BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
+                                  Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                    BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
+                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                            BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
+                                              Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                                  Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
+                                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
+                                                            BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
+                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
+                                                                      SubqueryBroadcast [d_date_sk] #1
+                                                                        BroadcastExchange #3
+                                                                          WholeStageCodegen (1)
+                                                                            ColumnarToRow
+                                                                              InputAdapter
+                                                                                CometProject [d_date_sk,d_date,d_week_seq]
+                                                                                  CometFilter [d_year,d_date_sk,d_week_seq,d_date]
+                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
                                                               InputAdapter
-                                                                BroadcastExchange #5
-                                                                  WholeStageCodegen (2)
+                                                                BroadcastExchange #4
+                                                                  WholeStageCodegen (1)
                                                                     ColumnarToRow
                                                                       InputAdapter
-                                                                        CometFilter [w_warehouse_sk]
-                                                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                                                        CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
+                                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
                                                           InputAdapter
-                                                            BroadcastExchange #6
-                                                              WholeStageCodegen (3)
+                                                            BroadcastExchange #5
+                                                              WholeStageCodegen (2)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [i_item_sk]
-                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                                                                    CometFilter [w_warehouse_sk]
+                                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                                                       InputAdapter
-                                                        BroadcastExchange #7
-                                                          WholeStageCodegen (4)
+                                                        BroadcastExchange #6
+                                                          WholeStageCodegen (3)
                                                             ColumnarToRow
                                                               InputAdapter
-                                                                CometProject [cd_demo_sk]
-                                                                  CometFilter [cd_marital_status,cd_demo_sk]
-                                                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                                CometFilter [i_item_sk]
+                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
                                                   InputAdapter
-                                                    BroadcastExchange #8
-                                                      WholeStageCodegen (5)
+                                                    BroadcastExchange #7
+                                                      WholeStageCodegen (4)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometProject [hd_demo_sk]
-                                                              CometFilter [hd_buy_potential,hd_demo_sk]
-                                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
+                                                            CometProject [cd_demo_sk]
+                                                              CometFilter [cd_marital_status,cd_demo_sk]
+                                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                               InputAdapter
-                                                ReusedExchange [d_date_sk,d_date,d_week_seq] #3
+                                                BroadcastExchange #8
+                                                  WholeStageCodegen (5)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [hd_demo_sk]
+                                                          CometFilter [hd_buy_potential,hd_demo_sk]
+                                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
                                           InputAdapter
-                                            BroadcastExchange #9
-                                              WholeStageCodegen (7)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [d_week_seq,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                            ReusedExchange [d_date_sk,d_date,d_week_seq] #3
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (8)
+                                        BroadcastExchange #9
+                                          WholeStageCodegen (7)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometFilter [d_date,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                CometFilter [d_week_seq,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
                                   InputAdapter
-                                    BroadcastExchange #11
-                                      WholeStageCodegen (9)
+                                    BroadcastExchange #10
+                                      WholeStageCodegen (8)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometFilter [p_promo_sk]
-                                              CometScan parquet spark_catalog.default.promotion [p_promo_sk]
-                  InputAdapter
-                    WholeStageCodegen (12)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [cr_item_sk,cr_order_number]
-                            CometExchange [cr_item_sk,cr_order_number] #12
-                              CometProject [cr_item_sk,cr_order_number]
-                                CometFilter [cr_item_sk,cr_order_number]
-                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                              InputAdapter
+                                BroadcastExchange #11
+                                  WholeStageCodegen (9)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [p_promo_sk]
+                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                  CometSort [cr_item_sk,cr_order_number]
+                    CometColumnarExchange [cr_item_sk,cr_order_number] #12
+                      CometProject [cr_item_sk,cr_order_number]
+                        CometFilter [cr_item_sk,cr_order_number]
+                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt
index dc64c33861..38bf356802 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt
@@ -1,36 +1,40 @@
 == Physical Plan ==
-* Sort (32)
-+- Exchange (31)
-   +- * Project (30)
-      +- * BroadcastHashJoin Inner BuildRight (29)
-         :- * Filter (24)
-         :  +- * HashAggregate (23)
-         :     +- Exchange (22)
-         :        +- * HashAggregate (21)
-         :           +- * Project (20)
-         :              +- * BroadcastHashJoin Inner BuildRight (19)
-         :                 :- * Project (13)
-         :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
-         :                 :     :- * Project (6)
-         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-         :                 :     :     :- * ColumnarToRow (3)
-         :                 :     :     :  +- CometFilter (2)
-         :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-         :                 :     :     +- ReusedExchange (4)
-         :                 :     +- BroadcastExchange (11)
-         :                 :        +- * ColumnarToRow (10)
-         :                 :           +- CometProject (9)
-         :                 :              +- CometFilter (8)
-         :                 :                 +- CometScan parquet spark_catalog.default.store (7)
-         :                 +- BroadcastExchange (18)
-         :                    +- * ColumnarToRow (17)
-         :                       +- CometProject (16)
-         :                          +- CometFilter (15)
-         :                             +- CometScan parquet spark_catalog.default.household_demographics (14)
-         +- BroadcastExchange (28)
-            +- * ColumnarToRow (27)
-               +- CometFilter (26)
-                  +- CometScan parquet spark_catalog.default.customer (25)
+* ColumnarToRow (36)
++- CometSort (35)
+   +- CometColumnarExchange (34)
+      +- RowToColumnar (33)
+         +- * Project (32)
+            +- * BroadcastHashJoin Inner BuildRight (31)
+               :- * ColumnarToRow (26)
+               :  +- CometFilter (25)
+               :     +- CometHashAggregate (24)
+               :        +- CometColumnarExchange (23)
+               :           +- RowToColumnar (22)
+               :              +- * HashAggregate (21)
+               :                 +- * Project (20)
+               :                    +- * BroadcastHashJoin Inner BuildRight (19)
+               :                       :- * Project (13)
+               :                       :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :                       :     :- * Project (6)
+               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :                       :     :     :- * ColumnarToRow (3)
+               :                       :     :     :  +- CometFilter (2)
+               :                       :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                       :     :     +- ReusedExchange (4)
+               :                       :     +- BroadcastExchange (11)
+               :                       :        +- * ColumnarToRow (10)
+               :                       :           +- CometProject (9)
+               :                       :              +- CometFilter (8)
+               :                       :                 +- CometScan parquet spark_catalog.default.store (7)
+               :                       +- BroadcastExchange (18)
+               :                          +- * ColumnarToRow (17)
+               :                             +- CometProject (16)
+               :                                +- CometFilter (15)
+               :                                   +- CometScan parquet spark_catalog.default.household_demographics (14)
+               +- BroadcastExchange (30)
+                  +- * ColumnarToRow (29)
+                     +- CometFilter (28)
+                        +- CometScan parquet spark_catalog.default.customer (27)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -48,7 +52,7 @@ Condition : ((isnotnull(ss_store_sk#3) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 37]
+(4) ReusedExchange [Reuses operator id: 41]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -132,86 +136,96 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#14]
 Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 
-(22) Exchange
+(22) RowToColumnar
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) HashAggregate [codegen id : 6]
+(23) CometColumnarExchange
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(24) CometHashAggregate
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 Keys [2]: [ss_ticket_number#4, ss_customer_sk#1]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#16]
-Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count(1)#16 AS cnt#17]
 
-(24) Filter [codegen id : 6]
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17]
-Condition : ((cnt#17 >= 1) AND (cnt#17 <= 5))
+(25) CometFilter
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
+Condition : ((cnt#16 >= 1) AND (cnt#16 <= 5))
+
+(26) ColumnarToRow [codegen id : 6]
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+Output [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string>
 
-(26) CometFilter
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
-Condition : isnotnull(c_customer_sk#18)
+(28) CometFilter
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+Condition : isnotnull(c_customer_sk#17)
 
-(27) ColumnarToRow [codegen id : 5]
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(29) ColumnarToRow [codegen id : 5]
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 
-(28) BroadcastExchange
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(30) BroadcastExchange
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 6]
+(31) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#18]
+Right keys [1]: [c_customer_sk#17]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17, c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(32) Project [codegen id : 6]
+Output [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16, c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+
+(33) RowToColumnar
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+
+(34) CometColumnarExchange
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Arguments: rangepartitioning(cnt#16 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(31) Exchange
-Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Arguments: rangepartitioning(cnt#17 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(35) CometSort
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Arguments: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16], [cnt#16 DESC NULLS LAST]
 
-(32) Sort [codegen id : 7]
-Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Arguments: [cnt#17 DESC NULLS LAST], true, 0
+(36) ColumnarToRow [codegen id : 7]
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (41)
++- * ColumnarToRow (40)
+   +- CometProject (39)
+      +- CometFilter (38)
+         +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#23, d_dom#24]
+Output [3]: [d_date_sk#7, d_year#22, d_dom#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_dom), GreaterThanOrEqual(d_dom,1), LessThanOrEqual(d_dom,2), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(34) CometFilter
-Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
-Condition : ((((isnotnull(d_dom#24) AND (d_dom#24 >= 1)) AND (d_dom#24 <= 2)) AND d_year#23 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
+(38) CometFilter
+Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
+Condition : ((((isnotnull(d_dom#23) AND (d_dom#23 >= 1)) AND (d_dom#23 <= 2)) AND d_year#22 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
 
-(35) CometProject
-Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
+(39) CometProject
+Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(36) ColumnarToRow [codegen id : 1]
+(40) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(37) BroadcastExchange
+(41) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt
index 7c5ee1ef5a..45a7796f70 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt
@@ -1,56 +1,60 @@
 WholeStageCodegen (7)
-  Sort [cnt]
+  ColumnarToRow
     InputAdapter
-      Exchange [cnt] #1
-        WholeStageCodegen (6)
-          Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
-            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-              Filter [cnt]
-                HashAggregate [ss_ticket_number,ss_customer_sk,count] [count(1),cnt,count]
-                  InputAdapter
-                    Exchange [ss_ticket_number,ss_customer_sk] #2
-                      WholeStageCodegen (4)
-                        HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
-                          Project [ss_customer_sk,ss_ticket_number]
-                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                              Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
-                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_dom,d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                  InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+      CometSort [cnt]
+        CometColumnarExchange [cnt] #1
+          RowToColumnar
+            WholeStageCodegen (6)
+              Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
+                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [cnt]
+                        CometHashAggregate [ss_ticket_number,ss_customer_sk,count]
+                          CometColumnarExchange [ss_ticket_number,ss_customer_sk] #2
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
+                                  Project [ss_customer_sk,ss_ticket_number]
+                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                      Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
+                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                          Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_dom,d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
                                           InputAdapter
-                                            CometProject [s_store_sk]
-                                              CometFilter [s_county,s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (3)
-                                    ColumnarToRow
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [s_store_sk]
+                                                      CometFilter [s_county,s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
                                       InputAdapter
-                                        CometProject [hd_demo_sk]
-                                          CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
-                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
-              InputAdapter
-                BroadcastExchange #6
-                  WholeStageCodegen (5)
-                    ColumnarToRow
-                      InputAdapter
-                        CometFilter [c_customer_sk]
-                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (3)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [hd_demo_sk]
+                                                  CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
+                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
+                  InputAdapter
+                    BroadcastExchange #6
+                      WholeStageCodegen (5)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [c_customer_sk]
+                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt
index 85413ac1ce..431ca36ddf 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt
@@ -1,75 +1,83 @@
 == Physical Plan ==
-TakeOrderedAndProject (71)
-+- * Project (70)
-   +- * BroadcastHashJoin Inner BuildRight (69)
-      :- * Project (52)
-      :  +- * BroadcastHashJoin Inner BuildRight (51)
-      :     :- * BroadcastHashJoin Inner BuildRight (33)
-      :     :  :- * Filter (16)
-      :     :  :  +- * HashAggregate (15)
-      :     :  :     +- Exchange (14)
-      :     :  :        +- * HashAggregate (13)
-      :     :  :           +- * Project (12)
-      :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :  :                 :- * Project (9)
-      :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :  :                 :     :- * ColumnarToRow (3)
-      :     :  :                 :     :  +- CometFilter (2)
-      :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :  :                 :     +- BroadcastExchange (7)
-      :     :  :                 :        +- * ColumnarToRow (6)
-      :     :  :                 :           +- CometFilter (5)
-      :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :  :                 +- ReusedExchange (10)
-      :     :  +- BroadcastExchange (32)
-      :     :     +- * HashAggregate (31)
-      :     :        +- Exchange (30)
-      :     :           +- * HashAggregate (29)
-      :     :              +- * Project (28)
-      :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
-      :     :                    :- * Project (25)
-      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :                    :     :- * ColumnarToRow (19)
-      :     :                    :     :  +- CometFilter (18)
-      :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
-      :     :                    :     +- BroadcastExchange (23)
-      :     :                    :        +- * ColumnarToRow (22)
-      :     :                    :           +- CometFilter (21)
-      :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
-      :     :                    +- ReusedExchange (26)
-      :     +- BroadcastExchange (50)
-      :        +- * Filter (49)
-      :           +- * HashAggregate (48)
-      :              +- Exchange (47)
-      :                 +- * HashAggregate (46)
-      :                    +- * Project (45)
-      :                       +- * BroadcastHashJoin Inner BuildRight (44)
-      :                          :- * Project (42)
-      :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
-      :                          :     :- * ColumnarToRow (36)
-      :                          :     :  +- CometFilter (35)
-      :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
-      :                          :     +- BroadcastExchange (40)
-      :                          :        +- * ColumnarToRow (39)
-      :                          :           +- CometFilter (38)
-      :                          :              +- CometScan parquet spark_catalog.default.web_sales (37)
-      :                          +- ReusedExchange (43)
-      +- BroadcastExchange (68)
-         +- * HashAggregate (67)
-            +- Exchange (66)
-               +- * HashAggregate (65)
-                  +- * Project (64)
-                     +- * BroadcastHashJoin Inner BuildRight (63)
-                        :- * Project (61)
-                        :  +- * BroadcastHashJoin Inner BuildRight (60)
-                        :     :- * ColumnarToRow (55)
-                        :     :  +- CometFilter (54)
-                        :     :     +- CometScan parquet spark_catalog.default.customer (53)
-                        :     +- BroadcastExchange (59)
-                        :        +- * ColumnarToRow (58)
-                        :           +- CometFilter (57)
-                        :              +- CometScan parquet spark_catalog.default.web_sales (56)
-                        +- ReusedExchange (62)
+TakeOrderedAndProject (79)
++- * Project (78)
+   +- * BroadcastHashJoin Inner BuildRight (77)
+      :- * Project (58)
+      :  +- * BroadcastHashJoin Inner BuildRight (57)
+      :     :- * BroadcastHashJoin Inner BuildRight (37)
+      :     :  :- * ColumnarToRow (18)
+      :     :  :  +- CometFilter (17)
+      :     :  :     +- CometHashAggregate (16)
+      :     :  :        +- CometColumnarExchange (15)
+      :     :  :           +- RowToColumnar (14)
+      :     :  :              +- * HashAggregate (13)
+      :     :  :                 +- * Project (12)
+      :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :  :                       :- * Project (9)
+      :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :  :                       :     :- * ColumnarToRow (3)
+      :     :  :                       :     :  +- CometFilter (2)
+      :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :  :                       :     +- BroadcastExchange (7)
+      :     :  :                       :        +- * ColumnarToRow (6)
+      :     :  :                       :           +- CometFilter (5)
+      :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :  :                       +- ReusedExchange (10)
+      :     :  +- BroadcastExchange (36)
+      :     :     +- * ColumnarToRow (35)
+      :     :        +- CometHashAggregate (34)
+      :     :           +- CometColumnarExchange (33)
+      :     :              +- RowToColumnar (32)
+      :     :                 +- * HashAggregate (31)
+      :     :                    +- * Project (30)
+      :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :                          :- * Project (27)
+      :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :                          :     :- * ColumnarToRow (21)
+      :     :                          :     :  +- CometFilter (20)
+      :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
+      :     :                          :     +- BroadcastExchange (25)
+      :     :                          :        +- * ColumnarToRow (24)
+      :     :                          :           +- CometFilter (23)
+      :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
+      :     :                          +- ReusedExchange (28)
+      :     +- BroadcastExchange (56)
+      :        +- * ColumnarToRow (55)
+      :           +- CometFilter (54)
+      :              +- CometHashAggregate (53)
+      :                 +- CometColumnarExchange (52)
+      :                    +- RowToColumnar (51)
+      :                       +- * HashAggregate (50)
+      :                          +- * Project (49)
+      :                             +- * BroadcastHashJoin Inner BuildRight (48)
+      :                                :- * Project (46)
+      :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
+      :                                :     :- * ColumnarToRow (40)
+      :                                :     :  +- CometFilter (39)
+      :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
+      :                                :     +- BroadcastExchange (44)
+      :                                :        +- * ColumnarToRow (43)
+      :                                :           +- CometFilter (42)
+      :                                :              +- CometScan parquet spark_catalog.default.web_sales (41)
+      :                                +- ReusedExchange (47)
+      +- BroadcastExchange (76)
+         +- * ColumnarToRow (75)
+            +- CometHashAggregate (74)
+               +- CometColumnarExchange (73)
+                  +- RowToColumnar (72)
+                     +- * HashAggregate (71)
+                        +- * Project (70)
+                           +- * BroadcastHashJoin Inner BuildRight (69)
+                              :- * Project (67)
+                              :  +- * BroadcastHashJoin Inner BuildRight (66)
+                              :     :- * ColumnarToRow (61)
+                              :     :  +- CometFilter (60)
+                              :     :     +- CometScan parquet spark_catalog.default.customer (59)
+                              :     +- BroadcastExchange (65)
+                              :        +- * ColumnarToRow (64)
+                              :           +- CometFilter (63)
+                              :              +- CometScan parquet spark_catalog.default.web_sales (62)
+                              +- ReusedExchange (68)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -115,7 +123,7 @@ Join condition: None
 Output [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, ss_net_paid#6, ss_sold_date_sk#7]
 Input [7]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, ss_customer_sk#5, ss_net_paid#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 75]
+(10) ReusedExchange [Reuses operator id: 83]
 Output [2]: [d_date_sk#9, d_year#10]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -135,296 +143,312 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#6))]
 Aggregate Attributes [1]: [sum#11]
 Results [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 
-(14) Exchange
+(14) RowToColumnar
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 16]
+(15) CometColumnarExchange
+Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 Keys [4]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#6))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#6))#13]
-Results [2]: [c_customer_id#2 AS customer_id#14, MakeDecimal(sum(UnscaledValue(ss_net_paid#6))#13,17,2) AS year_total#15]
 
-(16) Filter [codegen id : 16]
-Input [2]: [customer_id#14, year_total#15]
-Condition : (isnotnull(year_total#15) AND (year_total#15 > 0.00))
+(17) CometFilter
+Input [2]: [customer_id#13, year_total#14]
+Condition : (isnotnull(year_total#14) AND (year_total#14 > 0.00))
+
+(18) ColumnarToRow [codegen id : 16]
+Input [2]: [customer_id#13, year_total#14]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
+Output [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(18) CometFilter
-Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
-Condition : (isnotnull(c_customer_sk#16) AND isnotnull(c_customer_id#17))
+(20) CometFilter
+Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
+Condition : (isnotnull(c_customer_sk#15) AND isnotnull(c_customer_id#16))
 
-(19) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
+(21) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+Output [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#22), dynamicpruningexpression(ss_sold_date_sk#22 IN dynamicpruning#23)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#21), dynamicpruningexpression(ss_sold_date_sk#21 IN dynamicpruning#22)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_net_paid:decimal(7,2)>
 
-(21) CometFilter
-Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
-Condition : isnotnull(ss_customer_sk#20)
+(23) CometFilter
+Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+Condition : isnotnull(ss_customer_sk#19)
 
-(22) ColumnarToRow [codegen id : 4]
-Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+(24) ColumnarToRow [codegen id : 4]
+Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 
-(23) BroadcastExchange
-Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+(25) BroadcastExchange
+Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#16]
-Right keys [1]: [ss_customer_sk#20]
+(26) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#15]
+Right keys [1]: [ss_customer_sk#19]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
-Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22]
-Input [7]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19, ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+(27) Project [codegen id : 6]
+Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21]
+Input [7]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18, ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 
-(26) ReusedExchange [Reuses operator id: 79]
-Output [2]: [d_date_sk#24, d_year#25]
+(28) ReusedExchange [Reuses operator id: 87]
+Output [2]: [d_date_sk#23, d_year#24]
 
-(27) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#22]
-Right keys [1]: [d_date_sk#24]
+(29) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#21]
+Right keys [1]: [d_date_sk#23]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
-Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
-Input [7]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22, d_date_sk#24, d_year#25]
-
-(29) HashAggregate [codegen id : 6]
-Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
-Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
-Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#21))]
-Aggregate Attributes [1]: [sum#26]
-Results [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
-
-(30) Exchange
-Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
-Arguments: hashpartitioning(c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 7]
-Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
-Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
-Functions [1]: [sum(UnscaledValue(ss_net_paid#21))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#21))#13]
-Results [4]: [c_customer_id#17 AS customer_id#28, c_first_name#18 AS customer_first_name#29, c_last_name#19 AS customer_last_name#30, MakeDecimal(sum(UnscaledValue(ss_net_paid#21))#13,17,2) AS year_total#31]
-
-(32) BroadcastExchange
-Input [4]: [customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31]
+(30) Project [codegen id : 6]
+Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
+Input [7]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21, d_date_sk#23, d_year#24]
+
+(31) HashAggregate [codegen id : 6]
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
+Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
+Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#20))]
+Aggregate Attributes [1]: [sum#25]
+Results [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+
+(32) RowToColumnar
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+
+(33) CometColumnarExchange
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+Arguments: hashpartitioning(c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
+Functions [1]: [sum(UnscaledValue(ss_net_paid#20))]
+
+(35) ColumnarToRow [codegen id : 7]
+Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
+
+(36) BroadcastExchange
+Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#14]
-Right keys [1]: [customer_id#28]
+(37) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#13]
+Right keys [1]: [customer_id#27]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
+Output [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(35) CometFilter
-Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
-Condition : (isnotnull(c_customer_sk#32) AND isnotnull(c_customer_id#33))
+(39) CometFilter
+Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
+Condition : (isnotnull(c_customer_sk#31) AND isnotnull(c_customer_id#32))
 
-(36) ColumnarToRow [codegen id : 10]
-Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
+(40) ColumnarToRow [codegen id : 10]
+Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+Output [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#38), dynamicpruningexpression(ws_sold_date_sk#38 IN dynamicpruning#39)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#37), dynamicpruningexpression(ws_sold_date_sk#37 IN dynamicpruning#38)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(38) CometFilter
-Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
-Condition : isnotnull(ws_bill_customer_sk#36)
+(42) CometFilter
+Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+Condition : isnotnull(ws_bill_customer_sk#35)
 
-(39) ColumnarToRow [codegen id : 8]
-Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+(43) ColumnarToRow [codegen id : 8]
+Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 
-(40) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+(44) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#32]
-Right keys [1]: [ws_bill_customer_sk#36]
+(45) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#31]
+Right keys [1]: [ws_bill_customer_sk#35]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
-Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38]
-Input [7]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35, ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+(46) Project [codegen id : 10]
+Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37]
+Input [7]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34, ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 
-(43) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#40, d_year#41]
+(47) ReusedExchange [Reuses operator id: 83]
+Output [2]: [d_date_sk#39, d_year#40]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#38]
-Right keys [1]: [d_date_sk#40]
+(48) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#37]
+Right keys [1]: [d_date_sk#39]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
-Input [7]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38, d_date_sk#40, d_year#41]
-
-(46) HashAggregate [codegen id : 10]
-Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
-Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#37))]
-Aggregate Attributes [1]: [sum#42]
-Results [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
-
-(47) Exchange
-Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
-Arguments: hashpartitioning(c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(48) HashAggregate [codegen id : 11]
-Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
-Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#37))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#37))#44]
-Results [2]: [c_customer_id#33 AS customer_id#45, MakeDecimal(sum(UnscaledValue(ws_net_paid#37))#44,17,2) AS year_total#46]
-
-(49) Filter [codegen id : 11]
-Input [2]: [customer_id#45, year_total#46]
-Condition : (isnotnull(year_total#46) AND (year_total#46 > 0.00))
-
-(50) BroadcastExchange
-Input [2]: [customer_id#45, year_total#46]
+(49) Project [codegen id : 10]
+Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
+Input [7]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37, d_date_sk#39, d_year#40]
+
+(50) HashAggregate [codegen id : 10]
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
+Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#36))]
+Aggregate Attributes [1]: [sum#41]
+Results [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+
+(51) RowToColumnar
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+
+(52) CometColumnarExchange
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+Arguments: hashpartitioning(c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(53) CometHashAggregate
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#36))]
+
+(54) CometFilter
+Input [2]: [customer_id#43, year_total#44]
+Condition : (isnotnull(year_total#44) AND (year_total#44 > 0.00))
+
+(55) ColumnarToRow [codegen id : 11]
+Input [2]: [customer_id#43, year_total#44]
+
+(56) BroadcastExchange
+Input [2]: [customer_id#43, year_total#44]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(51) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#14]
-Right keys [1]: [customer_id#45]
+(57) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#13]
+Right keys [1]: [customer_id#43]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 16]
-Output [7]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46]
-Input [8]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, customer_id#45, year_total#46]
+(58) Project [codegen id : 16]
+Output [7]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44]
+Input [8]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, customer_id#43, year_total#44]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
+Output [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(54) CometFilter
-Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
-Condition : (isnotnull(c_customer_sk#47) AND isnotnull(c_customer_id#48))
+(60) CometFilter
+Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
+Condition : (isnotnull(c_customer_sk#45) AND isnotnull(c_customer_id#46))
 
-(55) ColumnarToRow [codegen id : 14]
-Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
+(61) ColumnarToRow [codegen id : 14]
+Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+Output [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(57) CometFilter
-Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
-Condition : isnotnull(ws_bill_customer_sk#51)
+(63) CometFilter
+Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+Condition : isnotnull(ws_bill_customer_sk#49)
 
-(58) ColumnarToRow [codegen id : 12]
-Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+(64) ColumnarToRow [codegen id : 12]
+Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 
-(59) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+(65) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#47]
-Right keys [1]: [ws_bill_customer_sk#51]
+(66) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#45]
+Right keys [1]: [ws_bill_customer_sk#49]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 14]
-Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53]
-Input [7]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50, ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+(67) Project [codegen id : 14]
+Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51]
+Input [7]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48, ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 
-(62) ReusedExchange [Reuses operator id: 79]
-Output [2]: [d_date_sk#55, d_year#56]
+(68) ReusedExchange [Reuses operator id: 87]
+Output [2]: [d_date_sk#53, d_year#54]
 
-(63) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#53]
-Right keys [1]: [d_date_sk#55]
+(69) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#51]
+Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 14]
-Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
-Input [7]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56]
-
-(65) HashAggregate [codegen id : 14]
-Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
-Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#52))]
-Aggregate Attributes [1]: [sum#57]
-Results [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
-
-(66) Exchange
-Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
-Arguments: hashpartitioning(c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(67) HashAggregate [codegen id : 15]
-Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
-Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#52))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#52))#44]
-Results [2]: [c_customer_id#48 AS customer_id#59, MakeDecimal(sum(UnscaledValue(ws_net_paid#52))#44,17,2) AS year_total#60]
-
-(68) BroadcastExchange
-Input [2]: [customer_id#59, year_total#60]
+(70) Project [codegen id : 14]
+Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
+Input [7]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54]
+
+(71) HashAggregate [codegen id : 14]
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
+Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#50))]
+Aggregate Attributes [1]: [sum#55]
+Results [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+
+(72) RowToColumnar
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+
+(73) CometColumnarExchange
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+Arguments: hashpartitioning(c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(74) CometHashAggregate
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#50))]
+
+(75) ColumnarToRow [codegen id : 15]
+Input [2]: [customer_id#57, year_total#58]
+
+(76) BroadcastExchange
+Input [2]: [customer_id#57, year_total#58]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(69) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#14]
-Right keys [1]: [customer_id#59]
+(77) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#13]
+Right keys [1]: [customer_id#57]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#46 > 0.00) THEN (year_total#60 / year_total#46) END > CASE WHEN (year_total#15 > 0.00) THEN (year_total#31 / year_total#15) END)
+Join condition: (CASE WHEN (year_total#44 > 0.00) THEN (year_total#58 / year_total#44) END > CASE WHEN (year_total#14 > 0.00) THEN (year_total#30 / year_total#14) END)
 
-(70) Project [codegen id : 16]
-Output [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
-Input [9]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46, customer_id#59, year_total#60]
+(78) Project [codegen id : 16]
+Output [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
+Input [9]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44, customer_id#57, year_total#58]
 
-(71) TakeOrderedAndProject
-Input [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
-Arguments: 100, [customer_id#28 ASC NULLS FIRST, customer_id#28 ASC NULLS FIRST, customer_id#28 ASC NULLS FIRST], [customer_id#28, customer_first_name#29, customer_last_name#30]
+(79) TakeOrderedAndProject
+Input [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
+Arguments: 100, [customer_id#27 ASC NULLS FIRST, customer_id#27 ASC NULLS FIRST, customer_id#27 ASC NULLS FIRST], [customer_id#27, customer_first_name#28, customer_last_name#29]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometFilter (73)
-      +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (83)
++- * ColumnarToRow (82)
+   +- CometFilter (81)
+      +- CometScan parquet spark_catalog.default.date_dim (80)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -434,44 +458,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(73) CometFilter
+(81) CometFilter
 Input [2]: [d_date_sk#9, d_year#10]
 Condition : (((isnotnull(d_year#10) AND (d_year#10 = 2001)) AND d_year#10 IN (2001,2002)) AND isnotnull(d_date_sk#9))
 
-(74) ColumnarToRow [codegen id : 1]
+(82) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_year#10]
 
-(75) BroadcastExchange
+(83) BroadcastExchange
 Input [2]: [d_date_sk#9, d_year#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
-BroadcastExchange (79)
-+- * ColumnarToRow (78)
-   +- CometFilter (77)
-      +- CometScan parquet spark_catalog.default.date_dim (76)
+Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#21 IN dynamicpruning#22
+BroadcastExchange (87)
++- * ColumnarToRow (86)
+   +- CometFilter (85)
+      +- CometScan parquet spark_catalog.default.date_dim (84)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#24, d_year#25]
+Output [2]: [d_date_sk#23, d_year#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(77) CometFilter
-Input [2]: [d_date_sk#24, d_year#25]
-Condition : (((isnotnull(d_year#25) AND (d_year#25 = 2002)) AND d_year#25 IN (2001,2002)) AND isnotnull(d_date_sk#24))
+(85) CometFilter
+Input [2]: [d_date_sk#23, d_year#24]
+Condition : (((isnotnull(d_year#24) AND (d_year#24 = 2002)) AND d_year#24 IN (2001,2002)) AND isnotnull(d_date_sk#23))
 
-(78) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#24, d_year#25]
+(86) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#23, d_year#24]
 
-(79) BroadcastExchange
-Input [2]: [d_date_sk#24, d_year#25]
+(87) BroadcastExchange
+Input [2]: [d_date_sk#23, d_year#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#38 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#37 IN dynamicpruning#8
 
-Subquery:4 Hosting operator id = 56 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#23
+Subquery:4 Hosting operator id = 62 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#22
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt
index 9d3ae8fbee..6136429173 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt
@@ -5,43 +5,13 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name]
         Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,year_total,year_total]
           BroadcastHashJoin [customer_id,customer_id]
             BroadcastHashJoin [customer_id,customer_id]
-              Filter [year_total]
-                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,year_total,sum]
-                  InputAdapter
-                    Exchange [c_customer_id,c_first_name,c_last_name,d_year] #1
-                      WholeStageCodegen (3)
-                        HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
-                          Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
-                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [c_customer_sk,c_customer_id]
-                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ss_customer_sk]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                              InputAdapter
-                                ReusedExchange [d_date_sk,d_year] #3
-              InputAdapter
-                BroadcastExchange #4
-                  WholeStageCodegen (7)
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,customer_first_name,customer_last_name,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #5
-                          WholeStageCodegen (6)
+              ColumnarToRow
+                InputAdapter
+                  CometFilter [year_total]
+                    CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                      CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #1
+                        RowToColumnar
+                          WholeStageCodegen (3)
                             HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
                               Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
                                 BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -52,71 +22,109 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name]
                                           CometFilter [c_customer_sk,c_customer_id]
                                             CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                       InputAdapter
-                                        BroadcastExchange #6
-                                          WholeStageCodegen (4)
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometFilter [ss_customer_sk]
                                                   CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #2
-                                                      BroadcastExchange #7
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
                                                         WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
                                                               CometFilter [d_year,d_date_sk]
                                                                 CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #7
+                                    ReusedExchange [d_date_sk,d_year] #3
+              InputAdapter
+                BroadcastExchange #4
+                  WholeStageCodegen (7)
+                    ColumnarToRow
+                      InputAdapter
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #5
+                            RowToColumnar
+                              WholeStageCodegen (6)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (4)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ss_customer_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #2
+                                                          BroadcastExchange #7
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  Filter [year_total]
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #9
-                          WholeStageCodegen (10)
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                              Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk,c_customer_id]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [year_total]
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #9
+                            RowToColumnar
+                              WholeStageCodegen (10)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                          InputAdapter
+                                            BroadcastExchange #10
+                                              WholeStageCodegen (8)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (8)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
+                                        ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
+              ColumnarToRow
                 InputAdapter
-                  Exchange [c_customer_id,c_first_name,c_last_name,d_year] #12
-                    WholeStageCodegen (14)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                        Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_customer_sk,c_customer_id]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #12
+                      RowToColumnar
+                        WholeStageCodegen (14)
+                          HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_customer_id]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                    InputAdapter
+                                      BroadcastExchange #13
+                                        WholeStageCodegen (12)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #13
-                                    WholeStageCodegen (12)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_customer_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #2
-                            InputAdapter
-                              ReusedExchange [d_date_sk,d_year] #7
+                                  ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt
index 3a29db88ef..8b2d451b09 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt
@@ -1,136 +1,138 @@
 == Physical Plan ==
-TakeOrderedAndProject (132)
-+- * Project (131)
-   +- * SortMergeJoin Inner (130)
-      :- * Sort (71)
-      :  +- Exchange (70)
-      :     +- * Filter (69)
-      :        +- * HashAggregate (68)
-      :           +- Exchange (67)
-      :              +- * HashAggregate (66)
-      :                 +- * HashAggregate (65)
-      :                    +- Exchange (64)
-      :                       +- * HashAggregate (63)
-      :                          +- Union (62)
-      :                             :- * Project (23)
-      :                             :  +- * SortMergeJoin LeftOuter (22)
-      :                             :     :- * Sort (15)
-      :                             :     :  +- Exchange (14)
-      :                             :     :     +- * Project (13)
-      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (12)
-      :                             :     :           :- * Project (10)
-      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (9)
-      :                             :     :           :     :- * ColumnarToRow (3)
-      :                             :     :           :     :  +- CometFilter (2)
-      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-      :                             :     :           :     +- BroadcastExchange (8)
-      :                             :     :           :        +- * ColumnarToRow (7)
-      :                             :     :           :           +- CometProject (6)
-      :                             :     :           :              +- CometFilter (5)
-      :                             :     :           :                 +- CometScan parquet spark_catalog.default.item (4)
-      :                             :     :           +- ReusedExchange (11)
-      :                             :     +- * ColumnarToRow (21)
-      :                             :        +- CometSort (20)
-      :                             :           +- CometExchange (19)
-      :                             :              +- CometProject (18)
-      :                             :                 +- CometFilter (17)
-      :                             :                    +- CometScan parquet spark_catalog.default.catalog_returns (16)
-      :                             :- * Project (42)
-      :                             :  +- * SortMergeJoin LeftOuter (41)
-      :                             :     :- * Sort (34)
-      :                             :     :  +- Exchange (33)
-      :                             :     :     +- * Project (32)
-      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (31)
-      :                             :     :           :- * Project (29)
-      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (28)
-      :                             :     :           :     :- * ColumnarToRow (26)
-      :                             :     :           :     :  +- CometFilter (25)
-      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
-      :                             :     :           :     +- ReusedExchange (27)
-      :                             :     :           +- ReusedExchange (30)
-      :                             :     +- * ColumnarToRow (40)
-      :                             :        +- CometSort (39)
-      :                             :           +- CometExchange (38)
-      :                             :              +- CometProject (37)
-      :                             :                 +- CometFilter (36)
-      :                             :                    +- CometScan parquet spark_catalog.default.store_returns (35)
-      :                             +- * Project (61)
-      :                                +- * SortMergeJoin LeftOuter (60)
-      :                                   :- * Sort (53)
-      :                                   :  +- Exchange (52)
-      :                                   :     +- * Project (51)
-      :                                   :        +- * BroadcastHashJoin Inner BuildRight (50)
-      :                                   :           :- * Project (48)
-      :                                   :           :  +- * BroadcastHashJoin Inner BuildRight (47)
-      :                                   :           :     :- * ColumnarToRow (45)
-      :                                   :           :     :  +- CometFilter (44)
-      :                                   :           :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
-      :                                   :           :     +- ReusedExchange (46)
-      :                                   :           +- ReusedExchange (49)
-      :                                   +- * ColumnarToRow (59)
-      :                                      +- CometSort (58)
-      :                                         +- CometExchange (57)
-      :                                            +- CometProject (56)
-      :                                               +- CometFilter (55)
-      :                                                  +- CometScan parquet spark_catalog.default.web_returns (54)
-      +- * Sort (129)
-         +- Exchange (128)
-            +- * Filter (127)
-               +- * HashAggregate (126)
-                  +- Exchange (125)
-                     +- * HashAggregate (124)
-                        +- * HashAggregate (123)
-                           +- Exchange (122)
-                              +- * HashAggregate (121)
-                                 +- Union (120)
-                                    :- * Project (87)
-                                    :  +- * SortMergeJoin LeftOuter (86)
-                                    :     :- * Sort (82)
-                                    :     :  +- Exchange (81)
-                                    :     :     +- * Project (80)
-                                    :     :        +- * BroadcastHashJoin Inner BuildRight (79)
-                                    :     :           :- * Project (77)
-                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (76)
-                                    :     :           :     :- * ColumnarToRow (74)
-                                    :     :           :     :  +- CometFilter (73)
-                                    :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (72)
-                                    :     :           :     +- ReusedExchange (75)
-                                    :     :           +- ReusedExchange (78)
-                                    :     +- * ColumnarToRow (85)
-                                    :        +- CometSort (84)
-                                    :           +- ReusedExchange (83)
-                                    :- * Project (103)
-                                    :  +- * SortMergeJoin LeftOuter (102)
-                                    :     :- * Sort (98)
-                                    :     :  +- Exchange (97)
-                                    :     :     +- * Project (96)
-                                    :     :        +- * BroadcastHashJoin Inner BuildRight (95)
-                                    :     :           :- * Project (93)
-                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (92)
-                                    :     :           :     :- * ColumnarToRow (90)
-                                    :     :           :     :  +- CometFilter (89)
-                                    :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (88)
-                                    :     :           :     +- ReusedExchange (91)
-                                    :     :           +- ReusedExchange (94)
-                                    :     +- * ColumnarToRow (101)
-                                    :        +- CometSort (100)
-                                    :           +- ReusedExchange (99)
-                                    +- * Project (119)
-                                       +- * SortMergeJoin LeftOuter (118)
-                                          :- * Sort (114)
-                                          :  +- Exchange (113)
-                                          :     +- * Project (112)
-                                          :        +- * BroadcastHashJoin Inner BuildRight (111)
-                                          :           :- * Project (109)
-                                          :           :  +- * BroadcastHashJoin Inner BuildRight (108)
-                                          :           :     :- * ColumnarToRow (106)
-                                          :           :     :  +- CometFilter (105)
-                                          :           :     :     +- CometScan parquet spark_catalog.default.web_sales (104)
-                                          :           :     +- ReusedExchange (107)
-                                          :           +- ReusedExchange (110)
-                                          +- * ColumnarToRow (117)
-                                             +- CometSort (116)
-                                                +- ReusedExchange (115)
+TakeOrderedAndProject (134)
++- * Project (133)
+   +- * SortMergeJoin Inner (132)
+      :- * ColumnarToRow (72)
+      :  +- CometSort (71)
+      :     +- CometColumnarExchange (70)
+      :        +- CometFilter (69)
+      :           +- CometHashAggregate (68)
+      :              +- CometColumnarExchange (67)
+      :                 +- CometHashAggregate (66)
+      :                    +- CometHashAggregate (65)
+      :                       +- CometColumnarExchange (64)
+      :                          +- CometHashAggregate (63)
+      :                             +- CometUnion (62)
+      :                                :- CometProject (23)
+      :                                :  +- CometSortMergeJoin (22)
+      :                                :     :- CometSort (16)
+      :                                :     :  +- CometColumnarExchange (15)
+      :                                :     :     +- RowToColumnar (14)
+      :                                :     :        +- * Project (13)
+      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (12)
+      :                                :     :              :- * Project (10)
+      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (9)
+      :                                :     :              :     :- * ColumnarToRow (3)
+      :                                :     :              :     :  +- CometFilter (2)
+      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+      :                                :     :              :     +- BroadcastExchange (8)
+      :                                :     :              :        +- * ColumnarToRow (7)
+      :                                :     :              :           +- CometProject (6)
+      :                                :     :              :              +- CometFilter (5)
+      :                                :     :              :                 +- CometScan parquet spark_catalog.default.item (4)
+      :                                :     :              +- ReusedExchange (11)
+      :                                :     +- CometSort (21)
+      :                                :        +- CometColumnarExchange (20)
+      :                                :           +- CometProject (19)
+      :                                :              +- CometFilter (18)
+      :                                :                 +- CometScan parquet spark_catalog.default.catalog_returns (17)
+      :                                :- CometProject (42)
+      :                                :  +- CometSortMergeJoin (41)
+      :                                :     :- CometSort (35)
+      :                                :     :  +- CometColumnarExchange (34)
+      :                                :     :     +- RowToColumnar (33)
+      :                                :     :        +- * Project (32)
+      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (31)
+      :                                :     :              :- * Project (29)
+      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (28)
+      :                                :     :              :     :- * ColumnarToRow (26)
+      :                                :     :              :     :  +- CometFilter (25)
+      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
+      :                                :     :              :     +- ReusedExchange (27)
+      :                                :     :              +- ReusedExchange (30)
+      :                                :     +- CometSort (40)
+      :                                :        +- CometColumnarExchange (39)
+      :                                :           +- CometProject (38)
+      :                                :              +- CometFilter (37)
+      :                                :                 +- CometScan parquet spark_catalog.default.store_returns (36)
+      :                                +- CometProject (61)
+      :                                   +- CometSortMergeJoin (60)
+      :                                      :- CometSort (54)
+      :                                      :  +- CometColumnarExchange (53)
+      :                                      :     +- RowToColumnar (52)
+      :                                      :        +- * Project (51)
+      :                                      :           +- * BroadcastHashJoin Inner BuildRight (50)
+      :                                      :              :- * Project (48)
+      :                                      :              :  +- * BroadcastHashJoin Inner BuildRight (47)
+      :                                      :              :     :- * ColumnarToRow (45)
+      :                                      :              :     :  +- CometFilter (44)
+      :                                      :              :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
+      :                                      :              :     +- ReusedExchange (46)
+      :                                      :              +- ReusedExchange (49)
+      :                                      +- CometSort (59)
+      :                                         +- CometColumnarExchange (58)
+      :                                            +- CometProject (57)
+      :                                               +- CometFilter (56)
+      :                                                  +- CometScan parquet spark_catalog.default.web_returns (55)
+      +- * ColumnarToRow (131)
+         +- CometSort (130)
+            +- CometColumnarExchange (129)
+               +- CometFilter (128)
+                  +- CometHashAggregate (127)
+                     +- CometColumnarExchange (126)
+                        +- CometHashAggregate (125)
+                           +- CometHashAggregate (124)
+                              +- CometColumnarExchange (123)
+                                 +- CometHashAggregate (122)
+                                    +- CometUnion (121)
+                                       :- CometProject (88)
+                                       :  +- CometSortMergeJoin (87)
+                                       :     :- CometSort (84)
+                                       :     :  +- CometColumnarExchange (83)
+                                       :     :     +- RowToColumnar (82)
+                                       :     :        +- * Project (81)
+                                       :     :           +- * BroadcastHashJoin Inner BuildRight (80)
+                                       :     :              :- * Project (78)
+                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (77)
+                                       :     :              :     :- * ColumnarToRow (75)
+                                       :     :              :     :  +- CometFilter (74)
+                                       :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (73)
+                                       :     :              :     +- ReusedExchange (76)
+                                       :     :              +- ReusedExchange (79)
+                                       :     +- CometSort (86)
+                                       :        +- ReusedExchange (85)
+                                       :- CometProject (104)
+                                       :  +- CometSortMergeJoin (103)
+                                       :     :- CometSort (100)
+                                       :     :  +- CometColumnarExchange (99)
+                                       :     :     +- RowToColumnar (98)
+                                       :     :        +- * Project (97)
+                                       :     :           +- * BroadcastHashJoin Inner BuildRight (96)
+                                       :     :              :- * Project (94)
+                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (93)
+                                       :     :              :     :- * ColumnarToRow (91)
+                                       :     :              :     :  +- CometFilter (90)
+                                       :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (89)
+                                       :     :              :     +- ReusedExchange (92)
+                                       :     :              +- ReusedExchange (95)
+                                       :     +- CometSort (102)
+                                       :        +- ReusedExchange (101)
+                                       +- CometProject (120)
+                                          +- CometSortMergeJoin (119)
+                                             :- CometSort (116)
+                                             :  +- CometColumnarExchange (115)
+                                             :     +- RowToColumnar (114)
+                                             :        +- * Project (113)
+                                             :           +- * BroadcastHashJoin Inner BuildRight (112)
+                                             :              :- * Project (110)
+                                             :              :  +- * BroadcastHashJoin Inner BuildRight (109)
+                                             :              :     :- * ColumnarToRow (107)
+                                             :              :     :  +- CometFilter (106)
+                                             :              :     :     +- CometScan parquet spark_catalog.default.web_sales (105)
+                                             :              :     +- ReusedExchange (108)
+                                             :              +- ReusedExchange (111)
+                                             +- CometSort (118)
+                                                +- ReusedExchange (117)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -180,7 +182,7 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Input [10]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_item_sk#7, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 
-(11) ReusedExchange [Reuses operator id: 136]
+(11) ReusedExchange [Reuses operator id: 138]
 Output [2]: [d_date_sk#13, d_year#14]
 
 (12) BroadcastHashJoin [codegen id : 3]
@@ -193,13 +195,16 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
 Input [11]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_date_sk#13, d_year#14]
 
-(14) Exchange
+(14) RowToColumnar
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) Sort [codegen id : 4]
+(15) CometColumnarExchange
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometSort
+Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
+Arguments: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14], [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
@@ -208,34 +213,30 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(17) CometFilter
+(18) CometFilter
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Condition : (isnotnull(cr_order_number#16) AND isnotnull(cr_item_sk#15))
 
-(18) CometProject
+(19) CometProject
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 
-(19) CometExchange
+(20) CometColumnarExchange
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(20) CometSort
+(21) CometSort
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_order_number#16 ASC NULLS FIRST, cr_item_sk#15 ASC NULLS FIRST]
 
-(21) ColumnarToRow [codegen id : 5]
-Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
+(22) CometSortMergeJoin
+Left output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
+Right output [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
+Arguments: [cs_order_number#2, cs_item_sk#1], [cr_order_number#16, cr_item_sk#15], LeftOuter
 
-(22) SortMergeJoin [codegen id : 6]
-Left keys [2]: [cs_order_number#2, cs_item_sk#1]
-Right keys [2]: [cr_order_number#16, cr_item_sk#15]
-Join type: LeftOuter
-Join condition: None
-
-(23) Project [codegen id : 6]
-Output [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
+(23) CometProject
 Input [13]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14, cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
+Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21], [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
@@ -249,42 +250,45 @@ ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sa
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 Condition : isnotnull(ss_item_sk#22)
 
-(26) ColumnarToRow [codegen id : 9]
+(26) ColumnarToRow [codegen id : 6]
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 
 (27) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(28) BroadcastHashJoin [codegen id : 9]
+(28) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_item_sk#22]
 Right keys [1]: [i_item_sk#28]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 9]
+(29) Project [codegen id : 6]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 Input [10]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(30) ReusedExchange [Reuses operator id: 136]
+(30) ReusedExchange [Reuses operator id: 138]
 Output [2]: [d_date_sk#33, d_year#34]
 
-(31) BroadcastHashJoin [codegen id : 9]
+(31) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_sold_date_sk#26]
 Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 9]
+(32) Project [codegen id : 6]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
 Input [11]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_date_sk#33, d_year#34]
 
-(33) Exchange
+(33) RowToColumnar
+Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
+
+(34) CometColumnarExchange
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(34) Sort [codegen id : 10]
+(35) CometSort
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST], false, 0
+Arguments: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34], [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
 Output [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
@@ -293,34 +297,30 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(36) CometFilter
+(37) CometFilter
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Condition : (isnotnull(sr_ticket_number#36) AND isnotnull(sr_item_sk#35))
 
-(37) CometProject
+(38) CometProject
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 
-(38) CometExchange
+(39) CometColumnarExchange
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(39) CometSort
+(40) CometSort
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_ticket_number#36 ASC NULLS FIRST, sr_item_sk#35 ASC NULLS FIRST]
 
-(40) ColumnarToRow [codegen id : 11]
-Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-
-(41) SortMergeJoin [codegen id : 12]
-Left keys [2]: [ss_ticket_number#23, ss_item_sk#22]
-Right keys [2]: [sr_ticket_number#36, sr_item_sk#35]
-Join type: LeftOuter
-Join condition: None
+(41) CometSortMergeJoin
+Left output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
+Right output [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
+Arguments: [ss_ticket_number#23, ss_item_sk#22], [sr_ticket_number#36, sr_item_sk#35], LeftOuter
 
-(42) Project [codegen id : 12]
-Output [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
+(42) CometProject
 Input [13]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34, sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
+Arguments: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41], [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
@@ -334,42 +334,45 @@ ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sal
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 Condition : isnotnull(ws_item_sk#42)
 
-(45) ColumnarToRow [codegen id : 15]
+(45) ColumnarToRow [codegen id : 9]
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 
 (46) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(47) BroadcastHashJoin [codegen id : 15]
+(47) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#42]
 Right keys [1]: [i_item_sk#48]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 15]
+(48) Project [codegen id : 9]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 Input [10]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(49) ReusedExchange [Reuses operator id: 136]
+(49) ReusedExchange [Reuses operator id: 138]
 Output [2]: [d_date_sk#53, d_year#54]
 
-(50) BroadcastHashJoin [codegen id : 15]
+(50) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#46]
 Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 15]
+(51) Project [codegen id : 9]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
 Input [11]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_date_sk#53, d_year#54]
 
-(52) Exchange
+(52) RowToColumnar
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(53) Sort [codegen id : 16]
+(53) CometColumnarExchange
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(54) CometSort
+Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
+Arguments: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54], [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
 Output [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
@@ -378,363 +381,352 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_quantity:int,wr_return_amt:decimal(7,2)>
 
-(55) CometFilter
+(56) CometFilter
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Condition : (isnotnull(wr_order_number#56) AND isnotnull(wr_item_sk#55))
 
-(56) CometProject
+(57) CometProject
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 
-(57) CometExchange
+(58) CometColumnarExchange
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(58) CometSort
+(59) CometSort
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_order_number#56 ASC NULLS FIRST, wr_item_sk#55 ASC NULLS FIRST]
 
-(59) ColumnarToRow [codegen id : 17]
-Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-
-(60) SortMergeJoin [codegen id : 18]
-Left keys [2]: [ws_order_number#43, ws_item_sk#42]
-Right keys [2]: [wr_order_number#56, wr_item_sk#55]
-Join type: LeftOuter
-Join condition: None
+(60) CometSortMergeJoin
+Left output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
+Right output [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
+Arguments: [ws_order_number#43, ws_item_sk#42], [wr_order_number#56, wr_item_sk#55], LeftOuter
 
-(61) Project [codegen id : 18]
-Output [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
+(61) CometProject
 Input [13]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54, wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
+Arguments: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61], [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
 
-(62) Union
+(62) CometUnion
+Child 0 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
+Child 1 Input [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41]
+Child 2 Input [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61]
 
-(63) HashAggregate [codegen id : 19]
+(63) CometHashAggregate
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(64) Exchange
+(64) CometColumnarExchange
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(65) HashAggregate [codegen id : 20]
+(65) CometHashAggregate
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(66) HashAggregate [codegen id : 20]
+(66) CometHashAggregate
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum#62, sum#63]
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
 
-(67) Exchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(67) CometColumnarExchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(68) HashAggregate [codegen id : 21]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
+(68) CometHashAggregate
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum(sales_cnt#20)#66 AS sales_cnt#68, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#69]
 
-(69) Filter [codegen id : 21]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
-Condition : isnotnull(sales_cnt#68)
+(69) CometFilter
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+Condition : isnotnull(sales_cnt#64)
 
-(70) Exchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
-Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(70) CometColumnarExchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(71) Sort [codegen id : 22]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
-Arguments: [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST], false, 0
+(71) CometSort
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65], [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST]
+
+(72) ColumnarToRow [codegen id : 10]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
+Output [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#74), dynamicpruningexpression(cs_sold_date_sk#74 IN dynamicpruning#75)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#70), dynamicpruningexpression(cs_sold_date_sk#70 IN dynamicpruning#71)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_ext_sales_price:decimal(7,2)>
 
-(73) CometFilter
-Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
-Condition : isnotnull(cs_item_sk#70)
+(74) CometFilter
+Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
+Condition : isnotnull(cs_item_sk#66)
 
-(74) ColumnarToRow [codegen id : 25]
-Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
+(75) ColumnarToRow [codegen id : 13]
+Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
 
-(75) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(76) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 
-(76) BroadcastHashJoin [codegen id : 25]
-Left keys [1]: [cs_item_sk#70]
-Right keys [1]: [i_item_sk#76]
+(77) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cs_item_sk#66]
+Right keys [1]: [i_item_sk#72]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 25]
-Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
-Input [10]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(78) Project [codegen id : 13]
+Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+Input [10]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 
-(78) ReusedExchange [Reuses operator id: 140]
-Output [2]: [d_date_sk#81, d_year#82]
+(79) ReusedExchange [Reuses operator id: 142]
+Output [2]: [d_date_sk#77, d_year#78]
 
-(79) BroadcastHashJoin [codegen id : 25]
-Left keys [1]: [cs_sold_date_sk#74]
-Right keys [1]: [d_date_sk#81]
+(80) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cs_sold_date_sk#70]
+Right keys [1]: [d_date_sk#77]
 Join type: Inner
 Join condition: None
 
-(80) Project [codegen id : 25]
-Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
-Input [11]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_date_sk#81, d_year#82]
-
-(81) Exchange
-Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
-Arguments: hashpartitioning(cs_order_number#71, cs_item_sk#70, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(81) Project [codegen id : 13]
+Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Input [11]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_date_sk#77, d_year#78]
 
-(82) Sort [codegen id : 26]
-Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
-Arguments: [cs_order_number#71 ASC NULLS FIRST, cs_item_sk#70 ASC NULLS FIRST], false, 0
+(82) RowToColumnar
+Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
 
-(83) ReusedExchange [Reuses operator id: 19]
-Output [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+(83) CometColumnarExchange
+Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Arguments: hashpartitioning(cs_order_number#67, cs_item_sk#66, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
 (84) CometSort
-Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
-Arguments: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86], [cr_order_number#84 ASC NULLS FIRST, cr_item_sk#83 ASC NULLS FIRST]
+Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Arguments: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78], [cs_order_number#67 ASC NULLS FIRST, cs_item_sk#66 ASC NULLS FIRST]
 
-(85) ColumnarToRow [codegen id : 27]
-Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+(85) ReusedExchange [Reuses operator id: 20]
+Output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
 
-(86) SortMergeJoin [codegen id : 28]
-Left keys [2]: [cs_order_number#71, cs_item_sk#70]
-Right keys [2]: [cr_order_number#84, cr_item_sk#83]
-Join type: LeftOuter
-Join condition: None
+(86) CometSort
+Input [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+Arguments: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82], [cr_order_number#80 ASC NULLS FIRST, cr_item_sk#79 ASC NULLS FIRST]
+
+(87) CometSortMergeJoin
+Left output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Right output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+Arguments: [cs_order_number#67, cs_item_sk#66], [cr_order_number#80, cr_item_sk#79], LeftOuter
 
-(87) Project [codegen id : 28]
-Output [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, (cs_quantity#72 - coalesce(cr_return_quantity#85, 0)) AS sales_cnt#20, (cs_ext_sales_price#73 - coalesce(cr_return_amount#86, 0.00)) AS sales_amt#21]
-Input [13]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82, cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+(88) CometProject
+Input [13]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78, cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21], [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, (cs_quantity#68 - coalesce(cr_return_quantity#81, 0)) AS sales_cnt#20, (cs_ext_sales_price#69 - coalesce(cr_return_amount#82, 0.00)) AS sales_amt#21]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
+Output [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#91), dynamicpruningexpression(ss_sold_date_sk#91 IN dynamicpruning#92)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#87), dynamicpruningexpression(ss_sold_date_sk#87 IN dynamicpruning#88)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sales_price:decimal(7,2)>
 
-(89) CometFilter
-Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
-Condition : isnotnull(ss_item_sk#87)
+(90) CometFilter
+Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
+Condition : isnotnull(ss_item_sk#83)
 
-(90) ColumnarToRow [codegen id : 31]
-Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
+(91) ColumnarToRow [codegen id : 16]
+Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
 
-(91) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
+(92) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
 
-(92) BroadcastHashJoin [codegen id : 31]
-Left keys [1]: [ss_item_sk#87]
-Right keys [1]: [i_item_sk#93]
+(93) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [ss_item_sk#83]
+Right keys [1]: [i_item_sk#89]
 Join type: Inner
 Join condition: None
 
-(93) Project [codegen id : 31]
-Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
-Input [10]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
+(94) Project [codegen id : 16]
+Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
+Input [10]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
 
-(94) ReusedExchange [Reuses operator id: 140]
-Output [2]: [d_date_sk#98, d_year#99]
+(95) ReusedExchange [Reuses operator id: 142]
+Output [2]: [d_date_sk#94, d_year#95]
 
-(95) BroadcastHashJoin [codegen id : 31]
-Left keys [1]: [ss_sold_date_sk#91]
-Right keys [1]: [d_date_sk#98]
+(96) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [ss_sold_date_sk#87]
+Right keys [1]: [d_date_sk#94]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 31]
-Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
-Input [11]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_date_sk#98, d_year#99]
-
-(97) Exchange
-Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
-Arguments: hashpartitioning(ss_ticket_number#88, ss_item_sk#87, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+(97) Project [codegen id : 16]
+Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Input [11]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_date_sk#94, d_year#95]
 
-(98) Sort [codegen id : 32]
-Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
-Arguments: [ss_ticket_number#88 ASC NULLS FIRST, ss_item_sk#87 ASC NULLS FIRST], false, 0
+(98) RowToColumnar
+Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
 
-(99) ReusedExchange [Reuses operator id: 38]
-Output [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+(99) CometColumnarExchange
+Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Arguments: hashpartitioning(ss_ticket_number#84, ss_item_sk#83, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
 (100) CometSort
-Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
-Arguments: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103], [sr_ticket_number#101 ASC NULLS FIRST, sr_item_sk#100 ASC NULLS FIRST]
+Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Arguments: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95], [ss_ticket_number#84 ASC NULLS FIRST, ss_item_sk#83 ASC NULLS FIRST]
 
-(101) ColumnarToRow [codegen id : 33]
-Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+(101) ReusedExchange [Reuses operator id: 39]
+Output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
 
-(102) SortMergeJoin [codegen id : 34]
-Left keys [2]: [ss_ticket_number#88, ss_item_sk#87]
-Right keys [2]: [sr_ticket_number#101, sr_item_sk#100]
-Join type: LeftOuter
-Join condition: None
+(102) CometSort
+Input [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+Arguments: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99], [sr_ticket_number#97 ASC NULLS FIRST, sr_item_sk#96 ASC NULLS FIRST]
+
+(103) CometSortMergeJoin
+Left output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Right output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+Arguments: [ss_ticket_number#84, ss_item_sk#83], [sr_ticket_number#97, sr_item_sk#96], LeftOuter
 
-(103) Project [codegen id : 34]
-Output [7]: [d_year#99, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, (ss_quantity#89 - coalesce(sr_return_quantity#102, 0)) AS sales_cnt#40, (ss_ext_sales_price#90 - coalesce(sr_return_amt#103, 0.00)) AS sales_amt#41]
-Input [13]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99, sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+(104) CometProject
+Input [13]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95, sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+Arguments: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41], [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, (ss_quantity#85 - coalesce(sr_return_quantity#98, 0)) AS sales_cnt#40, (ss_ext_sales_price#86 - coalesce(sr_return_amt#99, 0.00)) AS sales_amt#41]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
+Output [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#108), dynamicpruningexpression(ws_sold_date_sk#108 IN dynamicpruning#109)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#104), dynamicpruningexpression(ws_sold_date_sk#104 IN dynamicpruning#105)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sales_price:decimal(7,2)>
 
-(105) CometFilter
-Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
-Condition : isnotnull(ws_item_sk#104)
+(106) CometFilter
+Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
+Condition : isnotnull(ws_item_sk#100)
 
-(106) ColumnarToRow [codegen id : 37]
-Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
+(107) ColumnarToRow [codegen id : 19]
+Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
 
-(107) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
+(108) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
 
-(108) BroadcastHashJoin [codegen id : 37]
-Left keys [1]: [ws_item_sk#104]
-Right keys [1]: [i_item_sk#110]
+(109) BroadcastHashJoin [codegen id : 19]
+Left keys [1]: [ws_item_sk#100]
+Right keys [1]: [i_item_sk#106]
 Join type: Inner
 Join condition: None
 
-(109) Project [codegen id : 37]
-Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
-Input [10]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
+(110) Project [codegen id : 19]
+Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
+Input [10]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
 
-(110) ReusedExchange [Reuses operator id: 140]
-Output [2]: [d_date_sk#115, d_year#116]
+(111) ReusedExchange [Reuses operator id: 142]
+Output [2]: [d_date_sk#111, d_year#112]
 
-(111) BroadcastHashJoin [codegen id : 37]
-Left keys [1]: [ws_sold_date_sk#108]
-Right keys [1]: [d_date_sk#115]
+(112) BroadcastHashJoin [codegen id : 19]
+Left keys [1]: [ws_sold_date_sk#104]
+Right keys [1]: [d_date_sk#111]
 Join type: Inner
 Join condition: None
 
-(112) Project [codegen id : 37]
-Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
-Input [11]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_date_sk#115, d_year#116]
-
-(113) Exchange
-Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
-Arguments: hashpartitioning(ws_order_number#105, ws_item_sk#104, 5), ENSURE_REQUIREMENTS, [plan_id=13]
+(113) Project [codegen id : 19]
+Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Input [11]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_date_sk#111, d_year#112]
 
-(114) Sort [codegen id : 38]
-Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
-Arguments: [ws_order_number#105 ASC NULLS FIRST, ws_item_sk#104 ASC NULLS FIRST], false, 0
+(114) RowToColumnar
+Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
 
-(115) ReusedExchange [Reuses operator id: 57]
-Output [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+(115) CometColumnarExchange
+Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Arguments: hashpartitioning(ws_order_number#101, ws_item_sk#100, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
 
 (116) CometSort
-Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
-Arguments: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120], [wr_order_number#118 ASC NULLS FIRST, wr_item_sk#117 ASC NULLS FIRST]
+Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Arguments: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112], [ws_order_number#101 ASC NULLS FIRST, ws_item_sk#100 ASC NULLS FIRST]
 
-(117) ColumnarToRow [codegen id : 39]
-Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+(117) ReusedExchange [Reuses operator id: 58]
+Output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
 
-(118) SortMergeJoin [codegen id : 40]
-Left keys [2]: [ws_order_number#105, ws_item_sk#104]
-Right keys [2]: [wr_order_number#118, wr_item_sk#117]
-Join type: LeftOuter
-Join condition: None
+(118) CometSort
+Input [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+Arguments: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116], [wr_order_number#114 ASC NULLS FIRST, wr_item_sk#113 ASC NULLS FIRST]
+
+(119) CometSortMergeJoin
+Left output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Right output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+Arguments: [ws_order_number#101, ws_item_sk#100], [wr_order_number#114, wr_item_sk#113], LeftOuter
 
-(119) Project [codegen id : 40]
-Output [7]: [d_year#116, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, (ws_quantity#106 - coalesce(wr_return_quantity#119, 0)) AS sales_cnt#60, (ws_ext_sales_price#107 - coalesce(wr_return_amt#120, 0.00)) AS sales_amt#61]
-Input [13]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116, wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+(120) CometProject
+Input [13]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112, wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+Arguments: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61], [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, (ws_quantity#102 - coalesce(wr_return_quantity#115, 0)) AS sales_cnt#60, (ws_ext_sales_price#103 - coalesce(wr_return_amt#116, 0.00)) AS sales_amt#61]
 
-(120) Union
+(121) CometUnion
+Child 0 Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Child 1 Input [7]: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41]
+Child 2 Input [7]: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61]
 
-(121) HashAggregate [codegen id : 41]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+(122) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(122) Exchange
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=14]
+(123) CometColumnarExchange
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
 
-(123) HashAggregate [codegen id : 42]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+(124) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(124) HashAggregate [codegen id : 42]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(125) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum#62, sum#121]
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
 
-(125) Exchange
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
-Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+(126) CometColumnarExchange
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
+Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(126) HashAggregate [codegen id : 43]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
-Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(127) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
+Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum(sales_cnt#20)#66 AS sales_cnt#123, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#124]
 
-(127) Filter [codegen id : 43]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
-Condition : isnotnull(sales_cnt#123)
+(128) CometFilter
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+Condition : isnotnull(sales_cnt#118)
+
+(129) CometColumnarExchange
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+Arguments: hashpartitioning(i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
 
-(128) Exchange
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
-Arguments: hashpartitioning(i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=16]
+(130) CometSort
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119], [i_brand_id#73 ASC NULLS FIRST, i_class_id#74 ASC NULLS FIRST, i_category_id#75 ASC NULLS FIRST, i_manufact_id#76 ASC NULLS FIRST]
 
-(129) Sort [codegen id : 44]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
-Arguments: [i_brand_id#77 ASC NULLS FIRST, i_class_id#78 ASC NULLS FIRST, i_category_id#79 ASC NULLS FIRST, i_manufact_id#80 ASC NULLS FIRST], false, 0
+(131) ColumnarToRow [codegen id : 20]
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
 
-(130) SortMergeJoin [codegen id : 45]
+(132) SortMergeJoin [codegen id : 21]
 Left keys [4]: [i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
-Right keys [4]: [i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+Right keys [4]: [i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 Join type: Inner
-Join condition: ((cast(sales_cnt#68 as decimal(17,2)) / cast(sales_cnt#123 as decimal(17,2))) < 0.90000000000000000000)
+Join condition: ((cast(sales_cnt#64 as decimal(17,2)) / cast(sales_cnt#118 as decimal(17,2))) < 0.90000000000000000000)
 
-(131) Project [codegen id : 45]
-Output [10]: [d_year#82 AS prev_year#125, d_year#14 AS year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#123 AS prev_yr_cnt#127, sales_cnt#68 AS curr_yr_cnt#128, (sales_cnt#68 - sales_cnt#123) AS sales_cnt_diff#129, (sales_amt#69 - sales_amt#124) AS sales_amt_diff#130]
-Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69, d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+(133) Project [codegen id : 21]
+Output [10]: [d_year#78 AS prev_year#120, d_year#14 AS year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#118 AS prev_yr_cnt#122, sales_cnt#64 AS curr_yr_cnt#123, (sales_cnt#64 - sales_cnt#118) AS sales_cnt_diff#124, (sales_amt#65 - sales_amt#119) AS sales_amt_diff#125]
+Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65, d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
 
-(132) TakeOrderedAndProject
-Input [10]: [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
-Arguments: 100, [sales_cnt_diff#129 ASC NULLS FIRST], [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
+(134) TakeOrderedAndProject
+Input [10]: [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
+Arguments: 100, [sales_cnt_diff#124 ASC NULLS FIRST], [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (136)
-+- * ColumnarToRow (135)
-   +- CometFilter (134)
-      +- CometScan parquet spark_catalog.default.date_dim (133)
+BroadcastExchange (138)
++- * ColumnarToRow (137)
+   +- CometFilter (136)
+      +- CometScan parquet spark_catalog.default.date_dim (135)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -744,14 +736,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(134) CometFilter
+(136) CometFilter
 Input [2]: [d_date_sk#13, d_year#14]
 Condition : ((isnotnull(d_year#14) AND (d_year#14 = 2002)) AND isnotnull(d_date_sk#13))
 
-(135) ColumnarToRow [codegen id : 1]
+(137) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#13, d_year#14]
 
-(136) BroadcastExchange
+(138) BroadcastExchange
 Input [2]: [d_date_sk#13, d_year#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=17]
 
@@ -759,33 +751,33 @@ Subquery:2 Hosting operator id = 24 Hosting Expression = ss_sold_date_sk#26 IN d
 
 Subquery:3 Hosting operator id = 43 Hosting Expression = ws_sold_date_sk#46 IN dynamicpruning#6
 
-Subquery:4 Hosting operator id = 72 Hosting Expression = cs_sold_date_sk#74 IN dynamicpruning#75
-BroadcastExchange (140)
-+- * ColumnarToRow (139)
-   +- CometFilter (138)
-      +- CometScan parquet spark_catalog.default.date_dim (137)
+Subquery:4 Hosting operator id = 73 Hosting Expression = cs_sold_date_sk#70 IN dynamicpruning#71
+BroadcastExchange (142)
++- * ColumnarToRow (141)
+   +- CometFilter (140)
+      +- CometScan parquet spark_catalog.default.date_dim (139)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#81, d_year#82]
+Output [2]: [d_date_sk#77, d_year#78]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(138) CometFilter
-Input [2]: [d_date_sk#81, d_year#82]
-Condition : ((isnotnull(d_year#82) AND (d_year#82 = 2001)) AND isnotnull(d_date_sk#81))
+(140) CometFilter
+Input [2]: [d_date_sk#77, d_year#78]
+Condition : ((isnotnull(d_year#78) AND (d_year#78 = 2001)) AND isnotnull(d_date_sk#77))
 
-(139) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#81, d_year#82]
+(141) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#77, d_year#78]
 
-(140) BroadcastExchange
-Input [2]: [d_date_sk#81, d_year#82]
+(142) BroadcastExchange
+Input [2]: [d_date_sk#77, d_year#78]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=18]
 
-Subquery:5 Hosting operator id = 88 Hosting Expression = ss_sold_date_sk#91 IN dynamicpruning#75
+Subquery:5 Hosting operator id = 89 Hosting Expression = ss_sold_date_sk#87 IN dynamicpruning#71
 
-Subquery:6 Hosting operator id = 104 Hosting Expression = ws_sold_date_sk#108 IN dynamicpruning#75
+Subquery:6 Hosting operator id = 105 Hosting Expression = ws_sold_date_sk#104 IN dynamicpruning#71
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt
index 837398c8f1..153383e5d0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt
@@ -1,237 +1,185 @@
 TakeOrderedAndProject [sales_cnt_diff,prev_year,year,i_brand_id,i_class_id,i_category_id,i_manufact_id,prev_yr_cnt,curr_yr_cnt,sales_amt_diff]
-  WholeStageCodegen (45)
+  WholeStageCodegen (21)
     Project [d_year,d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt,sales_amt,sales_amt]
       SortMergeJoin [i_brand_id,i_class_id,i_category_id,i_manufact_id,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt]
         InputAdapter
-          WholeStageCodegen (22)
-            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+          WholeStageCodegen (10)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
-                  WholeStageCodegen (21)
-                    Filter [sales_cnt]
-                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
-                        InputAdapter
-                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
-                            WholeStageCodegen (20)
-                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
-                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  InputAdapter
-                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
-                                      WholeStageCodegen (19)
-                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                          InputAdapter
-                                            Union
-                                              WholeStageCodegen (6)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
-                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (4)
-                                                        Sort [cs_order_number,cs_item_sk]
-                                                          InputAdapter
-                                                            Exchange [cs_order_number,cs_item_sk] #4
-                                                              WholeStageCodegen (3)
-                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [cs_item_sk]
-                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                                  BroadcastExchange #5
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #6
-                                                                            WholeStageCodegen (1)
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #5
-                                                    InputAdapter
-                                                      WholeStageCodegen (5)
+                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
+                    CometFilter [sales_cnt]
+                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
+                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
+                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
+                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  CometUnion
+                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                        CometSort [cs_order_number,cs_item_sk]
+                                          CometColumnarExchange [cs_order_number,cs_item_sk] #4
+                                            RowToColumnar
+                                              WholeStageCodegen (3)
+                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [cr_order_number,cr_item_sk]
-                                                              CometExchange [cr_order_number,cr_item_sk] #7
-                                                                CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                                                  CometFilter [cr_order_number,cr_item_sk]
-                                                                    CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
-                                              WholeStageCodegen (12)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
-                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (10)
-                                                        Sort [ss_ticket_number,ss_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ss_ticket_number,ss_item_sk] #8
-                                                              WholeStageCodegen (9)
-                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
+                                                            CometFilter [cs_item_sk]
+                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                  BroadcastExchange #5
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
                                                                         InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                                          CometFilter [d_year,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                        InputAdapter
+                                                          BroadcastExchange #6
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
                                                     InputAdapter
-                                                      WholeStageCodegen (11)
+                                                      ReusedExchange [d_date_sk,d_year] #5
+                                        CometSort [cr_order_number,cr_item_sk]
+                                          CometColumnarExchange [cr_order_number,cr_item_sk] #7
+                                            CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                              CometFilter [cr_order_number,cr_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                        CometSort [ss_ticket_number,ss_item_sk]
+                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #8
+                                            RowToColumnar
+                                              WholeStageCodegen (6)
+                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [sr_ticket_number,sr_item_sk]
-                                                              CometExchange [sr_ticket_number,sr_item_sk] #9
-                                                                CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                                                  CometFilter [sr_ticket_number,sr_item_sk]
-                                                                    CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
-                                              WholeStageCodegen (18)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
-                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (16)
-                                                        Sort [ws_order_number,ws_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ws_order_number,ws_item_sk] #10
-                                                              WholeStageCodegen (15)
-                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ws_item_sk]
-                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
-                                                                        InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                            CometFilter [ss_item_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
                                                     InputAdapter
-                                                      WholeStageCodegen (17)
+                                                      ReusedExchange [d_date_sk,d_year] #5
+                                        CometSort [sr_ticket_number,sr_item_sk]
+                                          CometColumnarExchange [sr_ticket_number,sr_item_sk] #9
+                                            CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                              CometFilter [sr_ticket_number,sr_item_sk]
+                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                        CometSort [ws_order_number,ws_item_sk]
+                                          CometColumnarExchange [ws_order_number,ws_item_sk] #10
+                                            RowToColumnar
+                                              WholeStageCodegen (9)
+                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [wr_order_number,wr_item_sk]
-                                                              CometExchange [wr_order_number,wr_item_sk] #11
-                                                                CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                                                  CometFilter [wr_order_number,wr_item_sk]
-                                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+                                                            CometFilter [ws_item_sk]
+                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk,d_year] #5
+                                        CometSort [wr_order_number,wr_item_sk]
+                                          CometColumnarExchange [wr_order_number,wr_item_sk] #11
+                                            CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                              CometFilter [wr_order_number,wr_item_sk]
+                                                CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
         InputAdapter
-          WholeStageCodegen (44)
-            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+          WholeStageCodegen (20)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
-                  WholeStageCodegen (43)
-                    Filter [sales_cnt]
-                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
-                        InputAdapter
-                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
-                            WholeStageCodegen (42)
-                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
-                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  InputAdapter
-                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
-                                      WholeStageCodegen (41)
-                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                          InputAdapter
-                                            Union
-                                              WholeStageCodegen (28)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
-                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (26)
-                                                        Sort [cs_order_number,cs_item_sk]
-                                                          InputAdapter
-                                                            Exchange [cs_order_number,cs_item_sk] #15
-                                                              WholeStageCodegen (25)
-                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [cs_item_sk]
-                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #2
-                                                                                  BroadcastExchange #16
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #16
-                                                    InputAdapter
-                                                      WholeStageCodegen (27)
+                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
+                    CometFilter [sales_cnt]
+                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
+                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
+                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
+                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  CometUnion
+                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                        CometSort [cs_order_number,cs_item_sk]
+                                          CometColumnarExchange [cs_order_number,cs_item_sk] #15
+                                            RowToColumnar
+                                              WholeStageCodegen (13)
+                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [cr_order_number,cr_item_sk]
-                                                              ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
-                                              WholeStageCodegen (34)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
-                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (32)
-                                                        Sort [ss_ticket_number,ss_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ss_ticket_number,ss_item_sk] #17
-                                                              WholeStageCodegen (31)
-                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #2
+                                                            CometFilter [cs_item_sk]
+                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #2
+                                                                  BroadcastExchange #16
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
                                                                         InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #16
+                                                                          CometFilter [d_year,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
                                                     InputAdapter
-                                                      WholeStageCodegen (33)
+                                                      ReusedExchange [d_date_sk,d_year] #16
+                                        CometSort [cr_order_number,cr_item_sk]
+                                          ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
+                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                        CometSort [ss_ticket_number,ss_item_sk]
+                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #17
+                                            RowToColumnar
+                                              WholeStageCodegen (16)
+                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [sr_ticket_number,sr_item_sk]
-                                                              ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
-                                              WholeStageCodegen (40)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
-                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                                            CometFilter [ss_item_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #2
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
                                                     InputAdapter
-                                                      WholeStageCodegen (38)
-                                                        Sort [ws_order_number,ws_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ws_order_number,ws_item_sk] #18
-                                                              WholeStageCodegen (37)
-                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ws_item_sk]
-                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #2
-                                                                        InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #16
-                                                    InputAdapter
-                                                      WholeStageCodegen (39)
+                                                      ReusedExchange [d_date_sk,d_year] #16
+                                        CometSort [sr_ticket_number,sr_item_sk]
+                                          ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
+                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                        CometSort [ws_order_number,ws_item_sk]
+                                          CometColumnarExchange [ws_order_number,ws_item_sk] #18
+                                            RowToColumnar
+                                              WholeStageCodegen (19)
+                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [wr_order_number,wr_item_sk]
-                                                              ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
+                                                            CometFilter [ws_item_sk]
+                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #2
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk,d_year] #16
+                                        CometSort [wr_order_number,wr_item_sk]
+                                          ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt
index 459bc5c019..3286597a34 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt
@@ -1,42 +1,44 @@
 == Physical Plan ==
-TakeOrderedAndProject (38)
-+- * HashAggregate (37)
-   +- Exchange (36)
-      +- * HashAggregate (35)
-         +- Union (34)
-            :- * Project (15)
-            :  +- * BroadcastHashJoin Inner BuildRight (14)
-            :     :- * Project (9)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-            :     :     :- * ColumnarToRow (3)
-            :     :     :  +- CometFilter (2)
-            :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :     :     +- BroadcastExchange (7)
-            :     :        +- * ColumnarToRow (6)
-            :     :           +- CometFilter (5)
-            :     :              +- CometScan parquet spark_catalog.default.item (4)
-            :     +- BroadcastExchange (13)
-            :        +- * ColumnarToRow (12)
-            :           +- CometFilter (11)
-            :              +- CometScan parquet spark_catalog.default.date_dim (10)
-            :- * Project (24)
-            :  +- * BroadcastHashJoin Inner BuildRight (23)
-            :     :- * Project (21)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-            :     :     :- * ColumnarToRow (18)
-            :     :     :  +- CometFilter (17)
-            :     :     :     +- CometScan parquet spark_catalog.default.web_sales (16)
-            :     :     +- ReusedExchange (19)
-            :     +- ReusedExchange (22)
-            +- * Project (33)
-               +- * BroadcastHashJoin Inner BuildRight (32)
-                  :- * Project (30)
-                  :  +- * BroadcastHashJoin Inner BuildRight (29)
-                  :     :- * ColumnarToRow (27)
-                  :     :  +- CometFilter (26)
-                  :     :     +- CometScan parquet spark_catalog.default.catalog_sales (25)
-                  :     +- ReusedExchange (28)
-                  +- ReusedExchange (31)
+* ColumnarToRow (40)
++- CometTakeOrderedAndProject (39)
+   +- CometHashAggregate (38)
+      +- CometColumnarExchange (37)
+         +- RowToColumnar (36)
+            +- * HashAggregate (35)
+               +- Union (34)
+                  :- * Project (15)
+                  :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :     :- * Project (9)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :- * ColumnarToRow (3)
+                  :     :     :  +- CometFilter (2)
+                  :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :     :     +- BroadcastExchange (7)
+                  :     :        +- * ColumnarToRow (6)
+                  :     :           +- CometFilter (5)
+                  :     :              +- CometScan parquet spark_catalog.default.item (4)
+                  :     +- BroadcastExchange (13)
+                  :        +- * ColumnarToRow (12)
+                  :           +- CometFilter (11)
+                  :              +- CometScan parquet spark_catalog.default.date_dim (10)
+                  :- * Project (24)
+                  :  +- * BroadcastHashJoin Inner BuildRight (23)
+                  :     :- * Project (21)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                  :     :     :- * ColumnarToRow (18)
+                  :     :     :  +- CometFilter (17)
+                  :     :     :     +- CometScan parquet spark_catalog.default.web_sales (16)
+                  :     :     +- ReusedExchange (19)
+                  :     +- ReusedExchange (22)
+                  +- * Project (33)
+                     +- * BroadcastHashJoin Inner BuildRight (32)
+                        :- * Project (30)
+                        :  +- * BroadcastHashJoin Inner BuildRight (29)
+                        :     :- * ColumnarToRow (27)
+                        :     :  +- CometFilter (26)
+                        :     :     +- CometScan parquet spark_catalog.default.catalog_sales (25)
+                        :     +- ReusedExchange (28)
+                        +- ReusedExchange (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -201,18 +203,22 @@ Functions [2]: [partial_count(1), partial_sum(UnscaledValue(ext_sales_price#12))
 Aggregate Attributes [2]: [count#37, sum#38]
 Results [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
 
-(36) Exchange
+(36) RowToColumnar
 Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
-Arguments: hashpartitioning(channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(37) HashAggregate [codegen id : 11]
+(37) CometColumnarExchange
+Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
+Arguments: hashpartitioning(channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(38) CometHashAggregate
 Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
 Keys [5]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6]
 Functions [2]: [count(1), sum(UnscaledValue(ext_sales_price#12))]
-Aggregate Attributes [2]: [count(1)#41, sum(UnscaledValue(ext_sales_price#12))#42]
-Results [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count(1)#41 AS sales_cnt#43, MakeDecimal(sum(UnscaledValue(ext_sales_price#12))#42,17,2) AS sales_amt#44]
 
-(38) TakeOrderedAndProject
-Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#43, sales_amt#44]
-Arguments: 100, [channel#10 ASC NULLS FIRST, col_name#11 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#9 ASC NULLS FIRST, i_category#6 ASC NULLS FIRST], [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#43, sales_amt#44]
+(39) CometTakeOrderedAndProject
+Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#41, sales_amt#42]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#10 ASC NULLS FIRST,col_name#11 ASC NULLS FIRST,d_year#8 ASC NULLS FIRST,d_qoy#9 ASC NULLS FIRST,i_category#6 ASC NULLS FIRST], output=[channel#10,col_name#11,d_year#8,d_qoy#9,i_category#6,sales_cnt#41,sales_amt#42]), 100, [channel#10 ASC NULLS FIRST, col_name#11 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#9 ASC NULLS FIRST, i_category#6 ASC NULLS FIRST], [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#41, sales_amt#42]
+
+(40) ColumnarToRow [codegen id : 11]
+Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#41, sales_amt#42]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt
index 73e6b09afe..8cd2591c7b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt
@@ -1,58 +1,60 @@
-TakeOrderedAndProject [channel,col_name,d_year,d_qoy,i_category,sales_cnt,sales_amt]
-  WholeStageCodegen (11)
-    HashAggregate [channel,col_name,d_year,d_qoy,i_category,count,sum] [count(1),sum(UnscaledValue(ext_sales_price)),sales_cnt,sales_amt,count,sum]
-      InputAdapter
-        Exchange [channel,col_name,d_year,d_qoy,i_category] #1
-          WholeStageCodegen (10)
-            HashAggregate [channel,col_name,d_year,d_qoy,i_category,ext_sales_price] [count,sum,count,sum]
-              InputAdapter
-                Union
-                  WholeStageCodegen (3)
-                    Project [ss_store_sk,d_year,d_qoy,i_category,ss_ext_sales_price]
-                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                        Project [ss_store_sk,ss_ext_sales_price,ss_sold_date_sk,i_category]
-                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ss_store_sk,ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
+WholeStageCodegen (11)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,col_name,d_year,d_qoy,i_category,sales_cnt,sales_amt]
+        CometHashAggregate [channel,col_name,d_year,d_qoy,i_category,count,sum]
+          CometColumnarExchange [channel,col_name,d_year,d_qoy,i_category] #1
+            RowToColumnar
+              WholeStageCodegen (10)
+                HashAggregate [channel,col_name,d_year,d_qoy,i_category,ext_sales_price] [count,sum,count,sum]
+                  InputAdapter
+                    Union
+                      WholeStageCodegen (3)
+                        Project [ss_store_sk,d_year,d_qoy,i_category,ss_ext_sales_price]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_store_sk,ss_ext_sales_price,ss_sold_date_sk,i_category]
+                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_store_sk,ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                InputAdapter
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
                             InputAdapter
-                              BroadcastExchange #2
-                                WholeStageCodegen (1)
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
-                        InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (2)
-                              ColumnarToRow
+                                      CometFilter [d_date_sk]
+                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                      WholeStageCodegen (6)
+                        Project [ws_ship_customer_sk,d_year,d_qoy,i_category,ws_ext_sales_price]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk,i_category]
+                              BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ws_ship_customer_sk,ws_item_sk]
+                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk]
                                 InputAdapter
-                                  CometFilter [d_date_sk]
-                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                  WholeStageCodegen (6)
-                    Project [ws_ship_customer_sk,d_year,d_qoy,i_category,ws_ext_sales_price]
-                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                        Project [ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk,i_category]
-                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ws_ship_customer_sk,ws_item_sk]
-                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                  ReusedExchange [i_item_sk,i_category] #2
                             InputAdapter
-                              ReusedExchange [i_item_sk,i_category] #2
-                        InputAdapter
-                          ReusedExchange [d_date_sk,d_year,d_qoy] #3
-                  WholeStageCodegen (9)
-                    Project [cs_ship_addr_sk,d_year,d_qoy,i_category,cs_ext_sales_price]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_ship_addr_sk,cs_ext_sales_price,cs_sold_date_sk,i_category]
-                          BroadcastHashJoin [cs_item_sk,i_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [cs_ship_addr_sk,cs_item_sk]
-                                  CometScan parquet spark_catalog.default.catalog_sales [cs_ship_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                      WholeStageCodegen (9)
+                        Project [cs_ship_addr_sk,d_year,d_qoy,i_category,cs_ext_sales_price]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_ship_addr_sk,cs_ext_sales_price,cs_sold_date_sk,i_category]
+                              BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [cs_ship_addr_sk,cs_item_sk]
+                                      CometScan parquet spark_catalog.default.catalog_sales [cs_ship_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                InputAdapter
+                                  ReusedExchange [i_item_sk,i_category] #2
                             InputAdapter
-                              ReusedExchange [i_item_sk,i_category] #2
-                        InputAdapter
-                          ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt
index 692db69b81..2b95b83f04 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt
@@ -1,89 +1,103 @@
 == Physical Plan ==
-TakeOrderedAndProject (85)
-+- * HashAggregate (84)
-   +- Exchange (83)
-      +- * HashAggregate (82)
-         +- * Expand (81)
-            +- Union (80)
-               :- * Project (30)
-               :  +- * BroadcastHashJoin LeftOuter BuildRight (29)
-               :     :- * HashAggregate (15)
-               :     :  +- Exchange (14)
-               :     :     +- * HashAggregate (13)
-               :     :        +- * Project (12)
-               :     :           +- * BroadcastHashJoin Inner BuildRight (11)
-               :     :              :- * Project (6)
-               :     :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :     :              :     :- * ColumnarToRow (3)
-               :     :              :     :  +- CometFilter (2)
-               :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :              :     +- ReusedExchange (4)
-               :     :              +- BroadcastExchange (10)
-               :     :                 +- * ColumnarToRow (9)
-               :     :                    +- CometFilter (8)
-               :     :                       +- CometScan parquet spark_catalog.default.store (7)
-               :     +- BroadcastExchange (28)
-               :        +- * HashAggregate (27)
-               :           +- Exchange (26)
-               :              +- * HashAggregate (25)
-               :                 +- * Project (24)
-               :                    +- * BroadcastHashJoin Inner BuildRight (23)
-               :                       :- * Project (21)
-               :                       :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :                       :     :- * ColumnarToRow (18)
-               :                       :     :  +- CometFilter (17)
-               :                       :     :     +- CometScan parquet spark_catalog.default.store_returns (16)
-               :                       :     +- ReusedExchange (19)
-               :                       +- ReusedExchange (22)
-               :- * Project (49)
-               :  +- * BroadcastNestedLoopJoin Inner BuildLeft (48)
-               :     :- BroadcastExchange (39)
-               :     :  +- * HashAggregate (38)
-               :     :     +- Exchange (37)
-               :     :        +- * HashAggregate (36)
-               :     :           +- * Project (35)
-               :     :              +- * BroadcastHashJoin Inner BuildRight (34)
-               :     :                 :- * ColumnarToRow (32)
-               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (31)
-               :     :                 +- ReusedExchange (33)
-               :     +- * HashAggregate (47)
-               :        +- Exchange (46)
-               :           +- * HashAggregate (45)
-               :              +- * Project (44)
-               :                 +- * BroadcastHashJoin Inner BuildRight (43)
-               :                    :- * ColumnarToRow (41)
-               :                    :  +- CometScan parquet spark_catalog.default.catalog_returns (40)
-               :                    +- ReusedExchange (42)
-               +- * Project (79)
-                  +- * BroadcastHashJoin LeftOuter BuildRight (78)
-                     :- * HashAggregate (64)
-                     :  +- Exchange (63)
-                     :     +- * HashAggregate (62)
-                     :        +- * Project (61)
-                     :           +- * BroadcastHashJoin Inner BuildRight (60)
-                     :              :- * Project (55)
-                     :              :  +- * BroadcastHashJoin Inner BuildRight (54)
-                     :              :     :- * ColumnarToRow (52)
-                     :              :     :  +- CometFilter (51)
-                     :              :     :     +- CometScan parquet spark_catalog.default.web_sales (50)
-                     :              :     +- ReusedExchange (53)
-                     :              +- BroadcastExchange (59)
-                     :                 +- * ColumnarToRow (58)
-                     :                    +- CometFilter (57)
-                     :                       +- CometScan parquet spark_catalog.default.web_page (56)
-                     +- BroadcastExchange (77)
-                        +- * HashAggregate (76)
-                           +- Exchange (75)
-                              +- * HashAggregate (74)
-                                 +- * Project (73)
-                                    +- * BroadcastHashJoin Inner BuildRight (72)
-                                       :- * Project (70)
-                                       :  +- * BroadcastHashJoin Inner BuildRight (69)
-                                       :     :- * ColumnarToRow (67)
-                                       :     :  +- CometFilter (66)
-                                       :     :     +- CometScan parquet spark_catalog.default.web_returns (65)
-                                       :     +- ReusedExchange (68)
-                                       +- ReusedExchange (71)
+* ColumnarToRow (99)
++- CometTakeOrderedAndProject (98)
+   +- CometHashAggregate (97)
+      +- CometColumnarExchange (96)
+         +- RowToColumnar (95)
+            +- * HashAggregate (94)
+               +- * Expand (93)
+                  +- Union (92)
+                     :- * Project (34)
+                     :  +- * BroadcastHashJoin LeftOuter BuildRight (33)
+                     :     :- * ColumnarToRow (17)
+                     :     :  +- CometHashAggregate (16)
+                     :     :     +- CometColumnarExchange (15)
+                     :     :        +- RowToColumnar (14)
+                     :     :           +- * HashAggregate (13)
+                     :     :              +- * Project (12)
+                     :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
+                     :     :                    :- * Project (6)
+                     :     :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+                     :     :                    :     :- * ColumnarToRow (3)
+                     :     :                    :     :  +- CometFilter (2)
+                     :     :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :                    :     +- ReusedExchange (4)
+                     :     :                    +- BroadcastExchange (10)
+                     :     :                       +- * ColumnarToRow (9)
+                     :     :                          +- CometFilter (8)
+                     :     :                             +- CometScan parquet spark_catalog.default.store (7)
+                     :     +- BroadcastExchange (32)
+                     :        +- * ColumnarToRow (31)
+                     :           +- CometHashAggregate (30)
+                     :              +- CometColumnarExchange (29)
+                     :                 +- RowToColumnar (28)
+                     :                    +- * HashAggregate (27)
+                     :                       +- * Project (26)
+                     :                          +- * BroadcastHashJoin Inner BuildRight (25)
+                     :                             :- * Project (23)
+                     :                             :  +- * BroadcastHashJoin Inner BuildRight (22)
+                     :                             :     :- * ColumnarToRow (20)
+                     :                             :     :  +- CometFilter (19)
+                     :                             :     :     +- CometScan parquet spark_catalog.default.store_returns (18)
+                     :                             :     +- ReusedExchange (21)
+                     :                             +- ReusedExchange (24)
+                     :- * Project (57)
+                     :  +- * BroadcastNestedLoopJoin Inner BuildLeft (56)
+                     :     :- BroadcastExchange (45)
+                     :     :  +- * ColumnarToRow (44)
+                     :     :     +- CometHashAggregate (43)
+                     :     :        +- CometColumnarExchange (42)
+                     :     :           +- RowToColumnar (41)
+                     :     :              +- * HashAggregate (40)
+                     :     :                 +- * Project (39)
+                     :     :                    +- * BroadcastHashJoin Inner BuildRight (38)
+                     :     :                       :- * ColumnarToRow (36)
+                     :     :                       :  +- CometScan parquet spark_catalog.default.catalog_sales (35)
+                     :     :                       +- ReusedExchange (37)
+                     :     +- * ColumnarToRow (55)
+                     :        +- CometHashAggregate (54)
+                     :           +- CometColumnarExchange (53)
+                     :              +- RowToColumnar (52)
+                     :                 +- * HashAggregate (51)
+                     :                    +- * Project (50)
+                     :                       +- * BroadcastHashJoin Inner BuildRight (49)
+                     :                          :- * ColumnarToRow (47)
+                     :                          :  +- CometScan parquet spark_catalog.default.catalog_returns (46)
+                     :                          +- ReusedExchange (48)
+                     +- * Project (91)
+                        +- * BroadcastHashJoin LeftOuter BuildRight (90)
+                           :- * ColumnarToRow (74)
+                           :  +- CometHashAggregate (73)
+                           :     +- CometColumnarExchange (72)
+                           :        +- RowToColumnar (71)
+                           :           +- * HashAggregate (70)
+                           :              +- * Project (69)
+                           :                 +- * BroadcastHashJoin Inner BuildRight (68)
+                           :                    :- * Project (63)
+                           :                    :  +- * BroadcastHashJoin Inner BuildRight (62)
+                           :                    :     :- * ColumnarToRow (60)
+                           :                    :     :  +- CometFilter (59)
+                           :                    :     :     +- CometScan parquet spark_catalog.default.web_sales (58)
+                           :                    :     +- ReusedExchange (61)
+                           :                    +- BroadcastExchange (67)
+                           :                       +- * ColumnarToRow (66)
+                           :                          +- CometFilter (65)
+                           :                             +- CometScan parquet spark_catalog.default.web_page (64)
+                           +- BroadcastExchange (89)
+                              +- * ColumnarToRow (88)
+                                 +- CometHashAggregate (87)
+                                    +- CometColumnarExchange (86)
+                                       +- RowToColumnar (85)
+                                          +- * HashAggregate (84)
+                                             +- * Project (83)
+                                                +- * BroadcastHashJoin Inner BuildRight (82)
+                                                   :- * Project (80)
+                                                   :  +- * BroadcastHashJoin Inner BuildRight (79)
+                                                   :     :- * ColumnarToRow (77)
+                                                   :     :  +- CometFilter (76)
+                                                   :     :     +- CometScan parquet spark_catalog.default.web_returns (75)
+                                                   :     +- ReusedExchange (78)
+                                                   +- ReusedExchange (81)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -101,7 +115,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [ss_store_sk#1, ss_ext_sales_price#2, ss_net_profit#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 90]
+(4) ReusedExchange [Reuses operator id: 104]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -149,399 +163,427 @@ Functions [2]: [partial_sum(UnscaledValue(ss_ext_sales_price#2)), partial_sum(Un
 Aggregate Attributes [2]: [sum#8, sum#9]
 Results [3]: [s_store_sk#7, sum#10, sum#11]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [s_store_sk#7, sum#10, sum#11]
-Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 8]
+(15) CometColumnarExchange
+Input [3]: [s_store_sk#7, sum#10, sum#11]
+Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [s_store_sk#7, sum#10, sum#11]
 Keys [1]: [s_store_sk#7]
 Functions [2]: [sum(UnscaledValue(ss_ext_sales_price#2)), sum(UnscaledValue(ss_net_profit#3))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_ext_sales_price#2))#12, sum(UnscaledValue(ss_net_profit#3))#13]
-Results [3]: [s_store_sk#7, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#12,17,2) AS sales#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#3))#13,17,2) AS profit#15]
+
+(17) ColumnarToRow [codegen id : 8]
+Input [3]: [s_store_sk#7, sales#12, profit#13]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
+Output [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(sr_returned_date_sk#19), dynamicpruningexpression(sr_returned_date_sk#19 IN dynamicpruning#20)]
+PartitionFilters: [isnotnull(sr_returned_date_sk#17), dynamicpruningexpression(sr_returned_date_sk#17 IN dynamicpruning#18)]
 PushedFilters: [IsNotNull(sr_store_sk)]
 ReadSchema: struct<sr_store_sk:int,sr_return_amt:decimal(7,2),sr_net_loss:decimal(7,2)>
 
-(17) CometFilter
-Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
-Condition : isnotnull(sr_store_sk#16)
+(19) CometFilter
+Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
+Condition : isnotnull(sr_store_sk#14)
 
-(18) ColumnarToRow [codegen id : 6]
-Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
+(20) ColumnarToRow [codegen id : 6]
+Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
 
-(19) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#21]
+(21) ReusedExchange [Reuses operator id: 104]
+Output [1]: [d_date_sk#19]
 
-(20) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_returned_date_sk#19]
-Right keys [1]: [d_date_sk#21]
+(22) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_returned_date_sk#17]
+Right keys [1]: [d_date_sk#19]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 6]
-Output [3]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18]
-Input [5]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19, d_date_sk#21]
+(23) Project [codegen id : 6]
+Output [3]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16]
+Input [5]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17, d_date_sk#19]
 
-(22) ReusedExchange [Reuses operator id: 10]
-Output [1]: [s_store_sk#22]
+(24) ReusedExchange [Reuses operator id: 10]
+Output [1]: [s_store_sk#20]
 
-(23) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_store_sk#16]
-Right keys [1]: [s_store_sk#22]
+(25) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_store_sk#14]
+Right keys [1]: [s_store_sk#20]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
-Output [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
-Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
-
-(25) HashAggregate [codegen id : 6]
-Input [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
-Keys [1]: [s_store_sk#22]
-Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#17)), partial_sum(UnscaledValue(sr_net_loss#18))]
-Aggregate Attributes [2]: [sum#23, sum#24]
-Results [3]: [s_store_sk#22, sum#25, sum#26]
-
-(26) Exchange
-Input [3]: [s_store_sk#22, sum#25, sum#26]
-Arguments: hashpartitioning(s_store_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=3]
-
-(27) HashAggregate [codegen id : 7]
-Input [3]: [s_store_sk#22, sum#25, sum#26]
-Keys [1]: [s_store_sk#22]
-Functions [2]: [sum(UnscaledValue(sr_return_amt#17)), sum(UnscaledValue(sr_net_loss#18))]
-Aggregate Attributes [2]: [sum(UnscaledValue(sr_return_amt#17))#27, sum(UnscaledValue(sr_net_loss#18))#28]
-Results [3]: [s_store_sk#22, MakeDecimal(sum(UnscaledValue(sr_return_amt#17))#27,17,2) AS returns#29, MakeDecimal(sum(UnscaledValue(sr_net_loss#18))#28,17,2) AS profit_loss#30]
-
-(28) BroadcastExchange
-Input [3]: [s_store_sk#22, returns#29, profit_loss#30]
+(26) Project [codegen id : 6]
+Output [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
+Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
+
+(27) HashAggregate [codegen id : 6]
+Input [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
+Keys [1]: [s_store_sk#20]
+Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#15)), partial_sum(UnscaledValue(sr_net_loss#16))]
+Aggregate Attributes [2]: [sum#21, sum#22]
+Results [3]: [s_store_sk#20, sum#23, sum#24]
+
+(28) RowToColumnar
+Input [3]: [s_store_sk#20, sum#23, sum#24]
+
+(29) CometColumnarExchange
+Input [3]: [s_store_sk#20, sum#23, sum#24]
+Arguments: hashpartitioning(s_store_sk#20, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
+Input [3]: [s_store_sk#20, sum#23, sum#24]
+Keys [1]: [s_store_sk#20]
+Functions [2]: [sum(UnscaledValue(sr_return_amt#15)), sum(UnscaledValue(sr_net_loss#16))]
+
+(31) ColumnarToRow [codegen id : 7]
+Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
+
+(32) BroadcastExchange
+Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 8]
+(33) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [s_store_sk#7]
-Right keys [1]: [s_store_sk#22]
+Right keys [1]: [s_store_sk#20]
 Join type: LeftOuter
 Join condition: None
 
-(30) Project [codegen id : 8]
-Output [5]: [sales#14, coalesce(returns#29, 0.00) AS returns#31, (profit#15 - coalesce(profit_loss#30, 0.00)) AS profit#32, store channel AS channel#33, s_store_sk#7 AS id#34]
-Input [6]: [s_store_sk#7, sales#14, profit#15, s_store_sk#22, returns#29, profit_loss#30]
+(34) Project [codegen id : 8]
+Output [5]: [sales#12, coalesce(returns#25, 0.00) AS returns#27, (profit#13 - coalesce(profit_loss#26, 0.00)) AS profit#28, store channel AS channel#29, s_store_sk#7 AS id#30]
+Input [6]: [s_store_sk#7, sales#12, profit#13, s_store_sk#20, returns#25, profit_loss#26]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
+Output [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#38), dynamicpruningexpression(cs_sold_date_sk#38 IN dynamicpruning#39)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#34), dynamicpruningexpression(cs_sold_date_sk#34 IN dynamicpruning#35)]
 ReadSchema: struct<cs_call_center_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(32) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
+(36) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
 
-(33) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#40]
+(37) ReusedExchange [Reuses operator id: 104]
+Output [1]: [d_date_sk#36]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#38]
-Right keys [1]: [d_date_sk#40]
+(38) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#34]
+Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
-Input [5]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38, d_date_sk#40]
-
-(36) HashAggregate [codegen id : 10]
-Input [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
-Keys [1]: [cs_call_center_sk#35]
-Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#36)), partial_sum(UnscaledValue(cs_net_profit#37))]
-Aggregate Attributes [2]: [sum#41, sum#42]
-Results [3]: [cs_call_center_sk#35, sum#43, sum#44]
-
-(37) Exchange
-Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
-Arguments: hashpartitioning(cs_call_center_sk#35, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(38) HashAggregate [codegen id : 11]
-Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
-Keys [1]: [cs_call_center_sk#35]
-Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#36)), sum(UnscaledValue(cs_net_profit#37))]
-Aggregate Attributes [2]: [sum(UnscaledValue(cs_ext_sales_price#36))#45, sum(UnscaledValue(cs_net_profit#37))#46]
-Results [3]: [cs_call_center_sk#35, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#36))#45,17,2) AS sales#47, MakeDecimal(sum(UnscaledValue(cs_net_profit#37))#46,17,2) AS profit#48]
-
-(39) BroadcastExchange
-Input [3]: [cs_call_center_sk#35, sales#47, profit#48]
+(39) Project [codegen id : 10]
+Output [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
+Input [5]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34, d_date_sk#36]
+
+(40) HashAggregate [codegen id : 10]
+Input [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
+Keys [1]: [cs_call_center_sk#31]
+Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#32)), partial_sum(UnscaledValue(cs_net_profit#33))]
+Aggregate Attributes [2]: [sum#37, sum#38]
+Results [3]: [cs_call_center_sk#31, sum#39, sum#40]
+
+(41) RowToColumnar
+Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
+
+(42) CometColumnarExchange
+Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
+Arguments: hashpartitioning(cs_call_center_sk#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(43) CometHashAggregate
+Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
+Keys [1]: [cs_call_center_sk#31]
+Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#32)), sum(UnscaledValue(cs_net_profit#33))]
+
+(44) ColumnarToRow [codegen id : 11]
+Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
+
+(45) BroadcastExchange
+Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
 Arguments: IdentityBroadcastMode, [plan_id=6]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
+Output [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#51), dynamicpruningexpression(cr_returned_date_sk#51 IN dynamicpruning#52)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#45), dynamicpruningexpression(cr_returned_date_sk#45 IN dynamicpruning#46)]
 ReadSchema: struct<cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(41) ColumnarToRow [codegen id : 13]
-Input [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
+(47) ColumnarToRow [codegen id : 13]
+Input [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
 
-(42) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#53]
+(48) ReusedExchange [Reuses operator id: 104]
+Output [1]: [d_date_sk#47]
 
-(43) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cr_returned_date_sk#51]
-Right keys [1]: [d_date_sk#53]
+(49) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cr_returned_date_sk#45]
+Right keys [1]: [d_date_sk#47]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 13]
-Output [2]: [cr_return_amount#49, cr_net_loss#50]
-Input [4]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51, d_date_sk#53]
+(50) Project [codegen id : 13]
+Output [2]: [cr_return_amount#43, cr_net_loss#44]
+Input [4]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45, d_date_sk#47]
 
-(45) HashAggregate [codegen id : 13]
-Input [2]: [cr_return_amount#49, cr_net_loss#50]
+(51) HashAggregate [codegen id : 13]
+Input [2]: [cr_return_amount#43, cr_net_loss#44]
 Keys: []
-Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#49)), partial_sum(UnscaledValue(cr_net_loss#50))]
-Aggregate Attributes [2]: [sum#54, sum#55]
-Results [2]: [sum#56, sum#57]
+Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#43)), partial_sum(UnscaledValue(cr_net_loss#44))]
+Aggregate Attributes [2]: [sum#48, sum#49]
+Results [2]: [sum#50, sum#51]
+
+(52) RowToColumnar
+Input [2]: [sum#50, sum#51]
 
-(46) Exchange
-Input [2]: [sum#56, sum#57]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
+(53) CometColumnarExchange
+Input [2]: [sum#50, sum#51]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(47) HashAggregate
-Input [2]: [sum#56, sum#57]
+(54) CometHashAggregate
+Input [2]: [sum#50, sum#51]
 Keys: []
-Functions [2]: [sum(UnscaledValue(cr_return_amount#49)), sum(UnscaledValue(cr_net_loss#50))]
-Aggregate Attributes [2]: [sum(UnscaledValue(cr_return_amount#49))#58, sum(UnscaledValue(cr_net_loss#50))#59]
-Results [2]: [MakeDecimal(sum(UnscaledValue(cr_return_amount#49))#58,17,2) AS returns#60, MakeDecimal(sum(UnscaledValue(cr_net_loss#50))#59,17,2) AS profit_loss#61]
+Functions [2]: [sum(UnscaledValue(cr_return_amount#43)), sum(UnscaledValue(cr_net_loss#44))]
 
-(48) BroadcastNestedLoopJoin [codegen id : 14]
+(55) ColumnarToRow
+Input [2]: [returns#52, profit_loss#53]
+
+(56) BroadcastNestedLoopJoin [codegen id : 14]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 14]
-Output [5]: [sales#47, returns#60, (profit#48 - profit_loss#61) AS profit#62, catalog channel AS channel#63, cs_call_center_sk#35 AS id#64]
-Input [5]: [cs_call_center_sk#35, sales#47, profit#48, returns#60, profit_loss#61]
+(57) Project [codegen id : 14]
+Output [5]: [sales#41, returns#52, (profit#42 - profit_loss#53) AS profit#54, catalog channel AS channel#55, cs_call_center_sk#31 AS id#56]
+Input [5]: [cs_call_center_sk#31, sales#41, profit#42, returns#52, profit_loss#53]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
+Output [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#68), dynamicpruningexpression(ws_sold_date_sk#68 IN dynamicpruning#69)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#60), dynamicpruningexpression(ws_sold_date_sk#60 IN dynamicpruning#61)]
 PushedFilters: [IsNotNull(ws_web_page_sk)]
 ReadSchema: struct<ws_web_page_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(51) CometFilter
-Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
-Condition : isnotnull(ws_web_page_sk#65)
+(59) CometFilter
+Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
+Condition : isnotnull(ws_web_page_sk#57)
 
-(52) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
+(60) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
 
-(53) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#70]
+(61) ReusedExchange [Reuses operator id: 104]
+Output [1]: [d_date_sk#62]
 
-(54) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#68]
-Right keys [1]: [d_date_sk#70]
+(62) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#60]
+Right keys [1]: [d_date_sk#62]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 17]
-Output [3]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67]
-Input [5]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68, d_date_sk#70]
+(63) Project [codegen id : 17]
+Output [3]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59]
+Input [5]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60, d_date_sk#62]
 
 (unknown) Scan parquet spark_catalog.default.web_page
-Output [1]: [wp_web_page_sk#71]
+Output [1]: [wp_web_page_sk#63]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_page]
 PushedFilters: [IsNotNull(wp_web_page_sk)]
 ReadSchema: struct<wp_web_page_sk:int>
 
-(57) CometFilter
-Input [1]: [wp_web_page_sk#71]
-Condition : isnotnull(wp_web_page_sk#71)
+(65) CometFilter
+Input [1]: [wp_web_page_sk#63]
+Condition : isnotnull(wp_web_page_sk#63)
 
-(58) ColumnarToRow [codegen id : 16]
-Input [1]: [wp_web_page_sk#71]
+(66) ColumnarToRow [codegen id : 16]
+Input [1]: [wp_web_page_sk#63]
 
-(59) BroadcastExchange
-Input [1]: [wp_web_page_sk#71]
+(67) BroadcastExchange
+Input [1]: [wp_web_page_sk#63]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_web_page_sk#65]
-Right keys [1]: [wp_web_page_sk#71]
+(68) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_web_page_sk#57]
+Right keys [1]: [wp_web_page_sk#63]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 17]
-Output [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
-Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
+(69) Project [codegen id : 17]
+Output [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
+Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
+
+(70) HashAggregate [codegen id : 17]
+Input [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
+Keys [1]: [wp_web_page_sk#63]
+Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#58)), partial_sum(UnscaledValue(ws_net_profit#59))]
+Aggregate Attributes [2]: [sum#64, sum#65]
+Results [3]: [wp_web_page_sk#63, sum#66, sum#67]
 
-(62) HashAggregate [codegen id : 17]
-Input [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
-Keys [1]: [wp_web_page_sk#71]
-Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#66)), partial_sum(UnscaledValue(ws_net_profit#67))]
-Aggregate Attributes [2]: [sum#72, sum#73]
-Results [3]: [wp_web_page_sk#71, sum#74, sum#75]
+(71) RowToColumnar
+Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
 
-(63) Exchange
-Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
-Arguments: hashpartitioning(wp_web_page_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(72) CometColumnarExchange
+Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
+Arguments: hashpartitioning(wp_web_page_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(64) HashAggregate [codegen id : 22]
-Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
-Keys [1]: [wp_web_page_sk#71]
-Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#66)), sum(UnscaledValue(ws_net_profit#67))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ws_ext_sales_price#66))#76, sum(UnscaledValue(ws_net_profit#67))#77]
-Results [3]: [wp_web_page_sk#71, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#66))#76,17,2) AS sales#78, MakeDecimal(sum(UnscaledValue(ws_net_profit#67))#77,17,2) AS profit#79]
+(73) CometHashAggregate
+Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
+Keys [1]: [wp_web_page_sk#63]
+Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#58)), sum(UnscaledValue(ws_net_profit#59))]
+
+(74) ColumnarToRow [codegen id : 22]
+Input [3]: [wp_web_page_sk#63, sales#68, profit#69]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
+Output [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#83), dynamicpruningexpression(wr_returned_date_sk#83 IN dynamicpruning#84)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#73), dynamicpruningexpression(wr_returned_date_sk#73 IN dynamicpruning#74)]
 PushedFilters: [IsNotNull(wr_web_page_sk)]
 ReadSchema: struct<wr_web_page_sk:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(66) CometFilter
-Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
-Condition : isnotnull(wr_web_page_sk#80)
+(76) CometFilter
+Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
+Condition : isnotnull(wr_web_page_sk#70)
 
-(67) ColumnarToRow [codegen id : 20]
-Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
+(77) ColumnarToRow [codegen id : 20]
+Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
 
-(68) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#85]
+(78) ReusedExchange [Reuses operator id: 104]
+Output [1]: [d_date_sk#75]
 
-(69) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_returned_date_sk#83]
-Right keys [1]: [d_date_sk#85]
+(79) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_returned_date_sk#73]
+Right keys [1]: [d_date_sk#75]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 20]
-Output [3]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82]
-Input [5]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83, d_date_sk#85]
+(80) Project [codegen id : 20]
+Output [3]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72]
+Input [5]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73, d_date_sk#75]
 
-(71) ReusedExchange [Reuses operator id: 59]
-Output [1]: [wp_web_page_sk#86]
+(81) ReusedExchange [Reuses operator id: 67]
+Output [1]: [wp_web_page_sk#76]
 
-(72) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_web_page_sk#80]
-Right keys [1]: [wp_web_page_sk#86]
+(82) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_web_page_sk#70]
+Right keys [1]: [wp_web_page_sk#76]
 Join type: Inner
 Join condition: None
 
-(73) Project [codegen id : 20]
-Output [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
-Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
-
-(74) HashAggregate [codegen id : 20]
-Input [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
-Keys [1]: [wp_web_page_sk#86]
-Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#81)), partial_sum(UnscaledValue(wr_net_loss#82))]
-Aggregate Attributes [2]: [sum#87, sum#88]
-Results [3]: [wp_web_page_sk#86, sum#89, sum#90]
-
-(75) Exchange
-Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
-Arguments: hashpartitioning(wp_web_page_sk#86, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(76) HashAggregate [codegen id : 21]
-Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
-Keys [1]: [wp_web_page_sk#86]
-Functions [2]: [sum(UnscaledValue(wr_return_amt#81)), sum(UnscaledValue(wr_net_loss#82))]
-Aggregate Attributes [2]: [sum(UnscaledValue(wr_return_amt#81))#91, sum(UnscaledValue(wr_net_loss#82))#92]
-Results [3]: [wp_web_page_sk#86, MakeDecimal(sum(UnscaledValue(wr_return_amt#81))#91,17,2) AS returns#93, MakeDecimal(sum(UnscaledValue(wr_net_loss#82))#92,17,2) AS profit_loss#94]
-
-(77) BroadcastExchange
-Input [3]: [wp_web_page_sk#86, returns#93, profit_loss#94]
+(83) Project [codegen id : 20]
+Output [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
+Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
+
+(84) HashAggregate [codegen id : 20]
+Input [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
+Keys [1]: [wp_web_page_sk#76]
+Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#71)), partial_sum(UnscaledValue(wr_net_loss#72))]
+Aggregate Attributes [2]: [sum#77, sum#78]
+Results [3]: [wp_web_page_sk#76, sum#79, sum#80]
+
+(85) RowToColumnar
+Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
+
+(86) CometColumnarExchange
+Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
+Arguments: hashpartitioning(wp_web_page_sk#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(87) CometHashAggregate
+Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
+Keys [1]: [wp_web_page_sk#76]
+Functions [2]: [sum(UnscaledValue(wr_return_amt#71)), sum(UnscaledValue(wr_net_loss#72))]
+
+(88) ColumnarToRow [codegen id : 21]
+Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
+
+(89) BroadcastExchange
+Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(78) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [wp_web_page_sk#71]
-Right keys [1]: [wp_web_page_sk#86]
+(90) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [wp_web_page_sk#63]
+Right keys [1]: [wp_web_page_sk#76]
 Join type: LeftOuter
 Join condition: None
 
-(79) Project [codegen id : 22]
-Output [5]: [sales#78, coalesce(returns#93, 0.00) AS returns#95, (profit#79 - coalesce(profit_loss#94, 0.00)) AS profit#96, web channel AS channel#97, wp_web_page_sk#71 AS id#98]
-Input [6]: [wp_web_page_sk#71, sales#78, profit#79, wp_web_page_sk#86, returns#93, profit_loss#94]
+(91) Project [codegen id : 22]
+Output [5]: [sales#68, coalesce(returns#81, 0.00) AS returns#83, (profit#69 - coalesce(profit_loss#82, 0.00)) AS profit#84, web channel AS channel#85, wp_web_page_sk#63 AS id#86]
+Input [6]: [wp_web_page_sk#63, sales#68, profit#69, wp_web_page_sk#76, returns#81, profit_loss#82]
+
+(92) Union
+
+(93) Expand [codegen id : 23]
+Input [5]: [sales#12, returns#27, profit#28, channel#29, id#30]
+Arguments: [[sales#12, returns#27, profit#28, channel#29, id#30, 0], [sales#12, returns#27, profit#28, channel#29, null, 1], [sales#12, returns#27, profit#28, null, null, 3]], [sales#12, returns#27, profit#28, channel#87, id#88, spark_grouping_id#89]
 
-(80) Union
+(94) HashAggregate [codegen id : 23]
+Input [6]: [sales#12, returns#27, profit#28, channel#87, id#88, spark_grouping_id#89]
+Keys [3]: [channel#87, id#88, spark_grouping_id#89]
+Functions [3]: [partial_sum(sales#12), partial_sum(returns#27), partial_sum(profit#28)]
+Aggregate Attributes [6]: [sum#90, isEmpty#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+Results [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
 
-(81) Expand [codegen id : 23]
-Input [5]: [sales#14, returns#31, profit#32, channel#33, id#34]
-Arguments: [[sales#14, returns#31, profit#32, channel#33, id#34, 0], [sales#14, returns#31, profit#32, channel#33, null, 1], [sales#14, returns#31, profit#32, null, null, 3]], [sales#14, returns#31, profit#32, channel#99, id#100, spark_grouping_id#101]
+(95) RowToColumnar
+Input [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
 
-(82) HashAggregate [codegen id : 23]
-Input [6]: [sales#14, returns#31, profit#32, channel#99, id#100, spark_grouping_id#101]
-Keys [3]: [channel#99, id#100, spark_grouping_id#101]
-Functions [3]: [partial_sum(sales#14), partial_sum(returns#31), partial_sum(profit#32)]
-Aggregate Attributes [6]: [sum#102, isEmpty#103, sum#104, isEmpty#105, sum#106, isEmpty#107]
-Results [9]: [channel#99, id#100, spark_grouping_id#101, sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
+(96) CometColumnarExchange
+Input [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
+Arguments: hashpartitioning(channel#87, id#88, spark_grouping_id#89, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(83) Exchange
-Input [9]: [channel#99, id#100, spark_grouping_id#101, sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
-Arguments: hashpartitioning(channel#99, id#100, spark_grouping_id#101, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+(97) CometHashAggregate
+Input [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
+Keys [3]: [channel#87, id#88, spark_grouping_id#89]
+Functions [3]: [sum(sales#12), sum(returns#27), sum(profit#28)]
 
-(84) HashAggregate [codegen id : 24]
-Input [9]: [channel#99, id#100, spark_grouping_id#101, sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
-Keys [3]: [channel#99, id#100, spark_grouping_id#101]
-Functions [3]: [sum(sales#14), sum(returns#31), sum(profit#32)]
-Aggregate Attributes [3]: [sum(sales#14)#114, sum(returns#31)#115, sum(profit#32)#116]
-Results [5]: [channel#99, id#100, sum(sales#14)#114 AS sales#117, sum(returns#31)#115 AS returns#118, sum(profit#32)#116 AS profit#119]
+(98) CometTakeOrderedAndProject
+Input [5]: [channel#87, id#88, sales#102, returns#103, profit#104]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#87 ASC NULLS FIRST,id#88 ASC NULLS FIRST], output=[channel#87,id#88,sales#102,returns#103,profit#104]), 100, [channel#87 ASC NULLS FIRST, id#88 ASC NULLS FIRST], [channel#87, id#88, sales#102, returns#103, profit#104]
 
-(85) TakeOrderedAndProject
-Input [5]: [channel#99, id#100, sales#117, returns#118, profit#119]
-Arguments: 100, [channel#99 ASC NULLS FIRST, id#100 ASC NULLS FIRST], [channel#99, id#100, sales#117, returns#118, profit#119]
+(99) ColumnarToRow [codegen id : 24]
+Input [5]: [channel#87, id#88, sales#102, returns#103, profit#104]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (90)
-+- * ColumnarToRow (89)
-   +- CometProject (88)
-      +- CometFilter (87)
-         +- CometScan parquet spark_catalog.default.date_dim (86)
+BroadcastExchange (104)
++- * ColumnarToRow (103)
+   +- CometProject (102)
+      +- CometFilter (101)
+         +- CometScan parquet spark_catalog.default.date_dim (100)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_date#120]
+Output [2]: [d_date_sk#6, d_date#105]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-03), LessThanOrEqual(d_date,2000-09-02), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(87) CometFilter
-Input [2]: [d_date_sk#6, d_date#120]
-Condition : (((isnotnull(d_date#120) AND (d_date#120 >= 2000-08-03)) AND (d_date#120 <= 2000-09-02)) AND isnotnull(d_date_sk#6))
+(101) CometFilter
+Input [2]: [d_date_sk#6, d_date#105]
+Condition : (((isnotnull(d_date#105) AND (d_date#105 >= 2000-08-03)) AND (d_date#105 <= 2000-09-02)) AND isnotnull(d_date_sk#6))
 
-(88) CometProject
-Input [2]: [d_date_sk#6, d_date#120]
+(102) CometProject
+Input [2]: [d_date_sk#6, d_date#105]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(89) ColumnarToRow [codegen id : 1]
+(103) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(90) BroadcastExchange
+(104) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = sr_returned_date_sk#19 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 18 Hosting Expression = sr_returned_date_sk#17 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 31 Hosting Expression = cs_sold_date_sk#38 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 35 Hosting Expression = cs_sold_date_sk#34 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 40 Hosting Expression = cr_returned_date_sk#51 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 46 Hosting Expression = cr_returned_date_sk#45 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 50 Hosting Expression = ws_sold_date_sk#68 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 58 Hosting Expression = ws_sold_date_sk#60 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 65 Hosting Expression = wr_returned_date_sk#83 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 75 Hosting Expression = wr_returned_date_sk#73 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt
index d6693067f0..d8ada5be65 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt
@@ -1,143 +1,157 @@
-TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (24)
-    HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-      InputAdapter
-        Exchange [channel,id,spark_grouping_id] #1
-          WholeStageCodegen (23)
-            HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-              Expand [sales,returns,profit,channel,id]
-                InputAdapter
-                  Union
-                    WholeStageCodegen (8)
-                      Project [sales,returns,profit,profit_loss,s_store_sk]
-                        BroadcastHashJoin [s_store_sk,s_store_sk]
-                          HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(UnscaledValue(ss_net_profit)),sales,profit,sum,sum]
-                            InputAdapter
-                              Exchange [s_store_sk] #2
-                                WholeStageCodegen (3)
-                                  HashAggregate [s_store_sk,ss_ext_sales_price,ss_net_profit] [sum,sum,sum,sum]
-                                    Project [ss_ext_sales_price,ss_net_profit,s_store_sk]
-                                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                        Project [ss_store_sk,ss_ext_sales_price,ss_net_profit]
-                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_store_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
+WholeStageCodegen (24)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
+        CometHashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+          CometColumnarExchange [channel,id,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (23)
+                HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  Expand [sales,returns,profit,channel,id]
+                    InputAdapter
+                      Union
+                        WholeStageCodegen (8)
+                          Project [sales,returns,profit,profit_loss,s_store_sk]
+                            BroadcastHashJoin [s_store_sk,s_store_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometHashAggregate [s_store_sk,sum,sum]
+                                    CometColumnarExchange [s_store_sk] #2
+                                      RowToColumnar
+                                        WholeStageCodegen (3)
+                                          HashAggregate [s_store_sk,ss_ext_sales_price,ss_net_profit] [sum,sum,sum,sum]
+                                            Project [ss_ext_sales_price,ss_net_profit,s_store_sk]
+                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                Project [ss_store_sk,ss_ext_sales_price,ss_net_profit]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [ss_store_sk]
+                                                          CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #1
+                                                              BroadcastExchange #3
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_date,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk] #3
+                                                InputAdapter
+                                                  BroadcastExchange #4
+                                                    WholeStageCodegen (2)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [s_store_sk]
+                                                            CometScan parquet spark_catalog.default.store [s_store_sk]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (7)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [s_store_sk,sum,sum]
+                                          CometColumnarExchange [s_store_sk] #6
+                                            RowToColumnar
+                                              WholeStageCodegen (6)
+                                                HashAggregate [s_store_sk,sr_return_amt,sr_net_loss] [sum,sum,sum,sum]
+                                                  Project [sr_return_amt,sr_net_loss,s_store_sk]
+                                                    BroadcastHashJoin [sr_store_sk,s_store_sk]
+                                                      Project [sr_store_sk,sr_return_amt,sr_net_loss]
+                                                        BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
                                                           ColumnarToRow
                                                             InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_date,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk] #3
-                                        InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [s_store_sk]
-                                                    CometScan parquet spark_catalog.default.store [s_store_sk]
-                          InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (7)
-                                HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(sr_return_amt)),sum(UnscaledValue(sr_net_loss)),returns,profit_loss,sum,sum]
-                                  InputAdapter
-                                    Exchange [s_store_sk] #6
-                                      WholeStageCodegen (6)
-                                        HashAggregate [s_store_sk,sr_return_amt,sr_net_loss] [sum,sum,sum,sum]
-                                          Project [sr_return_amt,sr_net_loss,s_store_sk]
-                                            BroadcastHashJoin [sr_store_sk,s_store_sk]
-                                              Project [sr_store_sk,sr_return_amt,sr_net_loss]
-                                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [sr_store_sk]
-                                                        CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
+                                                              CometFilter [sr_store_sk]
+                                                                CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
+                                                                  ReusedSubquery [d_date_sk] #1
+                                                          InputAdapter
+                                                            ReusedExchange [d_date_sk] #3
+                                                      InputAdapter
+                                                        ReusedExchange [s_store_sk] #4
+                        WholeStageCodegen (14)
+                          Project [sales,returns,profit,profit_loss,cs_call_center_sk]
+                            BroadcastNestedLoopJoin
+                              InputAdapter
+                                BroadcastExchange #7
+                                  WholeStageCodegen (11)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [cs_call_center_sk,sum,sum]
+                                          CometColumnarExchange [cs_call_center_sk] #8
+                                            RowToColumnar
+                                              WholeStageCodegen (10)
+                                                HashAggregate [cs_call_center_sk,cs_ext_sales_price,cs_net_profit] [sum,sum,sum,sum]
+                                                  Project [cs_call_center_sk,cs_ext_sales_price,cs_net_profit]
+                                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_call_center_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
+                                                      InputAdapter
+                                                        ReusedExchange [d_date_sk] #3
+                              ColumnarToRow
+                                InputAdapter
+                                  CometHashAggregate [sum,sum]
+                                    CometColumnarExchange #9
+                                      RowToColumnar
+                                        WholeStageCodegen (13)
+                                          HashAggregate [cr_return_amount,cr_net_loss] [sum,sum,sum,sum]
+                                            Project [cr_return_amount,cr_net_loss]
+                                              BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
+                                                ColumnarToRow
                                                   InputAdapter
-                                                    ReusedExchange [d_date_sk] #3
-                                              InputAdapter
-                                                ReusedExchange [s_store_sk] #4
-                    WholeStageCodegen (14)
-                      Project [sales,returns,profit,profit_loss,cs_call_center_sk]
-                        BroadcastNestedLoopJoin
-                          InputAdapter
-                            BroadcastExchange #7
-                              WholeStageCodegen (11)
-                                HashAggregate [cs_call_center_sk,sum,sum] [sum(UnscaledValue(cs_ext_sales_price)),sum(UnscaledValue(cs_net_profit)),sales,profit,sum,sum]
-                                  InputAdapter
-                                    Exchange [cs_call_center_sk] #8
-                                      WholeStageCodegen (10)
-                                        HashAggregate [cs_call_center_sk,cs_ext_sales_price,cs_net_profit] [sum,sum,sum,sum]
-                                          Project [cs_call_center_sk,cs_ext_sales_price,cs_net_profit]
-                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_call_center_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
-                          HashAggregate [sum,sum] [sum(UnscaledValue(cr_return_amount)),sum(UnscaledValue(cr_net_loss)),returns,profit_loss,sum,sum]
-                            InputAdapter
-                              Exchange #9
-                                WholeStageCodegen (13)
-                                  HashAggregate [cr_return_amount,cr_net_loss] [sum,sum,sum,sum]
-                                    Project [cr_return_amount,cr_net_loss]
-                                      BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.catalog_returns [cr_return_amount,cr_net_loss,cr_returned_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                    WholeStageCodegen (22)
-                      Project [sales,returns,profit,profit_loss,wp_web_page_sk]
-                        BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
-                          HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(ws_ext_sales_price)),sum(UnscaledValue(ws_net_profit)),sales,profit,sum,sum]
-                            InputAdapter
-                              Exchange [wp_web_page_sk] #10
-                                WholeStageCodegen (17)
-                                  HashAggregate [wp_web_page_sk,ws_ext_sales_price,ws_net_profit] [sum,sum,sum,sum]
-                                    Project [ws_ext_sales_price,ws_net_profit,wp_web_page_sk]
-                                      BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                                        Project [ws_web_page_sk,ws_ext_sales_price,ws_net_profit]
-                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_web_page_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_web_page_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk] #3
-                                        InputAdapter
-                                          BroadcastExchange #11
-                                            WholeStageCodegen (16)
-                                              ColumnarToRow
+                                                    CometScan parquet spark_catalog.default.catalog_returns [cr_return_amount,cr_net_loss,cr_returned_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
                                                 InputAdapter
-                                                  CometFilter [wp_web_page_sk]
-                                                    CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
-                          InputAdapter
-                            BroadcastExchange #12
-                              WholeStageCodegen (21)
-                                HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(wr_return_amt)),sum(UnscaledValue(wr_net_loss)),returns,profit_loss,sum,sum]
-                                  InputAdapter
-                                    Exchange [wp_web_page_sk] #13
-                                      WholeStageCodegen (20)
-                                        HashAggregate [wp_web_page_sk,wr_return_amt,wr_net_loss] [sum,sum,sum,sum]
-                                          Project [wr_return_amt,wr_net_loss,wp_web_page_sk]
-                                            BroadcastHashJoin [wr_web_page_sk,wp_web_page_sk]
-                                              Project [wr_web_page_sk,wr_return_amt,wr_net_loss]
-                                                BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
-                                                  ColumnarToRow
+                                                  ReusedExchange [d_date_sk] #3
+                        WholeStageCodegen (22)
+                          Project [sales,returns,profit,profit_loss,wp_web_page_sk]
+                            BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometHashAggregate [wp_web_page_sk,sum,sum]
+                                    CometColumnarExchange [wp_web_page_sk] #10
+                                      RowToColumnar
+                                        WholeStageCodegen (17)
+                                          HashAggregate [wp_web_page_sk,ws_ext_sales_price,ws_net_profit] [sum,sum,sum,sum]
+                                            Project [ws_ext_sales_price,ws_net_profit,wp_web_page_sk]
+                                              BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                                                Project [ws_web_page_sk,ws_ext_sales_price,ws_net_profit]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [ws_web_page_sk]
+                                                          CometScan parquet spark_catalog.default.web_sales [ws_web_page_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
                                                     InputAdapter
-                                                      CometFilter [wr_web_page_sk]
-                                                        CometScan parquet spark_catalog.default.web_returns [wr_web_page_sk,wr_return_amt,wr_net_loss,wr_returned_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
-                                                  InputAdapter
-                                                    ReusedExchange [d_date_sk] #3
-                                              InputAdapter
-                                                ReusedExchange [wp_web_page_sk] #11
+                                                      ReusedExchange [d_date_sk] #3
+                                                InputAdapter
+                                                  BroadcastExchange #11
+                                                    WholeStageCodegen (16)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [wp_web_page_sk]
+                                                            CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
+                              InputAdapter
+                                BroadcastExchange #12
+                                  WholeStageCodegen (21)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [wp_web_page_sk,sum,sum]
+                                          CometColumnarExchange [wp_web_page_sk] #13
+                                            RowToColumnar
+                                              WholeStageCodegen (20)
+                                                HashAggregate [wp_web_page_sk,wr_return_amt,wr_net_loss] [sum,sum,sum,sum]
+                                                  Project [wr_return_amt,wr_net_loss,wp_web_page_sk]
+                                                    BroadcastHashJoin [wr_web_page_sk,wp_web_page_sk]
+                                                      Project [wr_web_page_sk,wr_return_amt,wr_net_loss]
+                                                        BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [wr_web_page_sk]
+                                                                CometScan parquet spark_catalog.default.web_returns [wr_web_page_sk,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                                  ReusedSubquery [d_date_sk] #1
+                                                          InputAdapter
+                                                            ReusedExchange [d_date_sk] #3
+                                                      InputAdapter
+                                                        ReusedExchange [wp_web_page_sk] #11
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt
index caab92168f..79c2b2a5bd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt
@@ -1,71 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (67)
-+- * Project (66)
-   +- * SortMergeJoin Inner (65)
-      :- * Project (43)
-      :  +- * SortMergeJoin Inner (42)
-      :     :- * Sort (20)
-      :     :  +- * HashAggregate (19)
-      :     :     +- Exchange (18)
-      :     :        +- * HashAggregate (17)
-      :     :           +- * Project (16)
-      :     :              +- * BroadcastHashJoin Inner BuildRight (15)
-      :     :                 :- * ColumnarToRow (13)
-      :     :                 :  +- CometProject (12)
-      :     :                 :     +- CometFilter (11)
-      :     :                 :        +- CometSortMergeJoin (10)
-      :     :                 :           :- CometSort (4)
-      :     :                 :           :  +- CometExchange (3)
-      :     :                 :           :     +- CometFilter (2)
-      :     :                 :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :                 :           +- CometSort (9)
-      :     :                 :              +- CometExchange (8)
-      :     :                 :                 +- CometProject (7)
-      :     :                 :                    +- CometFilter (6)
-      :     :                 :                       +- CometScan parquet spark_catalog.default.store_returns (5)
-      :     :                 +- ReusedExchange (14)
-      :     +- * Sort (41)
-      :        +- * Filter (40)
-      :           +- * HashAggregate (39)
-      :              +- Exchange (38)
-      :                 +- * HashAggregate (37)
-      :                    +- * Project (36)
-      :                       +- * BroadcastHashJoin Inner BuildRight (35)
-      :                          :- * ColumnarToRow (33)
-      :                          :  +- CometProject (32)
-      :                          :     +- CometFilter (31)
-      :                          :        +- CometSortMergeJoin (30)
-      :                          :           :- CometSort (24)
-      :                          :           :  +- CometExchange (23)
-      :                          :           :     +- CometFilter (22)
-      :                          :           :        +- CometScan parquet spark_catalog.default.web_sales (21)
-      :                          :           +- CometSort (29)
-      :                          :              +- CometExchange (28)
-      :                          :                 +- CometProject (27)
-      :                          :                    +- CometFilter (26)
-      :                          :                       +- CometScan parquet spark_catalog.default.web_returns (25)
-      :                          +- ReusedExchange (34)
-      +- * Sort (64)
-         +- * Filter (63)
-            +- * HashAggregate (62)
-               +- Exchange (61)
-                  +- * HashAggregate (60)
-                     +- * Project (59)
-                        +- * BroadcastHashJoin Inner BuildRight (58)
-                           :- * ColumnarToRow (56)
-                           :  +- CometProject (55)
-                           :     +- CometFilter (54)
-                           :        +- CometSortMergeJoin (53)
-                           :           :- CometSort (47)
-                           :           :  +- CometExchange (46)
-                           :           :     +- CometFilter (45)
-                           :           :        +- CometScan parquet spark_catalog.default.catalog_sales (44)
-                           :           +- CometSort (52)
-                           :              +- CometExchange (51)
-                           :                 +- CometProject (50)
-                           :                    +- CometFilter (49)
-                           :                       +- CometScan parquet spark_catalog.default.catalog_returns (48)
-                           +- ReusedExchange (57)
+TakeOrderedAndProject (71)
++- * Project (70)
+   +- * ColumnarToRow (69)
+      +- CometSortMergeJoin (68)
+         :- CometProject (45)
+         :  +- CometSortMergeJoin (44)
+         :     :- CometSort (21)
+         :     :  +- CometHashAggregate (20)
+         :     :     +- CometColumnarExchange (19)
+         :     :        +- RowToColumnar (18)
+         :     :           +- * HashAggregate (17)
+         :     :              +- * Project (16)
+         :     :                 +- * BroadcastHashJoin Inner BuildRight (15)
+         :     :                    :- * ColumnarToRow (13)
+         :     :                    :  +- CometProject (12)
+         :     :                    :     +- CometFilter (11)
+         :     :                    :        +- CometSortMergeJoin (10)
+         :     :                    :           :- CometSort (4)
+         :     :                    :           :  +- CometColumnarExchange (3)
+         :     :                    :           :     +- CometFilter (2)
+         :     :                    :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
+         :     :                    :           +- CometSort (9)
+         :     :                    :              +- CometColumnarExchange (8)
+         :     :                    :                 +- CometProject (7)
+         :     :                    :                    +- CometFilter (6)
+         :     :                    :                       +- CometScan parquet spark_catalog.default.store_returns (5)
+         :     :                    +- ReusedExchange (14)
+         :     +- CometSort (43)
+         :        +- CometFilter (42)
+         :           +- CometHashAggregate (41)
+         :              +- CometColumnarExchange (40)
+         :                 +- RowToColumnar (39)
+         :                    +- * HashAggregate (38)
+         :                       +- * Project (37)
+         :                          +- * BroadcastHashJoin Inner BuildRight (36)
+         :                             :- * ColumnarToRow (34)
+         :                             :  +- CometProject (33)
+         :                             :     +- CometFilter (32)
+         :                             :        +- CometSortMergeJoin (31)
+         :                             :           :- CometSort (25)
+         :                             :           :  +- CometColumnarExchange (24)
+         :                             :           :     +- CometFilter (23)
+         :                             :           :        +- CometScan parquet spark_catalog.default.web_sales (22)
+         :                             :           +- CometSort (30)
+         :                             :              +- CometColumnarExchange (29)
+         :                             :                 +- CometProject (28)
+         :                             :                    +- CometFilter (27)
+         :                             :                       +- CometScan parquet spark_catalog.default.web_returns (26)
+         :                             +- ReusedExchange (35)
+         +- CometSort (67)
+            +- CometFilter (66)
+               +- CometHashAggregate (65)
+                  +- CometColumnarExchange (64)
+                     +- RowToColumnar (63)
+                        +- * HashAggregate (62)
+                           +- * Project (61)
+                              +- * BroadcastHashJoin Inner BuildRight (60)
+                                 :- * ColumnarToRow (58)
+                                 :  +- CometProject (57)
+                                 :     +- CometFilter (56)
+                                 :        +- CometSortMergeJoin (55)
+                                 :           :- CometSort (49)
+                                 :           :  +- CometColumnarExchange (48)
+                                 :           :     +- CometFilter (47)
+                                 :           :        +- CometScan parquet spark_catalog.default.catalog_sales (46)
+                                 :           +- CometSort (54)
+                                 :              +- CometColumnarExchange (53)
+                                 :                 +- CometProject (52)
+                                 :                    +- CometFilter (51)
+                                 :                       +- CometScan parquet spark_catalog.default.catalog_returns (50)
+                                 +- ReusedExchange (59)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -80,9 +84,9 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_ticket_number:int,ss_qua
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_customer_sk#2))
 
-(3) CometExchange
+(3) CometColumnarExchange
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
@@ -103,9 +107,9 @@ Condition : (isnotnull(sr_ticket_number#10) AND isnotnull(sr_item_sk#9))
 Input [3]: [sr_item_sk#9, sr_ticket_number#10, sr_returned_date_sk#11]
 Arguments: [sr_item_sk#9, sr_ticket_number#10], [sr_item_sk#9, sr_ticket_number#10]
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
-Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
@@ -127,7 +131,7 @@ Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5,
 (13) ColumnarToRow [codegen id : 2]
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(14) ReusedExchange [Reuses operator id: 71]
+(14) ReusedExchange [Reuses operator id: 75]
 Output [2]: [d_date_sk#12, d_year#13]
 
 (15) BroadcastHashJoin [codegen id : 2]
@@ -147,248 +151,252 @@ Functions [3]: [partial_sum(ss_quantity#4), partial_sum(UnscaledValue(ss_wholesa
 Aggregate Attributes [3]: [sum#14, sum#15, sum#16]
 Results [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 
-(18) Exchange
+(18) RowToColumnar
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
-Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) HashAggregate [codegen id : 3]
+(19) CometColumnarExchange
+Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
+Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(20) CometHashAggregate
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 Keys [3]: [d_year#13, ss_item_sk#1, ss_customer_sk#2]
 Functions [3]: [sum(ss_quantity#4), sum(UnscaledValue(ss_wholesale_cost#5)), sum(UnscaledValue(ss_sales_price#6))]
-Aggregate Attributes [3]: [sum(ss_quantity#4)#20, sum(UnscaledValue(ss_wholesale_cost#5))#21, sum(UnscaledValue(ss_sales_price#6))#22]
-Results [6]: [d_year#13 AS ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, sum(ss_quantity#4)#20 AS ss_qty#24, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#5))#21,17,2) AS ss_wc#25, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#22,17,2) AS ss_sp#26]
 
-(20) Sort [codegen id : 3]
-Input [6]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
-Arguments: [ss_sold_year#23 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], false, 0
+(21) CometSort
+Input [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23], [ss_sold_year#20 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_sold_date_sk#30 IN dynamicpruning#31)]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_order_number:int,ws_quantity:int,ws_wholesale_cost:decimal(7,2),ws_sales_price:decimal(7,2)>
 
-(22) CometFilter
-Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Condition : (isnotnull(ws_item_sk#27) AND isnotnull(ws_bill_customer_sk#28))
+(23) CometFilter
+Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Condition : (isnotnull(ws_item_sk#24) AND isnotnull(ws_bill_customer_sk#25))
 
-(23) CometExchange
-Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Arguments: hashpartitioning(ws_order_number#29, ws_item_sk#27, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
+(24) CometColumnarExchange
+Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Arguments: hashpartitioning(ws_order_number#26, ws_item_sk#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(24) CometSort
-Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_order_number#29 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST]
+(25) CometSort
+Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_order_number#26 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
+Output [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int>
 
-(26) CometFilter
-Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
-Condition : (isnotnull(wr_order_number#36) AND isnotnull(wr_item_sk#35))
+(27) CometFilter
+Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
+Condition : (isnotnull(wr_order_number#33) AND isnotnull(wr_item_sk#32))
 
-(27) CometProject
-Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
-Arguments: [wr_item_sk#35, wr_order_number#36], [wr_item_sk#35, wr_order_number#36]
+(28) CometProject
+Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
+Arguments: [wr_item_sk#32, wr_order_number#33], [wr_item_sk#32, wr_order_number#33]
 
-(28) CometExchange
-Input [2]: [wr_item_sk#35, wr_order_number#36]
-Arguments: hashpartitioning(wr_order_number#36, wr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+(29) CometColumnarExchange
+Input [2]: [wr_item_sk#32, wr_order_number#33]
+Arguments: hashpartitioning(wr_order_number#33, wr_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(29) CometSort
-Input [2]: [wr_item_sk#35, wr_order_number#36]
-Arguments: [wr_item_sk#35, wr_order_number#36], [wr_order_number#36 ASC NULLS FIRST, wr_item_sk#35 ASC NULLS FIRST]
+(30) CometSort
+Input [2]: [wr_item_sk#32, wr_order_number#33]
+Arguments: [wr_item_sk#32, wr_order_number#33], [wr_order_number#33 ASC NULLS FIRST, wr_item_sk#32 ASC NULLS FIRST]
 
-(30) CometSortMergeJoin
-Left output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Right output [2]: [wr_item_sk#35, wr_order_number#36]
-Arguments: [ws_order_number#29, ws_item_sk#27], [wr_order_number#36, wr_item_sk#35], LeftOuter
+(31) CometSortMergeJoin
+Left output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Right output [2]: [wr_item_sk#32, wr_order_number#33]
+Arguments: [ws_order_number#26, ws_item_sk#24], [wr_order_number#33, wr_item_sk#32], LeftOuter
 
-(31) CometFilter
-Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
-Condition : isnull(wr_order_number#36)
+(32) CometFilter
+Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
+Condition : isnull(wr_order_number#33)
 
-(32) CometProject
-Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
-Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+(33) CometProject
+Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
+Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
 
-(33) ColumnarToRow [codegen id : 5]
-Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+(34) ColumnarToRow [codegen id : 4]
+Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
 
-(34) ReusedExchange [Reuses operator id: 71]
-Output [2]: [d_date_sk#38, d_year#39]
+(35) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#35, d_year#36]
 
-(35) BroadcastHashJoin [codegen id : 5]
-Left keys [1]: [ws_sold_date_sk#33]
-Right keys [1]: [d_date_sk#38]
+(36) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [ws_sold_date_sk#30]
+Right keys [1]: [d_date_sk#35]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 5]
-Output [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
-Input [8]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, d_date_sk#38, d_year#39]
-
-(37) HashAggregate [codegen id : 5]
-Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
-Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
-Functions [3]: [partial_sum(ws_quantity#30), partial_sum(UnscaledValue(ws_wholesale_cost#31)), partial_sum(UnscaledValue(ws_sales_price#32))]
-Aggregate Attributes [3]: [sum#40, sum#41, sum#42]
-Results [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
-
-(38) Exchange
-Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
-Arguments: hashpartitioning(d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(39) HashAggregate [codegen id : 6]
-Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
-Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
-Functions [3]: [sum(ws_quantity#30), sum(UnscaledValue(ws_wholesale_cost#31)), sum(UnscaledValue(ws_sales_price#32))]
-Aggregate Attributes [3]: [sum(ws_quantity#30)#46, sum(UnscaledValue(ws_wholesale_cost#31))#47, sum(UnscaledValue(ws_sales_price#32))#48]
-Results [6]: [d_year#39 AS ws_sold_year#49, ws_item_sk#27, ws_bill_customer_sk#28 AS ws_customer_sk#50, sum(ws_quantity#30)#46 AS ws_qty#51, MakeDecimal(sum(UnscaledValue(ws_wholesale_cost#31))#47,17,2) AS ws_wc#52, MakeDecimal(sum(UnscaledValue(ws_sales_price#32))#48,17,2) AS ws_sp#53]
-
-(40) Filter [codegen id : 6]
-Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
-Condition : (coalesce(ws_qty#51, 0) > 0)
-
-(41) Sort [codegen id : 6]
-Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
-Arguments: [ws_sold_year#49 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST, ws_customer_sk#50 ASC NULLS FIRST], false, 0
-
-(42) SortMergeJoin [codegen id : 7]
-Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
-Right keys [3]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50]
-Join type: Inner
-Join condition: None
+(37) Project [codegen id : 4]
+Output [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
+Input [8]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, d_date_sk#35, d_year#36]
+
+(38) HashAggregate [codegen id : 4]
+Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
+Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
+Functions [3]: [partial_sum(ws_quantity#27), partial_sum(UnscaledValue(ws_wholesale_cost#28)), partial_sum(UnscaledValue(ws_sales_price#29))]
+Aggregate Attributes [3]: [sum#37, sum#38, sum#39]
+Results [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+
+(39) RowToColumnar
+Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+
+(40) CometColumnarExchange
+Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+Arguments: hashpartitioning(d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(41) CometHashAggregate
+Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
+Functions [3]: [sum(ws_quantity#27), sum(UnscaledValue(ws_wholesale_cost#28)), sum(UnscaledValue(ws_sales_price#29))]
+
+(42) CometFilter
+Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Condition : (coalesce(ws_qty#45, 0) > 0)
+
+(43) CometSort
+Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Arguments: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47], [ws_sold_year#43 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST, ws_customer_sk#44 ASC NULLS FIRST]
+
+(44) CometSortMergeJoin
+Left output [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
+Right output [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44], Inner
 
-(43) Project [codegen id : 7]
-Output [9]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53]
-Input [12]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
+(45) CometProject
+Input [12]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47], [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#60), dynamicpruningexpression(cs_sold_date_sk#60 IN dynamicpruning#61)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#54), dynamicpruningexpression(cs_sold_date_sk#54 IN dynamicpruning#55)]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_wholesale_cost:decimal(7,2),cs_sales_price:decimal(7,2)>
 
-(45) CometFilter
-Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Condition : (isnotnull(cs_item_sk#55) AND isnotnull(cs_bill_customer_sk#54))
+(47) CometFilter
+Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Condition : (isnotnull(cs_item_sk#49) AND isnotnull(cs_bill_customer_sk#48))
 
-(46) CometExchange
-Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Arguments: hashpartitioning(cs_order_number#56, cs_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+(48) CometColumnarExchange
+Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Arguments: hashpartitioning(cs_order_number#50, cs_item_sk#49, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(47) CometSort
-Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_order_number#56 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST]
+(49) CometSort
+Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_order_number#50 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
+Output [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(49) CometFilter
-Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
-Condition : (isnotnull(cr_order_number#63) AND isnotnull(cr_item_sk#62))
+(51) CometFilter
+Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
+Condition : (isnotnull(cr_order_number#57) AND isnotnull(cr_item_sk#56))
 
-(50) CometProject
-Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
-Arguments: [cr_item_sk#62, cr_order_number#63], [cr_item_sk#62, cr_order_number#63]
+(52) CometProject
+Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
+Arguments: [cr_item_sk#56, cr_order_number#57], [cr_item_sk#56, cr_order_number#57]
 
-(51) CometExchange
-Input [2]: [cr_item_sk#62, cr_order_number#63]
-Arguments: hashpartitioning(cr_order_number#63, cr_item_sk#62, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
+(53) CometColumnarExchange
+Input [2]: [cr_item_sk#56, cr_order_number#57]
+Arguments: hashpartitioning(cr_order_number#57, cr_item_sk#56, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(52) CometSort
-Input [2]: [cr_item_sk#62, cr_order_number#63]
-Arguments: [cr_item_sk#62, cr_order_number#63], [cr_order_number#63 ASC NULLS FIRST, cr_item_sk#62 ASC NULLS FIRST]
+(54) CometSort
+Input [2]: [cr_item_sk#56, cr_order_number#57]
+Arguments: [cr_item_sk#56, cr_order_number#57], [cr_order_number#57 ASC NULLS FIRST, cr_item_sk#56 ASC NULLS FIRST]
 
-(53) CometSortMergeJoin
-Left output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Right output [2]: [cr_item_sk#62, cr_order_number#63]
-Arguments: [cs_order_number#56, cs_item_sk#55], [cr_order_number#63, cr_item_sk#62], LeftOuter
+(55) CometSortMergeJoin
+Left output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Right output [2]: [cr_item_sk#56, cr_order_number#57]
+Arguments: [cs_order_number#50, cs_item_sk#49], [cr_order_number#57, cr_item_sk#56], LeftOuter
 
-(54) CometFilter
-Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
-Condition : isnull(cr_order_number#63)
+(56) CometFilter
+Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
+Condition : isnull(cr_order_number#57)
 
-(55) CometProject
-Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
-Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+(57) CometProject
+Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
+Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
 
-(56) ColumnarToRow [codegen id : 9]
-Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+(58) ColumnarToRow [codegen id : 6]
+Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
 
-(57) ReusedExchange [Reuses operator id: 71]
-Output [2]: [d_date_sk#65, d_year#66]
+(59) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#59, d_year#60]
 
-(58) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [cs_sold_date_sk#60]
-Right keys [1]: [d_date_sk#65]
+(60) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [cs_sold_date_sk#54]
+Right keys [1]: [d_date_sk#59]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 9]
-Output [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
-Input [8]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, d_date_sk#65, d_year#66]
-
-(60) HashAggregate [codegen id : 9]
-Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
-Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
-Functions [3]: [partial_sum(cs_quantity#57), partial_sum(UnscaledValue(cs_wholesale_cost#58)), partial_sum(UnscaledValue(cs_sales_price#59))]
-Aggregate Attributes [3]: [sum#67, sum#68, sum#69]
-Results [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
-
-(61) Exchange
-Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
-Arguments: hashpartitioning(d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, 5), ENSURE_REQUIREMENTS, [plan_id=9]
-
-(62) HashAggregate [codegen id : 10]
-Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
-Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
-Functions [3]: [sum(cs_quantity#57), sum(UnscaledValue(cs_wholesale_cost#58)), sum(UnscaledValue(cs_sales_price#59))]
-Aggregate Attributes [3]: [sum(cs_quantity#57)#73, sum(UnscaledValue(cs_wholesale_cost#58))#74, sum(UnscaledValue(cs_sales_price#59))#75]
-Results [6]: [d_year#66 AS cs_sold_year#76, cs_item_sk#55, cs_bill_customer_sk#54 AS cs_customer_sk#77, sum(cs_quantity#57)#73 AS cs_qty#78, MakeDecimal(sum(UnscaledValue(cs_wholesale_cost#58))#74,17,2) AS cs_wc#79, MakeDecimal(sum(UnscaledValue(cs_sales_price#59))#75,17,2) AS cs_sp#80]
-
-(63) Filter [codegen id : 10]
-Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
-Condition : (coalesce(cs_qty#78, 0) > 0)
-
-(64) Sort [codegen id : 10]
-Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
-Arguments: [cs_sold_year#76 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST, cs_customer_sk#77 ASC NULLS FIRST], false, 0
-
-(65) SortMergeJoin [codegen id : 11]
-Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
-Right keys [3]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77]
-Join type: Inner
-Join condition: None
+(61) Project [codegen id : 6]
+Output [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
+Input [8]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, d_date_sk#59, d_year#60]
+
+(62) HashAggregate [codegen id : 6]
+Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
+Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
+Functions [3]: [partial_sum(cs_quantity#51), partial_sum(UnscaledValue(cs_wholesale_cost#52)), partial_sum(UnscaledValue(cs_sales_price#53))]
+Aggregate Attributes [3]: [sum#61, sum#62, sum#63]
+Results [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+
+(63) RowToColumnar
+Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+
+(64) CometColumnarExchange
+Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+Arguments: hashpartitioning(d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(65) CometHashAggregate
+Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
+Functions [3]: [sum(cs_quantity#51), sum(UnscaledValue(cs_wholesale_cost#52)), sum(UnscaledValue(cs_sales_price#53))]
+
+(66) CometFilter
+Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+Condition : (coalesce(cs_qty#69, 0) > 0)
+
+(67) CometSort
+Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+Arguments: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71], [cs_sold_year#67 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST, cs_customer_sk#68 ASC NULLS FIRST]
+
+(68) CometSortMergeJoin
+Left output [9]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
+Right output [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68], Inner
+
+(69) ColumnarToRow [codegen id : 7]
+Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
 
-(66) Project [codegen id : 11]
-Output [12]: [round((cast(ss_qty#24 as double) / cast(coalesce((ws_qty#51 + cs_qty#78), 1) as double)), 2) AS ratio#81, ss_qty#24 AS store_qty#82, ss_wc#25 AS store_wholesale_cost#83, ss_sp#26 AS store_sales_price#84, (coalesce(ws_qty#51, 0) + coalesce(cs_qty#78, 0)) AS other_chan_qty#85, (coalesce(ws_wc#52, 0.00) + coalesce(cs_wc#79, 0.00)) AS other_chan_wholesale_cost#86, (coalesce(ws_sp#53, 0.00) + coalesce(cs_sp#80, 0.00)) AS other_chan_sales_price#87, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, cs_qty#78]
-Input [15]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53, cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
+(70) Project [codegen id : 7]
+Output [12]: [round((cast(ss_qty#21 as double) / cast(coalesce((ws_qty#45 + cs_qty#69), 1) as double)), 2) AS ratio#72, ss_qty#21 AS store_qty#73, ss_wc#22 AS store_wholesale_cost#74, ss_sp#23 AS store_sales_price#75, (coalesce(ws_qty#45, 0) + coalesce(cs_qty#69, 0)) AS other_chan_qty#76, (coalesce(ws_wc#46, 0.00) + coalesce(cs_wc#70, 0.00)) AS other_chan_wholesale_cost#77, (coalesce(ws_sp#47, 0.00) + coalesce(cs_sp#71, 0.00)) AS other_chan_sales_price#78, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, cs_qty#69]
+Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
 
-(67) TakeOrderedAndProject
-Input [12]: [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, cs_qty#78]
-Arguments: 100, [ratio#81 ASC NULLS FIRST, ss_qty#24 DESC NULLS LAST, ss_wc#25 DESC NULLS LAST, ss_sp#26 DESC NULLS LAST, other_chan_qty#85 ASC NULLS FIRST, other_chan_wholesale_cost#86 ASC NULLS FIRST, other_chan_sales_price#87 ASC NULLS FIRST, round((cast(ss_qty#24 as double) / cast(coalesce((ws_qty#51 + cs_qty#78), 1) as double)), 2) ASC NULLS FIRST], [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87]
+(71) TakeOrderedAndProject
+Input [12]: [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, cs_qty#69]
+Arguments: 100, [ratio#72 ASC NULLS FIRST, ss_qty#21 DESC NULLS LAST, ss_wc#22 DESC NULLS LAST, ss_sp#23 DESC NULLS LAST, other_chan_qty#76 ASC NULLS FIRST, other_chan_wholesale_cost#77 ASC NULLS FIRST, other_chan_sales_price#78 ASC NULLS FIRST, round((cast(ss_qty#21 as double) / cast(coalesce((ws_qty#45 + cs_qty#69), 1) as double)), 2) ASC NULLS FIRST], [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (71)
-+- * ColumnarToRow (70)
-   +- CometFilter (69)
-      +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometFilter (73)
+      +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -398,19 +406,19 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(69) CometFilter
+(73) CometFilter
 Input [2]: [d_date_sk#12, d_year#13]
 Condition : ((isnotnull(d_year#13) AND (d_year#13 = 2000)) AND isnotnull(d_date_sk#12))
 
-(70) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#12, d_year#13]
 
-(71) BroadcastExchange
+(75) BroadcastExchange
 Input [2]: [d_date_sk#12, d_year#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-Subquery:2 Hosting operator id = 21 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 22 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 44 Hosting Expression = cs_sold_date_sk#60 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 46 Hosting Expression = cs_sold_date_sk#54 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt
index 7b351afcd3..002e6d86d8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt
@@ -1,80 +1,74 @@
 TakeOrderedAndProject [ratio,ss_qty,ss_wc,ss_sp,other_chan_qty,other_chan_wholesale_cost,other_chan_sales_price,ws_qty,cs_qty,store_qty,store_wholesale_cost,store_sales_price]
-  WholeStageCodegen (11)
+  WholeStageCodegen (7)
     Project [ss_qty,ws_qty,cs_qty,ss_wc,ss_sp,ws_wc,cs_wc,ws_sp,cs_sp]
-      SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
+      ColumnarToRow
         InputAdapter
-          WholeStageCodegen (7)
-            Project [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
-              SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
-                InputAdapter
-                  WholeStageCodegen (3)
-                    Sort [ss_sold_year,ss_item_sk,ss_customer_sk]
-                      HashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum] [sum(ss_quantity),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_sales_price)),ss_sold_year,ss_qty,ss_wc,ss_sp,sum,sum,sum]
-                        InputAdapter
-                          Exchange [d_year,ss_item_sk,ss_customer_sk] #1
-                            WholeStageCodegen (2)
-                              HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
-                                Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                          CometFilter [sr_ticket_number]
-                                            CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                              CometSort [ss_ticket_number,ss_item_sk]
-                                                CometExchange [ss_ticket_number,ss_item_sk] #2
-                                                  CometFilter [ss_item_sk,ss_customer_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [d_year,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                              CometSort [sr_ticket_number,sr_item_sk]
-                                                CometExchange [sr_ticket_number,sr_item_sk] #4
-                                                  CometProject [sr_item_sk,sr_ticket_number]
-                                                    CometFilter [sr_ticket_number,sr_item_sk]
-                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+          CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
+            CometProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
+              CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
+                CometSort [ss_sold_year,ss_item_sk,ss_customer_sk]
+                  CometHashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum]
+                    CometColumnarExchange [d_year,ss_item_sk,ss_customer_sk] #1
+                      RowToColumnar
+                        WholeStageCodegen (2)
+                          HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
+                            Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                      CometFilter [sr_ticket_number]
+                                        CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                          CometSort [ss_ticket_number,ss_item_sk]
+                                            CometColumnarExchange [ss_ticket_number,ss_item_sk] #2
+                                              CometFilter [ss_item_sk,ss_customer_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                          CometSort [sr_ticket_number,sr_item_sk]
+                                            CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
+                                              CometProject [sr_item_sk,sr_ticket_number]
+                                                CometFilter [sr_ticket_number,sr_item_sk]
+                                                  CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk,d_year] #3
+                CometSort [ws_sold_year,ws_item_sk,ws_customer_sk]
+                  CometFilter [ws_qty]
+                    CometHashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum]
+                      CometColumnarExchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
+                        RowToColumnar
+                          WholeStageCodegen (4)
+                            HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
+                              Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  ColumnarToRow
                                     InputAdapter
-                                      ReusedExchange [d_date_sk,d_year] #3
-                InputAdapter
-                  WholeStageCodegen (6)
-                    Sort [ws_sold_year,ws_item_sk,ws_customer_sk]
-                      Filter [ws_qty]
-                        HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum] [sum(ws_quantity),sum(UnscaledValue(ws_wholesale_cost)),sum(UnscaledValue(ws_sales_price)),ws_sold_year,ws_customer_sk,ws_qty,ws_wc,ws_sp,sum,sum,sum]
-                          InputAdapter
-                            Exchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
-                              WholeStageCodegen (5)
-                                HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
-                                  Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                            CometFilter [wr_order_number]
-                                              CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                                CometSort [ws_order_number,ws_item_sk]
-                                                  CometExchange [ws_order_number,ws_item_sk] #6
-                                                    CometFilter [ws_item_sk,ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
-                                                CometSort [wr_order_number,wr_item_sk]
-                                                  CometExchange [wr_order_number,wr_item_sk] #7
-                                                    CometProject [wr_item_sk,wr_order_number]
-                                                      CometFilter [wr_order_number,wr_item_sk]
-                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
-        InputAdapter
-          WholeStageCodegen (10)
-            Sort [cs_sold_year,cs_item_sk,cs_customer_sk]
-              Filter [cs_qty]
-                HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum] [sum(cs_quantity),sum(UnscaledValue(cs_wholesale_cost)),sum(UnscaledValue(cs_sales_price)),cs_sold_year,cs_customer_sk,cs_qty,cs_wc,cs_sp,sum,sum,sum]
-                  InputAdapter
-                    Exchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
-                      WholeStageCodegen (9)
+                                      CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                        CometFilter [wr_order_number]
+                                          CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                            CometSort [ws_order_number,ws_item_sk]
+                                              CometColumnarExchange [ws_order_number,ws_item_sk] #6
+                                                CometFilter [ws_item_sk,ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            CometSort [wr_order_number,wr_item_sk]
+                                              CometColumnarExchange [wr_order_number,wr_item_sk] #7
+                                                CometProject [wr_item_sk,wr_order_number]
+                                                  CometFilter [wr_order_number,wr_item_sk]
+                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
+            CometSort [cs_sold_year,cs_item_sk,cs_customer_sk]
+              CometFilter [cs_qty]
+                CometHashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum]
+                  CometColumnarExchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
+                    RowToColumnar
+                      WholeStageCodegen (6)
                         HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,cs_quantity,cs_wholesale_cost,cs_sales_price] [sum,sum,sum,sum,sum,sum]
                           Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_wholesale_cost,cs_sales_price,d_year]
                             BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
@@ -84,12 +78,12 @@ TakeOrderedAndProject [ratio,ss_qty,ss_wc,ss_sp,other_chan_qty,other_chan_wholes
                                     CometFilter [cr_order_number]
                                       CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
                                         CometSort [cs_order_number,cs_item_sk]
-                                          CometExchange [cs_order_number,cs_item_sk] #9
+                                          CometColumnarExchange [cs_order_number,cs_item_sk] #9
                                             CometFilter [cs_item_sk,cs_bill_customer_sk]
                                               CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_order_number,cs_quantity,cs_wholesale_cost,cs_sales_price,cs_sold_date_sk]
                                                 ReusedSubquery [d_date_sk] #1
                                         CometSort [cr_order_number,cr_item_sk]
-                                          CometExchange [cr_order_number,cr_item_sk] #10
+                                          CometColumnarExchange [cr_order_number,cr_item_sk] #10
                                             CometProject [cr_item_sk,cr_order_number]
                                               CometFilter [cr_order_number,cr_item_sk]
                                                 CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt
index 667c05e1c6..344150578b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt
@@ -1,34 +1,36 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * Project (29)
-   +- * BroadcastHashJoin Inner BuildRight (28)
-      :- * HashAggregate (23)
-      :  +- Exchange (22)
-      :     +- * HashAggregate (21)
-      :        +- * Project (20)
-      :           +- * BroadcastHashJoin Inner BuildRight (19)
-      :              :- * Project (13)
-      :              :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :              :     :- * Project (6)
-      :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :              :     :     :- * ColumnarToRow (3)
-      :              :     :     :  +- CometFilter (2)
-      :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :              :     :     +- ReusedExchange (4)
-      :              :     +- BroadcastExchange (11)
-      :              :        +- * ColumnarToRow (10)
-      :              :           +- CometProject (9)
-      :              :              +- CometFilter (8)
-      :              :                 +- CometScan parquet spark_catalog.default.store (7)
-      :              +- BroadcastExchange (18)
-      :                 +- * ColumnarToRow (17)
-      :                    +- CometProject (16)
-      :                       +- CometFilter (15)
-      :                          +- CometScan parquet spark_catalog.default.household_demographics (14)
-      +- BroadcastExchange (27)
-         +- * ColumnarToRow (26)
-            +- CometFilter (25)
-               +- CometScan parquet spark_catalog.default.customer (24)
+TakeOrderedAndProject (32)
++- * Project (31)
+   +- * BroadcastHashJoin Inner BuildRight (30)
+      :- * ColumnarToRow (25)
+      :  +- CometHashAggregate (24)
+      :     +- CometColumnarExchange (23)
+      :        +- RowToColumnar (22)
+      :           +- * HashAggregate (21)
+      :              +- * Project (20)
+      :                 +- * BroadcastHashJoin Inner BuildRight (19)
+      :                    :- * Project (13)
+      :                    :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :                    :     :- * Project (6)
+      :                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :                    :     :     :- * ColumnarToRow (3)
+      :                    :     :     :  +- CometFilter (2)
+      :                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :                    :     :     +- ReusedExchange (4)
+      :                    :     +- BroadcastExchange (11)
+      :                    :        +- * ColumnarToRow (10)
+      :                    :           +- CometProject (9)
+      :                    :              +- CometFilter (8)
+      :                    :                 +- CometScan parquet spark_catalog.default.store (7)
+      :                    +- BroadcastExchange (18)
+      :                       +- * ColumnarToRow (17)
+      :                          +- CometProject (16)
+      :                             +- CometFilter (15)
+      :                                +- CometScan parquet spark_catalog.default.household_demographics (14)
+      +- BroadcastExchange (29)
+         +- * ColumnarToRow (28)
+            +- CometFilter (27)
+               +- CometScan parquet spark_catalog.default.customer (26)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -46,7 +48,7 @@ Condition : ((isnotnull(ss_store_sk#4) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [8]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_store_sk#4, ss_ticket_number#5, ss_coupon_amt#6, ss_net_profit#7, ss_sold_date_sk#8]
 
-(4) ReusedExchange [Reuses operator id: 35]
+(4) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#10]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -130,78 +132,82 @@ Functions [2]: [partial_sum(UnscaledValue(ss_coupon_amt#6)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#17, sum#18]
 Results [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
 
-(22) Exchange
+(22) RowToColumnar
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
-Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) HashAggregate [codegen id : 6]
+(23) CometColumnarExchange
+Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
+Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(24) CometHashAggregate
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
 Keys [4]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13]
 Functions [2]: [sum(UnscaledValue(ss_coupon_amt#6)), sum(UnscaledValue(ss_net_profit#7))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_coupon_amt#6))#21, sum(UnscaledValue(ss_net_profit#7))#22]
-Results [5]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#6))#21,17,2) AS amt#23, MakeDecimal(sum(UnscaledValue(ss_net_profit#7))#22,17,2) AS profit#24]
+
+(25) ColumnarToRow [codegen id : 6]
+Input [5]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, amt#21, profit#22]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
+Output [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_first_name:string,c_last_name:string>
 
-(25) CometFilter
-Input [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
-Condition : isnotnull(c_customer_sk#25)
+(27) CometFilter
+Input [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
+Condition : isnotnull(c_customer_sk#23)
 
-(26) ColumnarToRow [codegen id : 5]
-Input [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
+(28) ColumnarToRow [codegen id : 5]
+Input [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
 
-(27) BroadcastExchange
-Input [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
+(29) BroadcastExchange
+Input [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(28) BroadcastHashJoin [codegen id : 6]
+(30) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#25]
+Right keys [1]: [c_customer_sk#23]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 6]
-Output [7]: [c_last_name#27, c_first_name#26, substr(s_city#13, 1, 30) AS substr(s_city, 1, 30)#28, ss_ticket_number#5, amt#23, profit#24, s_city#13]
-Input [8]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, amt#23, profit#24, c_customer_sk#25, c_first_name#26, c_last_name#27]
+(31) Project [codegen id : 6]
+Output [7]: [c_last_name#25, c_first_name#24, substr(s_city#13, 1, 30) AS substr(s_city, 1, 30)#26, ss_ticket_number#5, amt#21, profit#22, s_city#13]
+Input [8]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, amt#21, profit#22, c_customer_sk#23, c_first_name#24, c_last_name#25]
 
-(30) TakeOrderedAndProject
-Input [7]: [c_last_name#27, c_first_name#26, substr(s_city, 1, 30)#28, ss_ticket_number#5, amt#23, profit#24, s_city#13]
-Arguments: 100, [c_last_name#27 ASC NULLS FIRST, c_first_name#26 ASC NULLS FIRST, substr(s_city#13, 1, 30) ASC NULLS FIRST, profit#24 ASC NULLS FIRST], [c_last_name#27, c_first_name#26, substr(s_city, 1, 30)#28, ss_ticket_number#5, amt#23, profit#24]
+(32) TakeOrderedAndProject
+Input [7]: [c_last_name#25, c_first_name#24, substr(s_city, 1, 30)#26, ss_ticket_number#5, amt#21, profit#22, s_city#13]
+Arguments: 100, [c_last_name#25 ASC NULLS FIRST, c_first_name#24 ASC NULLS FIRST, substr(s_city#13, 1, 30) ASC NULLS FIRST, profit#22 ASC NULLS FIRST], [c_last_name#25, c_first_name#24, substr(s_city, 1, 30)#26, ss_ticket_number#5, amt#21, profit#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#29, d_dow#30]
+Output [3]: [d_date_sk#10, d_year#27, d_dow#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_dow), EqualTo(d_dow,1), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dow:int>
 
-(32) CometFilter
-Input [3]: [d_date_sk#10, d_year#29, d_dow#30]
-Condition : (((isnotnull(d_dow#30) AND (d_dow#30 = 1)) AND d_year#29 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
+(34) CometFilter
+Input [3]: [d_date_sk#10, d_year#27, d_dow#28]
+Condition : (((isnotnull(d_dow#28) AND (d_dow#28 = 1)) AND d_year#27 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
 
-(33) CometProject
-Input [3]: [d_date_sk#10, d_year#29, d_dow#30]
+(35) CometProject
+Input [3]: [d_date_sk#10, d_year#27, d_dow#28]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(34) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(35) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt
index 4c05c449c5..b86117fc50 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt
@@ -2,47 +2,49 @@ TakeOrderedAndProject [c_last_name,c_first_name,s_city,profit,substr(s_city, 1,
   WholeStageCodegen (6)
     Project [c_last_name,c_first_name,s_city,ss_ticket_number,amt,profit]
       BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-        HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,sum,sum] [sum(UnscaledValue(ss_coupon_amt)),sum(UnscaledValue(ss_net_profit)),amt,profit,sum,sum]
+        ColumnarToRow
           InputAdapter
-            Exchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city] #1
-              WholeStageCodegen (4)
-                HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
-                  Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
-                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                      Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [d_date_sk]
-                                                  CometFilter [d_dow,d_year,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
+            CometHashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,sum,sum]
+              CometColumnarExchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city] #1
+                RowToColumnar
+                  WholeStageCodegen (4)
+                    HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
+                      Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
+                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                          Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
+                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                              Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_dow,d_year,d_date_sk]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk] #2
                               InputAdapter
-                                ReusedExchange [d_date_sk] #2
+                                BroadcastExchange #3
+                                  WholeStageCodegen (2)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [s_store_sk,s_city]
+                                          CometFilter [s_number_employees,s_store_sk]
+                                            CometScan parquet spark_catalog.default.store [s_store_sk,s_number_employees,s_city]
                           InputAdapter
-                            BroadcastExchange #3
-                              WholeStageCodegen (2)
+                            BroadcastExchange #4
+                              WholeStageCodegen (3)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometProject [s_store_sk,s_city]
-                                      CometFilter [s_number_employees,s_store_sk]
-                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_number_employees,s_city]
-                      InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (3)
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [hd_demo_sk]
-                                  CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                                    CometProject [hd_demo_sk]
+                                      CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                        CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
         InputAdapter
           BroadcastExchange #5
             WholeStageCodegen (5)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt
index f54999ff58..67656a9098 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt
@@ -1,47 +1,53 @@
 == Physical Plan ==
-TakeOrderedAndProject (43)
-+- * HashAggregate (42)
-   +- Exchange (41)
-      +- * HashAggregate (40)
-         +- * Project (39)
-            +- * BroadcastHashJoin Inner BuildRight (38)
-               :- * Project (12)
-               :  +- * BroadcastHashJoin Inner BuildRight (11)
-               :     :- * Project (6)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :     :     :- * ColumnarToRow (3)
-               :     :     :  +- CometFilter (2)
-               :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :     +- ReusedExchange (4)
-               :     +- BroadcastExchange (10)
-               :        +- * ColumnarToRow (9)
-               :           +- CometFilter (8)
-               :              +- CometScan parquet spark_catalog.default.store (7)
-               +- BroadcastExchange (37)
-                  +- * HashAggregate (36)
-                     +- Exchange (35)
-                        +- * HashAggregate (34)
-                           +- * BroadcastHashJoin LeftSemi BuildRight (33)
-                              :- * ColumnarToRow (16)
-                              :  +- CometProject (15)
-                              :     +- CometFilter (14)
-                              :        +- CometScan parquet spark_catalog.default.customer_address (13)
-                              +- BroadcastExchange (32)
-                                 +- * Project (31)
-                                    +- * Filter (30)
-                                       +- * HashAggregate (29)
-                                          +- Exchange (28)
-                                             +- * HashAggregate (27)
-                                                +- * Project (26)
-                                                   +- * BroadcastHashJoin Inner BuildRight (25)
-                                                      :- * ColumnarToRow (19)
-                                                      :  +- CometFilter (18)
-                                                      :     +- CometScan parquet spark_catalog.default.customer_address (17)
-                                                      +- BroadcastExchange (24)
-                                                         +- * ColumnarToRow (23)
-                                                            +- CometProject (22)
-                                                               +- CometFilter (21)
-                                                                  +- CometScan parquet spark_catalog.default.customer (20)
+* ColumnarToRow (49)
++- CometTakeOrderedAndProject (48)
+   +- CometHashAggregate (47)
+      +- CometColumnarExchange (46)
+         +- RowToColumnar (45)
+            +- * HashAggregate (44)
+               +- * Project (43)
+                  +- * BroadcastHashJoin Inner BuildRight (42)
+                     :- * Project (12)
+                     :  +- * BroadcastHashJoin Inner BuildRight (11)
+                     :     :- * Project (6)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                     :     :     :- * ColumnarToRow (3)
+                     :     :     :  +- CometFilter (2)
+                     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :     :     +- ReusedExchange (4)
+                     :     +- BroadcastExchange (10)
+                     :        +- * ColumnarToRow (9)
+                     :           +- CometFilter (8)
+                     :              +- CometScan parquet spark_catalog.default.store (7)
+                     +- BroadcastExchange (41)
+                        +- * ColumnarToRow (40)
+                           +- CometHashAggregate (39)
+                              +- CometColumnarExchange (38)
+                                 +- RowToColumnar (37)
+                                    +- * HashAggregate (36)
+                                       +- * BroadcastHashJoin LeftSemi BuildRight (35)
+                                          :- * ColumnarToRow (16)
+                                          :  +- CometProject (15)
+                                          :     +- CometFilter (14)
+                                          :        +- CometScan parquet spark_catalog.default.customer_address (13)
+                                          +- BroadcastExchange (34)
+                                             +- * ColumnarToRow (33)
+                                                +- CometProject (32)
+                                                   +- CometFilter (31)
+                                                      +- CometHashAggregate (30)
+                                                         +- CometColumnarExchange (29)
+                                                            +- RowToColumnar (28)
+                                                               +- * HashAggregate (27)
+                                                                  +- * Project (26)
+                                                                     +- * BroadcastHashJoin Inner BuildRight (25)
+                                                                        :- * ColumnarToRow (19)
+                                                                        :  +- CometFilter (18)
+                                                                        :     +- CometScan parquet spark_catalog.default.customer_address (17)
+                                                                        +- BroadcastExchange (24)
+                                                                           +- * ColumnarToRow (23)
+                                                                              +- CometProject (22)
+                                                                                 +- CometFilter (21)
+                                                                                    +- CometScan parquet spark_catalog.default.customer (20)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -59,7 +65,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 8]
 Input [3]: [ss_store_sk#1, ss_net_profit#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 48]
+(4) ReusedExchange [Reuses operator id: 54]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 8]
@@ -170,118 +176,130 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#15]
 Results [2]: [ca_zip#12, count#16]
 
-(28) Exchange
+(28) RowToColumnar
 Input [2]: [ca_zip#12, count#16]
-Arguments: hashpartitioning(ca_zip#12, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(29) HashAggregate [codegen id : 5]
+(29) CometColumnarExchange
+Input [2]: [ca_zip#12, count#16]
+Arguments: hashpartitioning(ca_zip#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
 Input [2]: [ca_zip#12, count#16]
 Keys [1]: [ca_zip#12]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#17]
-Results [2]: [substr(ca_zip#12, 1, 5) AS ca_zip#18, count(1)#17 AS cnt#19]
 
-(30) Filter [codegen id : 5]
-Input [2]: [ca_zip#18, cnt#19]
-Condition : (cnt#19 > 10)
+(31) CometFilter
+Input [2]: [ca_zip#17, cnt#18]
+Condition : (cnt#18 > 10)
+
+(32) CometProject
+Input [2]: [ca_zip#17, cnt#18]
+Arguments: [ca_zip#17], [ca_zip#17]
 
-(31) Project [codegen id : 5]
-Output [1]: [ca_zip#18]
-Input [2]: [ca_zip#18, cnt#19]
+(33) ColumnarToRow [codegen id : 5]
+Input [1]: [ca_zip#17]
 
-(32) BroadcastExchange
-Input [1]: [ca_zip#18]
+(34) BroadcastExchange
+Input [1]: [ca_zip#17]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true])),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 6]
+(35) BroadcastHashJoin [codegen id : 6]
 Left keys [2]: [coalesce(ca_zip#10, ), isnull(ca_zip#10)]
-Right keys [2]: [coalesce(ca_zip#18, ), isnull(ca_zip#18)]
+Right keys [2]: [coalesce(ca_zip#17, ), isnull(ca_zip#17)]
 Join type: LeftSemi
 Join condition: None
 
-(34) HashAggregate [codegen id : 6]
+(36) HashAggregate [codegen id : 6]
 Input [1]: [ca_zip#10]
 Keys [1]: [ca_zip#10]
 Functions: []
 Aggregate Attributes: []
 Results [1]: [ca_zip#10]
 
-(35) Exchange
+(37) RowToColumnar
 Input [1]: [ca_zip#10]
-Arguments: hashpartitioning(ca_zip#10, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(36) HashAggregate [codegen id : 7]
+(38) CometColumnarExchange
+Input [1]: [ca_zip#10]
+Arguments: hashpartitioning(ca_zip#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(39) CometHashAggregate
 Input [1]: [ca_zip#10]
 Keys [1]: [ca_zip#10]
 Functions: []
-Aggregate Attributes: []
-Results [1]: [ca_zip#10]
 
-(37) BroadcastExchange
+(40) ColumnarToRow [codegen id : 7]
+Input [1]: [ca_zip#10]
+
+(41) BroadcastExchange
 Input [1]: [ca_zip#10]
 Arguments: HashedRelationBroadcastMode(List(substr(input[0, string, true], 1, 2)),false), [plan_id=6]
 
-(38) BroadcastHashJoin [codegen id : 8]
+(42) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [substr(s_zip#8, 1, 2)]
 Right keys [1]: [substr(ca_zip#10, 1, 2)]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 8]
+(43) Project [codegen id : 8]
 Output [2]: [ss_net_profit#2, s_store_name#7]
 Input [4]: [ss_net_profit#2, s_store_name#7, s_zip#8, ca_zip#10]
 
-(40) HashAggregate [codegen id : 8]
+(44) HashAggregate [codegen id : 8]
 Input [2]: [ss_net_profit#2, s_store_name#7]
 Keys [1]: [s_store_name#7]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum#20]
-Results [2]: [s_store_name#7, sum#21]
+Aggregate Attributes [1]: [sum#19]
+Results [2]: [s_store_name#7, sum#20]
 
-(41) Exchange
-Input [2]: [s_store_name#7, sum#21]
-Arguments: hashpartitioning(s_store_name#7, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(45) RowToColumnar
+Input [2]: [s_store_name#7, sum#20]
 
-(42) HashAggregate [codegen id : 9]
-Input [2]: [s_store_name#7, sum#21]
+(46) CometColumnarExchange
+Input [2]: [s_store_name#7, sum#20]
+Arguments: hashpartitioning(s_store_name#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(47) CometHashAggregate
+Input [2]: [s_store_name#7, sum#20]
 Keys [1]: [s_store_name#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#22]
-Results [2]: [s_store_name#7, MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#22,17,2) AS sum(ss_net_profit)#23]
 
-(43) TakeOrderedAndProject
-Input [2]: [s_store_name#7, sum(ss_net_profit)#23]
-Arguments: 100, [s_store_name#7 ASC NULLS FIRST], [s_store_name#7, sum(ss_net_profit)#23]
+(48) CometTakeOrderedAndProject
+Input [2]: [s_store_name#7, sum(ss_net_profit)#21]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[s_store_name#7 ASC NULLS FIRST], output=[s_store_name#7,sum(ss_net_profit)#21]), 100, [s_store_name#7 ASC NULLS FIRST], [s_store_name#7, sum(ss_net_profit)#21]
+
+(49) ColumnarToRow [codegen id : 9]
+Input [2]: [s_store_name#7, sum(ss_net_profit)#21]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (54)
++- * ColumnarToRow (53)
+   +- CometProject (52)
+      +- CometFilter (51)
+         +- CometScan parquet spark_catalog.default.date_dim (50)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#5, d_year#24, d_qoy#25]
+Output [3]: [d_date_sk#5, d_year#22, d_qoy#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(45) CometFilter
-Input [3]: [d_date_sk#5, d_year#24, d_qoy#25]
-Condition : ((((isnotnull(d_qoy#25) AND isnotnull(d_year#24)) AND (d_qoy#25 = 2)) AND (d_year#24 = 1998)) AND isnotnull(d_date_sk#5))
+(51) CometFilter
+Input [3]: [d_date_sk#5, d_year#22, d_qoy#23]
+Condition : ((((isnotnull(d_qoy#23) AND isnotnull(d_year#22)) AND (d_qoy#23 = 2)) AND (d_year#22 = 1998)) AND isnotnull(d_date_sk#5))
 
-(46) CometProject
-Input [3]: [d_date_sk#5, d_year#24, d_qoy#25]
+(52) CometProject
+Input [3]: [d_date_sk#5, d_year#22, d_qoy#23]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(47) ColumnarToRow [codegen id : 1]
+(53) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(48) BroadcastExchange
+(54) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt
index 76fa276931..f4b5da283b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt
@@ -1,72 +1,78 @@
-TakeOrderedAndProject [s_store_name,sum(ss_net_profit)]
-  WholeStageCodegen (9)
-    HashAggregate [s_store_name,sum] [sum(UnscaledValue(ss_net_profit)),sum(ss_net_profit),sum]
-      InputAdapter
-        Exchange [s_store_name] #1
-          WholeStageCodegen (8)
-            HashAggregate [s_store_name,ss_net_profit] [sum,sum]
-              Project [ss_net_profit,s_store_name]
-                BroadcastHashJoin [s_zip,ca_zip]
-                  Project [ss_net_profit,s_store_name,s_zip]
-                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      Project [ss_store_sk,ss_net_profit]
-                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [ss_store_sk]
-                                CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                  SubqueryBroadcast [d_date_sk] #1
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [d_date_sk]
-                                              CometFilter [d_qoy,d_year,d_date_sk]
-                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+WholeStageCodegen (9)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [s_store_name,sum(ss_net_profit)]
+        CometHashAggregate [s_store_name,sum]
+          CometColumnarExchange [s_store_name] #1
+            RowToColumnar
+              WholeStageCodegen (8)
+                HashAggregate [s_store_name,ss_net_profit] [sum,sum]
+                  Project [ss_net_profit,s_store_name]
+                    BroadcastHashJoin [s_zip,ca_zip]
+                      Project [ss_net_profit,s_store_name,s_zip]
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_store_sk,ss_net_profit]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [ss_store_sk]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [d_date_sk]
+                                                  CometFilter [d_qoy,d_year,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                              InputAdapter
+                                ReusedExchange [d_date_sk] #2
                           InputAdapter
-                            ReusedExchange [d_date_sk] #2
+                            BroadcastExchange #3
+                              WholeStageCodegen (2)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [s_store_sk,s_zip]
+                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
                       InputAdapter
-                        BroadcastExchange #3
-                          WholeStageCodegen (2)
+                        BroadcastExchange #4
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [s_store_sk,s_zip]
-                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
-                  InputAdapter
-                    BroadcastExchange #4
-                      WholeStageCodegen (7)
-                        HashAggregate [ca_zip]
-                          InputAdapter
-                            Exchange [ca_zip] #5
-                              WholeStageCodegen (6)
-                                HashAggregate [ca_zip]
-                                  BroadcastHashJoin [ca_zip,ca_zip]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [ca_zip] [ca_zip]
-                                          CometFilter [ca_zip]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_zip]
-                                    InputAdapter
-                                      BroadcastExchange #6
-                                        WholeStageCodegen (5)
-                                          Project [ca_zip]
-                                            Filter [cnt]
-                                              HashAggregate [ca_zip,count] [count(1),ca_zip,cnt,count]
-                                                InputAdapter
-                                                  Exchange [ca_zip] #7
-                                                    WholeStageCodegen (4)
-                                                      HashAggregate [ca_zip] [count,count]
-                                                        Project [ca_zip]
-                                                          BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [ca_address_sk]
-                                                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
-                                                            InputAdapter
-                                                              BroadcastExchange #8
-                                                                WholeStageCodegen (3)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [c_current_addr_sk]
-                                                                        CometFilter [c_preferred_cust_flag,c_current_addr_sk]
-                                                                          CometScan parquet spark_catalog.default.customer [c_current_addr_sk,c_preferred_cust_flag]
+                                CometHashAggregate [ca_zip]
+                                  CometColumnarExchange [ca_zip] #5
+                                    RowToColumnar
+                                      WholeStageCodegen (6)
+                                        HashAggregate [ca_zip]
+                                          BroadcastHashJoin [ca_zip,ca_zip]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [ca_zip] [ca_zip]
+                                                  CometFilter [ca_zip]
+                                                    CometScan parquet spark_catalog.default.customer_address [ca_zip]
+                                            InputAdapter
+                                              BroadcastExchange #6
+                                                WholeStageCodegen (5)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [ca_zip]
+                                                        CometFilter [cnt]
+                                                          CometHashAggregate [ca_zip,count]
+                                                            CometColumnarExchange [ca_zip] #7
+                                                              RowToColumnar
+                                                                WholeStageCodegen (4)
+                                                                  HashAggregate [ca_zip] [count,count]
+                                                                    Project [ca_zip]
+                                                                      BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ca_address_sk]
+                                                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
+                                                                        InputAdapter
+                                                                          BroadcastExchange #8
+                                                                            WholeStageCodegen (3)
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometProject [c_current_addr_sk]
+                                                                                    CometFilter [c_preferred_cust_flag,c_current_addr_sk]
+                                                                                      CometScan parquet spark_catalog.default.customer [c_current_addr_sk,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt
index dfd123a1d9..e08d527aa0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt
@@ -1,108 +1,116 @@
 == Physical Plan ==
-TakeOrderedAndProject (104)
-+- * HashAggregate (103)
-   +- Exchange (102)
-      +- * HashAggregate (101)
-         +- * Expand (100)
-            +- Union (99)
-               :- * HashAggregate (38)
-               :  +- Exchange (37)
-               :     +- * HashAggregate (36)
-               :        +- * Project (35)
-               :           +- * BroadcastHashJoin Inner BuildRight (34)
-               :              :- * Project (28)
-               :              :  +- * BroadcastHashJoin Inner BuildRight (27)
-               :              :     :- * Project (21)
-               :              :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :              :     :     :- * Project (15)
-               :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :              :     :     :     :- * ColumnarToRow (12)
-               :              :     :     :     :  +- CometProject (11)
-               :              :     :     :     :     +- CometSortMergeJoin (10)
-               :              :     :     :     :        :- CometSort (4)
-               :              :     :     :     :        :  +- CometExchange (3)
-               :              :     :     :     :        :     +- CometFilter (2)
-               :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
-               :              :     :     :     :        +- CometSort (9)
-               :              :     :     :     :           +- CometExchange (8)
-               :              :     :     :     :              +- CometProject (7)
-               :              :     :     :     :                 +- CometFilter (6)
-               :              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-               :              :     :     :     +- ReusedExchange (13)
-               :              :     :     +- BroadcastExchange (19)
-               :              :     :        +- * ColumnarToRow (18)
-               :              :     :           +- CometFilter (17)
-               :              :     :              +- CometScan parquet spark_catalog.default.store (16)
-               :              :     +- BroadcastExchange (26)
-               :              :        +- * ColumnarToRow (25)
-               :              :           +- CometProject (24)
-               :              :              +- CometFilter (23)
-               :              :                 +- CometScan parquet spark_catalog.default.item (22)
-               :              +- BroadcastExchange (33)
-               :                 +- * ColumnarToRow (32)
-               :                    +- CometProject (31)
-               :                       +- CometFilter (30)
-               :                          +- CometScan parquet spark_catalog.default.promotion (29)
-               :- * HashAggregate (68)
-               :  +- Exchange (67)
-               :     +- * HashAggregate (66)
-               :        +- * Project (65)
-               :           +- * BroadcastHashJoin Inner BuildRight (64)
-               :              :- * Project (62)
-               :              :  +- * BroadcastHashJoin Inner BuildRight (61)
-               :              :     :- * Project (59)
-               :              :     :  +- * BroadcastHashJoin Inner BuildRight (58)
-               :              :     :     :- * Project (53)
-               :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (52)
-               :              :     :     :     :- * ColumnarToRow (50)
-               :              :     :     :     :  +- CometProject (49)
-               :              :     :     :     :     +- CometSortMergeJoin (48)
-               :              :     :     :     :        :- CometSort (42)
-               :              :     :     :     :        :  +- CometExchange (41)
-               :              :     :     :     :        :     +- CometFilter (40)
-               :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (39)
-               :              :     :     :     :        +- CometSort (47)
-               :              :     :     :     :           +- CometExchange (46)
-               :              :     :     :     :              +- CometProject (45)
-               :              :     :     :     :                 +- CometFilter (44)
-               :              :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (43)
-               :              :     :     :     +- ReusedExchange (51)
-               :              :     :     +- BroadcastExchange (57)
-               :              :     :        +- * ColumnarToRow (56)
-               :              :     :           +- CometFilter (55)
-               :              :     :              +- CometScan parquet spark_catalog.default.catalog_page (54)
-               :              :     +- ReusedExchange (60)
-               :              +- ReusedExchange (63)
-               +- * HashAggregate (98)
-                  +- Exchange (97)
-                     +- * HashAggregate (96)
-                        +- * Project (95)
-                           +- * BroadcastHashJoin Inner BuildRight (94)
-                              :- * Project (92)
-                              :  +- * BroadcastHashJoin Inner BuildRight (91)
-                              :     :- * Project (89)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (88)
-                              :     :     :- * Project (83)
-                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (82)
-                              :     :     :     :- * ColumnarToRow (80)
-                              :     :     :     :  +- CometProject (79)
-                              :     :     :     :     +- CometSortMergeJoin (78)
-                              :     :     :     :        :- CometSort (72)
-                              :     :     :     :        :  +- CometExchange (71)
-                              :     :     :     :        :     +- CometFilter (70)
-                              :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (69)
-                              :     :     :     :        +- CometSort (77)
-                              :     :     :     :           +- CometExchange (76)
-                              :     :     :     :              +- CometProject (75)
-                              :     :     :     :                 +- CometFilter (74)
-                              :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (73)
-                              :     :     :     +- ReusedExchange (81)
-                              :     :     +- BroadcastExchange (87)
-                              :     :        +- * ColumnarToRow (86)
-                              :     :           +- CometFilter (85)
-                              :     :              +- CometScan parquet spark_catalog.default.web_site (84)
-                              :     +- ReusedExchange (90)
-                              +- ReusedExchange (93)
+* ColumnarToRow (112)
++- CometTakeOrderedAndProject (111)
+   +- CometHashAggregate (110)
+      +- CometColumnarExchange (109)
+         +- RowToColumnar (108)
+            +- * HashAggregate (107)
+               +- * Expand (106)
+                  +- Union (105)
+                     :- * HashAggregate (40)
+                     :  +- * ColumnarToRow (39)
+                     :     +- CometColumnarExchange (38)
+                     :        +- RowToColumnar (37)
+                     :           +- * HashAggregate (36)
+                     :              +- * Project (35)
+                     :                 +- * BroadcastHashJoin Inner BuildRight (34)
+                     :                    :- * Project (28)
+                     :                    :  +- * BroadcastHashJoin Inner BuildRight (27)
+                     :                    :     :- * Project (21)
+                     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :                    :     :     :- * Project (15)
+                     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :                    :     :     :     :- * ColumnarToRow (12)
+                     :                    :     :     :     :  +- CometProject (11)
+                     :                    :     :     :     :     +- CometSortMergeJoin (10)
+                     :                    :     :     :     :        :- CometSort (4)
+                     :                    :     :     :     :        :  +- CometColumnarExchange (3)
+                     :                    :     :     :     :        :     +- CometFilter (2)
+                     :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :                    :     :     :     :        +- CometSort (9)
+                     :                    :     :     :     :           +- CometColumnarExchange (8)
+                     :                    :     :     :     :              +- CometProject (7)
+                     :                    :     :     :     :                 +- CometFilter (6)
+                     :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+                     :                    :     :     :     +- ReusedExchange (13)
+                     :                    :     :     +- BroadcastExchange (19)
+                     :                    :     :        +- * ColumnarToRow (18)
+                     :                    :     :           +- CometFilter (17)
+                     :                    :     :              +- CometScan parquet spark_catalog.default.store (16)
+                     :                    :     +- BroadcastExchange (26)
+                     :                    :        +- * ColumnarToRow (25)
+                     :                    :           +- CometProject (24)
+                     :                    :              +- CometFilter (23)
+                     :                    :                 +- CometScan parquet spark_catalog.default.item (22)
+                     :                    +- BroadcastExchange (33)
+                     :                       +- * ColumnarToRow (32)
+                     :                          +- CometProject (31)
+                     :                             +- CometFilter (30)
+                     :                                +- CometScan parquet spark_catalog.default.promotion (29)
+                     :- * HashAggregate (72)
+                     :  +- * ColumnarToRow (71)
+                     :     +- CometColumnarExchange (70)
+                     :        +- RowToColumnar (69)
+                     :           +- * HashAggregate (68)
+                     :              +- * Project (67)
+                     :                 +- * BroadcastHashJoin Inner BuildRight (66)
+                     :                    :- * Project (64)
+                     :                    :  +- * BroadcastHashJoin Inner BuildRight (63)
+                     :                    :     :- * Project (61)
+                     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (60)
+                     :                    :     :     :- * Project (55)
+                     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+                     :                    :     :     :     :- * ColumnarToRow (52)
+                     :                    :     :     :     :  +- CometProject (51)
+                     :                    :     :     :     :     +- CometSortMergeJoin (50)
+                     :                    :     :     :     :        :- CometSort (44)
+                     :                    :     :     :     :        :  +- CometColumnarExchange (43)
+                     :                    :     :     :     :        :     +- CometFilter (42)
+                     :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (41)
+                     :                    :     :     :     :        +- CometSort (49)
+                     :                    :     :     :     :           +- CometColumnarExchange (48)
+                     :                    :     :     :     :              +- CometProject (47)
+                     :                    :     :     :     :                 +- CometFilter (46)
+                     :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (45)
+                     :                    :     :     :     +- ReusedExchange (53)
+                     :                    :     :     +- BroadcastExchange (59)
+                     :                    :     :        +- * ColumnarToRow (58)
+                     :                    :     :           +- CometFilter (57)
+                     :                    :     :              +- CometScan parquet spark_catalog.default.catalog_page (56)
+                     :                    :     +- ReusedExchange (62)
+                     :                    +- ReusedExchange (65)
+                     +- * HashAggregate (104)
+                        +- * ColumnarToRow (103)
+                           +- CometColumnarExchange (102)
+                              +- RowToColumnar (101)
+                                 +- * HashAggregate (100)
+                                    +- * Project (99)
+                                       +- * BroadcastHashJoin Inner BuildRight (98)
+                                          :- * Project (96)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (95)
+                                          :     :- * Project (93)
+                                          :     :  +- * BroadcastHashJoin Inner BuildRight (92)
+                                          :     :     :- * Project (87)
+                                          :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
+                                          :     :     :     :- * ColumnarToRow (84)
+                                          :     :     :     :  +- CometProject (83)
+                                          :     :     :     :     +- CometSortMergeJoin (82)
+                                          :     :     :     :        :- CometSort (76)
+                                          :     :     :     :        :  +- CometColumnarExchange (75)
+                                          :     :     :     :        :     +- CometFilter (74)
+                                          :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (73)
+                                          :     :     :     :        +- CometSort (81)
+                                          :     :     :     :           +- CometColumnarExchange (80)
+                                          :     :     :     :              +- CometProject (79)
+                                          :     :     :     :                 +- CometFilter (78)
+                                          :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (77)
+                                          :     :     :     +- ReusedExchange (85)
+                                          :     :     +- BroadcastExchange (91)
+                                          :     :        +- * ColumnarToRow (90)
+                                          :     :           +- CometFilter (89)
+                                          :     :              +- CometScan parquet spark_catalog.default.web_site (88)
+                                          :     +- ReusedExchange (94)
+                                          +- ReusedExchange (97)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -117,9 +125,9 @@ ReadSchema: struct<ss_item_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_numb
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
 Condition : ((isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1)) AND isnotnull(ss_promo_sk#3))
 
-(3) CometExchange
+(3) CometColumnarExchange
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
@@ -140,9 +148,9 @@ Condition : (isnotnull(sr_item_sk#9) AND isnotnull(sr_ticket_number#10))
 Input [5]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12, sr_returned_date_sk#13]
 Arguments: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12], [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
-Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
@@ -160,7 +168,7 @@ Arguments: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss
 (12) ColumnarToRow [codegen id : 5]
 Input [8]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7, sr_return_amt#11, sr_net_loss#12]
 
-(13) ReusedExchange [Reuses operator id: 109]
+(13) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#14]
 
 (14) BroadcastHashJoin [codegen id : 5]
@@ -272,11 +280,17 @@ Functions [3]: [partial_sum(UnscaledValue(ss_ext_sales_price#5)), partial_sum(co
 Aggregate Attributes [5]: [sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Results [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 
-(37) Exchange
+(37) RowToColumnar
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
-Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(38) HashAggregate [codegen id : 6]
+(38) CometColumnarExchange
+Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
+Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(39) ColumnarToRow [codegen id : 6]
+Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
+
+(40) HashAggregate [codegen id : 6]
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 Keys [1]: [s_store_id#16]
 Functions [3]: [sum(UnscaledValue(ss_ext_sales_price#5)), sum(coalesce(cast(sr_return_amt#11 as decimal(12,2)), 0.00)), sum((ss_net_profit#6 - coalesce(cast(sr_net_loss#12 as decimal(12,2)), 0.00)))]
@@ -291,15 +305,15 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk), IsNotNull(cs_item_sk), IsNotNull(cs_promo_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_item_sk:int,cs_promo_sk:int,cs_order_number:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(40) CometFilter
+(42) CometFilter
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : ((isnotnull(cs_catalog_page_sk#39) AND isnotnull(cs_item_sk#40)) AND isnotnull(cs_promo_sk#41))
 
-(41) CometExchange
+(43) CometColumnarExchange
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
-Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(42) CometSort
+(44) CometSort
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45], [cs_item_sk#40 ASC NULLS FIRST, cs_order_number#42 ASC NULLS FIRST]
 
@@ -310,44 +324,44 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(44) CometFilter
+(46) CometFilter
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Condition : (isnotnull(cr_item_sk#47) AND isnotnull(cr_order_number#48))
 
-(45) CometProject
+(47) CometProject
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 
-(46) CometExchange
+(48) CometColumnarExchange
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
-Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
+Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(47) CometSort
+(49) CometSort
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47 ASC NULLS FIRST, cr_order_number#48 ASC NULLS FIRST]
 
-(48) CometSortMergeJoin
+(50) CometSortMergeJoin
 Left output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Right output [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_item_sk#40, cs_order_number#42], [cr_item_sk#47, cr_order_number#48], LeftOuter
 
-(49) CometProject
+(51) CometProject
 Input [11]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50], [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(50) ColumnarToRow [codegen id : 11]
+(52) ColumnarToRow [codegen id : 11]
 Input [8]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(51) ReusedExchange [Reuses operator id: 109]
+(53) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#52]
 
-(52) BroadcastHashJoin [codegen id : 11]
+(54) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_sold_date_sk#45]
 Right keys [1]: [d_date_sk#52]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 11]
+(55) Project [codegen id : 11]
 Output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50, d_date_sk#52]
 
@@ -358,65 +372,71 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(55) CometFilter
+(57) CometFilter
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Condition : isnotnull(cp_catalog_page_sk#53)
 
-(56) ColumnarToRow [codegen id : 8]
+(58) ColumnarToRow [codegen id : 8]
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(57) BroadcastExchange
+(59) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(58) BroadcastHashJoin [codegen id : 11]
+(60) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_catalog_page_sk#39]
 Right keys [1]: [cp_catalog_page_sk#53]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 11]
+(61) Project [codegen id : 11]
 Output [7]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(60) ReusedExchange [Reuses operator id: 26]
+(62) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#55]
 
-(61) BroadcastHashJoin [codegen id : 11]
+(63) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_item_sk#40]
 Right keys [1]: [i_item_sk#55]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 11]
+(64) Project [codegen id : 11]
 Output [6]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [8]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, i_item_sk#55]
 
-(63) ReusedExchange [Reuses operator id: 33]
+(65) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#56]
 
-(64) BroadcastHashJoin [codegen id : 11]
+(66) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_promo_sk#41]
 Right keys [1]: [p_promo_sk#56]
 Join type: Inner
 Join condition: None
 
-(65) Project [codegen id : 11]
+(67) Project [codegen id : 11]
 Output [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [7]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, p_promo_sk#56]
 
-(66) HashAggregate [codegen id : 11]
+(68) HashAggregate [codegen id : 11]
 Input [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [partial_sum(UnscaledValue(cs_ext_sales_price#43)), partial_sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), partial_sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#57, sum#58, isEmpty#59, sum#60, isEmpty#61]
 Results [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 
-(67) Exchange
+(69) RowToColumnar
+Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
+
+(70) CometColumnarExchange
+Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
+Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(71) ColumnarToRow [codegen id : 12]
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
-Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(68) HashAggregate [codegen id : 12]
+(72) HashAggregate [codegen id : 12]
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [sum(UnscaledValue(cs_ext_sales_price#43)), sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
@@ -431,15 +451,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#81), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk), IsNotNull(ws_item_sk), IsNotNull(ws_promo_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_promo_sk:int,ws_order_number:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(70) CometFilter
+(74) CometFilter
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Condition : ((isnotnull(ws_web_site_sk#76) AND isnotnull(ws_item_sk#75)) AND isnotnull(ws_promo_sk#77))
 
-(71) CometExchange
+(75) CometColumnarExchange
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
-Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=11]
+Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(72) CometSort
+(76) CometSort
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81], [ws_item_sk#75 ASC NULLS FIRST, ws_order_number#78 ASC NULLS FIRST]
 
@@ -450,44 +470,44 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_item_sk), IsNotNull(wr_order_number)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(74) CometFilter
+(78) CometFilter
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Condition : (isnotnull(wr_item_sk#83) AND isnotnull(wr_order_number#84))
 
-(75) CometProject
+(79) CometProject
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 
-(76) CometExchange
+(80) CometColumnarExchange
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
-Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
+Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(77) CometSort
+(81) CometSort
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83 ASC NULLS FIRST, wr_order_number#84 ASC NULLS FIRST]
 
-(78) CometSortMergeJoin
+(82) CometSortMergeJoin
 Left output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Right output [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_order_number#78], [wr_item_sk#83, wr_order_number#84], LeftOuter
 
-(79) CometProject
+(83) CometProject
 Input [11]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86], [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(80) ColumnarToRow [codegen id : 17]
+(84) ColumnarToRow [codegen id : 17]
 Input [8]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(81) ReusedExchange [Reuses operator id: 109]
+(85) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#88]
 
-(82) BroadcastHashJoin [codegen id : 17]
+(86) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_sold_date_sk#81]
 Right keys [1]: [d_date_sk#88]
 Join type: Inner
 Join condition: None
 
-(83) Project [codegen id : 17]
+(87) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86, d_date_sk#88]
 
@@ -498,133 +518,143 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(85) CometFilter
+(89) CometFilter
 Input [2]: [web_site_sk#89, web_site_id#90]
 Condition : isnotnull(web_site_sk#89)
 
-(86) ColumnarToRow [codegen id : 14]
+(90) ColumnarToRow [codegen id : 14]
 Input [2]: [web_site_sk#89, web_site_id#90]
 
-(87) BroadcastExchange
+(91) BroadcastExchange
 Input [2]: [web_site_sk#89, web_site_id#90]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(88) BroadcastHashJoin [codegen id : 17]
+(92) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_web_site_sk#76]
 Right keys [1]: [web_site_sk#89]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 17]
+(93) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_sk#89, web_site_id#90]
 
-(90) ReusedExchange [Reuses operator id: 26]
+(94) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#91]
 
-(91) BroadcastHashJoin [codegen id : 17]
+(95) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_item_sk#75]
 Right keys [1]: [i_item_sk#91]
 Join type: Inner
 Join condition: None
 
-(92) Project [codegen id : 17]
+(96) Project [codegen id : 17]
 Output [6]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [8]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, i_item_sk#91]
 
-(93) ReusedExchange [Reuses operator id: 33]
+(97) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#92]
 
-(94) BroadcastHashJoin [codegen id : 17]
+(98) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_promo_sk#77]
 Right keys [1]: [p_promo_sk#92]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 17]
+(99) Project [codegen id : 17]
 Output [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [7]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, p_promo_sk#92]
 
-(96) HashAggregate [codegen id : 17]
+(100) HashAggregate [codegen id : 17]
 Input [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Keys [1]: [web_site_id#90]
 Functions [3]: [partial_sum(UnscaledValue(ws_ext_sales_price#79)), partial_sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), partial_sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#93, sum#94, isEmpty#95, sum#96, isEmpty#97]
 Results [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 
-(97) Exchange
+(101) RowToColumnar
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
-Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, [plan_id=14]
 
-(98) HashAggregate [codegen id : 18]
+(102) CometColumnarExchange
+Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
+Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+
+(103) ColumnarToRow [codegen id : 18]
+Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
+
+(104) HashAggregate [codegen id : 18]
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 Keys [1]: [web_site_id#90]
 Functions [3]: [sum(UnscaledValue(ws_ext_sales_price#79)), sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_sales_price#79))#103, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105]
 Results [5]: [MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#79))#103,17,2) AS sales#106, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104 AS returns#107, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105 AS profit#108, web channel AS channel#109, concat(web_site, web_site_id#90) AS id#110]
 
-(99) Union
+(105) Union
 
-(100) Expand [codegen id : 19]
+(106) Expand [codegen id : 19]
 Input [5]: [sales#34, returns#35, profit#36, channel#37, id#38]
 Arguments: [[sales#34, returns#35, profit#36, channel#37, id#38, 0], [sales#34, returns#35, profit#36, channel#37, null, 1], [sales#34, returns#35, profit#36, null, null, 3]], [sales#34, returns#35, profit#36, channel#111, id#112, spark_grouping_id#113]
 
-(101) HashAggregate [codegen id : 19]
+(107) HashAggregate [codegen id : 19]
 Input [6]: [sales#34, returns#35, profit#36, channel#111, id#112, spark_grouping_id#113]
 Keys [3]: [channel#111, id#112, spark_grouping_id#113]
 Functions [3]: [partial_sum(sales#34), partial_sum(returns#35), partial_sum(profit#36)]
 Aggregate Attributes [6]: [sum#114, isEmpty#115, sum#116, isEmpty#117, sum#118, isEmpty#119]
 Results [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
 
-(102) Exchange
+(108) RowToColumnar
+Input [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
+
+(109) CometColumnarExchange
 Input [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
-Arguments: hashpartitioning(channel#111, id#112, spark_grouping_id#113, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+Arguments: hashpartitioning(channel#111, id#112, spark_grouping_id#113, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(103) HashAggregate [codegen id : 20]
+(110) CometHashAggregate
 Input [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
 Keys [3]: [channel#111, id#112, spark_grouping_id#113]
 Functions [3]: [sum(sales#34), sum(returns#35), sum(profit#36)]
-Aggregate Attributes [3]: [sum(sales#34)#126, sum(returns#35)#127, sum(profit#36)#128]
-Results [5]: [channel#111, id#112, sum(sales#34)#126 AS sales#129, sum(returns#35)#127 AS returns#130, sum(profit#36)#128 AS profit#131]
 
-(104) TakeOrderedAndProject
-Input [5]: [channel#111, id#112, sales#129, returns#130, profit#131]
-Arguments: 100, [channel#111 ASC NULLS FIRST, id#112 ASC NULLS FIRST], [channel#111, id#112, sales#129, returns#130, profit#131]
+(111) CometTakeOrderedAndProject
+Input [5]: [channel#111, id#112, sales#126, returns#127, profit#128]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#111 ASC NULLS FIRST,id#112 ASC NULLS FIRST], output=[channel#111,id#112,sales#126,returns#127,profit#128]), 100, [channel#111 ASC NULLS FIRST, id#112 ASC NULLS FIRST], [channel#111, id#112, sales#126, returns#127, profit#128]
+
+(112) ColumnarToRow [codegen id : 20]
+Input [5]: [channel#111, id#112, sales#126, returns#127, profit#128]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (109)
-+- * ColumnarToRow (108)
-   +- CometProject (107)
-      +- CometFilter (106)
-         +- CometScan parquet spark_catalog.default.date_dim (105)
+BroadcastExchange (117)
++- * ColumnarToRow (116)
+   +- CometProject (115)
+      +- CometFilter (114)
+         +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_date#132]
+Output [2]: [d_date_sk#14, d_date#129]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), LessThanOrEqual(d_date,2000-09-22), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(106) CometFilter
-Input [2]: [d_date_sk#14, d_date#132]
-Condition : (((isnotnull(d_date#132) AND (d_date#132 >= 2000-08-23)) AND (d_date#132 <= 2000-09-22)) AND isnotnull(d_date_sk#14))
+(114) CometFilter
+Input [2]: [d_date_sk#14, d_date#129]
+Condition : (((isnotnull(d_date#129) AND (d_date#129 >= 2000-08-23)) AND (d_date#129 <= 2000-09-22)) AND isnotnull(d_date_sk#14))
 
-(107) CometProject
-Input [2]: [d_date_sk#14, d_date#132]
+(115) CometProject
+Input [2]: [d_date_sk#14, d_date#129]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(108) ColumnarToRow [codegen id : 1]
+(116) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(109) BroadcastExchange
+(117) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=16]
 
-Subquery:2 Hosting operator id = 39 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 41 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 69 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 73 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt
index 8fc66cbe4d..f28c862efd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt
@@ -1,152 +1,160 @@
-TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (20)
-    HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-      InputAdapter
-        Exchange [channel,id,spark_grouping_id] #1
-          WholeStageCodegen (19)
-            HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-              Expand [sales,returns,profit,channel,id]
-                InputAdapter
-                  Union
-                    WholeStageCodegen (6)
-                      HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
-                        InputAdapter
-                          Exchange [s_store_id] #2
-                            WholeStageCodegen (5)
-                              HashAggregate [s_store_id,ss_ext_sales_price,sr_return_amt,ss_net_profit,sr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
-                                Project [ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
-                                  BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                    Project [ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
-                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                        Project [ss_item_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
-                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                            Project [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss]
-                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk,sr_return_amt,sr_net_loss]
-                                                      CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                                                        CometSort [ss_item_sk,ss_ticket_number]
-                                                          CometExchange [ss_item_sk,ss_ticket_number] #3
-                                                            CometFilter [ss_store_sk,ss_item_sk,ss_promo_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                  BroadcastExchange #4
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [d_date_sk]
-                                                                            CometFilter [d_date,d_date_sk]
-                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                        CometSort [sr_item_sk,sr_ticket_number]
-                                                          CometExchange [sr_item_sk,sr_ticket_number] #5
-                                                            CometProject [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss]
-                                                              CometFilter [sr_item_sk,sr_ticket_number]
-                                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss,sr_returned_date_sk]
+WholeStageCodegen (20)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
+        CometHashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+          CometColumnarExchange [channel,id,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (19)
+                HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  Expand [sales,returns,profit,channel,id]
+                    InputAdapter
+                      Union
+                        WholeStageCodegen (6)
+                          HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [s_store_id] #2
+                                  RowToColumnar
+                                    WholeStageCodegen (5)
+                                      HashAggregate [s_store_id,ss_ext_sales_price,sr_return_amt,ss_net_profit,sr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
+                                        Project [ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
+                                          BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                            Project [ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
+                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                Project [ss_item_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
+                                                  BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                    Project [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss]
+                                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk,sr_return_amt,sr_net_loss]
+                                                              CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                CometSort [ss_item_sk,ss_ticket_number]
+                                                                  CometColumnarExchange [ss_item_sk,ss_ticket_number] #3
+                                                                    CometFilter [ss_store_sk,ss_item_sk,ss_promo_sk]
+                                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                                        SubqueryBroadcast [d_date_sk] #1
+                                                                          BroadcastExchange #4
+                                                                            WholeStageCodegen (1)
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometProject [d_date_sk]
+                                                                                    CometFilter [d_date,d_date_sk]
+                                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                                CometSort [sr_item_sk,sr_ticket_number]
+                                                                  CometColumnarExchange [sr_item_sk,sr_ticket_number] #5
+                                                                    CometProject [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss]
+                                                                      CometFilter [sr_item_sk,sr_ticket_number]
+                                                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss,sr_returned_date_sk]
+                                                        InputAdapter
+                                                          ReusedExchange [d_date_sk] #4
+                                                    InputAdapter
+                                                      BroadcastExchange #6
+                                                        WholeStageCodegen (2)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [s_store_sk]
+                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
                                                 InputAdapter
-                                                  ReusedExchange [d_date_sk] #4
+                                                  BroadcastExchange #7
+                                                    WholeStageCodegen (3)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [i_item_sk]
+                                                            CometFilter [i_current_price,i_item_sk]
+                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price]
                                             InputAdapter
-                                              BroadcastExchange #6
-                                                WholeStageCodegen (2)
+                                              BroadcastExchange #8
+                                                WholeStageCodegen (4)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
-                                        InputAdapter
-                                          BroadcastExchange #7
-                                            WholeStageCodegen (3)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [i_item_sk]
-                                                    CometFilter [i_current_price,i_item_sk]
-                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price]
-                                    InputAdapter
-                                      BroadcastExchange #8
-                                        WholeStageCodegen (4)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [p_promo_sk]
-                                                CometFilter [p_channel_tv,p_promo_sk]
-                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_tv]
-                    WholeStageCodegen (12)
-                      HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
-                        InputAdapter
-                          Exchange [cp_catalog_page_id] #9
-                            WholeStageCodegen (11)
-                              HashAggregate [cp_catalog_page_id,cs_ext_sales_price,cr_return_amount,cs_net_profit,cr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
-                                Project [cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
-                                  BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                                    Project [cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
-                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                        Project [cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
-                                          BroadcastHashJoin [cs_catalog_page_sk,cp_catalog_page_sk]
-                                            Project [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss]
-                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk,cr_return_amount,cr_net_loss]
-                                                      CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                                                        CometSort [cs_item_sk,cs_order_number]
-                                                          CometExchange [cs_item_sk,cs_order_number] #10
-                                                            CometFilter [cs_catalog_page_sk,cs_item_sk,cs_promo_sk]
-                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                        CometSort [cr_item_sk,cr_order_number]
-                                                          CometExchange [cr_item_sk,cr_order_number] #11
-                                                            CometProject [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss]
-                                                              CometFilter [cr_item_sk,cr_order_number]
-                                                                CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss,cr_returned_date_sk]
+                                                      CometProject [p_promo_sk]
+                                                        CometFilter [p_channel_tv,p_promo_sk]
+                                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_tv]
+                        WholeStageCodegen (12)
+                          HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [cp_catalog_page_id] #9
+                                  RowToColumnar
+                                    WholeStageCodegen (11)
+                                      HashAggregate [cp_catalog_page_id,cs_ext_sales_price,cr_return_amount,cs_net_profit,cr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
+                                        Project [cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
+                                          BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                                            Project [cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
+                                              BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                Project [cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
+                                                  BroadcastHashJoin [cs_catalog_page_sk,cp_catalog_page_sk]
+                                                    Project [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss]
+                                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk,cr_return_amount,cr_net_loss]
+                                                              CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                                                                CometSort [cs_item_sk,cs_order_number]
+                                                                  CometColumnarExchange [cs_item_sk,cs_order_number] #10
+                                                                    CometFilter [cs_catalog_page_sk,cs_item_sk,cs_promo_sk]
+                                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
+                                                                        ReusedSubquery [d_date_sk] #1
+                                                                CometSort [cr_item_sk,cr_order_number]
+                                                                  CometColumnarExchange [cr_item_sk,cr_order_number] #11
+                                                                    CometProject [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss]
+                                                                      CometFilter [cr_item_sk,cr_order_number]
+                                                                        CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss,cr_returned_date_sk]
+                                                        InputAdapter
+                                                          ReusedExchange [d_date_sk] #4
+                                                    InputAdapter
+                                                      BroadcastExchange #12
+                                                        WholeStageCodegen (8)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [cp_catalog_page_sk]
+                                                                CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
                                                 InputAdapter
-                                                  ReusedExchange [d_date_sk] #4
+                                                  ReusedExchange [i_item_sk] #7
                                             InputAdapter
-                                              BroadcastExchange #12
-                                                WholeStageCodegen (8)
-                                                  ColumnarToRow
+                                              ReusedExchange [p_promo_sk] #8
+                        WholeStageCodegen (18)
+                          HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
+                            ColumnarToRow
+                              InputAdapter
+                                CometColumnarExchange [web_site_id] #13
+                                  RowToColumnar
+                                    WholeStageCodegen (17)
+                                      HashAggregate [web_site_id,ws_ext_sales_price,wr_return_amt,ws_net_profit,wr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
+                                        Project [ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
+                                          BroadcastHashJoin [ws_promo_sk,p_promo_sk]
+                                            Project [ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
+                                              BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                Project [ws_item_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
+                                                  BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                                                    Project [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss]
+                                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk,wr_return_amt,wr_net_loss]
+                                                              CometSortMergeJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
+                                                                CometSort [ws_item_sk,ws_order_number]
+                                                                  CometColumnarExchange [ws_item_sk,ws_order_number] #14
+                                                                    CometFilter [ws_web_site_sk,ws_item_sk,ws_promo_sk]
+                                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_order_number,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                                        ReusedSubquery [d_date_sk] #1
+                                                                CometSort [wr_item_sk,wr_order_number]
+                                                                  CometColumnarExchange [wr_item_sk,wr_order_number] #15
+                                                                    CometProject [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss]
+                                                                      CometFilter [wr_item_sk,wr_order_number]
+                                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                        InputAdapter
+                                                          ReusedExchange [d_date_sk] #4
                                                     InputAdapter
-                                                      CometFilter [cp_catalog_page_sk]
-                                                        CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
-                                        InputAdapter
-                                          ReusedExchange [i_item_sk] #7
-                                    InputAdapter
-                                      ReusedExchange [p_promo_sk] #8
-                    WholeStageCodegen (18)
-                      HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
-                        InputAdapter
-                          Exchange [web_site_id] #13
-                            WholeStageCodegen (17)
-                              HashAggregate [web_site_id,ws_ext_sales_price,wr_return_amt,ws_net_profit,wr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
-                                Project [ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
-                                  BroadcastHashJoin [ws_promo_sk,p_promo_sk]
-                                    Project [ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
-                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                        Project [ws_item_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
-                                          BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                                            Project [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss]
-                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk,wr_return_amt,wr_net_loss]
-                                                      CometSortMergeJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
-                                                        CometSort [ws_item_sk,ws_order_number]
-                                                          CometExchange [ws_item_sk,ws_order_number] #14
-                                                            CometFilter [ws_web_site_sk,ws_item_sk,ws_promo_sk]
-                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_order_number,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                        CometSort [wr_item_sk,wr_order_number]
-                                                          CometExchange [wr_item_sk,wr_order_number] #15
-                                                            CometProject [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss]
-                                                              CometFilter [wr_item_sk,wr_order_number]
-                                                                CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                      BroadcastExchange #16
+                                                        WholeStageCodegen (14)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [web_site_sk]
+                                                                CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
                                                 InputAdapter
-                                                  ReusedExchange [d_date_sk] #4
+                                                  ReusedExchange [i_item_sk] #7
                                             InputAdapter
-                                              BroadcastExchange #16
-                                                WholeStageCodegen (14)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [web_site_sk]
-                                                        CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
-                                        InputAdapter
-                                          ReusedExchange [i_item_sk] #7
-                                    InputAdapter
-                                      ReusedExchange [p_promo_sk] #8
+                                              ReusedExchange [p_promo_sk] #8
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt
index d8dc396dd7..c31369315e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt
@@ -1,52 +1,56 @@
 == Physical Plan ==
-TakeOrderedAndProject (48)
-+- * Project (47)
-   +- * BroadcastHashJoin Inner BuildRight (46)
-      :- * Project (41)
-      :  +- * BroadcastHashJoin Inner BuildRight (40)
-      :     :- * Project (35)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-      :     :     :- * Filter (16)
-      :     :     :  +- * HashAggregate (15)
-      :     :     :     +- Exchange (14)
-      :     :     :        +- * HashAggregate (13)
-      :     :     :           +- * Project (12)
-      :     :     :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :                 :- * Project (6)
-      :     :     :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :     :                 :     :- * ColumnarToRow (3)
-      :     :     :                 :     :  +- CometFilter (2)
-      :     :     :                 :     :     +- CometScan parquet spark_catalog.default.catalog_returns (1)
-      :     :     :                 :     +- ReusedExchange (4)
-      :     :     :                 +- BroadcastExchange (10)
-      :     :     :                    +- * ColumnarToRow (9)
-      :     :     :                       +- CometFilter (8)
-      :     :     :                          +- CometScan parquet spark_catalog.default.customer_address (7)
-      :     :     +- BroadcastExchange (33)
-      :     :        +- * Filter (32)
-      :     :           +- * HashAggregate (31)
-      :     :              +- Exchange (30)
-      :     :                 +- * HashAggregate (29)
-      :     :                    +- * HashAggregate (28)
-      :     :                       +- Exchange (27)
-      :     :                          +- * HashAggregate (26)
-      :     :                             +- * Project (25)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :                                   :- * Project (22)
-      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (21)
-      :     :                                   :     :- * ColumnarToRow (19)
-      :     :                                   :     :  +- CometFilter (18)
-      :     :                                   :     :     +- CometScan parquet spark_catalog.default.catalog_returns (17)
-      :     :                                   :     +- ReusedExchange (20)
-      :     :                                   +- ReusedExchange (23)
-      :     +- BroadcastExchange (39)
-      :        +- * ColumnarToRow (38)
-      :           +- CometFilter (37)
-      :              +- CometScan parquet spark_catalog.default.customer (36)
-      +- BroadcastExchange (45)
-         +- * ColumnarToRow (44)
-            +- CometFilter (43)
-               +- CometScan parquet spark_catalog.default.customer_address (42)
+TakeOrderedAndProject (52)
++- * Project (51)
+   +- * BroadcastHashJoin Inner BuildRight (50)
+      :- * Project (45)
+      :  +- * BroadcastHashJoin Inner BuildRight (44)
+      :     :- * Project (39)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (38)
+      :     :     :- * ColumnarToRow (18)
+      :     :     :  +- CometFilter (17)
+      :     :     :     +- CometHashAggregate (16)
+      :     :     :        +- CometColumnarExchange (15)
+      :     :     :           +- RowToColumnar (14)
+      :     :     :              +- * HashAggregate (13)
+      :     :     :                 +- * Project (12)
+      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :                       :- * Project (6)
+      :     :     :                       :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :     :                       :     :- * ColumnarToRow (3)
+      :     :     :                       :     :  +- CometFilter (2)
+      :     :     :                       :     :     +- CometScan parquet spark_catalog.default.catalog_returns (1)
+      :     :     :                       :     +- ReusedExchange (4)
+      :     :     :                       +- BroadcastExchange (10)
+      :     :     :                          +- * ColumnarToRow (9)
+      :     :     :                             +- CometFilter (8)
+      :     :     :                                +- CometScan parquet spark_catalog.default.customer_address (7)
+      :     :     +- BroadcastExchange (37)
+      :     :        +- * ColumnarToRow (36)
+      :     :           +- CometFilter (35)
+      :     :              +- CometHashAggregate (34)
+      :     :                 +- CometColumnarExchange (33)
+      :     :                    +- CometHashAggregate (32)
+      :     :                       +- CometHashAggregate (31)
+      :     :                          +- CometColumnarExchange (30)
+      :     :                             +- RowToColumnar (29)
+      :     :                                +- * HashAggregate (28)
+      :     :                                   +- * Project (27)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :                                         :- * Project (24)
+      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (23)
+      :     :                                         :     :- * ColumnarToRow (21)
+      :     :                                         :     :  +- CometFilter (20)
+      :     :                                         :     :     +- CometScan parquet spark_catalog.default.catalog_returns (19)
+      :     :                                         :     +- ReusedExchange (22)
+      :     :                                         +- ReusedExchange (25)
+      :     +- BroadcastExchange (43)
+      :        +- * ColumnarToRow (42)
+      :           +- CometFilter (41)
+      :              +- CometScan parquet spark_catalog.default.customer (40)
+      +- BroadcastExchange (49)
+         +- * ColumnarToRow (48)
+            +- CometFilter (47)
+               +- CometScan parquet spark_catalog.default.customer_address (46)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
@@ -64,7 +68,7 @@ Condition : (isnotnull(cr_returning_addr_sk#2) AND isnotnull(cr_returning_custom
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 53]
+(4) ReusedExchange [Reuses operator id: 57]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -112,208 +116,212 @@ Functions [1]: [partial_sum(UnscaledValue(cr_return_amt_inc_tax#3))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
-Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 11]
+(15) CometColumnarExchange
+Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
+Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
 Keys [2]: [cr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))#11]
-Results [3]: [cr_returning_customer_sk#1 AS ctr_customer_sk#12, ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(cr_return_amt_inc_tax#3))#11,17,2) AS ctr_total_return#14]
 
-(16) Filter [codegen id : 11]
-Input [3]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14]
-Condition : isnotnull(ctr_total_return#14)
+(17) CometFilter
+Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
+Condition : isnotnull(ctr_total_return#13)
+
+(18) ColumnarToRow [codegen id : 10]
+Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#4), dynamicpruningexpression(cr_returned_date_sk#4 IN dynamicpruning#15)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#4), dynamicpruningexpression(cr_returned_date_sk#4 IN dynamicpruning#14)]
 PushedFilters: [IsNotNull(cr_returning_addr_sk)]
 ReadSchema: struct<cr_returning_customer_sk:int,cr_returning_addr_sk:int,cr_return_amt_inc_tax:decimal(7,2)>
 
-(18) CometFilter
+(20) CometFilter
 Input [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 Condition : isnotnull(cr_returning_addr_sk#2)
 
-(19) ColumnarToRow [codegen id : 6]
+(21) ColumnarToRow [codegen id : 6]
 Input [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 
-(20) ReusedExchange [Reuses operator id: 53]
+(22) ReusedExchange [Reuses operator id: 57]
 Output [1]: [d_date_sk#6]
 
-(21) BroadcastHashJoin [codegen id : 6]
+(23) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cr_returned_date_sk#4]
 Right keys [1]: [d_date_sk#6]
 Join type: Inner
 Join condition: None
 
-(22) Project [codegen id : 6]
+(24) Project [codegen id : 6]
 Output [3]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3]
 Input [5]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4, d_date_sk#6]
 
-(23) ReusedExchange [Reuses operator id: 10]
+(25) ReusedExchange [Reuses operator id: 10]
 Output [2]: [ca_address_sk#7, ca_state#8]
 
-(24) BroadcastHashJoin [codegen id : 6]
+(26) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cr_returning_addr_sk#2]
 Right keys [1]: [ca_address_sk#7]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
+(27) Project [codegen id : 6]
 Output [3]: [cr_returning_customer_sk#1, cr_return_amt_inc_tax#3, ca_state#8]
 Input [5]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, ca_address_sk#7, ca_state#8]
 
-(26) HashAggregate [codegen id : 6]
+(28) HashAggregate [codegen id : 6]
 Input [3]: [cr_returning_customer_sk#1, cr_return_amt_inc_tax#3, ca_state#8]
 Keys [2]: [cr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [partial_sum(UnscaledValue(cr_return_amt_inc_tax#3))]
-Aggregate Attributes [1]: [sum#16]
-Results [3]: [cr_returning_customer_sk#1, ca_state#8, sum#17]
+Aggregate Attributes [1]: [sum#15]
+Results [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
 
-(27) Exchange
-Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#17]
-Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(29) RowToColumnar
+Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
 
-(28) HashAggregate [codegen id : 7]
-Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#17]
+(30) CometColumnarExchange
+Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
+Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(31) CometHashAggregate
+Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
 Keys [2]: [cr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))#11]
-Results [2]: [ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(cr_return_amt_inc_tax#3))#11,17,2) AS ctr_total_return#14]
-
-(29) HashAggregate [codegen id : 7]
-Input [2]: [ctr_state#13, ctr_total_return#14]
-Keys [1]: [ctr_state#13]
-Functions [1]: [partial_avg(ctr_total_return#14)]
-Aggregate Attributes [2]: [sum#18, count#19]
-Results [3]: [ctr_state#13, sum#20, count#21]
-
-(30) Exchange
-Input [3]: [ctr_state#13, sum#20, count#21]
-Arguments: hashpartitioning(ctr_state#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 8]
-Input [3]: [ctr_state#13, sum#20, count#21]
-Keys [1]: [ctr_state#13]
-Functions [1]: [avg(ctr_total_return#14)]
-Aggregate Attributes [1]: [avg(ctr_total_return#14)#22]
-Results [2]: [(avg(ctr_total_return#14)#22 * 1.2) AS (avg(ctr_total_return) * 1.2)#23, ctr_state#13 AS ctr_state#13#24]
-
-(32) Filter [codegen id : 8]
-Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
-Condition : isnotnull((avg(ctr_total_return) * 1.2)#23)
-
-(33) BroadcastExchange
-Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
+
+(32) CometHashAggregate
+Input [2]: [ctr_state#12, ctr_total_return#13]
+Keys [1]: [ctr_state#12]
+Functions [1]: [partial_avg(ctr_total_return#13)]
+
+(33) CometColumnarExchange
+Input [3]: [ctr_state#12, sum#17, count#18]
+Arguments: hashpartitioning(ctr_state#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [3]: [ctr_state#12, sum#17, count#18]
+Keys [1]: [ctr_state#12]
+Functions [1]: [avg(ctr_total_return#13)]
+
+(35) CometFilter
+Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+Condition : isnotnull((avg(ctr_total_return) * 1.2)#19)
+
+(36) ColumnarToRow [codegen id : 7]
+Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+
+(37) BroadcastExchange
+Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
 Arguments: HashedRelationBroadcastMode(List(input[1, string, true]),false), [plan_id=5]
 
-(34) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [ctr_state#13]
-Right keys [1]: [ctr_state#13#24]
+(38) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ctr_state#12]
+Right keys [1]: [ctr_state#12#20]
 Join type: Inner
-Join condition: (cast(ctr_total_return#14 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#23)
+Join condition: (cast(ctr_total_return#13 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#19)
 
-(35) Project [codegen id : 11]
-Output [2]: [ctr_customer_sk#12, ctr_total_return#14]
-Input [5]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14, (avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
+(39) Project [codegen id : 10]
+Output [2]: [ctr_customer_sk#11, ctr_total_return#13]
+Input [5]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13, (avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
+Output [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_current_addr_sk:int,c_salutation:string,c_first_name:string,c_last_name:string>
 
-(37) CometFilter
-Input [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
-Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_current_addr_sk#27))
+(41) CometFilter
+Input [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
+Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_current_addr_sk#23))
 
-(38) ColumnarToRow [codegen id : 9]
-Input [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
+(42) ColumnarToRow [codegen id : 8]
+Input [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
 
-(39) BroadcastExchange
-Input [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
+(43) BroadcastExchange
+Input [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(40) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [ctr_customer_sk#12]
-Right keys [1]: [c_customer_sk#25]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ctr_customer_sk#11]
+Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 11]
-Output [6]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
-Input [8]: [ctr_customer_sk#12, ctr_total_return#14, c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
+(45) Project [codegen id : 10]
+Output [6]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
+Input [8]: [ctr_customer_sk#11, ctr_total_return#13, c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
 
 (unknown) Scan parquet spark_catalog.default.customer_address
-Output [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
+Output [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_state), EqualTo(ca_state,GA), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_street_number:string,ca_street_name:string,ca_street_type:string,ca_suite_number:string,ca_city:string,ca_county:string,ca_state:string,ca_zip:string,ca_country:string,ca_gmt_offset:decimal(5,2),ca_location_type:string>
 
-(43) CometFilter
-Input [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
-Condition : ((isnotnull(ca_state#38) AND (ca_state#38 = GA)) AND isnotnull(ca_address_sk#31))
+(47) CometFilter
+Input [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
+Condition : ((isnotnull(ca_state#34) AND (ca_state#34 = GA)) AND isnotnull(ca_address_sk#27))
 
-(44) ColumnarToRow [codegen id : 10]
-Input [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
+(48) ColumnarToRow [codegen id : 9]
+Input [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
 
-(45) BroadcastExchange
-Input [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
+(49) BroadcastExchange
+Input [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(46) BroadcastHashJoin [codegen id : 11]
-Left keys [1]: [c_current_addr_sk#27]
-Right keys [1]: [ca_address_sk#31]
+(50) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_current_addr_sk#23]
+Right keys [1]: [ca_address_sk#27]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 11]
-Output [16]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42, ctr_total_return#14]
-Input [18]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
+(51) Project [codegen id : 10]
+Output [16]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38, ctr_total_return#13]
+Input [18]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
 
-(48) TakeOrderedAndProject
-Input [16]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42, ctr_total_return#14]
-Arguments: 100, [c_customer_id#26 ASC NULLS FIRST, c_salutation#28 ASC NULLS FIRST, c_first_name#29 ASC NULLS FIRST, c_last_name#30 ASC NULLS FIRST, ca_street_number#32 ASC NULLS FIRST, ca_street_name#33 ASC NULLS FIRST, ca_street_type#34 ASC NULLS FIRST, ca_suite_number#35 ASC NULLS FIRST, ca_city#36 ASC NULLS FIRST, ca_county#37 ASC NULLS FIRST, ca_state#38 ASC NULLS FIRST, ca_zip#39 ASC NULLS FIRST, ca_country#40 ASC NULLS FIRST, ca_gmt_offset#41 ASC NULLS FIRST, ca_location_type#42 ASC NULLS FIRST, ctr_total_return#14 ASC NULLS FIRST], [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42, ctr_total_return#14]
+(52) TakeOrderedAndProject
+Input [16]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38, ctr_total_return#13]
+Arguments: 100, [c_customer_id#22 ASC NULLS FIRST, c_salutation#24 ASC NULLS FIRST, c_first_name#25 ASC NULLS FIRST, c_last_name#26 ASC NULLS FIRST, ca_street_number#28 ASC NULLS FIRST, ca_street_name#29 ASC NULLS FIRST, ca_street_type#30 ASC NULLS FIRST, ca_suite_number#31 ASC NULLS FIRST, ca_city#32 ASC NULLS FIRST, ca_county#33 ASC NULLS FIRST, ca_state#34 ASC NULLS FIRST, ca_zip#35 ASC NULLS FIRST, ca_country#36 ASC NULLS FIRST, ca_gmt_offset#37 ASC NULLS FIRST, ca_location_type#38 ASC NULLS FIRST, ctr_total_return#13 ASC NULLS FIRST], [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38, ctr_total_return#13]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cr_returned_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (53)
-+- * ColumnarToRow (52)
-   +- CometProject (51)
-      +- CometFilter (50)
-         +- CometScan parquet spark_catalog.default.date_dim (49)
+BroadcastExchange (57)
++- * ColumnarToRow (56)
+   +- CometProject (55)
+      +- CometFilter (54)
+         +- CometScan parquet spark_catalog.default.date_dim (53)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_year#43]
+Output [2]: [d_date_sk#6, d_year#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(50) CometFilter
-Input [2]: [d_date_sk#6, d_year#43]
-Condition : ((isnotnull(d_year#43) AND (d_year#43 = 2000)) AND isnotnull(d_date_sk#6))
+(54) CometFilter
+Input [2]: [d_date_sk#6, d_year#39]
+Condition : ((isnotnull(d_year#39) AND (d_year#39 = 2000)) AND isnotnull(d_date_sk#6))
 
-(51) CometProject
-Input [2]: [d_date_sk#6, d_year#43]
+(55) CometProject
+Input [2]: [d_date_sk#6, d_year#39]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(52) ColumnarToRow [codegen id : 1]
+(56) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(53) BroadcastExchange
+(57) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 17 Hosting Expression = cr_returned_date_sk#4 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 19 Hosting Expression = cr_returned_date_sk#4 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt
index da163f0233..8e5f0eb89b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt
@@ -1,54 +1,56 @@
 TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,ca_street_number,ca_street_name,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset,ca_location_type,ctr_total_return]
-  WholeStageCodegen (11)
+  WholeStageCodegen (10)
     Project [c_customer_id,c_salutation,c_first_name,c_last_name,ca_street_number,ca_street_name,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset,ca_location_type,ctr_total_return]
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
         Project [ctr_total_return,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name]
           BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
             Project [ctr_customer_sk,ctr_total_return]
               BroadcastHashJoin [ctr_state,ctr_state,ctr_total_return,(avg(ctr_total_return) * 1.2)]
-                Filter [ctr_total_return]
-                  HashAggregate [cr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(cr_return_amt_inc_tax)),ctr_customer_sk,ctr_state,ctr_total_return,sum]
-                    InputAdapter
-                      Exchange [cr_returning_customer_sk,ca_state] #1
-                        WholeStageCodegen (3)
-                          HashAggregate [cr_returning_customer_sk,ca_state,cr_return_amt_inc_tax] [sum,sum]
-                            Project [cr_returning_customer_sk,cr_return_amt_inc_tax,ca_state]
-                              BroadcastHashJoin [cr_returning_addr_sk,ca_address_sk]
-                                Project [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax]
-                                  BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [cr_returning_addr_sk,cr_returning_customer_sk]
-                                          CometScan parquet spark_catalog.default.catalog_returns [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax,cr_returned_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #2
-                                InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (2)
-                                      ColumnarToRow
+                ColumnarToRow
+                  InputAdapter
+                    CometFilter [ctr_total_return]
+                      CometHashAggregate [cr_returning_customer_sk,ca_state,sum]
+                        CometColumnarExchange [cr_returning_customer_sk,ca_state] #1
+                          RowToColumnar
+                            WholeStageCodegen (3)
+                              HashAggregate [cr_returning_customer_sk,ca_state,cr_return_amt_inc_tax] [sum,sum]
+                                Project [cr_returning_customer_sk,cr_return_amt_inc_tax,ca_state]
+                                  BroadcastHashJoin [cr_returning_addr_sk,ca_address_sk]
+                                    Project [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax]
+                                      BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cr_returning_addr_sk,cr_returning_customer_sk]
+                                              CometScan parquet spark_catalog.default.catalog_returns [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax,cr_returned_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                         InputAdapter
-                                          CometFilter [ca_address_sk,ca_state]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                          ReusedExchange [d_date_sk] #2
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (2)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ca_address_sk,ca_state]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                 InputAdapter
                   BroadcastExchange #4
-                    WholeStageCodegen (8)
-                      Filter [(avg(ctr_total_return) * 1.2)]
-                        HashAggregate [ctr_state,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),ctr_state,sum,count]
-                          InputAdapter
-                            Exchange [ctr_state] #5
-                              WholeStageCodegen (7)
-                                HashAggregate [ctr_state,ctr_total_return] [sum,count,sum,count]
-                                  HashAggregate [cr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(cr_return_amt_inc_tax)),ctr_state,ctr_total_return,sum]
-                                    InputAdapter
-                                      Exchange [cr_returning_customer_sk,ca_state] #6
+                    WholeStageCodegen (7)
+                      ColumnarToRow
+                        InputAdapter
+                          CometFilter [(avg(ctr_total_return) * 1.2)]
+                            CometHashAggregate [ctr_state,sum,count]
+                              CometColumnarExchange [ctr_state] #5
+                                CometHashAggregate [ctr_state,ctr_total_return]
+                                  CometHashAggregate [cr_returning_customer_sk,ca_state,sum]
+                                    CometColumnarExchange [cr_returning_customer_sk,ca_state] #6
+                                      RowToColumnar
                                         WholeStageCodegen (6)
                                           HashAggregate [cr_returning_customer_sk,ca_state,cr_return_amt_inc_tax] [sum,sum]
                                             Project [cr_returning_customer_sk,cr_return_amt_inc_tax,ca_state]
@@ -66,14 +68,14 @@ TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,ca_st
                                                   ReusedExchange [ca_address_sk,ca_state] #3
             InputAdapter
               BroadcastExchange #7
-                WholeStageCodegen (9)
+                WholeStageCodegen (8)
                   ColumnarToRow
                     InputAdapter
                       CometFilter [c_customer_sk,c_current_addr_sk]
                         CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name]
         InputAdapter
           BroadcastExchange #8
-            WholeStageCodegen (10)
+            WholeStageCodegen (9)
               ColumnarToRow
                 InputAdapter
                   CometFilter [ca_state,ca_address_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt
index 683f7bd940..694fc26e95 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt
@@ -1,29 +1,31 @@
 == Physical Plan ==
-TakeOrderedAndProject (25)
-+- * HashAggregate (24)
-   +- Exchange (23)
-      +- * HashAggregate (22)
-         +- * Project (21)
-            +- * BroadcastHashJoin Inner BuildLeft (20)
-               :- BroadcastExchange (15)
-               :  +- * Project (14)
-               :     +- * BroadcastHashJoin Inner BuildRight (13)
-               :        :- * Project (11)
-               :        :  +- * BroadcastHashJoin Inner BuildRight (10)
-               :        :     :- * ColumnarToRow (4)
-               :        :     :  +- CometProject (3)
-               :        :     :     +- CometFilter (2)
-               :        :     :        +- CometScan parquet spark_catalog.default.item (1)
-               :        :     +- BroadcastExchange (9)
-               :        :        +- * ColumnarToRow (8)
-               :        :           +- CometProject (7)
-               :        :              +- CometFilter (6)
-               :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
-               :        +- ReusedExchange (12)
-               +- * ColumnarToRow (19)
-                  +- CometProject (18)
-                     +- CometFilter (17)
-                        +- CometScan parquet spark_catalog.default.store_sales (16)
+* ColumnarToRow (27)
++- CometTakeOrderedAndProject (26)
+   +- CometHashAggregate (25)
+      +- CometColumnarExchange (24)
+         +- RowToColumnar (23)
+            +- * HashAggregate (22)
+               +- * Project (21)
+                  +- * BroadcastHashJoin Inner BuildLeft (20)
+                     :- BroadcastExchange (15)
+                     :  +- * Project (14)
+                     :     +- * BroadcastHashJoin Inner BuildRight (13)
+                     :        :- * Project (11)
+                     :        :  +- * BroadcastHashJoin Inner BuildRight (10)
+                     :        :     :- * ColumnarToRow (4)
+                     :        :     :  +- CometProject (3)
+                     :        :     :     +- CometFilter (2)
+                     :        :     :        +- CometScan parquet spark_catalog.default.item (1)
+                     :        :     +- BroadcastExchange (9)
+                     :        :        +- * ColumnarToRow (8)
+                     :        :           +- CometProject (7)
+                     :        :              +- CometFilter (6)
+                     :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
+                     :        +- ReusedExchange (12)
+                     +- * ColumnarToRow (19)
+                        +- CometProject (18)
+                           +- CometFilter (17)
+                              +- CometScan parquet spark_catalog.default.store_sales (16)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -77,7 +79,7 @@ Join condition: None
 Output [5]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_date_sk#8]
 Input [6]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_item_sk#6, inv_date_sk#8]
 
-(12) ReusedExchange [Reuses operator id: 30]
+(12) ReusedExchange [Reuses operator id: 32]
 Output [1]: [d_date_sk#10]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -129,29 +131,33 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(23) Exchange
+(23) RowToColumnar
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(24) HashAggregate [codegen id : 5]
+(24) CometColumnarExchange
+Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(25) CometHashAggregate
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Keys [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(25) TakeOrderedAndProject
+(26) CometTakeOrderedAndProject
+Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#2 ASC NULLS FIRST], output=[i_item_id#2,i_item_desc#3,i_current_price#4]), 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
+
+(27) ColumnarToRow [codegen id : 5]
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = inv_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (30)
-+- * ColumnarToRow (29)
-   +- CometProject (28)
-      +- CometFilter (27)
-         +- CometScan parquet spark_catalog.default.date_dim (26)
+BroadcastExchange (32)
++- * ColumnarToRow (31)
+   +- CometProject (30)
+      +- CometFilter (29)
+         +- CometScan parquet spark_catalog.default.date_dim (28)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -161,18 +167,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-05-25), LessThanOrEqual(d_date,2000-07-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(27) CometFilter
+(29) CometFilter
 Input [2]: [d_date_sk#10, d_date#13]
 Condition : (((isnotnull(d_date#13) AND (d_date#13 >= 2000-05-25)) AND (d_date#13 <= 2000-07-24)) AND isnotnull(d_date_sk#10))
 
-(28) CometProject
+(30) CometProject
 Input [2]: [d_date_sk#10, d_date#13]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(29) ColumnarToRow [codegen id : 1]
+(31) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(30) BroadcastExchange
+(32) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt
index 0252eb575f..2c652d64fd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt
@@ -1,44 +1,46 @@
-TakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
-  WholeStageCodegen (5)
-    HashAggregate [i_item_id,i_item_desc,i_current_price]
-      InputAdapter
-        Exchange [i_item_id,i_item_desc,i_current_price] #1
-          WholeStageCodegen (4)
-            HashAggregate [i_item_id,i_item_desc,i_current_price]
-              Project [i_item_id,i_item_desc,i_current_price]
-                BroadcastHashJoin [i_item_sk,ss_item_sk]
-                  InputAdapter
-                    BroadcastExchange #2
-                      WholeStageCodegen (3)
-                        Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                          BroadcastHashJoin [inv_date_sk,d_date_sk]
-                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
-                              BroadcastHashJoin [i_item_sk,inv_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                                      CometFilter [i_current_price,i_manufact_id,i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
+        CometHashAggregate [i_item_id,i_item_desc,i_current_price]
+          CometColumnarExchange [i_item_id,i_item_desc,i_current_price] #1
+            RowToColumnar
+              WholeStageCodegen (4)
+                HashAggregate [i_item_id,i_item_desc,i_current_price]
+                  Project [i_item_id,i_item_desc,i_current_price]
+                    BroadcastHashJoin [i_item_sk,ss_item_sk]
+                      InputAdapter
+                        BroadcastExchange #2
+                          WholeStageCodegen (3)
+                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                              BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
+                                  BroadcastHashJoin [i_item_sk,inv_item_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                                          CometFilter [i_current_price,i_manufact_id,i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [inv_item_sk,inv_date_sk]
+                                                CometFilter [inv_quantity_on_hand,inv_item_sk]
+                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #4
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_date,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [inv_item_sk,inv_date_sk]
-                                            CometFilter [inv_quantity_on_hand,inv_item_sk]
-                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #4
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_date,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                            InputAdapter
-                              ReusedExchange [d_date_sk] #4
-                  ColumnarToRow
-                    InputAdapter
-                      CometProject [ss_item_sk]
-                        CometFilter [ss_item_sk]
-                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                  ReusedExchange [d_date_sk] #4
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [ss_item_sk]
+                            CometFilter [ss_item_sk]
+                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt
index 164ecf8af8..63c12d9f08 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt
@@ -1,50 +1,56 @@
 == Physical Plan ==
-TakeOrderedAndProject (46)
-+- * Project (45)
-   +- * BroadcastHashJoin Inner BuildRight (44)
-      :- * Project (30)
-      :  +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :- * HashAggregate (15)
-      :     :  +- Exchange (14)
-      :     :     +- * HashAggregate (13)
-      :     :        +- * Project (12)
-      :     :           +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :              :- * Project (9)
-      :     :              :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :              :     :- * ColumnarToRow (3)
-      :     :              :     :  +- CometFilter (2)
-      :     :              :     :     +- CometScan parquet spark_catalog.default.store_returns (1)
-      :     :              :     +- BroadcastExchange (7)
-      :     :              :        +- * ColumnarToRow (6)
-      :     :              :           +- CometFilter (5)
-      :     :              :              +- CometScan parquet spark_catalog.default.item (4)
-      :     :              +- ReusedExchange (10)
-      :     +- BroadcastExchange (28)
-      :        +- * HashAggregate (27)
-      :           +- Exchange (26)
-      :              +- * HashAggregate (25)
-      :                 +- * Project (24)
-      :                    +- * BroadcastHashJoin Inner BuildRight (23)
-      :                       :- * Project (21)
-      :                       :  +- * BroadcastHashJoin Inner BuildRight (20)
-      :                       :     :- * ColumnarToRow (18)
-      :                       :     :  +- CometFilter (17)
-      :                       :     :     +- CometScan parquet spark_catalog.default.catalog_returns (16)
-      :                       :     +- ReusedExchange (19)
-      :                       +- ReusedExchange (22)
-      +- BroadcastExchange (43)
-         +- * HashAggregate (42)
-            +- Exchange (41)
-               +- * HashAggregate (40)
-                  +- * Project (39)
-                     +- * BroadcastHashJoin Inner BuildRight (38)
-                        :- * Project (36)
-                        :  +- * BroadcastHashJoin Inner BuildRight (35)
-                        :     :- * ColumnarToRow (33)
-                        :     :  +- CometFilter (32)
-                        :     :     +- CometScan parquet spark_catalog.default.web_returns (31)
-                        :     +- ReusedExchange (34)
-                        +- ReusedExchange (37)
+TakeOrderedAndProject (52)
++- * Project (51)
+   +- * BroadcastHashJoin Inner BuildRight (50)
+      :- * Project (34)
+      :  +- * BroadcastHashJoin Inner BuildRight (33)
+      :     :- * ColumnarToRow (17)
+      :     :  +- CometHashAggregate (16)
+      :     :     +- CometColumnarExchange (15)
+      :     :        +- RowToColumnar (14)
+      :     :           +- * HashAggregate (13)
+      :     :              +- * Project (12)
+      :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                    :- * Project (9)
+      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                    :     :- * ColumnarToRow (3)
+      :     :                    :     :  +- CometFilter (2)
+      :     :                    :     :     +- CometScan parquet spark_catalog.default.store_returns (1)
+      :     :                    :     +- BroadcastExchange (7)
+      :     :                    :        +- * ColumnarToRow (6)
+      :     :                    :           +- CometFilter (5)
+      :     :                    :              +- CometScan parquet spark_catalog.default.item (4)
+      :     :                    +- ReusedExchange (10)
+      :     +- BroadcastExchange (32)
+      :        +- * ColumnarToRow (31)
+      :           +- CometHashAggregate (30)
+      :              +- CometColumnarExchange (29)
+      :                 +- RowToColumnar (28)
+      :                    +- * HashAggregate (27)
+      :                       +- * Project (26)
+      :                          +- * BroadcastHashJoin Inner BuildRight (25)
+      :                             :- * Project (23)
+      :                             :  +- * BroadcastHashJoin Inner BuildRight (22)
+      :                             :     :- * ColumnarToRow (20)
+      :                             :     :  +- CometFilter (19)
+      :                             :     :     +- CometScan parquet spark_catalog.default.catalog_returns (18)
+      :                             :     +- ReusedExchange (21)
+      :                             +- ReusedExchange (24)
+      +- BroadcastExchange (49)
+         +- * ColumnarToRow (48)
+            +- CometHashAggregate (47)
+               +- CometColumnarExchange (46)
+                  +- RowToColumnar (45)
+                     +- * HashAggregate (44)
+                        +- * Project (43)
+                           +- * BroadcastHashJoin Inner BuildRight (42)
+                              :- * Project (40)
+                              :  +- * BroadcastHashJoin Inner BuildRight (39)
+                              :     :- * ColumnarToRow (37)
+                              :     :  +- CometFilter (36)
+                              :     :     +- CometScan parquet spark_catalog.default.web_returns (35)
+                              :     +- ReusedExchange (38)
+                              +- ReusedExchange (41)
 
 
 (unknown) Scan parquet spark_catalog.default.store_returns
@@ -90,7 +96,7 @@ Join condition: None
 Output [3]: [sr_return_quantity#2, sr_returned_date_sk#3, i_item_id#6]
 Input [5]: [sr_item_sk#1, sr_return_quantity#2, sr_returned_date_sk#3, i_item_sk#5, i_item_id#6]
 
-(10) ReusedExchange [Reuses operator id: 62]
+(10) ReusedExchange [Reuses operator id: 68]
 Output [1]: [d_date_sk#7]
 
 (11) BroadcastHashJoin [codegen id : 5]
@@ -110,262 +116,274 @@ Functions [1]: [partial_sum(sr_return_quantity#2)]
 Aggregate Attributes [1]: [sum#8]
 Results [2]: [i_item_id#6, sum#9]
 
-(14) Exchange
+(14) RowToColumnar
 Input [2]: [i_item_id#6, sum#9]
-Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 18]
+(15) CometColumnarExchange
+Input [2]: [i_item_id#6, sum#9]
+Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [2]: [i_item_id#6, sum#9]
 Keys [1]: [i_item_id#6]
 Functions [1]: [sum(sr_return_quantity#2)]
-Aggregate Attributes [1]: [sum(sr_return_quantity#2)#10]
-Results [2]: [i_item_id#6 AS item_id#11, sum(sr_return_quantity#2)#10 AS sr_item_qty#12]
+
+(17) ColumnarToRow [codegen id : 18]
+Input [2]: [item_id#10, sr_item_qty#11]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15]
+Output [3]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#15), dynamicpruningexpression(cr_returned_date_sk#15 IN dynamicpruning#16)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#14), dynamicpruningexpression(cr_returned_date_sk#14 IN dynamicpruning#15)]
 PushedFilters: [IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_return_quantity:int>
 
-(17) CometFilter
-Input [3]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15]
-Condition : isnotnull(cr_item_sk#13)
+(19) CometFilter
+Input [3]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14]
+Condition : isnotnull(cr_item_sk#12)
 
-(18) ColumnarToRow [codegen id : 10]
-Input [3]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15]
+(20) ColumnarToRow [codegen id : 10]
+Input [3]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14]
 
-(19) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#17, i_item_id#18]
+(21) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#16, i_item_id#17]
 
-(20) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cr_item_sk#13]
-Right keys [1]: [i_item_sk#17]
+(22) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cr_item_sk#12]
+Right keys [1]: [i_item_sk#16]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 10]
-Output [3]: [cr_return_quantity#14, cr_returned_date_sk#15, i_item_id#18]
-Input [5]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15, i_item_sk#17, i_item_id#18]
+(23) Project [codegen id : 10]
+Output [3]: [cr_return_quantity#13, cr_returned_date_sk#14, i_item_id#17]
+Input [5]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14, i_item_sk#16, i_item_id#17]
 
-(22) ReusedExchange [Reuses operator id: 62]
-Output [1]: [d_date_sk#19]
+(24) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#18]
 
-(23) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cr_returned_date_sk#15]
-Right keys [1]: [d_date_sk#19]
+(25) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cr_returned_date_sk#14]
+Right keys [1]: [d_date_sk#18]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 10]
-Output [2]: [cr_return_quantity#14, i_item_id#18]
-Input [4]: [cr_return_quantity#14, cr_returned_date_sk#15, i_item_id#18, d_date_sk#19]
-
-(25) HashAggregate [codegen id : 10]
-Input [2]: [cr_return_quantity#14, i_item_id#18]
-Keys [1]: [i_item_id#18]
-Functions [1]: [partial_sum(cr_return_quantity#14)]
-Aggregate Attributes [1]: [sum#20]
-Results [2]: [i_item_id#18, sum#21]
-
-(26) Exchange
-Input [2]: [i_item_id#18, sum#21]
-Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, [plan_id=3]
-
-(27) HashAggregate [codegen id : 11]
-Input [2]: [i_item_id#18, sum#21]
-Keys [1]: [i_item_id#18]
-Functions [1]: [sum(cr_return_quantity#14)]
-Aggregate Attributes [1]: [sum(cr_return_quantity#14)#22]
-Results [2]: [i_item_id#18 AS item_id#23, sum(cr_return_quantity#14)#22 AS cr_item_qty#24]
-
-(28) BroadcastExchange
-Input [2]: [item_id#23, cr_item_qty#24]
+(26) Project [codegen id : 10]
+Output [2]: [cr_return_quantity#13, i_item_id#17]
+Input [4]: [cr_return_quantity#13, cr_returned_date_sk#14, i_item_id#17, d_date_sk#18]
+
+(27) HashAggregate [codegen id : 10]
+Input [2]: [cr_return_quantity#13, i_item_id#17]
+Keys [1]: [i_item_id#17]
+Functions [1]: [partial_sum(cr_return_quantity#13)]
+Aggregate Attributes [1]: [sum#19]
+Results [2]: [i_item_id#17, sum#20]
+
+(28) RowToColumnar
+Input [2]: [i_item_id#17, sum#20]
+
+(29) CometColumnarExchange
+Input [2]: [i_item_id#17, sum#20]
+Arguments: hashpartitioning(i_item_id#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
+Input [2]: [i_item_id#17, sum#20]
+Keys [1]: [i_item_id#17]
+Functions [1]: [sum(cr_return_quantity#13)]
+
+(31) ColumnarToRow [codegen id : 11]
+Input [2]: [item_id#21, cr_item_qty#22]
+
+(32) BroadcastExchange
+Input [2]: [item_id#21, cr_item_qty#22]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [item_id#11]
-Right keys [1]: [item_id#23]
+(33) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [item_id#10]
+Right keys [1]: [item_id#21]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 18]
-Output [3]: [item_id#11, sr_item_qty#12, cr_item_qty#24]
-Input [4]: [item_id#11, sr_item_qty#12, item_id#23, cr_item_qty#24]
+(34) Project [codegen id : 18]
+Output [3]: [item_id#10, sr_item_qty#11, cr_item_qty#22]
+Input [4]: [item_id#10, sr_item_qty#11, item_id#21, cr_item_qty#22]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [3]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27]
+Output [3]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#27), dynamicpruningexpression(wr_returned_date_sk#27 IN dynamicpruning#28)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#25), dynamicpruningexpression(wr_returned_date_sk#25 IN dynamicpruning#26)]
 PushedFilters: [IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_return_quantity:int>
 
-(32) CometFilter
-Input [3]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27]
-Condition : isnotnull(wr_item_sk#25)
+(36) CometFilter
+Input [3]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25]
+Condition : isnotnull(wr_item_sk#23)
 
-(33) ColumnarToRow [codegen id : 16]
-Input [3]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27]
+(37) ColumnarToRow [codegen id : 16]
+Input [3]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25]
 
-(34) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#29, i_item_id#30]
+(38) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#27, i_item_id#28]
 
-(35) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [wr_item_sk#25]
-Right keys [1]: [i_item_sk#29]
+(39) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [wr_item_sk#23]
+Right keys [1]: [i_item_sk#27]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 16]
-Output [3]: [wr_return_quantity#26, wr_returned_date_sk#27, i_item_id#30]
-Input [5]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27, i_item_sk#29, i_item_id#30]
+(40) Project [codegen id : 16]
+Output [3]: [wr_return_quantity#24, wr_returned_date_sk#25, i_item_id#28]
+Input [5]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25, i_item_sk#27, i_item_id#28]
 
-(37) ReusedExchange [Reuses operator id: 62]
-Output [1]: [d_date_sk#31]
+(41) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#29]
 
-(38) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [wr_returned_date_sk#27]
-Right keys [1]: [d_date_sk#31]
+(42) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [wr_returned_date_sk#25]
+Right keys [1]: [d_date_sk#29]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 16]
-Output [2]: [wr_return_quantity#26, i_item_id#30]
-Input [4]: [wr_return_quantity#26, wr_returned_date_sk#27, i_item_id#30, d_date_sk#31]
-
-(40) HashAggregate [codegen id : 16]
-Input [2]: [wr_return_quantity#26, i_item_id#30]
-Keys [1]: [i_item_id#30]
-Functions [1]: [partial_sum(wr_return_quantity#26)]
-Aggregate Attributes [1]: [sum#32]
-Results [2]: [i_item_id#30, sum#33]
-
-(41) Exchange
-Input [2]: [i_item_id#30, sum#33]
-Arguments: hashpartitioning(i_item_id#30, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(42) HashAggregate [codegen id : 17]
-Input [2]: [i_item_id#30, sum#33]
-Keys [1]: [i_item_id#30]
-Functions [1]: [sum(wr_return_quantity#26)]
-Aggregate Attributes [1]: [sum(wr_return_quantity#26)#34]
-Results [2]: [i_item_id#30 AS item_id#35, sum(wr_return_quantity#26)#34 AS wr_item_qty#36]
-
-(43) BroadcastExchange
-Input [2]: [item_id#35, wr_item_qty#36]
+(43) Project [codegen id : 16]
+Output [2]: [wr_return_quantity#24, i_item_id#28]
+Input [4]: [wr_return_quantity#24, wr_returned_date_sk#25, i_item_id#28, d_date_sk#29]
+
+(44) HashAggregate [codegen id : 16]
+Input [2]: [wr_return_quantity#24, i_item_id#28]
+Keys [1]: [i_item_id#28]
+Functions [1]: [partial_sum(wr_return_quantity#24)]
+Aggregate Attributes [1]: [sum#30]
+Results [2]: [i_item_id#28, sum#31]
+
+(45) RowToColumnar
+Input [2]: [i_item_id#28, sum#31]
+
+(46) CometColumnarExchange
+Input [2]: [i_item_id#28, sum#31]
+Arguments: hashpartitioning(i_item_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(47) CometHashAggregate
+Input [2]: [i_item_id#28, sum#31]
+Keys [1]: [i_item_id#28]
+Functions [1]: [sum(wr_return_quantity#24)]
+
+(48) ColumnarToRow [codegen id : 17]
+Input [2]: [item_id#32, wr_item_qty#33]
+
+(49) BroadcastExchange
+Input [2]: [item_id#32, wr_item_qty#33]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=6]
 
-(44) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [item_id#11]
-Right keys [1]: [item_id#35]
+(50) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [item_id#10]
+Right keys [1]: [item_id#32]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 18]
-Output [8]: [item_id#11, sr_item_qty#12, (((cast(sr_item_qty#12 as double) / cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as double)) / 3.0) * 100.0) AS sr_dev#37, cr_item_qty#24, (((cast(cr_item_qty#24 as double) / cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as double)) / 3.0) * 100.0) AS cr_dev#38, wr_item_qty#36, (((cast(wr_item_qty#36 as double) / cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as double)) / 3.0) * 100.0) AS wr_dev#39, (cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as decimal(20,0)) / 3.0) AS average#40]
-Input [5]: [item_id#11, sr_item_qty#12, cr_item_qty#24, item_id#35, wr_item_qty#36]
+(51) Project [codegen id : 18]
+Output [8]: [item_id#10, sr_item_qty#11, (((cast(sr_item_qty#11 as double) / cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as double)) / 3.0) * 100.0) AS sr_dev#34, cr_item_qty#22, (((cast(cr_item_qty#22 as double) / cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as double)) / 3.0) * 100.0) AS cr_dev#35, wr_item_qty#33, (((cast(wr_item_qty#33 as double) / cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as double)) / 3.0) * 100.0) AS wr_dev#36, (cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as decimal(20,0)) / 3.0) AS average#37]
+Input [5]: [item_id#10, sr_item_qty#11, cr_item_qty#22, item_id#32, wr_item_qty#33]
 
-(46) TakeOrderedAndProject
-Input [8]: [item_id#11, sr_item_qty#12, sr_dev#37, cr_item_qty#24, cr_dev#38, wr_item_qty#36, wr_dev#39, average#40]
-Arguments: 100, [item_id#11 ASC NULLS FIRST, sr_item_qty#12 ASC NULLS FIRST], [item_id#11, sr_item_qty#12, sr_dev#37, cr_item_qty#24, cr_dev#38, wr_item_qty#36, wr_dev#39, average#40]
+(52) TakeOrderedAndProject
+Input [8]: [item_id#10, sr_item_qty#11, sr_dev#34, cr_item_qty#22, cr_dev#35, wr_item_qty#33, wr_dev#36, average#37]
+Arguments: 100, [item_id#10 ASC NULLS FIRST, sr_item_qty#11 ASC NULLS FIRST], [item_id#10, sr_item_qty#11, sr_dev#34, cr_item_qty#22, cr_dev#35, wr_item_qty#33, wr_dev#36, average#37]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = sr_returned_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (62)
-+- * Project (61)
-   +- * BroadcastHashJoin LeftSemi BuildRight (60)
-      :- * ColumnarToRow (49)
-      :  +- CometFilter (48)
-      :     +- CometScan parquet spark_catalog.default.date_dim (47)
-      +- BroadcastExchange (59)
-         +- * Project (58)
-            +- * BroadcastHashJoin LeftSemi BuildRight (57)
-               :- * ColumnarToRow (51)
-               :  +- CometScan parquet spark_catalog.default.date_dim (50)
-               +- BroadcastExchange (56)
-                  +- * ColumnarToRow (55)
-                     +- CometProject (54)
-                        +- CometFilter (53)
-                           +- CometScan parquet spark_catalog.default.date_dim (52)
+BroadcastExchange (68)
++- * Project (67)
+   +- * BroadcastHashJoin LeftSemi BuildRight (66)
+      :- * ColumnarToRow (55)
+      :  +- CometFilter (54)
+      :     +- CometScan parquet spark_catalog.default.date_dim (53)
+      +- BroadcastExchange (65)
+         +- * Project (64)
+            +- * BroadcastHashJoin LeftSemi BuildRight (63)
+               :- * ColumnarToRow (57)
+               :  +- CometScan parquet spark_catalog.default.date_dim (56)
+               +- BroadcastExchange (62)
+                  +- * ColumnarToRow (61)
+                     +- CometProject (60)
+                        +- CometFilter (59)
+                           +- CometScan parquet spark_catalog.default.date_dim (58)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_date#41]
+Output [2]: [d_date_sk#7, d_date#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(48) CometFilter
-Input [2]: [d_date_sk#7, d_date#41]
+(54) CometFilter
+Input [2]: [d_date_sk#7, d_date#38]
 Condition : isnotnull(d_date_sk#7)
 
-(49) ColumnarToRow [codegen id : 3]
-Input [2]: [d_date_sk#7, d_date#41]
+(55) ColumnarToRow [codegen id : 3]
+Input [2]: [d_date_sk#7, d_date#38]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#42, d_week_seq#43]
+Output [2]: [d_date#39, d_week_seq#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(51) ColumnarToRow [codegen id : 2]
-Input [2]: [d_date#42, d_week_seq#43]
+(57) ColumnarToRow [codegen id : 2]
+Input [2]: [d_date#39, d_week_seq#40]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#44, d_week_seq#45]
+Output [2]: [d_date#41, d_week_seq#42]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(53) CometFilter
-Input [2]: [d_date#44, d_week_seq#45]
-Condition : cast(d_date#44 as string) IN (2000-06-30,2000-09-27,2000-11-17)
+(59) CometFilter
+Input [2]: [d_date#41, d_week_seq#42]
+Condition : cast(d_date#41 as string) IN (2000-06-30,2000-09-27,2000-11-17)
 
-(54) CometProject
-Input [2]: [d_date#44, d_week_seq#45]
-Arguments: [d_week_seq#45], [d_week_seq#45]
+(60) CometProject
+Input [2]: [d_date#41, d_week_seq#42]
+Arguments: [d_week_seq#42], [d_week_seq#42]
 
-(55) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#45]
+(61) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#42]
 
-(56) BroadcastExchange
-Input [1]: [d_week_seq#45]
+(62) BroadcastExchange
+Input [1]: [d_week_seq#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(57) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [d_week_seq#43]
-Right keys [1]: [d_week_seq#45]
+(63) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [d_week_seq#40]
+Right keys [1]: [d_week_seq#42]
 Join type: LeftSemi
 Join condition: None
 
-(58) Project [codegen id : 2]
-Output [1]: [d_date#42]
-Input [2]: [d_date#42, d_week_seq#43]
+(64) Project [codegen id : 2]
+Output [1]: [d_date#39]
+Input [2]: [d_date#39, d_week_seq#40]
 
-(59) BroadcastExchange
-Input [1]: [d_date#42]
+(65) BroadcastExchange
+Input [1]: [d_date#39]
 Arguments: HashedRelationBroadcastMode(List(input[0, date, true]),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [d_date#41]
-Right keys [1]: [d_date#42]
+(66) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [d_date#38]
+Right keys [1]: [d_date#39]
 Join type: LeftSemi
 Join condition: None
 
-(61) Project [codegen id : 3]
+(67) Project [codegen id : 3]
 Output [1]: [d_date_sk#7]
-Input [2]: [d_date_sk#7, d_date#41]
+Input [2]: [d_date_sk#7, d_date#38]
 
-(62) BroadcastExchange
+(68) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = cr_returned_date_sk#15 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 18 Hosting Expression = cr_returned_date_sk#14 IN dynamicpruning#4
 
-Subquery:3 Hosting operator id = 31 Hosting Expression = wr_returned_date_sk#27 IN dynamicpruning#4
+Subquery:3 Hosting operator id = 35 Hosting Expression = wr_returned_date_sk#25 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt
index a8f1ba3f10..bc1df2c571 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt
@@ -4,92 +4,98 @@ TakeOrderedAndProject [item_id,sr_item_qty,sr_dev,cr_item_qty,cr_dev,wr_item_qty
       BroadcastHashJoin [item_id,item_id]
         Project [item_id,sr_item_qty,cr_item_qty]
           BroadcastHashJoin [item_id,item_id]
-            HashAggregate [i_item_id,sum] [sum(sr_return_quantity),item_id,sr_item_qty,sum]
+            ColumnarToRow
               InputAdapter
-                Exchange [i_item_id] #1
-                  WholeStageCodegen (5)
-                    HashAggregate [i_item_id,sr_return_quantity] [sum,sum]
-                      Project [sr_return_quantity,i_item_id]
-                        BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                          Project [sr_return_quantity,sr_returned_date_sk,i_item_id]
-                            BroadcastHashJoin [sr_item_sk,i_item_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [sr_item_sk]
-                                    CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_return_quantity,sr_returned_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (3)
-                                            Project [d_date_sk]
-                                              BroadcastHashJoin [d_date,d_date]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                InputAdapter
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (2)
-                                                      Project [d_date]
-                                                        BroadcastHashJoin [d_week_seq,d_week_seq]
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
-                                                          InputAdapter
-                                                            BroadcastExchange #4
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [d_week_seq]
-                                                                      CometFilter [d_date]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                CometHashAggregate [i_item_id,sum]
+                  CometColumnarExchange [i_item_id] #1
+                    RowToColumnar
+                      WholeStageCodegen (5)
+                        HashAggregate [i_item_id,sr_return_quantity] [sum,sum]
+                          Project [sr_return_quantity,i_item_id]
+                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                              Project [sr_return_quantity,sr_returned_date_sk,i_item_id]
+                                BroadcastHashJoin [sr_item_sk,i_item_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [sr_item_sk]
+                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_return_quantity,sr_returned_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (3)
+                                                Project [d_date_sk]
+                                                  BroadcastHashJoin [d_date,d_date]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                    InputAdapter
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (2)
+                                                          Project [d_date]
+                                                            BroadcastHashJoin [d_week_seq,d_week_seq]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                                                              InputAdapter
+                                                                BroadcastExchange #4
+                                                                  WholeStageCodegen (1)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [d_week_seq]
+                                                                          CometFilter [d_date]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                                  InputAdapter
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [i_item_sk,i_item_id]
+                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
                               InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [i_item_sk,i_item_id]
-                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-                          InputAdapter
-                            ReusedExchange [d_date_sk] #2
+                                ReusedExchange [d_date_sk] #2
             InputAdapter
               BroadcastExchange #6
                 WholeStageCodegen (11)
-                  HashAggregate [i_item_id,sum] [sum(cr_return_quantity),item_id,cr_item_qty,sum]
+                  ColumnarToRow
                     InputAdapter
-                      Exchange [i_item_id] #7
-                        WholeStageCodegen (10)
-                          HashAggregate [i_item_id,cr_return_quantity] [sum,sum]
-                            Project [cr_return_quantity,i_item_id]
-                              BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
-                                Project [cr_return_quantity,cr_returned_date_sk,i_item_id]
-                                  BroadcastHashJoin [cr_item_sk,i_item_sk]
+                      CometHashAggregate [i_item_id,sum]
+                        CometColumnarExchange [i_item_id] #7
+                          RowToColumnar
+                            WholeStageCodegen (10)
+                              HashAggregate [i_item_id,cr_return_quantity] [sum,sum]
+                                Project [cr_return_quantity,i_item_id]
+                                  BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
+                                    Project [cr_return_quantity,cr_returned_date_sk,i_item_id]
+                                      BroadcastHashJoin [cr_item_sk,i_item_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cr_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_return_quantity,cr_returned_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [i_item_sk,i_item_id] #5
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #2
+        InputAdapter
+          BroadcastExchange #8
+            WholeStageCodegen (17)
+              ColumnarToRow
+                InputAdapter
+                  CometHashAggregate [i_item_id,sum]
+                    CometColumnarExchange [i_item_id] #9
+                      RowToColumnar
+                        WholeStageCodegen (16)
+                          HashAggregate [i_item_id,wr_return_quantity] [sum,sum]
+                            Project [wr_return_quantity,i_item_id]
+                              BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
+                                Project [wr_return_quantity,wr_returned_date_sk,i_item_id]
+                                  BroadcastHashJoin [wr_item_sk,i_item_sk]
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [cr_item_sk]
-                                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_return_quantity,cr_returned_date_sk]
+                                        CometFilter [wr_item_sk]
+                                          CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_return_quantity,wr_returned_date_sk]
                                             ReusedSubquery [d_date_sk] #1
                                     InputAdapter
                                       ReusedExchange [i_item_sk,i_item_id] #5
                                 InputAdapter
                                   ReusedExchange [d_date_sk] #2
-        InputAdapter
-          BroadcastExchange #8
-            WholeStageCodegen (17)
-              HashAggregate [i_item_id,sum] [sum(wr_return_quantity),item_id,wr_item_qty,sum]
-                InputAdapter
-                  Exchange [i_item_id] #9
-                    WholeStageCodegen (16)
-                      HashAggregate [i_item_id,wr_return_quantity] [sum,sum]
-                        Project [wr_return_quantity,i_item_id]
-                          BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
-                            Project [wr_return_quantity,wr_returned_date_sk,i_item_id]
-                              BroadcastHashJoin [wr_item_sk,i_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [wr_item_sk]
-                                      CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_return_quantity,wr_returned_date_sk]
-                                        ReusedSubquery [d_date_sk] #1
-                                InputAdapter
-                                  ReusedExchange [i_item_sk,i_item_id] #5
-                            InputAdapter
-                              ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt
index 4de54cadc1..fad4c0cd4e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt
@@ -1,52 +1,54 @@
 == Physical Plan ==
-TakeOrderedAndProject (48)
-+- * HashAggregate (47)
-   +- Exchange (46)
-      +- * HashAggregate (45)
-         +- * Project (44)
-            +- * BroadcastHashJoin Inner BuildRight (43)
-               :- * Project (38)
-               :  +- * BroadcastHashJoin Inner BuildRight (37)
-               :     :- * Project (35)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-               :     :     :- * Project (28)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
-               :     :     :     :- * Project (22)
-               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (21)
-               :     :     :     :     :- * Project (16)
-               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
-               :     :     :     :     :     :- * Project (10)
-               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildLeft (9)
-               :     :     :     :     :     :     :- BroadcastExchange (4)
-               :     :     :     :     :     :     :  +- * ColumnarToRow (3)
-               :     :     :     :     :     :     :     +- CometFilter (2)
-               :     :     :     :     :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
-               :     :     :     :     :     :     +- * ColumnarToRow (8)
-               :     :     :     :     :     :        +- CometProject (7)
-               :     :     :     :     :     :           +- CometFilter (6)
-               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_returns (5)
-               :     :     :     :     :     +- BroadcastExchange (14)
-               :     :     :     :     :        +- * ColumnarToRow (13)
-               :     :     :     :     :           +- CometFilter (12)
-               :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_page (11)
-               :     :     :     :     +- BroadcastExchange (20)
-               :     :     :     :        +- * ColumnarToRow (19)
-               :     :     :     :           +- CometFilter (18)
-               :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (17)
-               :     :     :     +- BroadcastExchange (26)
-               :     :     :        +- * ColumnarToRow (25)
-               :     :     :           +- CometFilter (24)
-               :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (23)
-               :     :     +- BroadcastExchange (33)
-               :     :        +- * ColumnarToRow (32)
-               :     :           +- CometProject (31)
-               :     :              +- CometFilter (30)
-               :     :                 +- CometScan parquet spark_catalog.default.customer_address (29)
-               :     +- ReusedExchange (36)
-               +- BroadcastExchange (42)
-                  +- * ColumnarToRow (41)
-                     +- CometFilter (40)
-                        +- CometScan parquet spark_catalog.default.reason (39)
+* ColumnarToRow (50)
++- CometTakeOrderedAndProject (49)
+   +- CometHashAggregate (48)
+      +- CometColumnarExchange (47)
+         +- RowToColumnar (46)
+            +- * HashAggregate (45)
+               +- * Project (44)
+                  +- * BroadcastHashJoin Inner BuildRight (43)
+                     :- * Project (38)
+                     :  +- * BroadcastHashJoin Inner BuildRight (37)
+                     :     :- * Project (35)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+                     :     :     :- * Project (28)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
+                     :     :     :     :- * Project (22)
+                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (21)
+                     :     :     :     :     :- * Project (16)
+                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
+                     :     :     :     :     :     :- * Project (10)
+                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildLeft (9)
+                     :     :     :     :     :     :     :- BroadcastExchange (4)
+                     :     :     :     :     :     :     :  +- * ColumnarToRow (3)
+                     :     :     :     :     :     :     :     +- CometFilter (2)
+                     :     :     :     :     :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
+                     :     :     :     :     :     :     +- * ColumnarToRow (8)
+                     :     :     :     :     :     :        +- CometProject (7)
+                     :     :     :     :     :     :           +- CometFilter (6)
+                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_returns (5)
+                     :     :     :     :     :     +- BroadcastExchange (14)
+                     :     :     :     :     :        +- * ColumnarToRow (13)
+                     :     :     :     :     :           +- CometFilter (12)
+                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_page (11)
+                     :     :     :     :     +- BroadcastExchange (20)
+                     :     :     :     :        +- * ColumnarToRow (19)
+                     :     :     :     :           +- CometFilter (18)
+                     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (17)
+                     :     :     :     +- BroadcastExchange (26)
+                     :     :     :        +- * ColumnarToRow (25)
+                     :     :     :           +- CometFilter (24)
+                     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (23)
+                     :     :     +- BroadcastExchange (33)
+                     :     :        +- * ColumnarToRow (32)
+                     :     :           +- CometProject (31)
+                     :     :              +- CometFilter (30)
+                     :     :                 +- CometScan parquet spark_catalog.default.customer_address (29)
+                     :     +- ReusedExchange (36)
+                     +- BroadcastExchange (42)
+                        +- * ColumnarToRow (41)
+                           +- CometFilter (40)
+                              +- CometScan parquet spark_catalog.default.reason (39)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -212,7 +214,7 @@ Join condition: ((((ca_state#26 IN (IN,OH,NJ) AND (ws_net_profit#6 >= 100.00)) A
 Output [5]: [ws_quantity#4, ws_sold_date_sk#7, wr_reason_sk#13, wr_fee#15, wr_refunded_cash#16]
 Input [9]: [ws_quantity#4, ws_net_profit#6, ws_sold_date_sk#7, wr_refunded_addr_sk#11, wr_reason_sk#13, wr_fee#15, wr_refunded_cash#16, ca_address_sk#25, ca_state#26]
 
-(36) ReusedExchange [Reuses operator id: 53]
+(36) ReusedExchange [Reuses operator id: 55]
 Output [1]: [d_date_sk#28]
 
 (37) BroadcastHashJoin [codegen id : 8]
@@ -260,50 +262,54 @@ Functions [3]: [partial_avg(ws_quantity#4), partial_avg(UnscaledValue(wr_refunde
 Aggregate Attributes [6]: [sum#31, count#32, sum#33, count#34, sum#35, count#36]
 Results [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
 
-(46) Exchange
+(46) RowToColumnar
 Input [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
-Arguments: hashpartitioning(r_reason_desc#30, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(47) HashAggregate [codegen id : 9]
+(47) CometColumnarExchange
+Input [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
+Arguments: hashpartitioning(r_reason_desc#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(48) CometHashAggregate
 Input [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
 Keys [1]: [r_reason_desc#30]
 Functions [3]: [avg(ws_quantity#4), avg(UnscaledValue(wr_refunded_cash#16)), avg(UnscaledValue(wr_fee#15))]
-Aggregate Attributes [3]: [avg(ws_quantity#4)#43, avg(UnscaledValue(wr_refunded_cash#16))#44, avg(UnscaledValue(wr_fee#15))#45]
-Results [4]: [substr(r_reason_desc#30, 1, 20) AS substr(r_reason_desc, 1, 20)#46, avg(ws_quantity#4)#43 AS avg(ws_quantity)#47, cast((avg(UnscaledValue(wr_refunded_cash#16))#44 / 100.0) as decimal(11,6)) AS avg(wr_refunded_cash)#48, cast((avg(UnscaledValue(wr_fee#15))#45 / 100.0) as decimal(11,6)) AS avg(wr_fee)#49]
 
-(48) TakeOrderedAndProject
-Input [4]: [substr(r_reason_desc, 1, 20)#46, avg(ws_quantity)#47, avg(wr_refunded_cash)#48, avg(wr_fee)#49]
-Arguments: 100, [substr(r_reason_desc, 1, 20)#46 ASC NULLS FIRST, avg(ws_quantity)#47 ASC NULLS FIRST, avg(wr_refunded_cash)#48 ASC NULLS FIRST, avg(wr_fee)#49 ASC NULLS FIRST], [substr(r_reason_desc, 1, 20)#46, avg(ws_quantity)#47, avg(wr_refunded_cash)#48, avg(wr_fee)#49]
+(49) CometTakeOrderedAndProject
+Input [4]: [substr(r_reason_desc, 1, 20)#43, avg(ws_quantity)#44, avg(wr_refunded_cash)#45, avg(wr_fee)#46]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[substr(r_reason_desc, 1, 20)#43 ASC NULLS FIRST,avg(ws_quantity)#44 ASC NULLS FIRST,avg(wr_refunded_cash)#45 ASC NULLS FIRST,avg(wr_fee)#46 ASC NULLS FIRST], output=[substr(r_reason_desc, 1, 20)#43,avg(ws_quantity)#44,avg(wr_refunded_cash)#45,avg(wr_fee)#46]), 100, [substr(r_reason_desc, 1, 20)#43 ASC NULLS FIRST, avg(ws_quantity)#44 ASC NULLS FIRST, avg(wr_refunded_cash)#45 ASC NULLS FIRST, avg(wr_fee)#46 ASC NULLS FIRST], [substr(r_reason_desc, 1, 20)#43, avg(ws_quantity)#44, avg(wr_refunded_cash)#45, avg(wr_fee)#46]
+
+(50) ColumnarToRow [codegen id : 9]
+Input [4]: [substr(r_reason_desc, 1, 20)#43, avg(ws_quantity)#44, avg(wr_refunded_cash)#45, avg(wr_fee)#46]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (53)
-+- * ColumnarToRow (52)
-   +- CometProject (51)
-      +- CometFilter (50)
-         +- CometScan parquet spark_catalog.default.date_dim (49)
+BroadcastExchange (55)
++- * ColumnarToRow (54)
+   +- CometProject (53)
+      +- CometFilter (52)
+         +- CometScan parquet spark_catalog.default.date_dim (51)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#28, d_year#50]
+Output [2]: [d_date_sk#28, d_year#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(50) CometFilter
-Input [2]: [d_date_sk#28, d_year#50]
-Condition : ((isnotnull(d_year#50) AND (d_year#50 = 2000)) AND isnotnull(d_date_sk#28))
+(52) CometFilter
+Input [2]: [d_date_sk#28, d_year#47]
+Condition : ((isnotnull(d_year#47) AND (d_year#47 = 2000)) AND isnotnull(d_date_sk#28))
 
-(51) CometProject
-Input [2]: [d_date_sk#28, d_year#50]
+(53) CometProject
+Input [2]: [d_date_sk#28, d_year#47]
 Arguments: [d_date_sk#28], [d_date_sk#28]
 
-(52) ColumnarToRow [codegen id : 1]
+(54) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#28]
 
-(53) BroadcastExchange
+(55) BroadcastExchange
 Input [1]: [d_date_sk#28]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt
index e21f8091c0..10f51b2972 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt
@@ -1,79 +1,81 @@
-TakeOrderedAndProject [substr(r_reason_desc, 1, 20),avg(ws_quantity),avg(wr_refunded_cash),avg(wr_fee)]
-  WholeStageCodegen (9)
-    HashAggregate [r_reason_desc,sum,count,sum,count,sum,count] [avg(ws_quantity),avg(UnscaledValue(wr_refunded_cash)),avg(UnscaledValue(wr_fee)),substr(r_reason_desc, 1, 20),avg(ws_quantity),avg(wr_refunded_cash),avg(wr_fee),sum,count,sum,count,sum,count]
-      InputAdapter
-        Exchange [r_reason_desc] #1
-          WholeStageCodegen (8)
-            HashAggregate [r_reason_desc,ws_quantity,wr_refunded_cash,wr_fee] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-              Project [ws_quantity,wr_fee,wr_refunded_cash,r_reason_desc]
-                BroadcastHashJoin [wr_reason_sk,r_reason_sk]
-                  Project [ws_quantity,wr_reason_sk,wr_fee,wr_refunded_cash]
-                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                      Project [ws_quantity,ws_sold_date_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                        BroadcastHashJoin [wr_refunded_addr_sk,ca_address_sk,ca_state,ws_net_profit]
-                          Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                            BroadcastHashJoin [wr_returning_cdemo_sk,cd_marital_status,cd_education_status,cd_demo_sk,cd_marital_status,cd_education_status]
-                              Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash,cd_marital_status,cd_education_status]
-                                BroadcastHashJoin [wr_refunded_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ws_sales_price]
-                                  Project [ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                                    BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                                      Project [ws_web_page_sk,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                                        BroadcastHashJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
+WholeStageCodegen (9)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [substr(r_reason_desc, 1, 20),avg(ws_quantity),avg(wr_refunded_cash),avg(wr_fee)]
+        CometHashAggregate [r_reason_desc,sum,count,sum,count,sum,count]
+          CometColumnarExchange [r_reason_desc] #1
+            RowToColumnar
+              WholeStageCodegen (8)
+                HashAggregate [r_reason_desc,ws_quantity,wr_refunded_cash,wr_fee] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                  Project [ws_quantity,wr_fee,wr_refunded_cash,r_reason_desc]
+                    BroadcastHashJoin [wr_reason_sk,r_reason_sk]
+                      Project [ws_quantity,wr_reason_sk,wr_fee,wr_refunded_cash]
+                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                          Project [ws_quantity,ws_sold_date_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                            BroadcastHashJoin [wr_refunded_addr_sk,ca_address_sk,ca_state,ws_net_profit]
+                              Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                                BroadcastHashJoin [wr_returning_cdemo_sk,cd_marital_status,cd_education_status,cd_demo_sk,cd_marital_status,cd_education_status]
+                                  Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash,cd_marital_status,cd_education_status]
+                                    BroadcastHashJoin [wr_refunded_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ws_sales_price]
+                                      Project [ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                                        BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                                          Project [ws_web_page_sk,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                                            BroadcastHashJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
+                                              InputAdapter
+                                                BroadcastExchange #2
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [ws_item_sk,ws_order_number,ws_web_page_sk,ws_sales_price,ws_net_profit]
+                                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_page_sk,ws_order_number,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #1
+                                                              BroadcastExchange #3
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_year,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash]
+                                                    CometFilter [wr_item_sk,wr_order_number,wr_refunded_cdemo_sk,wr_returning_cdemo_sk,wr_refunded_addr_sk,wr_reason_sk]
+                                                      CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash,wr_returned_date_sk]
                                           InputAdapter
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (1)
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (2)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [ws_item_sk,ws_order_number,ws_web_page_sk,ws_sales_price,ws_net_profit]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_page_sk,ws_order_number,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #1
-                                                          BroadcastExchange #3
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometProject [d_date_sk]
-                                                                    CometFilter [d_year,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash]
-                                                CometFilter [wr_item_sk,wr_order_number,wr_refunded_cdemo_sk,wr_returning_cdemo_sk,wr_refunded_addr_sk,wr_reason_sk]
-                                                  CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash,wr_returned_date_sk]
+                                                    CometFilter [wp_web_page_sk]
+                                                      CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
                                       InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (2)
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (3)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometFilter [wp_web_page_sk]
-                                                  CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
+                                                CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
+                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                                   InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (3)
+                                    BroadcastExchange #6
+                                      WholeStageCodegen (4)
                                         ColumnarToRow
                                           InputAdapter
                                             CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
                                               CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                               InputAdapter
-                                BroadcastExchange #6
-                                  WholeStageCodegen (4)
+                                BroadcastExchange #7
+                                  WholeStageCodegen (5)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
-                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
+                                        CometProject [ca_address_sk,ca_state]
+                                          CometFilter [ca_country,ca_address_sk,ca_state]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                           InputAdapter
-                            BroadcastExchange #7
-                              WholeStageCodegen (5)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ca_address_sk,ca_state]
-                                      CometFilter [ca_country,ca_address_sk,ca_state]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                            ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        ReusedExchange [d_date_sk] #3
-                  InputAdapter
-                    BroadcastExchange #8
-                      WholeStageCodegen (7)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [r_reason_sk]
-                              CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
+                        BroadcastExchange #8
+                          WholeStageCodegen (7)
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [r_reason_sk]
+                                  CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt
index cab784da58..5bd7bc5594 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt
@@ -1,25 +1,27 @@
 == Physical Plan ==
-TakeOrderedAndProject (21)
-+- * Project (20)
-   +- Window (19)
-      +- * Sort (18)
-         +- Exchange (17)
-            +- * HashAggregate (16)
-               +- Exchange (15)
-                  +- * HashAggregate (14)
-                     +- * Expand (13)
-                        +- * Project (12)
-                           +- * BroadcastHashJoin Inner BuildRight (11)
-                              :- * Project (6)
-                              :  +- * BroadcastHashJoin Inner BuildRight (5)
-                              :     :- * ColumnarToRow (3)
-                              :     :  +- CometFilter (2)
-                              :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                              :     +- ReusedExchange (4)
-                              +- BroadcastExchange (10)
-                                 +- * ColumnarToRow (9)
-                                    +- CometFilter (8)
-                                       +- CometScan parquet spark_catalog.default.item (7)
+TakeOrderedAndProject (23)
++- * Project (22)
+   +- Window (21)
+      +- * ColumnarToRow (20)
+         +- CometSort (19)
+            +- CometColumnarExchange (18)
+               +- CometHashAggregate (17)
+                  +- CometColumnarExchange (16)
+                     +- RowToColumnar (15)
+                        +- * HashAggregate (14)
+                           +- * Expand (13)
+                              +- * Project (12)
+                                 +- * BroadcastHashJoin Inner BuildRight (11)
+                                    :- * Project (6)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+                                    :     :- * ColumnarToRow (3)
+                                    :     :  +- CometFilter (2)
+                                    :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                                    :     +- ReusedExchange (4)
+                                    +- BroadcastExchange (10)
+                                       +- * ColumnarToRow (9)
+                                          +- CometFilter (8)
+                                             +- CometScan parquet spark_catalog.default.item (7)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -37,7 +39,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [3]: [ws_item_sk#1, ws_net_paid#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 26]
+(4) ReusedExchange [Reuses operator id: 28]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -89,66 +91,70 @@ Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
 
-(15) Exchange
+(15) RowToColumnar
 Input [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
-Arguments: hashpartitioning(i_category#9, i_class#10, spark_grouping_id#11, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(16) HashAggregate [codegen id : 4]
+(16) CometColumnarExchange
+Input [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
+Arguments: hashpartitioning(i_category#9, i_class#10, spark_grouping_id#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(17) CometHashAggregate
 Input [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
 Keys [3]: [i_category#9, i_class#10, spark_grouping_id#11]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#14]
-Results [7]: [MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#14,17,2) AS total_sum#15, i_category#9, i_class#10, (cast((shiftright(spark_grouping_id#11, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#11, 0) & 1) as tinyint)) AS lochierarchy#16, MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#14,17,2) AS _w0#17, (cast((shiftright(spark_grouping_id#11, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#11, 0) & 1) as tinyint)) AS _w1#18, CASE WHEN (cast((shiftright(spark_grouping_id#11, 0) & 1) as tinyint) = 0) THEN i_category#9 END AS _w2#19]
 
-(17) Exchange
-Input [7]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19]
-Arguments: hashpartitioning(_w1#18, _w2#19, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(18) CometColumnarExchange
+Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
+Arguments: hashpartitioning(_w1#17, _w2#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(19) CometSort
+Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
+Arguments: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18], [_w1#17 ASC NULLS FIRST, _w2#18 ASC NULLS FIRST, _w0#16 DESC NULLS LAST]
 
-(18) Sort [codegen id : 5]
-Input [7]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19]
-Arguments: [_w1#18 ASC NULLS FIRST, _w2#19 ASC NULLS FIRST, _w0#17 DESC NULLS LAST], false, 0
+(20) ColumnarToRow [codegen id : 4]
+Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
 
-(19) Window
-Input [7]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19]
-Arguments: [rank(_w0#17) windowspecdefinition(_w1#18, _w2#19, _w0#17 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#20], [_w1#18, _w2#19], [_w0#17 DESC NULLS LAST]
+(21) Window
+Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
+Arguments: [rank(_w0#16) windowspecdefinition(_w1#17, _w2#18, _w0#16 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#19], [_w1#17, _w2#18], [_w0#16 DESC NULLS LAST]
 
-(20) Project [codegen id : 6]
-Output [5]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, rank_within_parent#20]
-Input [8]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19, rank_within_parent#20]
+(22) Project [codegen id : 5]
+Output [5]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, rank_within_parent#19]
+Input [8]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18, rank_within_parent#19]
 
-(21) TakeOrderedAndProject
-Input [5]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, rank_within_parent#20]
-Arguments: 100, [lochierarchy#16 DESC NULLS LAST, CASE WHEN (lochierarchy#16 = 0) THEN i_category#9 END ASC NULLS FIRST, rank_within_parent#20 ASC NULLS FIRST], [total_sum#15, i_category#9, i_class#10, lochierarchy#16, rank_within_parent#20]
+(23) TakeOrderedAndProject
+Input [5]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, rank_within_parent#19]
+Arguments: 100, [lochierarchy#15 DESC NULLS LAST, CASE WHEN (lochierarchy#15 = 0) THEN i_category#9 END ASC NULLS FIRST, rank_within_parent#19 ASC NULLS FIRST], [total_sum#14, i_category#9, i_class#10, lochierarchy#15, rank_within_parent#19]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (26)
-+- * ColumnarToRow (25)
-   +- CometProject (24)
-      +- CometFilter (23)
-         +- CometScan parquet spark_catalog.default.date_dim (22)
+BroadcastExchange (28)
++- * ColumnarToRow (27)
+   +- CometProject (26)
+      +- CometFilter (25)
+         +- CometScan parquet spark_catalog.default.date_dim (24)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#21]
+Output [2]: [d_date_sk#5, d_month_seq#20]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(23) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#21]
-Condition : (((isnotnull(d_month_seq#21) AND (d_month_seq#21 >= 1200)) AND (d_month_seq#21 <= 1211)) AND isnotnull(d_date_sk#5))
+(25) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#20]
+Condition : (((isnotnull(d_month_seq#20) AND (d_month_seq#20 >= 1200)) AND (d_month_seq#20 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(24) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#21]
+(26) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#20]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(25) ColumnarToRow [codegen id : 1]
+(27) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(26) BroadcastExchange
+(28) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt
index f9db2ce7a4..b4fcc80345 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,total_sum,i_class]
-  WholeStageCodegen (6)
+  WholeStageCodegen (5)
     Project [total_sum,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [_w0,_w1,_w2]
-          WholeStageCodegen (5)
-            Sort [_w1,_w2,_w0]
+          WholeStageCodegen (4)
+            ColumnarToRow
               InputAdapter
-                Exchange [_w1,_w2] #1
-                  WholeStageCodegen (4)
-                    HashAggregate [i_category,i_class,spark_grouping_id,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,lochierarchy,_w0,_w1,_w2,sum]
-                      InputAdapter
-                        Exchange [i_category,i_class,spark_grouping_id] #2
+                CometSort [_w1,_w2,_w0]
+                  CometColumnarExchange [_w1,_w2] #1
+                    CometHashAggregate [i_category,i_class,spark_grouping_id,sum]
+                      CometColumnarExchange [i_category,i_class,spark_grouping_id] #2
+                        RowToColumnar
                           WholeStageCodegen (3)
                             HashAggregate [i_category,i_class,spark_grouping_id,ws_net_paid] [sum,sum]
                               Expand [ws_net_paid,i_category,i_class]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt
index a82b90a2a9..78435aff4b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt
@@ -1,51 +1,59 @@
 == Physical Plan ==
-* HashAggregate (47)
-+- Exchange (46)
-   +- * HashAggregate (45)
-      +- * Project (44)
-         +- * BroadcastHashJoin LeftAnti BuildRight (43)
-            :- * BroadcastHashJoin LeftAnti BuildRight (29)
-            :  :- * HashAggregate (15)
-            :  :  +- Exchange (14)
-            :  :     +- * HashAggregate (13)
-            :  :        +- * Project (12)
-            :  :           +- * BroadcastHashJoin Inner BuildRight (11)
-            :  :              :- * Project (6)
-            :  :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-            :  :              :     :- * ColumnarToRow (3)
-            :  :              :     :  +- CometFilter (2)
-            :  :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :  :              :     +- ReusedExchange (4)
-            :  :              +- BroadcastExchange (10)
-            :  :                 +- * ColumnarToRow (9)
-            :  :                    +- CometFilter (8)
-            :  :                       +- CometScan parquet spark_catalog.default.customer (7)
-            :  +- BroadcastExchange (28)
-            :     +- * HashAggregate (27)
-            :        +- Exchange (26)
-            :           +- * HashAggregate (25)
-            :              +- * Project (24)
-            :                 +- * BroadcastHashJoin Inner BuildRight (23)
-            :                    :- * Project (21)
-            :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-            :                    :     :- * ColumnarToRow (18)
-            :                    :     :  +- CometFilter (17)
-            :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (16)
-            :                    :     +- ReusedExchange (19)
-            :                    +- ReusedExchange (22)
-            +- BroadcastExchange (42)
-               +- * HashAggregate (41)
-                  +- Exchange (40)
-                     +- * HashAggregate (39)
-                        +- * Project (38)
-                           +- * BroadcastHashJoin Inner BuildRight (37)
-                              :- * Project (35)
-                              :  +- * BroadcastHashJoin Inner BuildRight (34)
-                              :     :- * ColumnarToRow (32)
-                              :     :  +- CometFilter (31)
-                              :     :     +- CometScan parquet spark_catalog.default.web_sales (30)
-                              :     +- ReusedExchange (33)
-                              +- ReusedExchange (36)
+* ColumnarToRow (55)
++- CometHashAggregate (54)
+   +- CometColumnarExchange (53)
+      +- RowToColumnar (52)
+         +- * HashAggregate (51)
+            +- * Project (50)
+               +- * BroadcastHashJoin LeftAnti BuildRight (49)
+                  :- * BroadcastHashJoin LeftAnti BuildRight (33)
+                  :  :- * ColumnarToRow (17)
+                  :  :  +- CometHashAggregate (16)
+                  :  :     +- CometColumnarExchange (15)
+                  :  :        +- RowToColumnar (14)
+                  :  :           +- * HashAggregate (13)
+                  :  :              +- * Project (12)
+                  :  :                 +- * BroadcastHashJoin Inner BuildRight (11)
+                  :  :                    :- * Project (6)
+                  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+                  :  :                    :     :- * ColumnarToRow (3)
+                  :  :                    :     :  +- CometFilter (2)
+                  :  :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :  :                    :     +- ReusedExchange (4)
+                  :  :                    +- BroadcastExchange (10)
+                  :  :                       +- * ColumnarToRow (9)
+                  :  :                          +- CometFilter (8)
+                  :  :                             +- CometScan parquet spark_catalog.default.customer (7)
+                  :  +- BroadcastExchange (32)
+                  :     +- * ColumnarToRow (31)
+                  :        +- CometHashAggregate (30)
+                  :           +- CometColumnarExchange (29)
+                  :              +- RowToColumnar (28)
+                  :                 +- * HashAggregate (27)
+                  :                    +- * Project (26)
+                  :                       +- * BroadcastHashJoin Inner BuildRight (25)
+                  :                          :- * Project (23)
+                  :                          :  +- * BroadcastHashJoin Inner BuildRight (22)
+                  :                          :     :- * ColumnarToRow (20)
+                  :                          :     :  +- CometFilter (19)
+                  :                          :     :     +- CometScan parquet spark_catalog.default.catalog_sales (18)
+                  :                          :     +- ReusedExchange (21)
+                  :                          +- ReusedExchange (24)
+                  +- BroadcastExchange (48)
+                     +- * ColumnarToRow (47)
+                        +- CometHashAggregate (46)
+                           +- CometColumnarExchange (45)
+                              +- RowToColumnar (44)
+                                 +- * HashAggregate (43)
+                                    +- * Project (42)
+                                       +- * BroadcastHashJoin Inner BuildRight (41)
+                                          :- * Project (39)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (38)
+                                          :     :- * ColumnarToRow (36)
+                                          :     :  +- CometFilter (35)
+                                          :     :     +- CometScan parquet spark_catalog.default.web_sales (34)
+                                          :     +- ReusedExchange (37)
+                                          +- ReusedExchange (40)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -63,7 +71,7 @@ Condition : isnotnull(ss_customer_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_customer_sk#1, ss_sold_date_sk#2]
 
-(4) ReusedExchange [Reuses operator id: 52]
+(4) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#4, d_date#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -111,16 +119,20 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
-Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 12]
+(15) CometColumnarExchange
+Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
+Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Keys [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
+
+(17) ColumnarToRow [codegen id : 12]
+Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
@@ -130,62 +142,66 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#10), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int>
 
-(17) CometFilter
+(19) CometFilter
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 Condition : isnotnull(cs_bill_customer_sk#9)
 
-(18) ColumnarToRow [codegen id : 6]
+(20) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 
-(19) ReusedExchange [Reuses operator id: 52]
+(21) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#12, d_date#13]
 
-(20) BroadcastHashJoin [codegen id : 6]
+(22) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_sold_date_sk#10]
 Right keys [1]: [d_date_sk#12]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 6]
+(23) Project [codegen id : 6]
 Output [2]: [cs_bill_customer_sk#9, d_date#13]
 Input [4]: [cs_bill_customer_sk#9, cs_sold_date_sk#10, d_date_sk#12, d_date#13]
 
-(22) ReusedExchange [Reuses operator id: 10]
+(24) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(23) BroadcastHashJoin [codegen id : 6]
+(25) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_bill_customer_sk#9]
 Right keys [1]: [c_customer_sk#14]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
+(26) Project [codegen id : 6]
 Output [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Input [5]: [cs_bill_customer_sk#9, d_date#13, c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(25) HashAggregate [codegen id : 6]
+(27) HashAggregate [codegen id : 6]
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(26) Exchange
+(28) RowToColumnar
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
-Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(27) HashAggregate [codegen id : 7]
+(29) CometColumnarExchange
+Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
+Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(28) BroadcastExchange
+(31) ColumnarToRow [codegen id : 7]
+Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
+
+(32) BroadcastExchange
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 12]
+(33) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#16, ), isnull(c_last_name#16), coalesce(c_first_name#15, ), isnull(c_first_name#15), coalesce(d_date#13, 1970-01-01), isnull(d_date#13)]
 Join type: LeftAnti
@@ -199,123 +215,131 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#18), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int>
 
-(31) CometFilter
+(35) CometFilter
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 Condition : isnotnull(ws_bill_customer_sk#17)
 
-(32) ColumnarToRow [codegen id : 10]
+(36) ColumnarToRow [codegen id : 10]
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 
-(33) ReusedExchange [Reuses operator id: 52]
+(37) ReusedExchange [Reuses operator id: 60]
 Output [2]: [d_date_sk#20, d_date#21]
 
-(34) BroadcastHashJoin [codegen id : 10]
+(38) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_sold_date_sk#18]
 Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
+(39) Project [codegen id : 10]
 Output [2]: [ws_bill_customer_sk#17, d_date#21]
 Input [4]: [ws_bill_customer_sk#17, ws_sold_date_sk#18, d_date_sk#20, d_date#21]
 
-(36) ReusedExchange [Reuses operator id: 10]
+(40) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(37) BroadcastHashJoin [codegen id : 10]
+(41) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_bill_customer_sk#17]
 Right keys [1]: [c_customer_sk#22]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
+(42) Project [codegen id : 10]
 Output [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Input [5]: [ws_bill_customer_sk#17, d_date#21, c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(39) HashAggregate [codegen id : 10]
+(43) HashAggregate [codegen id : 10]
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(40) Exchange
+(44) RowToColumnar
+Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
+
+(45) CometColumnarExchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(41) HashAggregate [codegen id : 11]
+(46) CometHashAggregate
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(42) BroadcastExchange
+(47) ColumnarToRow [codegen id : 11]
+Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
+
+(48) BroadcastExchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 12]
+(49) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#24, ), isnull(c_last_name#24), coalesce(c_first_name#23, ), isnull(c_first_name#23), coalesce(d_date#21, 1970-01-01), isnull(d_date#21)]
 Join type: LeftAnti
 Join condition: None
 
-(44) Project [codegen id : 12]
+(50) Project [codegen id : 12]
 Output: []
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(45) HashAggregate [codegen id : 12]
+(51) HashAggregate [codegen id : 12]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#25]
 Results [1]: [count#26]
 
-(46) Exchange
+(52) RowToColumnar
 Input [1]: [count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(47) HashAggregate [codegen id : 13]
+(53) CometColumnarExchange
+Input [1]: [count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(54) CometHashAggregate
 Input [1]: [count#26]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#27]
-Results [1]: [count(1)#27 AS count(1)#28]
+
+(55) ColumnarToRow [codegen id : 13]
+Input [1]: [count(1)#27]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#2 IN dynamicpruning#3
-BroadcastExchange (52)
-+- * ColumnarToRow (51)
-   +- CometProject (50)
-      +- CometFilter (49)
-         +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (60)
++- * ColumnarToRow (59)
+   +- CometProject (58)
+      +- CometFilter (57)
+         +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
+Output [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(49) CometFilter
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
-Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1200)) AND (d_month_seq#29 <= 1211)) AND isnotnull(d_date_sk#4))
+(57) CometFilter
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
+Condition : (((isnotnull(d_month_seq#28) AND (d_month_seq#28 >= 1200)) AND (d_month_seq#28 <= 1211)) AND isnotnull(d_date_sk#4))
 
-(50) CometProject
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
+(58) CometProject
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
 Arguments: [d_date_sk#4, d_date#5], [d_date_sk#4, d_date#5]
 
-(51) ColumnarToRow [codegen id : 1]
+(59) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#4, d_date#5]
 
-(52) BroadcastExchange
+(60) BroadcastExchange
 Input [2]: [d_date_sk#4, d_date#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
+Subquery:2 Hosting operator id = 18 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
 
-Subquery:3 Hosting operator id = 30 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
+Subquery:3 Hosting operator id = 34 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt
index 315afe6602..28771f9d42 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt
@@ -1,81 +1,89 @@
 WholeStageCodegen (13)
-  HashAggregate [count] [count(1),count(1),count]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (12)
-          HashAggregate [count,count]
-            Project
-              BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                  HashAggregate [c_last_name,c_first_name,d_date]
-                    InputAdapter
-                      Exchange [c_last_name,c_first_name,d_date] #2
-                        WholeStageCodegen (3)
-                          HashAggregate [c_last_name,c_first_name,d_date]
-                            Project [c_last_name,c_first_name,d_date]
-                              BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                Project [ss_customer_sk,d_date]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_customer_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
+      CometHashAggregate [count]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (12)
+              HashAggregate [count,count]
+                Project
+                  BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                    BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                      ColumnarToRow
+                        InputAdapter
+                          CometHashAggregate [c_last_name,c_first_name,d_date]
+                            CometColumnarExchange [c_last_name,c_first_name,d_date] #2
+                              RowToColumnar
+                                WholeStageCodegen (3)
+                                  HashAggregate [c_last_name,c_first_name,d_date]
+                                    Project [c_last_name,c_first_name,d_date]
+                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                        Project [ss_customer_sk,d_date]
+                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_customer_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk,d_date]
+                                                                CometFilter [d_month_seq,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk,d_date] #3
+                                        InputAdapter
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [c_customer_sk]
+                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
+                      InputAdapter
+                        BroadcastExchange #5
+                          WholeStageCodegen (7)
+                            ColumnarToRow
+                              InputAdapter
+                                CometHashAggregate [c_last_name,c_first_name,d_date]
+                                  CometColumnarExchange [c_last_name,c_first_name,d_date] #6
+                                    RowToColumnar
+                                      WholeStageCodegen (6)
+                                        HashAggregate [c_last_name,c_first_name,d_date]
+                                          Project [c_last_name,c_first_name,d_date]
+                                            BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                              Project [cs_bill_customer_sk,d_date]
+                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometProject [d_date_sk,d_date]
-                                                        CometFilter [d_month_seq,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk,d_date] #3
-                                InputAdapter
-                                  BroadcastExchange #4
-                                    WholeStageCodegen (2)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
-                  InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (7)
-                        HashAggregate [c_last_name,c_first_name,d_date]
-                          InputAdapter
-                            Exchange [c_last_name,c_first_name,d_date] #6
-                              WholeStageCodegen (6)
-                                HashAggregate [c_last_name,c_first_name,d_date]
-                                  Project [c_last_name,c_first_name,d_date]
-                                    BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                      Project [cs_bill_customer_sk,d_date]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
+                                                      CometFilter [cs_bill_customer_sk]
+                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
+                                                          ReusedSubquery [d_date_sk] #1
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk,d_date] #3
+                                              InputAdapter
+                                                ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (11)
+                          ColumnarToRow
+                            InputAdapter
+                              CometHashAggregate [c_last_name,c_first_name,d_date]
+                                CometColumnarExchange [c_last_name,c_first_name,d_date] #8
+                                  RowToColumnar
+                                    WholeStageCodegen (10)
+                                      HashAggregate [c_last_name,c_first_name,d_date]
+                                        Project [c_last_name,c_first_name,d_date]
+                                          BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                                            Project [ws_bill_customer_sk,d_date]
+                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
+                                                InputAdapter
+                                                  ReusedExchange [d_date_sk,d_date] #3
                                             InputAdapter
-                                              CometFilter [cs_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk,d_date] #3
-                                      InputAdapter
-                                        ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
-                InputAdapter
-                  BroadcastExchange #7
-                    WholeStageCodegen (11)
-                      HashAggregate [c_last_name,c_first_name,d_date]
-                        InputAdapter
-                          Exchange [c_last_name,c_first_name,d_date] #8
-                            WholeStageCodegen (10)
-                              HashAggregate [c_last_name,c_first_name,d_date]
-                                Project [c_last_name,c_first_name,d_date]
-                                  BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                                    Project [ws_bill_customer_sk,d_date]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ws_bill_customer_sk]
-                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk,d_date] #3
-                                    InputAdapter
-                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                                              ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt
index 26821dfd2a..0794d36e95 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt
@@ -1,186 +1,202 @@
 == Physical Plan ==
-* BroadcastNestedLoopJoin Inner BuildRight (182)
-:- * BroadcastNestedLoopJoin Inner BuildRight (160)
-:  :- * BroadcastNestedLoopJoin Inner BuildRight (138)
-:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (116)
-:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (94)
-:  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (72)
-:  :  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (50)
-:  :  :  :  :  :  :- * HashAggregate (28)
-:  :  :  :  :  :  :  +- Exchange (27)
-:  :  :  :  :  :  :     +- * HashAggregate (26)
-:  :  :  :  :  :  :        +- * Project (25)
-:  :  :  :  :  :  :           +- * BroadcastHashJoin Inner BuildRight (24)
-:  :  :  :  :  :  :              :- * Project (18)
-:  :  :  :  :  :  :              :  +- * BroadcastHashJoin Inner BuildRight (17)
-:  :  :  :  :  :  :              :     :- * Project (11)
-:  :  :  :  :  :  :              :     :  +- * BroadcastHashJoin Inner BuildRight (10)
-:  :  :  :  :  :  :              :     :     :- * ColumnarToRow (4)
-:  :  :  :  :  :  :              :     :     :  +- CometProject (3)
-:  :  :  :  :  :  :              :     :     :     +- CometFilter (2)
-:  :  :  :  :  :  :              :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
-:  :  :  :  :  :  :              :     :     +- BroadcastExchange (9)
-:  :  :  :  :  :  :              :     :        +- * ColumnarToRow (8)
-:  :  :  :  :  :  :              :     :           +- CometProject (7)
-:  :  :  :  :  :  :              :     :              +- CometFilter (6)
-:  :  :  :  :  :  :              :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
-:  :  :  :  :  :  :              :     +- BroadcastExchange (16)
-:  :  :  :  :  :  :              :        +- * ColumnarToRow (15)
-:  :  :  :  :  :  :              :           +- CometProject (14)
-:  :  :  :  :  :  :              :              +- CometFilter (13)
-:  :  :  :  :  :  :              :                 +- CometScan parquet spark_catalog.default.time_dim (12)
-:  :  :  :  :  :  :              +- BroadcastExchange (23)
-:  :  :  :  :  :  :                 +- * ColumnarToRow (22)
-:  :  :  :  :  :  :                    +- CometProject (21)
-:  :  :  :  :  :  :                       +- CometFilter (20)
-:  :  :  :  :  :  :                          +- CometScan parquet spark_catalog.default.store (19)
-:  :  :  :  :  :  +- BroadcastExchange (49)
-:  :  :  :  :  :     +- * HashAggregate (48)
-:  :  :  :  :  :        +- Exchange (47)
-:  :  :  :  :  :           +- * HashAggregate (46)
-:  :  :  :  :  :              +- * Project (45)
-:  :  :  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (44)
-:  :  :  :  :  :                    :- * Project (42)
-:  :  :  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (41)
-:  :  :  :  :  :                    :     :- * Project (35)
-:  :  :  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-:  :  :  :  :  :                    :     :     :- * ColumnarToRow (32)
-:  :  :  :  :  :                    :     :     :  +- CometProject (31)
-:  :  :  :  :  :                    :     :     :     +- CometFilter (30)
-:  :  :  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (29)
-:  :  :  :  :  :                    :     :     +- ReusedExchange (33)
-:  :  :  :  :  :                    :     +- BroadcastExchange (40)
-:  :  :  :  :  :                    :        +- * ColumnarToRow (39)
-:  :  :  :  :  :                    :           +- CometProject (38)
-:  :  :  :  :  :                    :              +- CometFilter (37)
-:  :  :  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (36)
-:  :  :  :  :  :                    +- ReusedExchange (43)
-:  :  :  :  :  +- BroadcastExchange (71)
-:  :  :  :  :     +- * HashAggregate (70)
-:  :  :  :  :        +- Exchange (69)
-:  :  :  :  :           +- * HashAggregate (68)
-:  :  :  :  :              +- * Project (67)
-:  :  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (66)
-:  :  :  :  :                    :- * Project (64)
-:  :  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (63)
-:  :  :  :  :                    :     :- * Project (57)
-:  :  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-:  :  :  :  :                    :     :     :- * ColumnarToRow (54)
-:  :  :  :  :                    :     :     :  +- CometProject (53)
-:  :  :  :  :                    :     :     :     +- CometFilter (52)
-:  :  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (51)
-:  :  :  :  :                    :     :     +- ReusedExchange (55)
-:  :  :  :  :                    :     +- BroadcastExchange (62)
-:  :  :  :  :                    :        +- * ColumnarToRow (61)
-:  :  :  :  :                    :           +- CometProject (60)
-:  :  :  :  :                    :              +- CometFilter (59)
-:  :  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (58)
-:  :  :  :  :                    +- ReusedExchange (65)
-:  :  :  :  +- BroadcastExchange (93)
-:  :  :  :     +- * HashAggregate (92)
-:  :  :  :        +- Exchange (91)
-:  :  :  :           +- * HashAggregate (90)
-:  :  :  :              +- * Project (89)
-:  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (88)
-:  :  :  :                    :- * Project (86)
-:  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (85)
-:  :  :  :                    :     :- * Project (79)
-:  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (78)
-:  :  :  :                    :     :     :- * ColumnarToRow (76)
-:  :  :  :                    :     :     :  +- CometProject (75)
-:  :  :  :                    :     :     :     +- CometFilter (74)
-:  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (73)
-:  :  :  :                    :     :     +- ReusedExchange (77)
-:  :  :  :                    :     +- BroadcastExchange (84)
-:  :  :  :                    :        +- * ColumnarToRow (83)
-:  :  :  :                    :           +- CometProject (82)
-:  :  :  :                    :              +- CometFilter (81)
-:  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (80)
-:  :  :  :                    +- ReusedExchange (87)
-:  :  :  +- BroadcastExchange (115)
-:  :  :     +- * HashAggregate (114)
-:  :  :        +- Exchange (113)
-:  :  :           +- * HashAggregate (112)
-:  :  :              +- * Project (111)
-:  :  :                 +- * BroadcastHashJoin Inner BuildRight (110)
-:  :  :                    :- * Project (108)
-:  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (107)
-:  :  :                    :     :- * Project (101)
-:  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (100)
-:  :  :                    :     :     :- * ColumnarToRow (98)
-:  :  :                    :     :     :  +- CometProject (97)
-:  :  :                    :     :     :     +- CometFilter (96)
-:  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (95)
-:  :  :                    :     :     +- ReusedExchange (99)
-:  :  :                    :     +- BroadcastExchange (106)
-:  :  :                    :        +- * ColumnarToRow (105)
-:  :  :                    :           +- CometProject (104)
-:  :  :                    :              +- CometFilter (103)
-:  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (102)
-:  :  :                    +- ReusedExchange (109)
-:  :  +- BroadcastExchange (137)
-:  :     +- * HashAggregate (136)
-:  :        +- Exchange (135)
-:  :           +- * HashAggregate (134)
-:  :              +- * Project (133)
-:  :                 +- * BroadcastHashJoin Inner BuildRight (132)
-:  :                    :- * Project (130)
-:  :                    :  +- * BroadcastHashJoin Inner BuildRight (129)
-:  :                    :     :- * Project (123)
-:  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (122)
-:  :                    :     :     :- * ColumnarToRow (120)
-:  :                    :     :     :  +- CometProject (119)
-:  :                    :     :     :     +- CometFilter (118)
-:  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (117)
-:  :                    :     :     +- ReusedExchange (121)
-:  :                    :     +- BroadcastExchange (128)
-:  :                    :        +- * ColumnarToRow (127)
-:  :                    :           +- CometProject (126)
-:  :                    :              +- CometFilter (125)
-:  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (124)
-:  :                    +- ReusedExchange (131)
-:  +- BroadcastExchange (159)
-:     +- * HashAggregate (158)
-:        +- Exchange (157)
-:           +- * HashAggregate (156)
-:              +- * Project (155)
-:                 +- * BroadcastHashJoin Inner BuildRight (154)
-:                    :- * Project (152)
-:                    :  +- * BroadcastHashJoin Inner BuildRight (151)
-:                    :     :- * Project (145)
-:                    :     :  +- * BroadcastHashJoin Inner BuildRight (144)
-:                    :     :     :- * ColumnarToRow (142)
-:                    :     :     :  +- CometProject (141)
-:                    :     :     :     +- CometFilter (140)
-:                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (139)
-:                    :     :     +- ReusedExchange (143)
-:                    :     +- BroadcastExchange (150)
-:                    :        +- * ColumnarToRow (149)
-:                    :           +- CometProject (148)
-:                    :              +- CometFilter (147)
-:                    :                 +- CometScan parquet spark_catalog.default.time_dim (146)
-:                    +- ReusedExchange (153)
-+- BroadcastExchange (181)
-   +- * HashAggregate (180)
-      +- Exchange (179)
-         +- * HashAggregate (178)
-            +- * Project (177)
-               +- * BroadcastHashJoin Inner BuildRight (176)
-                  :- * Project (174)
-                  :  +- * BroadcastHashJoin Inner BuildRight (173)
-                  :     :- * Project (167)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (166)
-                  :     :     :- * ColumnarToRow (164)
-                  :     :     :  +- CometProject (163)
-                  :     :     :     +- CometFilter (162)
-                  :     :     :        +- CometScan parquet spark_catalog.default.store_sales (161)
-                  :     :     +- ReusedExchange (165)
-                  :     +- BroadcastExchange (172)
-                  :        +- * ColumnarToRow (171)
-                  :           +- CometProject (170)
-                  :              +- CometFilter (169)
-                  :                 +- CometScan parquet spark_catalog.default.time_dim (168)
-                  +- ReusedExchange (175)
+* BroadcastNestedLoopJoin Inner BuildRight (198)
+:- * BroadcastNestedLoopJoin Inner BuildRight (174)
+:  :- * BroadcastNestedLoopJoin Inner BuildRight (150)
+:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (126)
+:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (102)
+:  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (78)
+:  :  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (54)
+:  :  :  :  :  :  :- * ColumnarToRow (30)
+:  :  :  :  :  :  :  +- CometHashAggregate (29)
+:  :  :  :  :  :  :     +- CometColumnarExchange (28)
+:  :  :  :  :  :  :        +- RowToColumnar (27)
+:  :  :  :  :  :  :           +- * HashAggregate (26)
+:  :  :  :  :  :  :              +- * Project (25)
+:  :  :  :  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (24)
+:  :  :  :  :  :  :                    :- * Project (18)
+:  :  :  :  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (17)
+:  :  :  :  :  :  :                    :     :- * Project (11)
+:  :  :  :  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (10)
+:  :  :  :  :  :  :                    :     :     :- * ColumnarToRow (4)
+:  :  :  :  :  :  :                    :     :     :  +- CometProject (3)
+:  :  :  :  :  :  :                    :     :     :     +- CometFilter (2)
+:  :  :  :  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
+:  :  :  :  :  :  :                    :     :     +- BroadcastExchange (9)
+:  :  :  :  :  :  :                    :     :        +- * ColumnarToRow (8)
+:  :  :  :  :  :  :                    :     :           +- CometProject (7)
+:  :  :  :  :  :  :                    :     :              +- CometFilter (6)
+:  :  :  :  :  :  :                    :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
+:  :  :  :  :  :  :                    :     +- BroadcastExchange (16)
+:  :  :  :  :  :  :                    :        +- * ColumnarToRow (15)
+:  :  :  :  :  :  :                    :           +- CometProject (14)
+:  :  :  :  :  :  :                    :              +- CometFilter (13)
+:  :  :  :  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (12)
+:  :  :  :  :  :  :                    +- BroadcastExchange (23)
+:  :  :  :  :  :  :                       +- * ColumnarToRow (22)
+:  :  :  :  :  :  :                          +- CometProject (21)
+:  :  :  :  :  :  :                             +- CometFilter (20)
+:  :  :  :  :  :  :                                +- CometScan parquet spark_catalog.default.store (19)
+:  :  :  :  :  :  +- BroadcastExchange (53)
+:  :  :  :  :  :     +- * ColumnarToRow (52)
+:  :  :  :  :  :        +- CometHashAggregate (51)
+:  :  :  :  :  :           +- CometColumnarExchange (50)
+:  :  :  :  :  :              +- RowToColumnar (49)
+:  :  :  :  :  :                 +- * HashAggregate (48)
+:  :  :  :  :  :                    +- * Project (47)
+:  :  :  :  :  :                       +- * BroadcastHashJoin Inner BuildRight (46)
+:  :  :  :  :  :                          :- * Project (44)
+:  :  :  :  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (43)
+:  :  :  :  :  :                          :     :- * Project (37)
+:  :  :  :  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (36)
+:  :  :  :  :  :                          :     :     :- * ColumnarToRow (34)
+:  :  :  :  :  :                          :     :     :  +- CometProject (33)
+:  :  :  :  :  :                          :     :     :     +- CometFilter (32)
+:  :  :  :  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (31)
+:  :  :  :  :  :                          :     :     +- ReusedExchange (35)
+:  :  :  :  :  :                          :     +- BroadcastExchange (42)
+:  :  :  :  :  :                          :        +- * ColumnarToRow (41)
+:  :  :  :  :  :                          :           +- CometProject (40)
+:  :  :  :  :  :                          :              +- CometFilter (39)
+:  :  :  :  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (38)
+:  :  :  :  :  :                          +- ReusedExchange (45)
+:  :  :  :  :  +- BroadcastExchange (77)
+:  :  :  :  :     +- * ColumnarToRow (76)
+:  :  :  :  :        +- CometHashAggregate (75)
+:  :  :  :  :           +- CometColumnarExchange (74)
+:  :  :  :  :              +- RowToColumnar (73)
+:  :  :  :  :                 +- * HashAggregate (72)
+:  :  :  :  :                    +- * Project (71)
+:  :  :  :  :                       +- * BroadcastHashJoin Inner BuildRight (70)
+:  :  :  :  :                          :- * Project (68)
+:  :  :  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (67)
+:  :  :  :  :                          :     :- * Project (61)
+:  :  :  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (60)
+:  :  :  :  :                          :     :     :- * ColumnarToRow (58)
+:  :  :  :  :                          :     :     :  +- CometProject (57)
+:  :  :  :  :                          :     :     :     +- CometFilter (56)
+:  :  :  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (55)
+:  :  :  :  :                          :     :     +- ReusedExchange (59)
+:  :  :  :  :                          :     +- BroadcastExchange (66)
+:  :  :  :  :                          :        +- * ColumnarToRow (65)
+:  :  :  :  :                          :           +- CometProject (64)
+:  :  :  :  :                          :              +- CometFilter (63)
+:  :  :  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (62)
+:  :  :  :  :                          +- ReusedExchange (69)
+:  :  :  :  +- BroadcastExchange (101)
+:  :  :  :     +- * ColumnarToRow (100)
+:  :  :  :        +- CometHashAggregate (99)
+:  :  :  :           +- CometColumnarExchange (98)
+:  :  :  :              +- RowToColumnar (97)
+:  :  :  :                 +- * HashAggregate (96)
+:  :  :  :                    +- * Project (95)
+:  :  :  :                       +- * BroadcastHashJoin Inner BuildRight (94)
+:  :  :  :                          :- * Project (92)
+:  :  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (91)
+:  :  :  :                          :     :- * Project (85)
+:  :  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (84)
+:  :  :  :                          :     :     :- * ColumnarToRow (82)
+:  :  :  :                          :     :     :  +- CometProject (81)
+:  :  :  :                          :     :     :     +- CometFilter (80)
+:  :  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (79)
+:  :  :  :                          :     :     +- ReusedExchange (83)
+:  :  :  :                          :     +- BroadcastExchange (90)
+:  :  :  :                          :        +- * ColumnarToRow (89)
+:  :  :  :                          :           +- CometProject (88)
+:  :  :  :                          :              +- CometFilter (87)
+:  :  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (86)
+:  :  :  :                          +- ReusedExchange (93)
+:  :  :  +- BroadcastExchange (125)
+:  :  :     +- * ColumnarToRow (124)
+:  :  :        +- CometHashAggregate (123)
+:  :  :           +- CometColumnarExchange (122)
+:  :  :              +- RowToColumnar (121)
+:  :  :                 +- * HashAggregate (120)
+:  :  :                    +- * Project (119)
+:  :  :                       +- * BroadcastHashJoin Inner BuildRight (118)
+:  :  :                          :- * Project (116)
+:  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (115)
+:  :  :                          :     :- * Project (109)
+:  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (108)
+:  :  :                          :     :     :- * ColumnarToRow (106)
+:  :  :                          :     :     :  +- CometProject (105)
+:  :  :                          :     :     :     +- CometFilter (104)
+:  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (103)
+:  :  :                          :     :     +- ReusedExchange (107)
+:  :  :                          :     +- BroadcastExchange (114)
+:  :  :                          :        +- * ColumnarToRow (113)
+:  :  :                          :           +- CometProject (112)
+:  :  :                          :              +- CometFilter (111)
+:  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (110)
+:  :  :                          +- ReusedExchange (117)
+:  :  +- BroadcastExchange (149)
+:  :     +- * ColumnarToRow (148)
+:  :        +- CometHashAggregate (147)
+:  :           +- CometColumnarExchange (146)
+:  :              +- RowToColumnar (145)
+:  :                 +- * HashAggregate (144)
+:  :                    +- * Project (143)
+:  :                       +- * BroadcastHashJoin Inner BuildRight (142)
+:  :                          :- * Project (140)
+:  :                          :  +- * BroadcastHashJoin Inner BuildRight (139)
+:  :                          :     :- * Project (133)
+:  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (132)
+:  :                          :     :     :- * ColumnarToRow (130)
+:  :                          :     :     :  +- CometProject (129)
+:  :                          :     :     :     +- CometFilter (128)
+:  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (127)
+:  :                          :     :     +- ReusedExchange (131)
+:  :                          :     +- BroadcastExchange (138)
+:  :                          :        +- * ColumnarToRow (137)
+:  :                          :           +- CometProject (136)
+:  :                          :              +- CometFilter (135)
+:  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (134)
+:  :                          +- ReusedExchange (141)
+:  +- BroadcastExchange (173)
+:     +- * ColumnarToRow (172)
+:        +- CometHashAggregate (171)
+:           +- CometColumnarExchange (170)
+:              +- RowToColumnar (169)
+:                 +- * HashAggregate (168)
+:                    +- * Project (167)
+:                       +- * BroadcastHashJoin Inner BuildRight (166)
+:                          :- * Project (164)
+:                          :  +- * BroadcastHashJoin Inner BuildRight (163)
+:                          :     :- * Project (157)
+:                          :     :  +- * BroadcastHashJoin Inner BuildRight (156)
+:                          :     :     :- * ColumnarToRow (154)
+:                          :     :     :  +- CometProject (153)
+:                          :     :     :     +- CometFilter (152)
+:                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (151)
+:                          :     :     +- ReusedExchange (155)
+:                          :     +- BroadcastExchange (162)
+:                          :        +- * ColumnarToRow (161)
+:                          :           +- CometProject (160)
+:                          :              +- CometFilter (159)
+:                          :                 +- CometScan parquet spark_catalog.default.time_dim (158)
+:                          +- ReusedExchange (165)
++- BroadcastExchange (197)
+   +- * ColumnarToRow (196)
+      +- CometHashAggregate (195)
+         +- CometColumnarExchange (194)
+            +- RowToColumnar (193)
+               +- * HashAggregate (192)
+                  +- * Project (191)
+                     +- * BroadcastHashJoin Inner BuildRight (190)
+                        :- * Project (188)
+                        :  +- * BroadcastHashJoin Inner BuildRight (187)
+                        :     :- * Project (181)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (180)
+                        :     :     :- * ColumnarToRow (178)
+                        :     :     :  +- CometProject (177)
+                        :     :     :     +- CometFilter (176)
+                        :     :     :        +- CometScan parquet spark_catalog.default.store_sales (175)
+                        :     :     +- ReusedExchange (179)
+                        :     +- BroadcastExchange (186)
+                        :        +- * ColumnarToRow (185)
+                        :           +- CometProject (184)
+                        :              +- CometFilter (183)
+                        :                 +- CometScan parquet spark_catalog.default.time_dim (182)
+                        +- ReusedExchange (189)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -304,728 +320,760 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#13]
 Results [1]: [count#14]
 
-(27) Exchange
+(27) RowToColumnar
 Input [1]: [count#14]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 40]
+(28) CometColumnarExchange
+Input [1]: [count#14]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [1]: [count#14]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#15]
-Results [1]: [count(1)#15 AS h8_30_to_9#16]
+
+(30) ColumnarToRow [codegen id : 40]
+Input [1]: [h8_30_to_9#15]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, ss_sold_date_sk#20]
+Output [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, ss_sold_date_sk#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(30) CometFilter
-Input [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, ss_sold_date_sk#20]
-Condition : ((isnotnull(ss_hdemo_sk#18) AND isnotnull(ss_sold_time_sk#17)) AND isnotnull(ss_store_sk#19))
+(32) CometFilter
+Input [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, ss_sold_date_sk#19]
+Condition : ((isnotnull(ss_hdemo_sk#17) AND isnotnull(ss_sold_time_sk#16)) AND isnotnull(ss_store_sk#18))
 
-(31) CometProject
-Input [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, ss_sold_date_sk#20]
-Arguments: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19], [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19]
+(33) CometProject
+Input [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, ss_sold_date_sk#19]
+Arguments: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18], [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18]
 
-(32) ColumnarToRow [codegen id : 8]
-Input [3]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19]
+(34) ColumnarToRow [codegen id : 8]
+Input [3]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18]
 
-(33) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#21]
+(35) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#20]
 
-(34) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_hdemo_sk#18]
-Right keys [1]: [hd_demo_sk#21]
+(36) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_hdemo_sk#17]
+Right keys [1]: [hd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
-Output [2]: [ss_sold_time_sk#17, ss_store_sk#19]
-Input [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, hd_demo_sk#21]
+(37) Project [codegen id : 8]
+Output [2]: [ss_sold_time_sk#16, ss_store_sk#18]
+Input [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, hd_demo_sk#20]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#22, t_hour#23, t_minute#24]
+Output [3]: [t_time_sk#21, t_hour#22, t_minute#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,9), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(37) CometFilter
-Input [3]: [t_time_sk#22, t_hour#23, t_minute#24]
-Condition : ((((isnotnull(t_hour#23) AND isnotnull(t_minute#24)) AND (t_hour#23 = 9)) AND (t_minute#24 < 30)) AND isnotnull(t_time_sk#22))
+(39) CometFilter
+Input [3]: [t_time_sk#21, t_hour#22, t_minute#23]
+Condition : ((((isnotnull(t_hour#22) AND isnotnull(t_minute#23)) AND (t_hour#22 = 9)) AND (t_minute#23 < 30)) AND isnotnull(t_time_sk#21))
 
-(38) CometProject
-Input [3]: [t_time_sk#22, t_hour#23, t_minute#24]
-Arguments: [t_time_sk#22], [t_time_sk#22]
+(40) CometProject
+Input [3]: [t_time_sk#21, t_hour#22, t_minute#23]
+Arguments: [t_time_sk#21], [t_time_sk#21]
 
-(39) ColumnarToRow [codegen id : 6]
-Input [1]: [t_time_sk#22]
+(41) ColumnarToRow [codegen id : 6]
+Input [1]: [t_time_sk#21]
 
-(40) BroadcastExchange
-Input [1]: [t_time_sk#22]
+(42) BroadcastExchange
+Input [1]: [t_time_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(41) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_sold_time_sk#17]
-Right keys [1]: [t_time_sk#22]
+(43) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_sold_time_sk#16]
+Right keys [1]: [t_time_sk#21]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 8]
-Output [1]: [ss_store_sk#19]
-Input [3]: [ss_sold_time_sk#17, ss_store_sk#19, t_time_sk#22]
+(44) Project [codegen id : 8]
+Output [1]: [ss_store_sk#18]
+Input [3]: [ss_sold_time_sk#16, ss_store_sk#18, t_time_sk#21]
 
-(43) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#25]
+(45) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#24]
 
-(44) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_store_sk#19]
-Right keys [1]: [s_store_sk#25]
+(46) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_store_sk#18]
+Right keys [1]: [s_store_sk#24]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 8]
+(47) Project [codegen id : 8]
 Output: []
-Input [2]: [ss_store_sk#19, s_store_sk#25]
+Input [2]: [ss_store_sk#18, s_store_sk#24]
 
-(46) HashAggregate [codegen id : 8]
+(48) HashAggregate [codegen id : 8]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#26]
-Results [1]: [count#27]
+Aggregate Attributes [1]: [count#25]
+Results [1]: [count#26]
 
-(47) Exchange
-Input [1]: [count#27]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
+(49) RowToColumnar
+Input [1]: [count#26]
 
-(48) HashAggregate [codegen id : 9]
-Input [1]: [count#27]
+(50) CometColumnarExchange
+Input [1]: [count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(51) CometHashAggregate
+Input [1]: [count#26]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#28]
-Results [1]: [count(1)#28 AS h9_to_9_30#29]
 
-(49) BroadcastExchange
-Input [1]: [h9_to_9_30#29]
+(52) ColumnarToRow [codegen id : 9]
+Input [1]: [h9_to_9_30#27]
+
+(53) BroadcastExchange
+Input [1]: [h9_to_9_30#27]
 Arguments: IdentityBroadcastMode, [plan_id=7]
 
-(50) BroadcastNestedLoopJoin [codegen id : 40]
+(54) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, ss_sold_date_sk#33]
+Output [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, ss_sold_date_sk#31]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(52) CometFilter
-Input [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, ss_sold_date_sk#33]
-Condition : ((isnotnull(ss_hdemo_sk#31) AND isnotnull(ss_sold_time_sk#30)) AND isnotnull(ss_store_sk#32))
+(56) CometFilter
+Input [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, ss_sold_date_sk#31]
+Condition : ((isnotnull(ss_hdemo_sk#29) AND isnotnull(ss_sold_time_sk#28)) AND isnotnull(ss_store_sk#30))
 
-(53) CometProject
-Input [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, ss_sold_date_sk#33]
-Arguments: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32], [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32]
+(57) CometProject
+Input [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, ss_sold_date_sk#31]
+Arguments: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30], [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30]
 
-(54) ColumnarToRow [codegen id : 13]
-Input [3]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32]
+(58) ColumnarToRow [codegen id : 13]
+Input [3]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30]
 
-(55) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#34]
+(59) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#32]
 
-(56) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_hdemo_sk#31]
-Right keys [1]: [hd_demo_sk#34]
+(60) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_hdemo_sk#29]
+Right keys [1]: [hd_demo_sk#32]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 13]
-Output [2]: [ss_sold_time_sk#30, ss_store_sk#32]
-Input [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, hd_demo_sk#34]
+(61) Project [codegen id : 13]
+Output [2]: [ss_sold_time_sk#28, ss_store_sk#30]
+Input [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, hd_demo_sk#32]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#35, t_hour#36, t_minute#37]
+Output [3]: [t_time_sk#33, t_hour#34, t_minute#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,9), GreaterThanOrEqual(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(59) CometFilter
-Input [3]: [t_time_sk#35, t_hour#36, t_minute#37]
-Condition : ((((isnotnull(t_hour#36) AND isnotnull(t_minute#37)) AND (t_hour#36 = 9)) AND (t_minute#37 >= 30)) AND isnotnull(t_time_sk#35))
+(63) CometFilter
+Input [3]: [t_time_sk#33, t_hour#34, t_minute#35]
+Condition : ((((isnotnull(t_hour#34) AND isnotnull(t_minute#35)) AND (t_hour#34 = 9)) AND (t_minute#35 >= 30)) AND isnotnull(t_time_sk#33))
 
-(60) CometProject
-Input [3]: [t_time_sk#35, t_hour#36, t_minute#37]
-Arguments: [t_time_sk#35], [t_time_sk#35]
+(64) CometProject
+Input [3]: [t_time_sk#33, t_hour#34, t_minute#35]
+Arguments: [t_time_sk#33], [t_time_sk#33]
 
-(61) ColumnarToRow [codegen id : 11]
-Input [1]: [t_time_sk#35]
+(65) ColumnarToRow [codegen id : 11]
+Input [1]: [t_time_sk#33]
 
-(62) BroadcastExchange
-Input [1]: [t_time_sk#35]
+(66) BroadcastExchange
+Input [1]: [t_time_sk#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-(63) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_sold_time_sk#30]
-Right keys [1]: [t_time_sk#35]
+(67) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_sold_time_sk#28]
+Right keys [1]: [t_time_sk#33]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 13]
-Output [1]: [ss_store_sk#32]
-Input [3]: [ss_sold_time_sk#30, ss_store_sk#32, t_time_sk#35]
+(68) Project [codegen id : 13]
+Output [1]: [ss_store_sk#30]
+Input [3]: [ss_sold_time_sk#28, ss_store_sk#30, t_time_sk#33]
 
-(65) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#38]
+(69) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#36]
 
-(66) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_store_sk#32]
-Right keys [1]: [s_store_sk#38]
+(70) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_store_sk#30]
+Right keys [1]: [s_store_sk#36]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 13]
+(71) Project [codegen id : 13]
 Output: []
-Input [2]: [ss_store_sk#32, s_store_sk#38]
+Input [2]: [ss_store_sk#30, s_store_sk#36]
 
-(68) HashAggregate [codegen id : 13]
+(72) HashAggregate [codegen id : 13]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#39]
-Results [1]: [count#40]
+Aggregate Attributes [1]: [count#37]
+Results [1]: [count#38]
+
+(73) RowToColumnar
+Input [1]: [count#38]
 
-(69) Exchange
-Input [1]: [count#40]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=9]
+(74) CometColumnarExchange
+Input [1]: [count#38]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(70) HashAggregate [codegen id : 14]
-Input [1]: [count#40]
+(75) CometHashAggregate
+Input [1]: [count#38]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#41]
-Results [1]: [count(1)#41 AS h9_30_to_10#42]
 
-(71) BroadcastExchange
-Input [1]: [h9_30_to_10#42]
+(76) ColumnarToRow [codegen id : 14]
+Input [1]: [h9_30_to_10#39]
+
+(77) BroadcastExchange
+Input [1]: [h9_30_to_10#39]
 Arguments: IdentityBroadcastMode, [plan_id=10]
 
-(72) BroadcastNestedLoopJoin [codegen id : 40]
+(78) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, ss_sold_date_sk#46]
+Output [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, ss_sold_date_sk#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(74) CometFilter
-Input [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, ss_sold_date_sk#46]
-Condition : ((isnotnull(ss_hdemo_sk#44) AND isnotnull(ss_sold_time_sk#43)) AND isnotnull(ss_store_sk#45))
+(80) CometFilter
+Input [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, ss_sold_date_sk#43]
+Condition : ((isnotnull(ss_hdemo_sk#41) AND isnotnull(ss_sold_time_sk#40)) AND isnotnull(ss_store_sk#42))
 
-(75) CometProject
-Input [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, ss_sold_date_sk#46]
-Arguments: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45], [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45]
+(81) CometProject
+Input [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, ss_sold_date_sk#43]
+Arguments: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42], [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42]
 
-(76) ColumnarToRow [codegen id : 18]
-Input [3]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45]
+(82) ColumnarToRow [codegen id : 18]
+Input [3]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42]
 
-(77) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#47]
+(83) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#44]
 
-(78) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ss_hdemo_sk#44]
-Right keys [1]: [hd_demo_sk#47]
+(84) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ss_hdemo_sk#41]
+Right keys [1]: [hd_demo_sk#44]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 18]
-Output [2]: [ss_sold_time_sk#43, ss_store_sk#45]
-Input [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, hd_demo_sk#47]
+(85) Project [codegen id : 18]
+Output [2]: [ss_sold_time_sk#40, ss_store_sk#42]
+Input [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, hd_demo_sk#44]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#48, t_hour#49, t_minute#50]
+Output [3]: [t_time_sk#45, t_hour#46, t_minute#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,10), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(81) CometFilter
-Input [3]: [t_time_sk#48, t_hour#49, t_minute#50]
-Condition : ((((isnotnull(t_hour#49) AND isnotnull(t_minute#50)) AND (t_hour#49 = 10)) AND (t_minute#50 < 30)) AND isnotnull(t_time_sk#48))
+(87) CometFilter
+Input [3]: [t_time_sk#45, t_hour#46, t_minute#47]
+Condition : ((((isnotnull(t_hour#46) AND isnotnull(t_minute#47)) AND (t_hour#46 = 10)) AND (t_minute#47 < 30)) AND isnotnull(t_time_sk#45))
 
-(82) CometProject
-Input [3]: [t_time_sk#48, t_hour#49, t_minute#50]
-Arguments: [t_time_sk#48], [t_time_sk#48]
+(88) CometProject
+Input [3]: [t_time_sk#45, t_hour#46, t_minute#47]
+Arguments: [t_time_sk#45], [t_time_sk#45]
 
-(83) ColumnarToRow [codegen id : 16]
-Input [1]: [t_time_sk#48]
+(89) ColumnarToRow [codegen id : 16]
+Input [1]: [t_time_sk#45]
 
-(84) BroadcastExchange
-Input [1]: [t_time_sk#48]
+(90) BroadcastExchange
+Input [1]: [t_time_sk#45]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(85) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ss_sold_time_sk#43]
-Right keys [1]: [t_time_sk#48]
+(91) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ss_sold_time_sk#40]
+Right keys [1]: [t_time_sk#45]
 Join type: Inner
 Join condition: None
 
-(86) Project [codegen id : 18]
-Output [1]: [ss_store_sk#45]
-Input [3]: [ss_sold_time_sk#43, ss_store_sk#45, t_time_sk#48]
+(92) Project [codegen id : 18]
+Output [1]: [ss_store_sk#42]
+Input [3]: [ss_sold_time_sk#40, ss_store_sk#42, t_time_sk#45]
 
-(87) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#51]
+(93) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#48]
 
-(88) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ss_store_sk#45]
-Right keys [1]: [s_store_sk#51]
+(94) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ss_store_sk#42]
+Right keys [1]: [s_store_sk#48]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 18]
+(95) Project [codegen id : 18]
 Output: []
-Input [2]: [ss_store_sk#45, s_store_sk#51]
+Input [2]: [ss_store_sk#42, s_store_sk#48]
 
-(90) HashAggregate [codegen id : 18]
+(96) HashAggregate [codegen id : 18]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#52]
-Results [1]: [count#53]
+Aggregate Attributes [1]: [count#49]
+Results [1]: [count#50]
+
+(97) RowToColumnar
+Input [1]: [count#50]
 
-(91) Exchange
-Input [1]: [count#53]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
+(98) CometColumnarExchange
+Input [1]: [count#50]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(92) HashAggregate [codegen id : 19]
-Input [1]: [count#53]
+(99) CometHashAggregate
+Input [1]: [count#50]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#54]
-Results [1]: [count(1)#54 AS h10_to_10_30#55]
 
-(93) BroadcastExchange
-Input [1]: [h10_to_10_30#55]
+(100) ColumnarToRow [codegen id : 19]
+Input [1]: [h10_to_10_30#51]
+
+(101) BroadcastExchange
+Input [1]: [h10_to_10_30#51]
 Arguments: IdentityBroadcastMode, [plan_id=13]
 
-(94) BroadcastNestedLoopJoin [codegen id : 40]
+(102) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, ss_sold_date_sk#59]
+Output [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, ss_sold_date_sk#55]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(96) CometFilter
-Input [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, ss_sold_date_sk#59]
-Condition : ((isnotnull(ss_hdemo_sk#57) AND isnotnull(ss_sold_time_sk#56)) AND isnotnull(ss_store_sk#58))
+(104) CometFilter
+Input [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, ss_sold_date_sk#55]
+Condition : ((isnotnull(ss_hdemo_sk#53) AND isnotnull(ss_sold_time_sk#52)) AND isnotnull(ss_store_sk#54))
 
-(97) CometProject
-Input [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, ss_sold_date_sk#59]
-Arguments: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58], [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58]
+(105) CometProject
+Input [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, ss_sold_date_sk#55]
+Arguments: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54], [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54]
 
-(98) ColumnarToRow [codegen id : 23]
-Input [3]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58]
+(106) ColumnarToRow [codegen id : 23]
+Input [3]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54]
 
-(99) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#60]
+(107) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#56]
 
-(100) BroadcastHashJoin [codegen id : 23]
-Left keys [1]: [ss_hdemo_sk#57]
-Right keys [1]: [hd_demo_sk#60]
+(108) BroadcastHashJoin [codegen id : 23]
+Left keys [1]: [ss_hdemo_sk#53]
+Right keys [1]: [hd_demo_sk#56]
 Join type: Inner
 Join condition: None
 
-(101) Project [codegen id : 23]
-Output [2]: [ss_sold_time_sk#56, ss_store_sk#58]
-Input [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, hd_demo_sk#60]
+(109) Project [codegen id : 23]
+Output [2]: [ss_sold_time_sk#52, ss_store_sk#54]
+Input [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, hd_demo_sk#56]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#61, t_hour#62, t_minute#63]
+Output [3]: [t_time_sk#57, t_hour#58, t_minute#59]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,10), GreaterThanOrEqual(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(103) CometFilter
-Input [3]: [t_time_sk#61, t_hour#62, t_minute#63]
-Condition : ((((isnotnull(t_hour#62) AND isnotnull(t_minute#63)) AND (t_hour#62 = 10)) AND (t_minute#63 >= 30)) AND isnotnull(t_time_sk#61))
+(111) CometFilter
+Input [3]: [t_time_sk#57, t_hour#58, t_minute#59]
+Condition : ((((isnotnull(t_hour#58) AND isnotnull(t_minute#59)) AND (t_hour#58 = 10)) AND (t_minute#59 >= 30)) AND isnotnull(t_time_sk#57))
 
-(104) CometProject
-Input [3]: [t_time_sk#61, t_hour#62, t_minute#63]
-Arguments: [t_time_sk#61], [t_time_sk#61]
+(112) CometProject
+Input [3]: [t_time_sk#57, t_hour#58, t_minute#59]
+Arguments: [t_time_sk#57], [t_time_sk#57]
 
-(105) ColumnarToRow [codegen id : 21]
-Input [1]: [t_time_sk#61]
+(113) ColumnarToRow [codegen id : 21]
+Input [1]: [t_time_sk#57]
 
-(106) BroadcastExchange
-Input [1]: [t_time_sk#61]
+(114) BroadcastExchange
+Input [1]: [t_time_sk#57]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
-(107) BroadcastHashJoin [codegen id : 23]
-Left keys [1]: [ss_sold_time_sk#56]
-Right keys [1]: [t_time_sk#61]
+(115) BroadcastHashJoin [codegen id : 23]
+Left keys [1]: [ss_sold_time_sk#52]
+Right keys [1]: [t_time_sk#57]
 Join type: Inner
 Join condition: None
 
-(108) Project [codegen id : 23]
-Output [1]: [ss_store_sk#58]
-Input [3]: [ss_sold_time_sk#56, ss_store_sk#58, t_time_sk#61]
+(116) Project [codegen id : 23]
+Output [1]: [ss_store_sk#54]
+Input [3]: [ss_sold_time_sk#52, ss_store_sk#54, t_time_sk#57]
 
-(109) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#64]
+(117) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#60]
 
-(110) BroadcastHashJoin [codegen id : 23]
-Left keys [1]: [ss_store_sk#58]
-Right keys [1]: [s_store_sk#64]
+(118) BroadcastHashJoin [codegen id : 23]
+Left keys [1]: [ss_store_sk#54]
+Right keys [1]: [s_store_sk#60]
 Join type: Inner
 Join condition: None
 
-(111) Project [codegen id : 23]
+(119) Project [codegen id : 23]
 Output: []
-Input [2]: [ss_store_sk#58, s_store_sk#64]
+Input [2]: [ss_store_sk#54, s_store_sk#60]
 
-(112) HashAggregate [codegen id : 23]
+(120) HashAggregate [codegen id : 23]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#65]
-Results [1]: [count#66]
+Aggregate Attributes [1]: [count#61]
+Results [1]: [count#62]
 
-(113) Exchange
-Input [1]: [count#66]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=15]
+(121) RowToColumnar
+Input [1]: [count#62]
 
-(114) HashAggregate [codegen id : 24]
-Input [1]: [count#66]
+(122) CometColumnarExchange
+Input [1]: [count#62]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+
+(123) CometHashAggregate
+Input [1]: [count#62]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#67]
-Results [1]: [count(1)#67 AS h10_30_to_11#68]
 
-(115) BroadcastExchange
-Input [1]: [h10_30_to_11#68]
+(124) ColumnarToRow [codegen id : 24]
+Input [1]: [h10_30_to_11#63]
+
+(125) BroadcastExchange
+Input [1]: [h10_30_to_11#63]
 Arguments: IdentityBroadcastMode, [plan_id=16]
 
-(116) BroadcastNestedLoopJoin [codegen id : 40]
+(126) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, ss_sold_date_sk#72]
+Output [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, ss_sold_date_sk#67]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(118) CometFilter
-Input [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, ss_sold_date_sk#72]
-Condition : ((isnotnull(ss_hdemo_sk#70) AND isnotnull(ss_sold_time_sk#69)) AND isnotnull(ss_store_sk#71))
+(128) CometFilter
+Input [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, ss_sold_date_sk#67]
+Condition : ((isnotnull(ss_hdemo_sk#65) AND isnotnull(ss_sold_time_sk#64)) AND isnotnull(ss_store_sk#66))
 
-(119) CometProject
-Input [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, ss_sold_date_sk#72]
-Arguments: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71], [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71]
+(129) CometProject
+Input [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, ss_sold_date_sk#67]
+Arguments: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66], [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66]
 
-(120) ColumnarToRow [codegen id : 28]
-Input [3]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71]
+(130) ColumnarToRow [codegen id : 28]
+Input [3]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66]
 
-(121) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#73]
+(131) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#68]
 
-(122) BroadcastHashJoin [codegen id : 28]
-Left keys [1]: [ss_hdemo_sk#70]
-Right keys [1]: [hd_demo_sk#73]
+(132) BroadcastHashJoin [codegen id : 28]
+Left keys [1]: [ss_hdemo_sk#65]
+Right keys [1]: [hd_demo_sk#68]
 Join type: Inner
 Join condition: None
 
-(123) Project [codegen id : 28]
-Output [2]: [ss_sold_time_sk#69, ss_store_sk#71]
-Input [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, hd_demo_sk#73]
+(133) Project [codegen id : 28]
+Output [2]: [ss_sold_time_sk#64, ss_store_sk#66]
+Input [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, hd_demo_sk#68]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#74, t_hour#75, t_minute#76]
+Output [3]: [t_time_sk#69, t_hour#70, t_minute#71]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,11), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(125) CometFilter
-Input [3]: [t_time_sk#74, t_hour#75, t_minute#76]
-Condition : ((((isnotnull(t_hour#75) AND isnotnull(t_minute#76)) AND (t_hour#75 = 11)) AND (t_minute#76 < 30)) AND isnotnull(t_time_sk#74))
+(135) CometFilter
+Input [3]: [t_time_sk#69, t_hour#70, t_minute#71]
+Condition : ((((isnotnull(t_hour#70) AND isnotnull(t_minute#71)) AND (t_hour#70 = 11)) AND (t_minute#71 < 30)) AND isnotnull(t_time_sk#69))
 
-(126) CometProject
-Input [3]: [t_time_sk#74, t_hour#75, t_minute#76]
-Arguments: [t_time_sk#74], [t_time_sk#74]
+(136) CometProject
+Input [3]: [t_time_sk#69, t_hour#70, t_minute#71]
+Arguments: [t_time_sk#69], [t_time_sk#69]
 
-(127) ColumnarToRow [codegen id : 26]
-Input [1]: [t_time_sk#74]
+(137) ColumnarToRow [codegen id : 26]
+Input [1]: [t_time_sk#69]
 
-(128) BroadcastExchange
-Input [1]: [t_time_sk#74]
+(138) BroadcastExchange
+Input [1]: [t_time_sk#69]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=17]
 
-(129) BroadcastHashJoin [codegen id : 28]
-Left keys [1]: [ss_sold_time_sk#69]
-Right keys [1]: [t_time_sk#74]
+(139) BroadcastHashJoin [codegen id : 28]
+Left keys [1]: [ss_sold_time_sk#64]
+Right keys [1]: [t_time_sk#69]
 Join type: Inner
 Join condition: None
 
-(130) Project [codegen id : 28]
-Output [1]: [ss_store_sk#71]
-Input [3]: [ss_sold_time_sk#69, ss_store_sk#71, t_time_sk#74]
+(140) Project [codegen id : 28]
+Output [1]: [ss_store_sk#66]
+Input [3]: [ss_sold_time_sk#64, ss_store_sk#66, t_time_sk#69]
 
-(131) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#77]
+(141) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#72]
 
-(132) BroadcastHashJoin [codegen id : 28]
-Left keys [1]: [ss_store_sk#71]
-Right keys [1]: [s_store_sk#77]
+(142) BroadcastHashJoin [codegen id : 28]
+Left keys [1]: [ss_store_sk#66]
+Right keys [1]: [s_store_sk#72]
 Join type: Inner
 Join condition: None
 
-(133) Project [codegen id : 28]
+(143) Project [codegen id : 28]
 Output: []
-Input [2]: [ss_store_sk#71, s_store_sk#77]
+Input [2]: [ss_store_sk#66, s_store_sk#72]
 
-(134) HashAggregate [codegen id : 28]
+(144) HashAggregate [codegen id : 28]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#78]
-Results [1]: [count#79]
+Aggregate Attributes [1]: [count#73]
+Results [1]: [count#74]
+
+(145) RowToColumnar
+Input [1]: [count#74]
 
-(135) Exchange
-Input [1]: [count#79]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=18]
+(146) CometColumnarExchange
+Input [1]: [count#74]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
 
-(136) HashAggregate [codegen id : 29]
-Input [1]: [count#79]
+(147) CometHashAggregate
+Input [1]: [count#74]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#80]
-Results [1]: [count(1)#80 AS h11_to_11_30#81]
 
-(137) BroadcastExchange
-Input [1]: [h11_to_11_30#81]
+(148) ColumnarToRow [codegen id : 29]
+Input [1]: [h11_to_11_30#75]
+
+(149) BroadcastExchange
+Input [1]: [h11_to_11_30#75]
 Arguments: IdentityBroadcastMode, [plan_id=19]
 
-(138) BroadcastNestedLoopJoin [codegen id : 40]
+(150) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, ss_sold_date_sk#85]
+Output [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, ss_sold_date_sk#79]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(140) CometFilter
-Input [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, ss_sold_date_sk#85]
-Condition : ((isnotnull(ss_hdemo_sk#83) AND isnotnull(ss_sold_time_sk#82)) AND isnotnull(ss_store_sk#84))
+(152) CometFilter
+Input [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, ss_sold_date_sk#79]
+Condition : ((isnotnull(ss_hdemo_sk#77) AND isnotnull(ss_sold_time_sk#76)) AND isnotnull(ss_store_sk#78))
 
-(141) CometProject
-Input [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, ss_sold_date_sk#85]
-Arguments: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84], [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84]
+(153) CometProject
+Input [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, ss_sold_date_sk#79]
+Arguments: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78], [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78]
 
-(142) ColumnarToRow [codegen id : 33]
-Input [3]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84]
+(154) ColumnarToRow [codegen id : 33]
+Input [3]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78]
 
-(143) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#86]
+(155) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#80]
 
-(144) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ss_hdemo_sk#83]
-Right keys [1]: [hd_demo_sk#86]
+(156) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ss_hdemo_sk#77]
+Right keys [1]: [hd_demo_sk#80]
 Join type: Inner
 Join condition: None
 
-(145) Project [codegen id : 33]
-Output [2]: [ss_sold_time_sk#82, ss_store_sk#84]
-Input [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, hd_demo_sk#86]
+(157) Project [codegen id : 33]
+Output [2]: [ss_sold_time_sk#76, ss_store_sk#78]
+Input [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, hd_demo_sk#80]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#87, t_hour#88, t_minute#89]
+Output [3]: [t_time_sk#81, t_hour#82, t_minute#83]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,11), GreaterThanOrEqual(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(147) CometFilter
-Input [3]: [t_time_sk#87, t_hour#88, t_minute#89]
-Condition : ((((isnotnull(t_hour#88) AND isnotnull(t_minute#89)) AND (t_hour#88 = 11)) AND (t_minute#89 >= 30)) AND isnotnull(t_time_sk#87))
+(159) CometFilter
+Input [3]: [t_time_sk#81, t_hour#82, t_minute#83]
+Condition : ((((isnotnull(t_hour#82) AND isnotnull(t_minute#83)) AND (t_hour#82 = 11)) AND (t_minute#83 >= 30)) AND isnotnull(t_time_sk#81))
 
-(148) CometProject
-Input [3]: [t_time_sk#87, t_hour#88, t_minute#89]
-Arguments: [t_time_sk#87], [t_time_sk#87]
+(160) CometProject
+Input [3]: [t_time_sk#81, t_hour#82, t_minute#83]
+Arguments: [t_time_sk#81], [t_time_sk#81]
 
-(149) ColumnarToRow [codegen id : 31]
-Input [1]: [t_time_sk#87]
+(161) ColumnarToRow [codegen id : 31]
+Input [1]: [t_time_sk#81]
 
-(150) BroadcastExchange
-Input [1]: [t_time_sk#87]
+(162) BroadcastExchange
+Input [1]: [t_time_sk#81]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=20]
 
-(151) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ss_sold_time_sk#82]
-Right keys [1]: [t_time_sk#87]
+(163) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ss_sold_time_sk#76]
+Right keys [1]: [t_time_sk#81]
 Join type: Inner
 Join condition: None
 
-(152) Project [codegen id : 33]
-Output [1]: [ss_store_sk#84]
-Input [3]: [ss_sold_time_sk#82, ss_store_sk#84, t_time_sk#87]
+(164) Project [codegen id : 33]
+Output [1]: [ss_store_sk#78]
+Input [3]: [ss_sold_time_sk#76, ss_store_sk#78, t_time_sk#81]
 
-(153) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#90]
+(165) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#84]
 
-(154) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ss_store_sk#84]
-Right keys [1]: [s_store_sk#90]
+(166) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ss_store_sk#78]
+Right keys [1]: [s_store_sk#84]
 Join type: Inner
 Join condition: None
 
-(155) Project [codegen id : 33]
+(167) Project [codegen id : 33]
 Output: []
-Input [2]: [ss_store_sk#84, s_store_sk#90]
+Input [2]: [ss_store_sk#78, s_store_sk#84]
 
-(156) HashAggregate [codegen id : 33]
+(168) HashAggregate [codegen id : 33]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#91]
-Results [1]: [count#92]
+Aggregate Attributes [1]: [count#85]
+Results [1]: [count#86]
+
+(169) RowToColumnar
+Input [1]: [count#86]
 
-(157) Exchange
-Input [1]: [count#92]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=21]
+(170) CometColumnarExchange
+Input [1]: [count#86]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=21]
 
-(158) HashAggregate [codegen id : 34]
-Input [1]: [count#92]
+(171) CometHashAggregate
+Input [1]: [count#86]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#93]
-Results [1]: [count(1)#93 AS h11_30_to_12#94]
 
-(159) BroadcastExchange
-Input [1]: [h11_30_to_12#94]
+(172) ColumnarToRow [codegen id : 34]
+Input [1]: [h11_30_to_12#87]
+
+(173) BroadcastExchange
+Input [1]: [h11_30_to_12#87]
 Arguments: IdentityBroadcastMode, [plan_id=22]
 
-(160) BroadcastNestedLoopJoin [codegen id : 40]
+(174) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, ss_sold_date_sk#98]
+Output [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, ss_sold_date_sk#91]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(162) CometFilter
-Input [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, ss_sold_date_sk#98]
-Condition : ((isnotnull(ss_hdemo_sk#96) AND isnotnull(ss_sold_time_sk#95)) AND isnotnull(ss_store_sk#97))
+(176) CometFilter
+Input [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, ss_sold_date_sk#91]
+Condition : ((isnotnull(ss_hdemo_sk#89) AND isnotnull(ss_sold_time_sk#88)) AND isnotnull(ss_store_sk#90))
 
-(163) CometProject
-Input [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, ss_sold_date_sk#98]
-Arguments: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97], [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97]
+(177) CometProject
+Input [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, ss_sold_date_sk#91]
+Arguments: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90], [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90]
 
-(164) ColumnarToRow [codegen id : 38]
-Input [3]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97]
+(178) ColumnarToRow [codegen id : 38]
+Input [3]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90]
 
-(165) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#99]
+(179) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#92]
 
-(166) BroadcastHashJoin [codegen id : 38]
-Left keys [1]: [ss_hdemo_sk#96]
-Right keys [1]: [hd_demo_sk#99]
+(180) BroadcastHashJoin [codegen id : 38]
+Left keys [1]: [ss_hdemo_sk#89]
+Right keys [1]: [hd_demo_sk#92]
 Join type: Inner
 Join condition: None
 
-(167) Project [codegen id : 38]
-Output [2]: [ss_sold_time_sk#95, ss_store_sk#97]
-Input [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, hd_demo_sk#99]
+(181) Project [codegen id : 38]
+Output [2]: [ss_sold_time_sk#88, ss_store_sk#90]
+Input [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, hd_demo_sk#92]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#100, t_hour#101, t_minute#102]
+Output [3]: [t_time_sk#93, t_hour#94, t_minute#95]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,12), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(169) CometFilter
-Input [3]: [t_time_sk#100, t_hour#101, t_minute#102]
-Condition : ((((isnotnull(t_hour#101) AND isnotnull(t_minute#102)) AND (t_hour#101 = 12)) AND (t_minute#102 < 30)) AND isnotnull(t_time_sk#100))
+(183) CometFilter
+Input [3]: [t_time_sk#93, t_hour#94, t_minute#95]
+Condition : ((((isnotnull(t_hour#94) AND isnotnull(t_minute#95)) AND (t_hour#94 = 12)) AND (t_minute#95 < 30)) AND isnotnull(t_time_sk#93))
 
-(170) CometProject
-Input [3]: [t_time_sk#100, t_hour#101, t_minute#102]
-Arguments: [t_time_sk#100], [t_time_sk#100]
+(184) CometProject
+Input [3]: [t_time_sk#93, t_hour#94, t_minute#95]
+Arguments: [t_time_sk#93], [t_time_sk#93]
 
-(171) ColumnarToRow [codegen id : 36]
-Input [1]: [t_time_sk#100]
+(185) ColumnarToRow [codegen id : 36]
+Input [1]: [t_time_sk#93]
 
-(172) BroadcastExchange
-Input [1]: [t_time_sk#100]
+(186) BroadcastExchange
+Input [1]: [t_time_sk#93]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=23]
 
-(173) BroadcastHashJoin [codegen id : 38]
-Left keys [1]: [ss_sold_time_sk#95]
-Right keys [1]: [t_time_sk#100]
+(187) BroadcastHashJoin [codegen id : 38]
+Left keys [1]: [ss_sold_time_sk#88]
+Right keys [1]: [t_time_sk#93]
 Join type: Inner
 Join condition: None
 
-(174) Project [codegen id : 38]
-Output [1]: [ss_store_sk#97]
-Input [3]: [ss_sold_time_sk#95, ss_store_sk#97, t_time_sk#100]
+(188) Project [codegen id : 38]
+Output [1]: [ss_store_sk#90]
+Input [3]: [ss_sold_time_sk#88, ss_store_sk#90, t_time_sk#93]
 
-(175) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#103]
+(189) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#96]
 
-(176) BroadcastHashJoin [codegen id : 38]
-Left keys [1]: [ss_store_sk#97]
-Right keys [1]: [s_store_sk#103]
+(190) BroadcastHashJoin [codegen id : 38]
+Left keys [1]: [ss_store_sk#90]
+Right keys [1]: [s_store_sk#96]
 Join type: Inner
 Join condition: None
 
-(177) Project [codegen id : 38]
+(191) Project [codegen id : 38]
 Output: []
-Input [2]: [ss_store_sk#97, s_store_sk#103]
+Input [2]: [ss_store_sk#90, s_store_sk#96]
 
-(178) HashAggregate [codegen id : 38]
+(192) HashAggregate [codegen id : 38]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#104]
-Results [1]: [count#105]
+Aggregate Attributes [1]: [count#97]
+Results [1]: [count#98]
 
-(179) Exchange
-Input [1]: [count#105]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=24]
+(193) RowToColumnar
+Input [1]: [count#98]
 
-(180) HashAggregate [codegen id : 39]
-Input [1]: [count#105]
+(194) CometColumnarExchange
+Input [1]: [count#98]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=24]
+
+(195) CometHashAggregate
+Input [1]: [count#98]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#106]
-Results [1]: [count(1)#106 AS h12_to_12_30#107]
 
-(181) BroadcastExchange
-Input [1]: [h12_to_12_30#107]
+(196) ColumnarToRow [codegen id : 39]
+Input [1]: [h12_to_12_30#99]
+
+(197) BroadcastExchange
+Input [1]: [h12_to_12_30#99]
 Arguments: IdentityBroadcastMode, [plan_id=25]
 
-(182) BroadcastNestedLoopJoin [codegen id : 40]
+(198) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt
index b497e0bab6..b80f512c53 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt
@@ -6,53 +6,123 @@ WholeStageCodegen (40)
           BroadcastNestedLoopJoin
             BroadcastNestedLoopJoin
               BroadcastNestedLoopJoin
-                HashAggregate [count] [count(1),h8_30_to_9,count]
+                ColumnarToRow
                   InputAdapter
-                    Exchange #1
-                      WholeStageCodegen (4)
-                        HashAggregate [count,count]
-                          Project
-                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                              Project [ss_store_sk]
-                                BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                                  Project [ss_sold_time_sk,ss_store_sk]
-                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                            CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                    CometHashAggregate [count]
+                      CometColumnarExchange #1
+                        RowToColumnar
+                          WholeStageCodegen (4)
+                            HashAggregate [count,count]
+                              Project
+                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                  Project [ss_store_sk]
+                                    BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                                      Project [ss_sold_time_sk,ss_store_sk]
+                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                                CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                                          InputAdapter
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [hd_demo_sk]
+                                                      CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                                        CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
                                       InputAdapter
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
+                                        BroadcastExchange #3
+                                          WholeStageCodegen (2)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [hd_demo_sk]
-                                                  CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                                                CometProject [t_time_sk]
+                                                  CometFilter [t_hour,t_minute,t_time_sk]
+                                                    CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                   InputAdapter
-                                    BroadcastExchange #3
-                                      WholeStageCodegen (2)
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (3)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [t_time_sk]
-                                              CometFilter [t_hour,t_minute,t_time_sk]
-                                                CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
-                              InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (3)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [s_store_sk]
-                                          CometFilter [s_store_name,s_store_sk]
-                                            CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
+                                            CometProject [s_store_sk]
+                                              CometFilter [s_store_name,s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
                 InputAdapter
                   BroadcastExchange #5
                     WholeStageCodegen (9)
-                      HashAggregate [count] [count(1),h9_to_9_30,count]
+                      ColumnarToRow
                         InputAdapter
-                          Exchange #6
-                            WholeStageCodegen (8)
+                          CometHashAggregate [count]
+                            CometColumnarExchange #6
+                              RowToColumnar
+                                WholeStageCodegen (8)
+                                  HashAggregate [count,count]
+                                    Project
+                                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                        Project [ss_store_sk]
+                                          BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                                            Project [ss_sold_time_sk,ss_store_sk]
+                                              BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                                      CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                                        CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                                                InputAdapter
+                                                  ReusedExchange [hd_demo_sk] #2
+                                            InputAdapter
+                                              BroadcastExchange #7
+                                                WholeStageCodegen (6)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [t_time_sk]
+                                                        CometFilter [t_hour,t_minute,t_time_sk]
+                                                          CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                                        InputAdapter
+                                          ReusedExchange [s_store_sk] #4
+              InputAdapter
+                BroadcastExchange #8
+                  WholeStageCodegen (14)
+                    ColumnarToRow
+                      InputAdapter
+                        CometHashAggregate [count]
+                          CometColumnarExchange #9
+                            RowToColumnar
+                              WholeStageCodegen (13)
+                                HashAggregate [count,count]
+                                  Project
+                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                      Project [ss_store_sk]
+                                        BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                                          Project [ss_sold_time_sk,ss_store_sk]
+                                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                                    CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                                              InputAdapter
+                                                ReusedExchange [hd_demo_sk] #2
+                                          InputAdapter
+                                            BroadcastExchange #10
+                                              WholeStageCodegen (11)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [t_time_sk]
+                                                      CometFilter [t_hour,t_minute,t_time_sk]
+                                                        CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                                      InputAdapter
+                                        ReusedExchange [s_store_sk] #4
+            InputAdapter
+              BroadcastExchange #11
+                WholeStageCodegen (19)
+                  ColumnarToRow
+                    InputAdapter
+                      CometHashAggregate [count]
+                        CometColumnarExchange #12
+                          RowToColumnar
+                            WholeStageCodegen (18)
                               HashAggregate [count,count]
                                 Project
                                   BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -68,8 +138,8 @@ WholeStageCodegen (40)
                                             InputAdapter
                                               ReusedExchange [hd_demo_sk] #2
                                         InputAdapter
-                                          BroadcastExchange #7
-                                            WholeStageCodegen (6)
+                                          BroadcastExchange #13
+                                            WholeStageCodegen (16)
                                               ColumnarToRow
                                                 InputAdapter
                                                   CometProject [t_time_sk]
@@ -77,13 +147,15 @@ WholeStageCodegen (40)
                                                       CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                     InputAdapter
                                       ReusedExchange [s_store_sk] #4
-              InputAdapter
-                BroadcastExchange #8
-                  WholeStageCodegen (14)
-                    HashAggregate [count] [count(1),h9_30_to_10,count]
-                      InputAdapter
-                        Exchange #9
-                          WholeStageCodegen (13)
+          InputAdapter
+            BroadcastExchange #14
+              WholeStageCodegen (24)
+                ColumnarToRow
+                  InputAdapter
+                    CometHashAggregate [count]
+                      CometColumnarExchange #15
+                        RowToColumnar
+                          WholeStageCodegen (23)
                             HashAggregate [count,count]
                               Project
                                 BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -99,8 +171,8 @@ WholeStageCodegen (40)
                                           InputAdapter
                                             ReusedExchange [hd_demo_sk] #2
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (11)
+                                        BroadcastExchange #16
+                                          WholeStageCodegen (21)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometProject [t_time_sk]
@@ -108,13 +180,15 @@ WholeStageCodegen (40)
                                                     CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                   InputAdapter
                                     ReusedExchange [s_store_sk] #4
-            InputAdapter
-              BroadcastExchange #11
-                WholeStageCodegen (19)
-                  HashAggregate [count] [count(1),h10_to_10_30,count]
-                    InputAdapter
-                      Exchange #12
-                        WholeStageCodegen (18)
+        InputAdapter
+          BroadcastExchange #17
+            WholeStageCodegen (29)
+              ColumnarToRow
+                InputAdapter
+                  CometHashAggregate [count]
+                    CometColumnarExchange #18
+                      RowToColumnar
+                        WholeStageCodegen (28)
                           HashAggregate [count,count]
                             Project
                               BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -130,8 +204,8 @@ WholeStageCodegen (40)
                                         InputAdapter
                                           ReusedExchange [hd_demo_sk] #2
                                     InputAdapter
-                                      BroadcastExchange #13
-                                        WholeStageCodegen (16)
+                                      BroadcastExchange #19
+                                        WholeStageCodegen (26)
                                           ColumnarToRow
                                             InputAdapter
                                               CometProject [t_time_sk]
@@ -139,13 +213,15 @@ WholeStageCodegen (40)
                                                   CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                 InputAdapter
                                   ReusedExchange [s_store_sk] #4
-          InputAdapter
-            BroadcastExchange #14
-              WholeStageCodegen (24)
-                HashAggregate [count] [count(1),h10_30_to_11,count]
-                  InputAdapter
-                    Exchange #15
-                      WholeStageCodegen (23)
+      InputAdapter
+        BroadcastExchange #20
+          WholeStageCodegen (34)
+            ColumnarToRow
+              InputAdapter
+                CometHashAggregate [count]
+                  CometColumnarExchange #21
+                    RowToColumnar
+                      WholeStageCodegen (33)
                         HashAggregate [count,count]
                           Project
                             BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -161,8 +237,8 @@ WholeStageCodegen (40)
                                       InputAdapter
                                         ReusedExchange [hd_demo_sk] #2
                                   InputAdapter
-                                    BroadcastExchange #16
-                                      WholeStageCodegen (21)
+                                    BroadcastExchange #22
+                                      WholeStageCodegen (31)
                                         ColumnarToRow
                                           InputAdapter
                                             CometProject [t_time_sk]
@@ -170,13 +246,15 @@ WholeStageCodegen (40)
                                                 CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                               InputAdapter
                                 ReusedExchange [s_store_sk] #4
-        InputAdapter
-          BroadcastExchange #17
-            WholeStageCodegen (29)
-              HashAggregate [count] [count(1),h11_to_11_30,count]
-                InputAdapter
-                  Exchange #18
-                    WholeStageCodegen (28)
+    InputAdapter
+      BroadcastExchange #23
+        WholeStageCodegen (39)
+          ColumnarToRow
+            InputAdapter
+              CometHashAggregate [count]
+                CometColumnarExchange #24
+                  RowToColumnar
+                    WholeStageCodegen (38)
                       HashAggregate [count,count]
                         Project
                           BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -192,8 +270,8 @@ WholeStageCodegen (40)
                                     InputAdapter
                                       ReusedExchange [hd_demo_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #19
-                                    WholeStageCodegen (26)
+                                  BroadcastExchange #25
+                                    WholeStageCodegen (36)
                                       ColumnarToRow
                                         InputAdapter
                                           CometProject [t_time_sk]
@@ -201,65 +279,3 @@ WholeStageCodegen (40)
                                               CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                             InputAdapter
                               ReusedExchange [s_store_sk] #4
-      InputAdapter
-        BroadcastExchange #20
-          WholeStageCodegen (34)
-            HashAggregate [count] [count(1),h11_30_to_12,count]
-              InputAdapter
-                Exchange #21
-                  WholeStageCodegen (33)
-                    HashAggregate [count,count]
-                      Project
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_store_sk]
-                            BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                              Project [ss_sold_time_sk,ss_store_sk]
-                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                        CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
-                                  InputAdapter
-                                    ReusedExchange [hd_demo_sk] #2
-                              InputAdapter
-                                BroadcastExchange #22
-                                  WholeStageCodegen (31)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [t_time_sk]
-                                          CometFilter [t_hour,t_minute,t_time_sk]
-                                            CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
-                          InputAdapter
-                            ReusedExchange [s_store_sk] #4
-    InputAdapter
-      BroadcastExchange #23
-        WholeStageCodegen (39)
-          HashAggregate [count] [count(1),h12_to_12_30,count]
-            InputAdapter
-              Exchange #24
-                WholeStageCodegen (38)
-                  HashAggregate [count,count]
-                    Project
-                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                        Project [ss_store_sk]
-                          BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                            Project [ss_sold_time_sk,ss_store_sk]
-                              BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                      CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
-                                InputAdapter
-                                  ReusedExchange [hd_demo_sk] #2
-                            InputAdapter
-                              BroadcastExchange #25
-                                WholeStageCodegen (36)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [t_time_sk]
-                                        CometFilter [t_hour,t_minute,t_time_sk]
-                                          CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
-                        InputAdapter
-                          ReusedExchange [s_store_sk] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt
index a59560090d..66c4896f4c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt
@@ -1,31 +1,33 @@
 == Physical Plan ==
-TakeOrderedAndProject (27)
-+- * Project (26)
-   +- * Filter (25)
-      +- Window (24)
-         +- * Sort (23)
-            +- Exchange (22)
-               +- * HashAggregate (21)
-                  +- Exchange (20)
-                     +- * HashAggregate (19)
-                        +- * Project (18)
-                           +- * BroadcastHashJoin Inner BuildRight (17)
-                              :- * Project (12)
-                              :  +- * BroadcastHashJoin Inner BuildRight (11)
-                              :     :- * Project (9)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                              :     :     :- * ColumnarToRow (3)
-                              :     :     :  +- CometFilter (2)
-                              :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-                              :     :     +- BroadcastExchange (7)
-                              :     :        +- * ColumnarToRow (6)
-                              :     :           +- CometFilter (5)
-                              :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
-                              :     +- ReusedExchange (10)
-                              +- BroadcastExchange (16)
-                                 +- * ColumnarToRow (15)
-                                    +- CometFilter (14)
-                                       +- CometScan parquet spark_catalog.default.store (13)
+TakeOrderedAndProject (29)
++- * Project (28)
+   +- * Filter (27)
+      +- Window (26)
+         +- * ColumnarToRow (25)
+            +- CometSort (24)
+               +- CometColumnarExchange (23)
+                  +- CometHashAggregate (22)
+                     +- CometColumnarExchange (21)
+                        +- RowToColumnar (20)
+                           +- * HashAggregate (19)
+                              +- * Project (18)
+                                 +- * BroadcastHashJoin Inner BuildRight (17)
+                                    :- * Project (12)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (11)
+                                    :     :- * Project (9)
+                                    :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                    :     :     :- * ColumnarToRow (3)
+                                    :     :     :  +- CometFilter (2)
+                                    :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+                                    :     :     +- BroadcastExchange (7)
+                                    :     :        +- * ColumnarToRow (6)
+                                    :     :           +- CometFilter (5)
+                                    :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
+                                    :     +- ReusedExchange (10)
+                                    +- BroadcastExchange (16)
+                                       +- * ColumnarToRow (15)
+                                          +- CometFilter (14)
+                                             +- CometScan parquet spark_catalog.default.store (13)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -71,7 +73,7 @@ Join condition: None
 Output [6]: [i_brand#2, i_class#3, i_category#4, ss_store_sk#6, ss_sales_price#7, ss_sold_date_sk#8]
 Input [8]: [i_item_sk#1, i_brand#2, i_class#3, i_category#4, ss_item_sk#5, ss_store_sk#6, ss_sales_price#7, ss_sold_date_sk#8]
 
-(10) ReusedExchange [Reuses operator id: 32]
+(10) ReusedExchange [Reuses operator id: 34]
 Output [2]: [d_date_sk#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -119,70 +121,74 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#7))]
 Aggregate Attributes [1]: [sum#15]
 Results [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
 
-(20) Exchange
+(20) RowToColumnar
 Input [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
-Arguments: hashpartitioning(i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
+Arguments: hashpartitioning(i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
 Keys [6]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#7))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#7))#17]
-Results [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, MakeDecimal(sum(UnscaledValue(ss_sales_price#7))#17,17,2) AS sum_sales#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#7))#17,17,2) AS _w0#19]
 
-(22) Exchange
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19]
-Arguments: hashpartitioning(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(23) CometColumnarExchange
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
+Arguments: hashpartitioning(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(24) CometSort
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18], [i_category#4 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST]
 
-(23) Sort [codegen id : 6]
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19]
-Arguments: [i_category#4 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST], false, 0
+(25) ColumnarToRow [codegen id : 5]
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
 
-(24) Window
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19]
-Arguments: [avg(_w0#19) windowspecdefinition(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#4, i_brand#2, s_store_name#13, s_company_name#14]
+(26) Window
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [avg(_w0#18) windowspecdefinition(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#19], [i_category#4, i_brand#2, s_store_name#13, s_company_name#14]
 
-(25) Filter [codegen id : 7]
-Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19, avg_monthly_sales#20]
-Condition : CASE WHEN NOT (avg_monthly_sales#20 = 0.000000) THEN ((abs((sum_sales#18 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END
+(27) Filter [codegen id : 6]
+Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18, avg_monthly_sales#19]
+Condition : CASE WHEN NOT (avg_monthly_sales#19 = 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#19)) / avg_monthly_sales#19) > 0.1000000000000000) END
 
-(26) Project [codegen id : 7]
-Output [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, avg_monthly_sales#20]
-Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19, avg_monthly_sales#20]
+(28) Project [codegen id : 6]
+Output [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, avg_monthly_sales#19]
+Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18, avg_monthly_sales#19]
 
-(27) TakeOrderedAndProject
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, avg_monthly_sales#20]
-Arguments: 100, [(sum_sales#18 - avg_monthly_sales#20) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, avg_monthly_sales#20]
+(29) TakeOrderedAndProject
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, avg_monthly_sales#19]
+Arguments: 100, [(sum_sales#17 - avg_monthly_sales#19) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, avg_monthly_sales#19]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (32)
-+- * ColumnarToRow (31)
-   +- CometProject (30)
-      +- CometFilter (29)
-         +- CometScan parquet spark_catalog.default.date_dim (28)
+BroadcastExchange (34)
++- * ColumnarToRow (33)
+   +- CometProject (32)
+      +- CometFilter (31)
+         +- CometScan parquet spark_catalog.default.date_dim (30)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#21, d_moy#11]
+Output [3]: [d_date_sk#10, d_year#20, d_moy#11]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(29) CometFilter
-Input [3]: [d_date_sk#10, d_year#21, d_moy#11]
-Condition : ((isnotnull(d_year#21) AND (d_year#21 = 1999)) AND isnotnull(d_date_sk#10))
+(31) CometFilter
+Input [3]: [d_date_sk#10, d_year#20, d_moy#11]
+Condition : ((isnotnull(d_year#20) AND (d_year#20 = 1999)) AND isnotnull(d_date_sk#10))
 
-(30) CometProject
-Input [3]: [d_date_sk#10, d_year#21, d_moy#11]
+(32) CometProject
+Input [3]: [d_date_sk#10, d_year#20, d_moy#11]
 Arguments: [d_date_sk#10, d_moy#11], [d_date_sk#10, d_moy#11]
 
-(31) ColumnarToRow [codegen id : 1]
+(33) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#10, d_moy#11]
 
-(32) BroadcastExchange
+(34) BroadcastExchange
 Input [2]: [d_date_sk#10, d_moy#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt
index bb9e4e17e2..8007b3089e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_class,i_brand,s_company_name,d_moy]
-  WholeStageCodegen (7)
+  WholeStageCodegen (6)
     Project [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,sum_sales,avg_monthly_sales]
       Filter [avg_monthly_sales,sum_sales]
         InputAdapter
           Window [_w0,i_category,i_brand,s_store_name,s_company_name]
-            WholeStageCodegen (6)
-              Sort [i_category,i_brand,s_store_name,s_company_name]
+            WholeStageCodegen (5)
+              ColumnarToRow
                 InputAdapter
-                  Exchange [i_category,i_brand,s_store_name,s_company_name] #1
-                    WholeStageCodegen (5)
-                      HashAggregate [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy] #2
+                  CometSort [i_category,i_brand,s_store_name,s_company_name]
+                    CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name] #1
+                      CometHashAggregate [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,sum]
+                        CometColumnarExchange [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy] #2
+                          RowToColumnar
                             WholeStageCodegen (4)
                               HashAggregate [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,ss_sales_price] [sum,sum]
                                 Project [i_brand,i_class,i_category,ss_sales_price,d_moy,s_store_name,s_company_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt
index 1671811424..f277fc9feb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt
@@ -29,7 +29,7 @@ Subquery:1 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquery
 * Project (12)
 +- * ColumnarToRow (11)
    +- CometHashAggregate (10)
-      +- CometExchange (9)
+      +- CometColumnarExchange (9)
          +- CometHashAggregate (8)
             +- CometProject (7)
                +- CometFilter (6)
@@ -56,9 +56,9 @@ Input [2]: [ss_ext_discount_amt#18, ss_net_paid#19]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#18)), partial_avg(UnscaledValue(ss_net_paid#19))]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [5]: [count#21, sum#22, count#23, sum#24, count#25]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (10) CometHashAggregate
 Input [5]: [count#21, sum#22, count#23, sum#24, count#25]
@@ -80,7 +80,7 @@ Subquery:4 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquery
 * Project (20)
 +- * ColumnarToRow (19)
    +- CometHashAggregate (18)
-      +- CometExchange (17)
+      +- CometColumnarExchange (17)
          +- CometHashAggregate (16)
             +- CometProject (15)
                +- CometFilter (14)
@@ -107,9 +107,9 @@ Input [2]: [ss_ext_discount_amt#31, ss_net_paid#32]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#31)), partial_avg(UnscaledValue(ss_net_paid#32))]
 
-(17) CometExchange
+(17) CometColumnarExchange
 Input [5]: [count#34, sum#35, count#36, sum#37, count#38]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (18) CometHashAggregate
 Input [5]: [count#34, sum#35, count#36, sum#37, count#38]
@@ -131,7 +131,7 @@ Subquery:7 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquery
 * Project (28)
 +- * ColumnarToRow (27)
    +- CometHashAggregate (26)
-      +- CometExchange (25)
+      +- CometColumnarExchange (25)
          +- CometHashAggregate (24)
             +- CometProject (23)
                +- CometFilter (22)
@@ -158,9 +158,9 @@ Input [2]: [ss_ext_discount_amt#44, ss_net_paid#45]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#44)), partial_avg(UnscaledValue(ss_net_paid#45))]
 
-(25) CometExchange
+(25) CometColumnarExchange
 Input [5]: [count#47, sum#48, count#49, sum#50, count#51]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
 (26) CometHashAggregate
 Input [5]: [count#47, sum#48, count#49, sum#50, count#51]
@@ -182,7 +182,7 @@ Subquery:10 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquer
 * Project (36)
 +- * ColumnarToRow (35)
    +- CometHashAggregate (34)
-      +- CometExchange (33)
+      +- CometColumnarExchange (33)
          +- CometHashAggregate (32)
             +- CometProject (31)
                +- CometFilter (30)
@@ -209,9 +209,9 @@ Input [2]: [ss_ext_discount_amt#57, ss_net_paid#58]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#57)), partial_avg(UnscaledValue(ss_net_paid#58))]
 
-(33) CometExchange
+(33) CometColumnarExchange
 Input [5]: [count#60, sum#61, count#62, sum#63, count#64]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
 (34) CometHashAggregate
 Input [5]: [count#60, sum#61, count#62, sum#63, count#64]
@@ -233,7 +233,7 @@ Subquery:13 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquer
 * Project (44)
 +- * ColumnarToRow (43)
    +- CometHashAggregate (42)
-      +- CometExchange (41)
+      +- CometColumnarExchange (41)
          +- CometHashAggregate (40)
             +- CometProject (39)
                +- CometFilter (38)
@@ -260,9 +260,9 @@ Input [2]: [ss_ext_discount_amt#70, ss_net_paid#71]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#70)), partial_avg(UnscaledValue(ss_net_paid#71))]
 
-(41) CometExchange
+(41) CometColumnarExchange
 Input [5]: [count#73, sum#74, count#75, sum#76, count#77]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
 (42) CometHashAggregate
 Input [5]: [count#73, sum#74, count#75, sum#76, count#77]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt
index a1fd64ecdc..eb47e062d4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt
@@ -6,7 +6,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometExchange #1
+                CometColumnarExchange #1
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -19,7 +19,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometExchange #2
+                CometColumnarExchange #2
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -32,7 +32,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometExchange #3
+                CometColumnarExchange #3
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -45,7 +45,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometExchange #4
+                CometColumnarExchange #4
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -58,7 +58,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometExchange #5
+                CometColumnarExchange #5
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt
index bb9bf128e7..f75f1c1908 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt
@@ -1,55 +1,59 @@
 == Physical Plan ==
-* Project (51)
-+- * BroadcastNestedLoopJoin Inner BuildRight (50)
-   :- * HashAggregate (28)
-   :  +- Exchange (27)
-   :     +- * HashAggregate (26)
-   :        +- * Project (25)
-   :           +- * BroadcastHashJoin Inner BuildRight (24)
-   :              :- * Project (18)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (17)
-   :              :     :- * Project (11)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (10)
-   :              :     :     :- * ColumnarToRow (4)
-   :              :     :     :  +- CometProject (3)
-   :              :     :     :     +- CometFilter (2)
-   :              :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
-   :              :     :     +- BroadcastExchange (9)
-   :              :     :        +- * ColumnarToRow (8)
-   :              :     :           +- CometProject (7)
-   :              :     :              +- CometFilter (6)
-   :              :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
-   :              :     +- BroadcastExchange (16)
-   :              :        +- * ColumnarToRow (15)
-   :              :           +- CometProject (14)
-   :              :              +- CometFilter (13)
-   :              :                 +- CometScan parquet spark_catalog.default.time_dim (12)
-   :              +- BroadcastExchange (23)
-   :                 +- * ColumnarToRow (22)
-   :                    +- CometProject (21)
-   :                       +- CometFilter (20)
-   :                          +- CometScan parquet spark_catalog.default.web_page (19)
-   +- BroadcastExchange (49)
-      +- * HashAggregate (48)
-         +- Exchange (47)
-            +- * HashAggregate (46)
-               +- * Project (45)
-                  +- * BroadcastHashJoin Inner BuildRight (44)
-                     :- * Project (42)
-                     :  +- * BroadcastHashJoin Inner BuildRight (41)
-                     :     :- * Project (35)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-                     :     :     :- * ColumnarToRow (32)
-                     :     :     :  +- CometProject (31)
-                     :     :     :     +- CometFilter (30)
-                     :     :     :        +- CometScan parquet spark_catalog.default.web_sales (29)
-                     :     :     +- ReusedExchange (33)
-                     :     +- BroadcastExchange (40)
-                     :        +- * ColumnarToRow (39)
-                     :           +- CometProject (38)
-                     :              +- CometFilter (37)
-                     :                 +- CometScan parquet spark_catalog.default.time_dim (36)
-                     +- ReusedExchange (43)
+* Project (55)
++- * BroadcastNestedLoopJoin Inner BuildRight (54)
+   :- * ColumnarToRow (30)
+   :  +- CometHashAggregate (29)
+   :     +- CometColumnarExchange (28)
+   :        +- RowToColumnar (27)
+   :           +- * HashAggregate (26)
+   :              +- * Project (25)
+   :                 +- * BroadcastHashJoin Inner BuildRight (24)
+   :                    :- * Project (18)
+   :                    :  +- * BroadcastHashJoin Inner BuildRight (17)
+   :                    :     :- * Project (11)
+   :                    :     :  +- * BroadcastHashJoin Inner BuildRight (10)
+   :                    :     :     :- * ColumnarToRow (4)
+   :                    :     :     :  +- CometProject (3)
+   :                    :     :     :     +- CometFilter (2)
+   :                    :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
+   :                    :     :     +- BroadcastExchange (9)
+   :                    :     :        +- * ColumnarToRow (8)
+   :                    :     :           +- CometProject (7)
+   :                    :     :              +- CometFilter (6)
+   :                    :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
+   :                    :     +- BroadcastExchange (16)
+   :                    :        +- * ColumnarToRow (15)
+   :                    :           +- CometProject (14)
+   :                    :              +- CometFilter (13)
+   :                    :                 +- CometScan parquet spark_catalog.default.time_dim (12)
+   :                    +- BroadcastExchange (23)
+   :                       +- * ColumnarToRow (22)
+   :                          +- CometProject (21)
+   :                             +- CometFilter (20)
+   :                                +- CometScan parquet spark_catalog.default.web_page (19)
+   +- BroadcastExchange (53)
+      +- * ColumnarToRow (52)
+         +- CometHashAggregate (51)
+            +- CometColumnarExchange (50)
+               +- RowToColumnar (49)
+                  +- * HashAggregate (48)
+                     +- * Project (47)
+                        +- * BroadcastHashJoin Inner BuildRight (46)
+                           :- * Project (44)
+                           :  +- * BroadcastHashJoin Inner BuildRight (43)
+                           :     :- * Project (37)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (36)
+                           :     :     :- * ColumnarToRow (34)
+                           :     :     :  +- CometProject (33)
+                           :     :     :     +- CometFilter (32)
+                           :     :     :        +- CometScan parquet spark_catalog.default.web_sales (31)
+                           :     :     +- ReusedExchange (35)
+                           :     +- BroadcastExchange (42)
+                           :        +- * ColumnarToRow (41)
+                           :           +- CometProject (40)
+                           :              +- CometFilter (39)
+                           :                 +- CometScan parquet spark_catalog.default.time_dim (38)
+                           +- ReusedExchange (45)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -173,120 +177,128 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#11]
 Results [1]: [count#12]
 
-(27) Exchange
+(27) RowToColumnar
 Input [1]: [count#12]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 10]
+(28) CometColumnarExchange
+Input [1]: [count#12]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [1]: [count#12]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#13]
-Results [1]: [count(1)#13 AS amc#14]
+
+(30) ColumnarToRow [codegen id : 10]
+Input [1]: [amc#13]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, ws_sold_date_sk#18]
+Output [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, ws_sold_date_sk#17]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_sales]
 PushedFilters: [IsNotNull(ws_ship_hdemo_sk), IsNotNull(ws_sold_time_sk), IsNotNull(ws_web_page_sk)]
 ReadSchema: struct<ws_sold_time_sk:int,ws_ship_hdemo_sk:int,ws_web_page_sk:int>
 
-(30) CometFilter
-Input [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, ws_sold_date_sk#18]
-Condition : ((isnotnull(ws_ship_hdemo_sk#16) AND isnotnull(ws_sold_time_sk#15)) AND isnotnull(ws_web_page_sk#17))
+(32) CometFilter
+Input [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, ws_sold_date_sk#17]
+Condition : ((isnotnull(ws_ship_hdemo_sk#15) AND isnotnull(ws_sold_time_sk#14)) AND isnotnull(ws_web_page_sk#16))
 
-(31) CometProject
-Input [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, ws_sold_date_sk#18]
-Arguments: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17], [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17]
+(33) CometProject
+Input [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, ws_sold_date_sk#17]
+Arguments: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16], [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16]
 
-(32) ColumnarToRow [codegen id : 8]
-Input [3]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17]
+(34) ColumnarToRow [codegen id : 8]
+Input [3]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16]
 
-(33) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#19]
+(35) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#18]
 
-(34) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ws_ship_hdemo_sk#16]
-Right keys [1]: [hd_demo_sk#19]
+(36) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ws_ship_hdemo_sk#15]
+Right keys [1]: [hd_demo_sk#18]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
-Output [2]: [ws_sold_time_sk#15, ws_web_page_sk#17]
-Input [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, hd_demo_sk#19]
+(37) Project [codegen id : 8]
+Output [2]: [ws_sold_time_sk#14, ws_web_page_sk#16]
+Input [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, hd_demo_sk#18]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [2]: [t_time_sk#20, t_hour#21]
+Output [2]: [t_time_sk#19, t_hour#20]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), GreaterThanOrEqual(t_hour,19), LessThanOrEqual(t_hour,20), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int>
 
-(37) CometFilter
-Input [2]: [t_time_sk#20, t_hour#21]
-Condition : (((isnotnull(t_hour#21) AND (t_hour#21 >= 19)) AND (t_hour#21 <= 20)) AND isnotnull(t_time_sk#20))
+(39) CometFilter
+Input [2]: [t_time_sk#19, t_hour#20]
+Condition : (((isnotnull(t_hour#20) AND (t_hour#20 >= 19)) AND (t_hour#20 <= 20)) AND isnotnull(t_time_sk#19))
 
-(38) CometProject
-Input [2]: [t_time_sk#20, t_hour#21]
-Arguments: [t_time_sk#20], [t_time_sk#20]
+(40) CometProject
+Input [2]: [t_time_sk#19, t_hour#20]
+Arguments: [t_time_sk#19], [t_time_sk#19]
 
-(39) ColumnarToRow [codegen id : 6]
-Input [1]: [t_time_sk#20]
+(41) ColumnarToRow [codegen id : 6]
+Input [1]: [t_time_sk#19]
 
-(40) BroadcastExchange
-Input [1]: [t_time_sk#20]
+(42) BroadcastExchange
+Input [1]: [t_time_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(41) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ws_sold_time_sk#15]
-Right keys [1]: [t_time_sk#20]
+(43) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ws_sold_time_sk#14]
+Right keys [1]: [t_time_sk#19]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 8]
-Output [1]: [ws_web_page_sk#17]
-Input [3]: [ws_sold_time_sk#15, ws_web_page_sk#17, t_time_sk#20]
+(44) Project [codegen id : 8]
+Output [1]: [ws_web_page_sk#16]
+Input [3]: [ws_sold_time_sk#14, ws_web_page_sk#16, t_time_sk#19]
 
-(43) ReusedExchange [Reuses operator id: 23]
-Output [1]: [wp_web_page_sk#22]
+(45) ReusedExchange [Reuses operator id: 23]
+Output [1]: [wp_web_page_sk#21]
 
-(44) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ws_web_page_sk#17]
-Right keys [1]: [wp_web_page_sk#22]
+(46) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ws_web_page_sk#16]
+Right keys [1]: [wp_web_page_sk#21]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 8]
+(47) Project [codegen id : 8]
 Output: []
-Input [2]: [ws_web_page_sk#17, wp_web_page_sk#22]
+Input [2]: [ws_web_page_sk#16, wp_web_page_sk#21]
 
-(46) HashAggregate [codegen id : 8]
+(48) HashAggregate [codegen id : 8]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#23]
-Results [1]: [count#24]
+Aggregate Attributes [1]: [count#22]
+Results [1]: [count#23]
 
-(47) Exchange
-Input [1]: [count#24]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
+(49) RowToColumnar
+Input [1]: [count#23]
 
-(48) HashAggregate [codegen id : 9]
-Input [1]: [count#24]
+(50) CometColumnarExchange
+Input [1]: [count#23]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(51) CometHashAggregate
+Input [1]: [count#23]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#25]
-Results [1]: [count(1)#25 AS pmc#26]
 
-(49) BroadcastExchange
-Input [1]: [pmc#26]
+(52) ColumnarToRow [codegen id : 9]
+Input [1]: [pmc#24]
+
+(53) BroadcastExchange
+Input [1]: [pmc#24]
 Arguments: IdentityBroadcastMode, [plan_id=7]
 
-(50) BroadcastNestedLoopJoin [codegen id : 10]
+(54) BroadcastNestedLoopJoin [codegen id : 10]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 10]
-Output [1]: [(cast(amc#14 as decimal(15,4)) / cast(pmc#26 as decimal(15,4))) AS am_pm_ratio#27]
-Input [2]: [amc#14, pmc#26]
+(55) Project [codegen id : 10]
+Output [1]: [(cast(amc#13 as decimal(15,4)) / cast(pmc#24 as decimal(15,4))) AS am_pm_ratio#25]
+Input [2]: [amc#13, pmc#24]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt
index c4e04b06bc..61f38f3615 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt
@@ -1,74 +1,78 @@
 WholeStageCodegen (10)
   Project [amc,pmc]
     BroadcastNestedLoopJoin
-      HashAggregate [count] [count(1),amc,count]
+      ColumnarToRow
         InputAdapter
-          Exchange #1
-            WholeStageCodegen (4)
-              HashAggregate [count,count]
-                Project
-                  BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                    Project [ws_web_page_sk]
-                      BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
-                        Project [ws_sold_time_sk,ws_web_page_sk]
-                          BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
-                                  CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
-                                    CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
+          CometHashAggregate [count]
+            CometColumnarExchange #1
+              RowToColumnar
+                WholeStageCodegen (4)
+                  HashAggregate [count,count]
+                    Project
+                      BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                        Project [ws_web_page_sk]
+                          BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
+                            Project [ws_sold_time_sk,ws_web_page_sk]
+                              BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
+                                      CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
+                                        CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
+                                InputAdapter
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [hd_demo_sk]
+                                            CometFilter [hd_dep_count,hd_demo_sk]
+                                              CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
                             InputAdapter
-                              BroadcastExchange #2
-                                WholeStageCodegen (1)
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [hd_demo_sk]
-                                        CometFilter [hd_dep_count,hd_demo_sk]
-                                          CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
+                                      CometProject [t_time_sk]
+                                        CometFilter [t_hour,t_time_sk]
+                                          CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
                         InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (2)
+                          BroadcastExchange #4
+                            WholeStageCodegen (3)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [t_time_sk]
-                                    CometFilter [t_hour,t_time_sk]
-                                      CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
-                    InputAdapter
-                      BroadcastExchange #4
-                        WholeStageCodegen (3)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [wp_web_page_sk]
-                                CometFilter [wp_char_count,wp_web_page_sk]
-                                  CometScan parquet spark_catalog.default.web_page [wp_web_page_sk,wp_char_count]
+                                  CometProject [wp_web_page_sk]
+                                    CometFilter [wp_char_count,wp_web_page_sk]
+                                      CometScan parquet spark_catalog.default.web_page [wp_web_page_sk,wp_char_count]
       InputAdapter
         BroadcastExchange #5
           WholeStageCodegen (9)
-            HashAggregate [count] [count(1),pmc,count]
+            ColumnarToRow
               InputAdapter
-                Exchange #6
-                  WholeStageCodegen (8)
-                    HashAggregate [count,count]
-                      Project
-                        BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                          Project [ws_web_page_sk]
-                            BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
-                              Project [ws_sold_time_sk,ws_web_page_sk]
-                                BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
-                                        CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
-                                          CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
+                CometHashAggregate [count]
+                  CometColumnarExchange #6
+                    RowToColumnar
+                      WholeStageCodegen (8)
+                        HashAggregate [count,count]
+                          Project
+                            BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                              Project [ws_web_page_sk]
+                                BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
+                                  Project [ws_sold_time_sk,ws_web_page_sk]
+                                    BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
+                                            CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
+                                              CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
+                                      InputAdapter
+                                        ReusedExchange [hd_demo_sk] #2
                                   InputAdapter
-                                    ReusedExchange [hd_demo_sk] #2
+                                    BroadcastExchange #7
+                                      WholeStageCodegen (6)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [t_time_sk]
+                                              CometFilter [t_hour,t_time_sk]
+                                                CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
                               InputAdapter
-                                BroadcastExchange #7
-                                  WholeStageCodegen (6)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [t_time_sk]
-                                          CometFilter [t_hour,t_time_sk]
-                                            CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
-                          InputAdapter
-                            ReusedExchange [wp_web_page_sk] #4
+                                ReusedExchange [wp_web_page_sk] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt
index c8110434e8..2d0c9fd987 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt
@@ -1,47 +1,49 @@
 == Physical Plan ==
-* Sort (43)
-+- Exchange (42)
-   +- * HashAggregate (41)
-      +- Exchange (40)
-         +- * HashAggregate (39)
-            +- * Project (38)
-               +- * BroadcastHashJoin Inner BuildRight (37)
-                  :- * Project (31)
-                  :  +- * BroadcastHashJoin Inner BuildRight (30)
-                  :     :- * Project (25)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (24)
-                  :     :     :- * Project (18)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                  :     :     :     :- * Project (12)
-                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (11)
-                  :     :     :     :     :- * Project (9)
-                  :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.call_center (1)
-                  :     :     :     :     :     +- BroadcastExchange (7)
-                  :     :     :     :     :        +- * ColumnarToRow (6)
-                  :     :     :     :     :           +- CometFilter (5)
-                  :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (4)
-                  :     :     :     :     +- ReusedExchange (10)
-                  :     :     :     +- BroadcastExchange (16)
-                  :     :     :        +- * ColumnarToRow (15)
-                  :     :     :           +- CometFilter (14)
-                  :     :     :              +- CometScan parquet spark_catalog.default.customer (13)
-                  :     :     +- BroadcastExchange (23)
-                  :     :        +- * ColumnarToRow (22)
-                  :     :           +- CometProject (21)
-                  :     :              +- CometFilter (20)
-                  :     :                 +- CometScan parquet spark_catalog.default.customer_address (19)
-                  :     +- BroadcastExchange (29)
-                  :        +- * ColumnarToRow (28)
-                  :           +- CometFilter (27)
-                  :              +- CometScan parquet spark_catalog.default.customer_demographics (26)
-                  +- BroadcastExchange (36)
-                     +- * ColumnarToRow (35)
-                        +- CometProject (34)
-                           +- CometFilter (33)
-                              +- CometScan parquet spark_catalog.default.household_demographics (32)
+* ColumnarToRow (45)
++- CometSort (44)
+   +- CometColumnarExchange (43)
+      +- CometHashAggregate (42)
+         +- CometColumnarExchange (41)
+            +- RowToColumnar (40)
+               +- * HashAggregate (39)
+                  +- * Project (38)
+                     +- * BroadcastHashJoin Inner BuildRight (37)
+                        :- * Project (31)
+                        :  +- * BroadcastHashJoin Inner BuildRight (30)
+                        :     :- * Project (25)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (24)
+                        :     :     :- * Project (18)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                        :     :     :     :- * Project (12)
+                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (11)
+                        :     :     :     :     :- * Project (9)
+                        :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                        :     :     :     :     :     :- * ColumnarToRow (3)
+                        :     :     :     :     :     :  +- CometFilter (2)
+                        :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.call_center (1)
+                        :     :     :     :     :     +- BroadcastExchange (7)
+                        :     :     :     :     :        +- * ColumnarToRow (6)
+                        :     :     :     :     :           +- CometFilter (5)
+                        :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (4)
+                        :     :     :     :     +- ReusedExchange (10)
+                        :     :     :     +- BroadcastExchange (16)
+                        :     :     :        +- * ColumnarToRow (15)
+                        :     :     :           +- CometFilter (14)
+                        :     :     :              +- CometScan parquet spark_catalog.default.customer (13)
+                        :     :     +- BroadcastExchange (23)
+                        :     :        +- * ColumnarToRow (22)
+                        :     :           +- CometProject (21)
+                        :     :              +- CometFilter (20)
+                        :     :                 +- CometScan parquet spark_catalog.default.customer_address (19)
+                        :     +- BroadcastExchange (29)
+                        :        +- * ColumnarToRow (28)
+                        :           +- CometFilter (27)
+                        :              +- CometScan parquet spark_catalog.default.customer_demographics (26)
+                        +- BroadcastExchange (36)
+                           +- * ColumnarToRow (35)
+                              +- CometProject (34)
+                                 +- CometFilter (33)
+                                    +- CometScan parquet spark_catalog.default.household_demographics (32)
 
 
 (unknown) Scan parquet spark_catalog.default.call_center
@@ -87,7 +89,7 @@ Join condition: None
 Output [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cr_returning_customer_sk#5, cr_net_loss#7, cr_returned_date_sk#8]
 Input [8]: [cc_call_center_sk#1, cc_call_center_id#2, cc_name#3, cc_manager#4, cr_returning_customer_sk#5, cr_call_center_sk#6, cr_net_loss#7, cr_returned_date_sk#8]
 
-(10) ReusedExchange [Reuses operator id: 48]
+(10) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#10]
 
 (11) BroadcastHashJoin [codegen id : 7]
@@ -227,54 +229,58 @@ Functions [1]: [partial_sum(UnscaledValue(cr_net_loss#7))]
 Aggregate Attributes [1]: [sum#22]
 Results [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
 
-(40) Exchange
+(40) RowToColumnar
 Input [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
-Arguments: hashpartitioning(cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) HashAggregate [codegen id : 8]
+(41) CometColumnarExchange
+Input [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
+Arguments: hashpartitioning(cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometHashAggregate
 Input [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
 Keys [5]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19]
 Functions [1]: [sum(UnscaledValue(cr_net_loss#7))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cr_net_loss#7))#24]
-Results [4]: [cc_call_center_id#2 AS Call_Center#25, cc_name#3 AS Call_Center_Name#26, cc_manager#4 AS Manager#27, MakeDecimal(sum(UnscaledValue(cr_net_loss#7))#24,17,2) AS Returns_Loss#28]
 
-(42) Exchange
-Input [4]: [Call_Center#25, Call_Center_Name#26, Manager#27, Returns_Loss#28]
-Arguments: rangepartitioning(Returns_Loss#28 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(43) CometColumnarExchange
+Input [4]: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27]
+Arguments: rangepartitioning(Returns_Loss#27 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(44) CometSort
+Input [4]: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27]
+Arguments: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27], [Returns_Loss#27 DESC NULLS LAST]
 
-(43) Sort [codegen id : 9]
-Input [4]: [Call_Center#25, Call_Center_Name#26, Manager#27, Returns_Loss#28]
-Arguments: [Returns_Loss#28 DESC NULLS LAST], true, 0
+(45) ColumnarToRow [codegen id : 8]
+Input [4]: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = cr_returned_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#29, d_moy#30]
+Output [3]: [d_date_sk#10, d_year#28, d_moy#29]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(45) CometFilter
-Input [3]: [d_date_sk#10, d_year#29, d_moy#30]
-Condition : ((((isnotnull(d_year#29) AND isnotnull(d_moy#30)) AND (d_year#29 = 1998)) AND (d_moy#30 = 11)) AND isnotnull(d_date_sk#10))
+(47) CometFilter
+Input [3]: [d_date_sk#10, d_year#28, d_moy#29]
+Condition : ((((isnotnull(d_year#28) AND isnotnull(d_moy#29)) AND (d_year#28 = 1998)) AND (d_moy#29 = 11)) AND isnotnull(d_date_sk#10))
 
-(46) CometProject
-Input [3]: [d_date_sk#10, d_year#29, d_moy#30]
+(48) CometProject
+Input [3]: [d_date_sk#10, d_year#28, d_moy#29]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(47) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(48) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt
index e5d62e3c0b..c2b89020cb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt
@@ -1,11 +1,11 @@
-WholeStageCodegen (9)
-  Sort [Returns_Loss]
+WholeStageCodegen (8)
+  ColumnarToRow
     InputAdapter
-      Exchange [Returns_Loss] #1
-        WholeStageCodegen (8)
-          HashAggregate [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status,sum] [sum(UnscaledValue(cr_net_loss)),Call_Center,Call_Center_Name,Manager,Returns_Loss,sum]
-            InputAdapter
-              Exchange [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status] #2
+      CometSort [Returns_Loss]
+        CometColumnarExchange [Returns_Loss] #1
+          CometHashAggregate [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status,sum]
+            CometColumnarExchange [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status] #2
+              RowToColumnar
                 WholeStageCodegen (7)
                   HashAggregate [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status,cr_net_loss] [sum,sum]
                     Project [cc_call_center_id,cc_name,cc_manager,cr_net_loss,cd_marital_status,cd_education_status]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt
index 111c30960b..f4d3879699 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt
@@ -1,33 +1,37 @@
 == Physical Plan ==
-* HashAggregate (29)
-+- Exchange (28)
-   +- * HashAggregate (27)
-      +- * Project (26)
-         +- * BroadcastHashJoin Inner BuildRight (25)
-            :- * Project (23)
-            :  +- * BroadcastHashJoin Inner BuildRight (22)
-            :     :- * Project (10)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-            :     :     :- * ColumnarToRow (3)
-            :     :     :  +- CometFilter (2)
-            :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-            :     :     +- BroadcastExchange (8)
-            :     :        +- * ColumnarToRow (7)
-            :     :           +- CometProject (6)
-            :     :              +- CometFilter (5)
-            :     :                 +- CometScan parquet spark_catalog.default.item (4)
-            :     +- BroadcastExchange (21)
-            :        +- * Filter (20)
-            :           +- * HashAggregate (19)
-            :              +- Exchange (18)
-            :                 +- * HashAggregate (17)
-            :                    +- * Project (16)
-            :                       +- * BroadcastHashJoin Inner BuildRight (15)
-            :                          :- * ColumnarToRow (13)
-            :                          :  +- CometFilter (12)
-            :                          :     +- CometScan parquet spark_catalog.default.web_sales (11)
-            :                          +- ReusedExchange (14)
-            +- ReusedExchange (24)
+* ColumnarToRow (33)
++- CometHashAggregate (32)
+   +- CometColumnarExchange (31)
+      +- RowToColumnar (30)
+         +- * HashAggregate (29)
+            +- * Project (28)
+               +- * BroadcastHashJoin Inner BuildRight (27)
+                  :- * Project (25)
+                  :  +- * BroadcastHashJoin Inner BuildRight (24)
+                  :     :- * Project (10)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                  :     :     :- * ColumnarToRow (3)
+                  :     :     :  +- CometFilter (2)
+                  :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :     :     +- BroadcastExchange (8)
+                  :     :        +- * ColumnarToRow (7)
+                  :     :           +- CometProject (6)
+                  :     :              +- CometFilter (5)
+                  :     :                 +- CometScan parquet spark_catalog.default.item (4)
+                  :     +- BroadcastExchange (23)
+                  :        +- * ColumnarToRow (22)
+                  :           +- CometFilter (21)
+                  :              +- CometHashAggregate (20)
+                  :                 +- CometColumnarExchange (19)
+                  :                    +- RowToColumnar (18)
+                  :                       +- * HashAggregate (17)
+                  :                          +- * Project (16)
+                  :                             +- * BroadcastHashJoin Inner BuildRight (15)
+                  :                                :- * ColumnarToRow (13)
+                  :                                :  +- CometFilter (12)
+                  :                                :     +- CometScan parquet spark_catalog.default.web_sales (11)
+                  :                                +- ReusedExchange (14)
+                  +- ReusedExchange (26)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -92,7 +96,7 @@ Condition : isnotnull(ws_item_sk#7)
 (13) ColumnarToRow [codegen id : 3]
 Input [3]: [ws_item_sk#7, ws_ext_discount_amt#8, ws_sold_date_sk#9]
 
-(14) ReusedExchange [Reuses operator id: 34]
+(14) ReusedExchange [Reuses operator id: 38]
 Output [1]: [d_date_sk#11]
 
 (15) BroadcastHashJoin [codegen id : 3]
@@ -112,96 +116,104 @@ Functions [1]: [partial_avg(UnscaledValue(ws_ext_discount_amt#8))]
 Aggregate Attributes [2]: [sum#12, count#13]
 Results [3]: [ws_item_sk#7, sum#14, count#15]
 
-(18) Exchange
+(18) RowToColumnar
 Input [3]: [ws_item_sk#7, sum#14, count#15]
-Arguments: hashpartitioning(ws_item_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(19) HashAggregate [codegen id : 4]
+(19) CometColumnarExchange
+Input [3]: [ws_item_sk#7, sum#14, count#15]
+Arguments: hashpartitioning(ws_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(20) CometHashAggregate
 Input [3]: [ws_item_sk#7, sum#14, count#15]
 Keys [1]: [ws_item_sk#7]
 Functions [1]: [avg(UnscaledValue(ws_ext_discount_amt#8))]
-Aggregate Attributes [1]: [avg(UnscaledValue(ws_ext_discount_amt#8))#16]
-Results [2]: [(1.3 * cast((avg(UnscaledValue(ws_ext_discount_amt#8))#16 / 100.0) as decimal(11,6))) AS (1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
 
-(20) Filter [codegen id : 4]
-Input [2]: [(1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
-Condition : isnotnull((1.3 * avg(ws_ext_discount_amt))#17)
+(21) CometFilter
+Input [2]: [(1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
+Condition : isnotnull((1.3 * avg(ws_ext_discount_amt))#16)
+
+(22) ColumnarToRow [codegen id : 4]
+Input [2]: [(1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
 
-(21) BroadcastExchange
-Input [2]: [(1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
+(23) BroadcastExchange
+Input [2]: [(1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint)),false), [plan_id=3]
 
-(22) BroadcastHashJoin [codegen id : 6]
+(24) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [i_item_sk#5]
 Right keys [1]: [ws_item_sk#7]
 Join type: Inner
-Join condition: (cast(ws_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(ws_ext_discount_amt))#17)
+Join condition: (cast(ws_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(ws_ext_discount_amt))#16)
 
-(23) Project [codegen id : 6]
+(25) Project [codegen id : 6]
 Output [2]: [ws_ext_discount_amt#2, ws_sold_date_sk#3]
-Input [5]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, i_item_sk#5, (1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
+Input [5]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, i_item_sk#5, (1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
 
-(24) ReusedExchange [Reuses operator id: 34]
-Output [1]: [d_date_sk#18]
+(26) ReusedExchange [Reuses operator id: 38]
+Output [1]: [d_date_sk#17]
 
-(25) BroadcastHashJoin [codegen id : 6]
+(27) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ws_sold_date_sk#3]
-Right keys [1]: [d_date_sk#18]
+Right keys [1]: [d_date_sk#17]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
+(28) Project [codegen id : 6]
 Output [1]: [ws_ext_discount_amt#2]
-Input [3]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, d_date_sk#18]
+Input [3]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, d_date_sk#17]
 
-(27) HashAggregate [codegen id : 6]
+(29) HashAggregate [codegen id : 6]
 Input [1]: [ws_ext_discount_amt#2]
 Keys: []
 Functions [1]: [partial_sum(UnscaledValue(ws_ext_discount_amt#2))]
-Aggregate Attributes [1]: [sum#19]
-Results [1]: [sum#20]
+Aggregate Attributes [1]: [sum#18]
+Results [1]: [sum#19]
 
-(28) Exchange
-Input [1]: [sum#20]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
+(30) RowToColumnar
+Input [1]: [sum#19]
 
-(29) HashAggregate [codegen id : 7]
-Input [1]: [sum#20]
+(31) CometColumnarExchange
+Input [1]: [sum#19]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(32) CometHashAggregate
+Input [1]: [sum#19]
 Keys: []
 Functions [1]: [sum(UnscaledValue(ws_ext_discount_amt#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_discount_amt#2))#21]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ws_ext_discount_amt#2))#21,17,2) AS Excess Discount Amount #22]
+
+(33) ColumnarToRow [codegen id : 7]
+Input [1]: [Excess Discount Amount #20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (34)
-+- * ColumnarToRow (33)
-   +- CometProject (32)
-      +- CometFilter (31)
-         +- CometScan parquet spark_catalog.default.date_dim (30)
+BroadcastExchange (38)
++- * ColumnarToRow (37)
+   +- CometProject (36)
+      +- CometFilter (35)
+         +- CometScan parquet spark_catalog.default.date_dim (34)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#18, d_date#23]
+Output [2]: [d_date_sk#17, d_date#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), LessThanOrEqual(d_date,2000-04-26), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(31) CometFilter
-Input [2]: [d_date_sk#18, d_date#23]
-Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2000-01-27)) AND (d_date#23 <= 2000-04-26)) AND isnotnull(d_date_sk#18))
+(35) CometFilter
+Input [2]: [d_date_sk#17, d_date#21]
+Condition : (((isnotnull(d_date#21) AND (d_date#21 >= 2000-01-27)) AND (d_date#21 <= 2000-04-26)) AND isnotnull(d_date_sk#17))
 
-(32) CometProject
-Input [2]: [d_date_sk#18, d_date#23]
-Arguments: [d_date_sk#18], [d_date_sk#18]
+(36) CometProject
+Input [2]: [d_date_sk#17, d_date#21]
+Arguments: [d_date_sk#17], [d_date_sk#17]
 
-(33) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#18]
+(37) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#17]
 
-(34) BroadcastExchange
-Input [1]: [d_date_sk#18]
+(38) BroadcastExchange
+Input [1]: [d_date_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
 Subquery:2 Hosting operator id = 11 Hosting Expression = ws_sold_date_sk#9 IN dynamicpruning#4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt
index a5e724c1ff..3ef3c57493 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt
@@ -1,52 +1,56 @@
 WholeStageCodegen (7)
-  HashAggregate [sum] [sum(UnscaledValue(ws_ext_discount_amt)),Excess Discount Amount ,sum]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (6)
-          HashAggregate [ws_ext_discount_amt] [sum,sum]
-            Project [ws_ext_discount_amt]
-              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                Project [ws_ext_discount_amt,ws_sold_date_sk]
-                  BroadcastHashJoin [i_item_sk,ws_item_sk,ws_ext_discount_amt,(1.3 * avg(ws_ext_discount_amt))]
-                    Project [ws_ext_discount_amt,ws_sold_date_sk,i_item_sk]
-                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [ws_item_sk,ws_ext_discount_amt]
-                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
-                                SubqueryBroadcast [d_date_sk] #1
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [d_date_sk]
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+      CometHashAggregate [sum]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (6)
+              HashAggregate [ws_ext_discount_amt] [sum,sum]
+                Project [ws_ext_discount_amt]
+                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                    Project [ws_ext_discount_amt,ws_sold_date_sk]
+                      BroadcastHashJoin [i_item_sk,ws_item_sk,ws_ext_discount_amt,(1.3 * avg(ws_ext_discount_amt))]
+                        Project [ws_ext_discount_amt,ws_sold_date_sk,i_item_sk]
+                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ws_item_sk,ws_ext_discount_amt]
+                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_date,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                            InputAdapter
+                              BroadcastExchange #3
+                                WholeStageCodegen (1)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [i_item_sk]
+                                        CometFilter [i_manufact_id,i_item_sk]
+                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
                         InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (1)
+                          BroadcastExchange #4
+                            WholeStageCodegen (4)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [i_item_sk]
-                                    CometFilter [i_manufact_id,i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
+                                  CometFilter [(1.3 * avg(ws_ext_discount_amt))]
+                                    CometHashAggregate [ws_item_sk,sum,count]
+                                      CometColumnarExchange [ws_item_sk] #5
+                                        RowToColumnar
+                                          WholeStageCodegen (3)
+                                            HashAggregate [ws_item_sk,ws_ext_discount_amt] [sum,count,sum,count]
+                                              Project [ws_item_sk,ws_ext_discount_amt]
+                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [ws_item_sk]
+                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
+                                                          ReusedSubquery [d_date_sk] #1
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk] #2
                     InputAdapter
-                      BroadcastExchange #4
-                        WholeStageCodegen (4)
-                          Filter [(1.3 * avg(ws_ext_discount_amt))]
-                            HashAggregate [ws_item_sk,sum,count] [avg(UnscaledValue(ws_ext_discount_amt)),(1.3 * avg(ws_ext_discount_amt)),sum,count]
-                              InputAdapter
-                                Exchange [ws_item_sk] #5
-                                  WholeStageCodegen (3)
-                                    HashAggregate [ws_item_sk,ws_ext_discount_amt] [sum,count,sum,count]
-                                      Project [ws_item_sk,ws_ext_discount_amt]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_item_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #2
-                InputAdapter
-                  ReusedExchange [d_date_sk] #2
+                      ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
index 4b396dbc38..c7490b740f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
@@ -1,27 +1,29 @@
 == Physical Plan ==
-TakeOrderedAndProject (23)
-+- * HashAggregate (22)
-   +- Exchange (21)
-      +- * HashAggregate (20)
-         +- * Project (19)
-            +- * BroadcastHashJoin Inner BuildRight (18)
-               :- * ColumnarToRow (12)
-               :  +- CometProject (11)
-               :     +- CometSortMergeJoin (10)
-               :        :- CometSort (4)
-               :        :  +- CometExchange (3)
-               :        :     +- CometProject (2)
-               :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
-               :        +- CometSort (9)
-               :           +- CometExchange (8)
-               :              +- CometProject (7)
-               :                 +- CometFilter (6)
-               :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-               +- BroadcastExchange (17)
-                  +- * ColumnarToRow (16)
-                     +- CometProject (15)
-                        +- CometFilter (14)
-                           +- CometScan parquet spark_catalog.default.reason (13)
+* ColumnarToRow (25)
++- CometTakeOrderedAndProject (24)
+   +- CometHashAggregate (23)
+      +- CometColumnarExchange (22)
+         +- RowToColumnar (21)
+            +- * HashAggregate (20)
+               +- * Project (19)
+                  +- * BroadcastHashJoin Inner BuildRight (18)
+                     :- * ColumnarToRow (12)
+                     :  +- CometProject (11)
+                     :     +- CometSortMergeJoin (10)
+                     :        :- CometSort (4)
+                     :        :  +- CometColumnarExchange (3)
+                     :        :     +- CometProject (2)
+                     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
+                     :        +- CometSort (9)
+                     :           +- CometColumnarExchange (8)
+                     :              +- CometProject (7)
+                     :                 +- CometFilter (6)
+                     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+                     +- BroadcastExchange (17)
+                        +- * ColumnarToRow (16)
+                           +- CometProject (15)
+                              +- CometFilter (14)
+                                 +- CometScan parquet spark_catalog.default.reason (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -34,9 +36,9 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_ticket_number:int,ss_qua
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5], [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5]
 
-(3) CometExchange
+(3) CometColumnarExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5]
-Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#3, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (4) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5]
@@ -57,9 +59,9 @@ Condition : ((isnotnull(sr_item_sk#7) AND isnotnull(sr_ticket_number#9)) AND isn
 Input [5]: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10, sr_returned_date_sk#11]
 Arguments: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10], [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10]
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [4]: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10]
-Arguments: hashpartitioning(sr_item_sk#7, sr_ticket_number#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_item_sk#7, sr_ticket_number#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [4]: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10]
@@ -116,18 +118,22 @@ Functions [1]: [partial_sum(act_sales#14)]
 Aggregate Attributes [2]: [sum#15, isEmpty#16]
 Results [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
 
-(21) Exchange
+(21) RowToColumnar
 Input [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
-Arguments: hashpartitioning(ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(22) HashAggregate [codegen id : 3]
+(22) CometColumnarExchange
+Input [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
+Arguments: hashpartitioning(ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(23) CometHashAggregate
 Input [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
 Keys [1]: [ss_customer_sk#2]
 Functions [1]: [sum(act_sales#14)]
-Aggregate Attributes [1]: [sum(act_sales#14)#19]
-Results [2]: [ss_customer_sk#2, sum(act_sales#14)#19 AS sumsales#20]
 
-(23) TakeOrderedAndProject
-Input [2]: [ss_customer_sk#2, sumsales#20]
-Arguments: 100, [sumsales#20 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], [ss_customer_sk#2, sumsales#20]
+(24) CometTakeOrderedAndProject
+Input [2]: [ss_customer_sk#2, sumsales#19]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[sumsales#19 ASC NULLS FIRST,ss_customer_sk#2 ASC NULLS FIRST], output=[ss_customer_sk#2,sumsales#19]), 100, [sumsales#19 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], [ss_customer_sk#2, sumsales#19]
+
+(25) ColumnarToRow [codegen id : 3]
+Input [2]: [ss_customer_sk#2, sumsales#19]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt
index 6178d5a371..85a37565ff 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt
@@ -1,30 +1,32 @@
-TakeOrderedAndProject [sumsales,ss_customer_sk]
-  WholeStageCodegen (3)
-    HashAggregate [ss_customer_sk,sum,isEmpty] [sum(act_sales),sumsales,sum,isEmpty]
-      InputAdapter
-        Exchange [ss_customer_sk] #1
-          WholeStageCodegen (2)
-            HashAggregate [ss_customer_sk,act_sales] [sum,isEmpty,sum,isEmpty]
-              Project [ss_customer_sk,sr_return_quantity,ss_quantity,ss_sales_price]
-                BroadcastHashJoin [sr_reason_sk,r_reason_sk]
-                  ColumnarToRow
-                    InputAdapter
-                      CometProject [ss_customer_sk,ss_quantity,ss_sales_price,sr_reason_sk,sr_return_quantity]
-                        CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                          CometSort [ss_item_sk,ss_ticket_number]
-                            CometExchange [ss_item_sk,ss_ticket_number] #2
-                              CometProject [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price]
-                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                          CometSort [sr_item_sk,sr_ticket_number]
-                            CometExchange [sr_item_sk,sr_ticket_number] #3
-                              CometProject [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity]
-                                CometFilter [sr_item_sk,sr_ticket_number,sr_reason_sk]
-                                  CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
-                  InputAdapter
-                    BroadcastExchange #4
-                      WholeStageCodegen (1)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [r_reason_sk]
-                              CometFilter [r_reason_desc,r_reason_sk]
-                                CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
+WholeStageCodegen (3)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [sumsales,ss_customer_sk]
+        CometHashAggregate [ss_customer_sk,sum,isEmpty]
+          CometColumnarExchange [ss_customer_sk] #1
+            RowToColumnar
+              WholeStageCodegen (2)
+                HashAggregate [ss_customer_sk,act_sales] [sum,isEmpty,sum,isEmpty]
+                  Project [ss_customer_sk,sr_return_quantity,ss_quantity,ss_sales_price]
+                    BroadcastHashJoin [sr_reason_sk,r_reason_sk]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [ss_customer_sk,ss_quantity,ss_sales_price,sr_reason_sk,sr_return_quantity]
+                            CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                              CometSort [ss_item_sk,ss_ticket_number]
+                                CometColumnarExchange [ss_item_sk,ss_ticket_number] #2
+                                  CometProject [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                              CometSort [sr_item_sk,sr_ticket_number]
+                                CometColumnarExchange [sr_item_sk,sr_ticket_number] #3
+                                  CometProject [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity]
+                                    CometFilter [sr_item_sk,sr_ticket_number,sr_reason_sk]
+                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
+                      InputAdapter
+                        BroadcastExchange #4
+                          WholeStageCodegen (1)
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [r_reason_sk]
+                                  CometFilter [r_reason_desc,r_reason_sk]
+                                    CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
index aafe59a77e..569baa88c6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-* HashAggregate (45)
-+- Exchange (44)
-   +- * HashAggregate (43)
-      +- * HashAggregate (42)
-         +- * HashAggregate (41)
-            +- * Project (40)
-               +- * BroadcastHashJoin Inner BuildRight (39)
-                  :- * Project (33)
-                  :  +- * BroadcastHashJoin Inner BuildRight (32)
-                  :     :- * Project (26)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                  :     :     :- * SortMergeJoin LeftAnti (19)
-                  :     :     :  :- * Project (13)
-                  :     :     :  :  +- * SortMergeJoin LeftSemi (12)
-                  :     :     :  :     :- * ColumnarToRow (6)
-                  :     :     :  :     :  +- CometSort (5)
-                  :     :     :  :     :     +- CometExchange (4)
-                  :     :     :  :     :        +- CometProject (3)
-                  :     :     :  :     :           +- CometFilter (2)
-                  :     :     :  :     :              +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :     :     :  :     +- * ColumnarToRow (11)
-                  :     :     :  :        +- CometSort (10)
-                  :     :     :  :           +- CometExchange (9)
-                  :     :     :  :              +- CometProject (8)
-                  :     :     :  :                 +- CometScan parquet spark_catalog.default.web_sales (7)
-                  :     :     :  +- * ColumnarToRow (18)
-                  :     :     :     +- CometSort (17)
-                  :     :     :        +- CometExchange (16)
-                  :     :     :           +- CometProject (15)
-                  :     :     :              +- CometScan parquet spark_catalog.default.web_returns (14)
-                  :     :     +- BroadcastExchange (24)
-                  :     :        +- * ColumnarToRow (23)
-                  :     :           +- CometProject (22)
-                  :     :              +- CometFilter (21)
-                  :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
-                  :     +- BroadcastExchange (31)
-                  :        +- * ColumnarToRow (30)
-                  :           +- CometProject (29)
-                  :              +- CometFilter (28)
-                  :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-                  +- BroadcastExchange (38)
-                     +- * ColumnarToRow (37)
-                        +- CometProject (36)
-                           +- CometFilter (35)
-                              +- CometScan parquet spark_catalog.default.web_site (34)
+* ColumnarToRow (47)
++- CometHashAggregate (46)
+   +- CometColumnarExchange (45)
+      +- RowToColumnar (44)
+         +- * HashAggregate (43)
+            +- * HashAggregate (42)
+               +- * HashAggregate (41)
+                  +- * Project (40)
+                     +- * BroadcastHashJoin Inner BuildRight (39)
+                        :- * Project (33)
+                        :  +- * BroadcastHashJoin Inner BuildRight (32)
+                        :     :- * Project (26)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                        :     :     :- * SortMergeJoin LeftAnti (19)
+                        :     :     :  :- * Project (13)
+                        :     :     :  :  +- * SortMergeJoin LeftSemi (12)
+                        :     :     :  :     :- * ColumnarToRow (6)
+                        :     :     :  :     :  +- CometSort (5)
+                        :     :     :  :     :     +- CometColumnarExchange (4)
+                        :     :     :  :     :        +- CometProject (3)
+                        :     :     :  :     :           +- CometFilter (2)
+                        :     :     :  :     :              +- CometScan parquet spark_catalog.default.web_sales (1)
+                        :     :     :  :     +- * ColumnarToRow (11)
+                        :     :     :  :        +- CometSort (10)
+                        :     :     :  :           +- CometColumnarExchange (9)
+                        :     :     :  :              +- CometProject (8)
+                        :     :     :  :                 +- CometScan parquet spark_catalog.default.web_sales (7)
+                        :     :     :  +- * ColumnarToRow (18)
+                        :     :     :     +- CometSort (17)
+                        :     :     :        +- CometColumnarExchange (16)
+                        :     :     :           +- CometProject (15)
+                        :     :     :              +- CometScan parquet spark_catalog.default.web_returns (14)
+                        :     :     +- BroadcastExchange (24)
+                        :     :        +- * ColumnarToRow (23)
+                        :     :           +- CometProject (22)
+                        :     :              +- CometFilter (21)
+                        :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
+                        :     +- BroadcastExchange (31)
+                        :        +- * ColumnarToRow (30)
+                        :           +- CometProject (29)
+                        :              +- CometFilter (28)
+                        :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+                        +- BroadcastExchange (38)
+                           +- * ColumnarToRow (37)
+                              +- CometProject (36)
+                                 +- CometFilter (35)
+                                    +- CometScan parquet spark_catalog.default.web_site (34)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -61,9 +63,9 @@ Condition : ((isnotnull(ws_ship_date_sk#1) AND isnotnull(ws_ship_addr_sk#2)) AND
 Input [8]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7, ws_sold_date_sk#8]
 Arguments: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7], [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7]
 
-(4) CometExchange
+(4) CometColumnarExchange
 Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7]
-Arguments: hashpartitioning(ws_order_number#5, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ws_order_number#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (5) CometSort
 Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7]
@@ -82,9 +84,9 @@ ReadSchema: struct<ws_warehouse_sk:int,ws_order_number:int>
 Input [3]: [ws_warehouse_sk#9, ws_order_number#10, ws_sold_date_sk#11]
 Arguments: [ws_warehouse_sk#9, ws_order_number#10], [ws_warehouse_sk#9, ws_order_number#10]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [2]: [ws_warehouse_sk#9, ws_order_number#10]
-Arguments: hashpartitioning(ws_order_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(ws_order_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [ws_warehouse_sk#9, ws_order_number#10]
@@ -113,9 +115,9 @@ ReadSchema: struct<wr_order_number:int>
 Input [2]: [wr_order_number#12, wr_returned_date_sk#13]
 Arguments: [wr_order_number#12], [wr_order_number#12]
 
-(16) CometExchange
+(16) CometColumnarExchange
 Input [1]: [wr_order_number#12]
-Arguments: hashpartitioning(wr_order_number#12, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(wr_order_number#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
 (17) CometSort
 Input [1]: [wr_order_number#12]
@@ -247,14 +249,18 @@ Functions [3]: [merge_sum(UnscaledValue(ws_ext_ship_cost#6)), merge_sum(Unscaled
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#6))#20, sum(UnscaledValue(ws_net_profit#7))#21, count(ws_order_number#5)#24]
 Results [3]: [sum#22, sum#23, count#25]
 
-(44) Exchange
+(44) RowToColumnar
 Input [3]: [sum#22, sum#23, count#25]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(45) HashAggregate [codegen id : 9]
+(45) CometColumnarExchange
+Input [3]: [sum#22, sum#23, count#25]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(46) CometHashAggregate
 Input [3]: [sum#22, sum#23, count#25]
 Keys: []
 Functions [3]: [sum(UnscaledValue(ws_ext_ship_cost#6)), sum(UnscaledValue(ws_net_profit#7)), count(distinct ws_order_number#5)]
-Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#6))#20, sum(UnscaledValue(ws_net_profit#7))#21, count(ws_order_number#5)#24]
-Results [3]: [count(ws_order_number#5)#24 AS order count #26, MakeDecimal(sum(UnscaledValue(ws_ext_ship_cost#6))#20,17,2) AS total shipping cost #27, MakeDecimal(sum(UnscaledValue(ws_net_profit#7))#21,17,2) AS total net profit #28]
+
+(47) ColumnarToRow [codegen id : 9]
+Input [3]: [order count #26, total shipping cost #27, total net profit #28]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt
index 369065a668..1784692e7c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt
@@ -1,68 +1,70 @@
 WholeStageCodegen (9)
-  HashAggregate [sum,sum,count] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (8)
-          HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
-            HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-              HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-                Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                  BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                    Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                      BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
-                        Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                          BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
-                            SortMergeJoin [ws_order_number,wr_order_number]
-                              InputAdapter
-                                WholeStageCodegen (3)
-                                  Project [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                                    SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
-                                      InputAdapter
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [ws_order_number]
-                                                CometExchange [ws_order_number] #2
-                                                  CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                                                    CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
-                                      InputAdapter
-                                        WholeStageCodegen (2)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [ws_order_number]
-                                                CometExchange [ws_order_number] #3
-                                                  CometProject [ws_warehouse_sk,ws_order_number]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
-                              InputAdapter
-                                WholeStageCodegen (4)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometSort [wr_order_number]
-                                        CometExchange [wr_order_number] #4
-                                          CometProject [wr_order_number]
-                                            CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
+      CometHashAggregate [sum,sum,count]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (8)
+              HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
+                HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+                  HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+                    Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                      BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                        Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                          BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
+                            Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                              BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
+                                SortMergeJoin [ws_order_number,wr_order_number]
+                                  InputAdapter
+                                    WholeStageCodegen (3)
+                                      Project [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                                        SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
+                                          InputAdapter
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometSort [ws_order_number]
+                                                    CometColumnarExchange [ws_order_number] #2
+                                                      CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                                                        CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
+                                                          CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
+                                          InputAdapter
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometSort [ws_order_number]
+                                                    CometColumnarExchange [ws_order_number] #3
+                                                      CometProject [ws_warehouse_sk,ws_order_number]
+                                                        CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
+                                  InputAdapter
+                                    WholeStageCodegen (4)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometSort [wr_order_number]
+                                            CometColumnarExchange [wr_order_number] #4
+                                              CometProject [wr_order_number]
+                                                CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
+                                InputAdapter
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (5)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [d_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                             InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (5)
+                              BroadcastExchange #6
+                                WholeStageCodegen (6)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [d_date_sk]
-                                        CometFilter [d_date,d_date_sk]
-                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                      CometProject [ca_address_sk]
+                                        CometFilter [ca_state,ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                         InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (6)
+                          BroadcastExchange #7
+                            WholeStageCodegen (7)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [ca_address_sk]
-                                    CometFilter [ca_state,ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (7)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [web_site_sk]
-                                CometFilter [web_company_name,web_site_sk]
-                                  CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
+                                  CometProject [web_site_sk]
+                                    CometFilter [web_company_name,web_site_sk]
+                                      CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
index 375c7bf2f9..c9e31178a9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
@@ -1,65 +1,67 @@
 == Physical Plan ==
-* HashAggregate (61)
-+- Exchange (60)
-   +- * HashAggregate (59)
-      +- * HashAggregate (58)
-         +- * HashAggregate (57)
-            +- * Project (56)
-               +- * BroadcastHashJoin Inner BuildRight (55)
-                  :- * Project (49)
-                  :  +- * BroadcastHashJoin Inner BuildRight (48)
-                  :     :- * Project (42)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (41)
-                  :     :     :- * SortMergeJoin LeftSemi (35)
-                  :     :     :  :- * SortMergeJoin LeftSemi (18)
-                  :     :     :  :  :- * ColumnarToRow (6)
-                  :     :     :  :  :  +- CometSort (5)
-                  :     :     :  :  :     +- CometExchange (4)
-                  :     :     :  :  :        +- CometProject (3)
-                  :     :     :  :  :           +- CometFilter (2)
-                  :     :     :  :  :              +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :     :     :  :  +- * Project (17)
-                  :     :     :  :     +- * SortMergeJoin Inner (16)
-                  :     :     :  :        :- * ColumnarToRow (12)
-                  :     :     :  :        :  +- CometSort (11)
-                  :     :     :  :        :     +- CometExchange (10)
-                  :     :     :  :        :        +- CometProject (9)
-                  :     :     :  :        :           +- CometFilter (8)
-                  :     :     :  :        :              +- CometScan parquet spark_catalog.default.web_sales (7)
-                  :     :     :  :        +- * ColumnarToRow (15)
-                  :     :     :  :           +- CometSort (14)
-                  :     :     :  :              +- ReusedExchange (13)
-                  :     :     :  +- * Project (34)
-                  :     :     :     +- * SortMergeJoin Inner (33)
-                  :     :     :        :- * ColumnarToRow (24)
-                  :     :     :        :  +- CometSort (23)
-                  :     :     :        :     +- CometExchange (22)
-                  :     :     :        :        +- CometProject (21)
-                  :     :     :        :           +- CometFilter (20)
-                  :     :     :        :              +- CometScan parquet spark_catalog.default.web_returns (19)
-                  :     :     :        +- * Project (32)
-                  :     :     :           +- * SortMergeJoin Inner (31)
-                  :     :     :              :- * ColumnarToRow (27)
-                  :     :     :              :  +- CometSort (26)
-                  :     :     :              :     +- ReusedExchange (25)
-                  :     :     :              +- * ColumnarToRow (30)
-                  :     :     :                 +- CometSort (29)
-                  :     :     :                    +- ReusedExchange (28)
-                  :     :     +- BroadcastExchange (40)
-                  :     :        +- * ColumnarToRow (39)
-                  :     :           +- CometProject (38)
-                  :     :              +- CometFilter (37)
-                  :     :                 +- CometScan parquet spark_catalog.default.date_dim (36)
-                  :     +- BroadcastExchange (47)
-                  :        +- * ColumnarToRow (46)
-                  :           +- CometProject (45)
-                  :              +- CometFilter (44)
-                  :                 +- CometScan parquet spark_catalog.default.customer_address (43)
-                  +- BroadcastExchange (54)
-                     +- * ColumnarToRow (53)
-                        +- CometProject (52)
-                           +- CometFilter (51)
-                              +- CometScan parquet spark_catalog.default.web_site (50)
+* ColumnarToRow (63)
++- CometHashAggregate (62)
+   +- CometColumnarExchange (61)
+      +- RowToColumnar (60)
+         +- * HashAggregate (59)
+            +- * HashAggregate (58)
+               +- * HashAggregate (57)
+                  +- * Project (56)
+                     +- * BroadcastHashJoin Inner BuildRight (55)
+                        :- * Project (49)
+                        :  +- * BroadcastHashJoin Inner BuildRight (48)
+                        :     :- * Project (42)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (41)
+                        :     :     :- * SortMergeJoin LeftSemi (35)
+                        :     :     :  :- * SortMergeJoin LeftSemi (18)
+                        :     :     :  :  :- * ColumnarToRow (6)
+                        :     :     :  :  :  +- CometSort (5)
+                        :     :     :  :  :     +- CometColumnarExchange (4)
+                        :     :     :  :  :        +- CometProject (3)
+                        :     :     :  :  :           +- CometFilter (2)
+                        :     :     :  :  :              +- CometScan parquet spark_catalog.default.web_sales (1)
+                        :     :     :  :  +- * Project (17)
+                        :     :     :  :     +- * SortMergeJoin Inner (16)
+                        :     :     :  :        :- * ColumnarToRow (12)
+                        :     :     :  :        :  +- CometSort (11)
+                        :     :     :  :        :     +- CometColumnarExchange (10)
+                        :     :     :  :        :        +- CometProject (9)
+                        :     :     :  :        :           +- CometFilter (8)
+                        :     :     :  :        :              +- CometScan parquet spark_catalog.default.web_sales (7)
+                        :     :     :  :        +- * ColumnarToRow (15)
+                        :     :     :  :           +- CometSort (14)
+                        :     :     :  :              +- ReusedExchange (13)
+                        :     :     :  +- * Project (34)
+                        :     :     :     +- * SortMergeJoin Inner (33)
+                        :     :     :        :- * ColumnarToRow (24)
+                        :     :     :        :  +- CometSort (23)
+                        :     :     :        :     +- CometColumnarExchange (22)
+                        :     :     :        :        +- CometProject (21)
+                        :     :     :        :           +- CometFilter (20)
+                        :     :     :        :              +- CometScan parquet spark_catalog.default.web_returns (19)
+                        :     :     :        +- * Project (32)
+                        :     :     :           +- * SortMergeJoin Inner (31)
+                        :     :     :              :- * ColumnarToRow (27)
+                        :     :     :              :  +- CometSort (26)
+                        :     :     :              :     +- ReusedExchange (25)
+                        :     :     :              +- * ColumnarToRow (30)
+                        :     :     :                 +- CometSort (29)
+                        :     :     :                    +- ReusedExchange (28)
+                        :     :     +- BroadcastExchange (40)
+                        :     :        +- * ColumnarToRow (39)
+                        :     :           +- CometProject (38)
+                        :     :              +- CometFilter (37)
+                        :     :                 +- CometScan parquet spark_catalog.default.date_dim (36)
+                        :     +- BroadcastExchange (47)
+                        :        +- * ColumnarToRow (46)
+                        :           +- CometProject (45)
+                        :              +- CometFilter (44)
+                        :                 +- CometScan parquet spark_catalog.default.customer_address (43)
+                        +- BroadcastExchange (54)
+                           +- * ColumnarToRow (53)
+                              +- CometProject (52)
+                                 +- CometFilter (51)
+                                    +- CometScan parquet spark_catalog.default.web_site (50)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -77,9 +79,9 @@ Condition : ((isnotnull(ws_ship_date_sk#1) AND isnotnull(ws_ship_addr_sk#2)) AND
 Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6, ws_sold_date_sk#7]
 Arguments: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6], [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6]
 
-(4) CometExchange
+(4) CometColumnarExchange
 Input [6]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6]
-Arguments: hashpartitioning(ws_order_number#4, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ws_order_number#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (5) CometSort
 Input [6]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6]
@@ -103,9 +105,9 @@ Condition : (isnotnull(ws_order_number#9) AND isnotnull(ws_warehouse_sk#8))
 Input [3]: [ws_warehouse_sk#8, ws_order_number#9, ws_sold_date_sk#10]
 Arguments: [ws_warehouse_sk#8, ws_order_number#9], [ws_warehouse_sk#8, ws_order_number#9]
 
-(10) CometExchange
+(10) CometColumnarExchange
 Input [2]: [ws_warehouse_sk#8, ws_order_number#9]
-Arguments: hashpartitioning(ws_order_number#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(ws_order_number#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (11) CometSort
 Input [2]: [ws_warehouse_sk#8, ws_order_number#9]
@@ -155,9 +157,9 @@ Condition : isnotnull(wr_order_number#13)
 Input [2]: [wr_order_number#13, wr_returned_date_sk#14]
 Arguments: [wr_order_number#13], [wr_order_number#13]
 
-(22) CometExchange
+(22) CometColumnarExchange
 Input [1]: [wr_order_number#13]
-Arguments: hashpartitioning(wr_order_number#13, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(wr_order_number#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
 (23) CometSort
 Input [1]: [wr_order_number#13]
@@ -329,14 +331,18 @@ Functions [3]: [merge_sum(UnscaledValue(ws_ext_ship_cost#5)), merge_sum(Unscaled
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#5))#21, sum(UnscaledValue(ws_net_profit#6))#22, count(ws_order_number#4)#25]
 Results [3]: [sum#23, sum#24, count#26]
 
-(60) Exchange
+(60) RowToColumnar
 Input [3]: [sum#23, sum#24, count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(61) HashAggregate [codegen id : 15]
+(61) CometColumnarExchange
+Input [3]: [sum#23, sum#24, count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(62) CometHashAggregate
 Input [3]: [sum#23, sum#24, count#26]
 Keys: []
 Functions [3]: [sum(UnscaledValue(ws_ext_ship_cost#5)), sum(UnscaledValue(ws_net_profit#6)), count(distinct ws_order_number#4)]
-Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#5))#21, sum(UnscaledValue(ws_net_profit#6))#22, count(ws_order_number#4)#25]
-Results [3]: [count(ws_order_number#4)#25 AS order count #27, MakeDecimal(sum(UnscaledValue(ws_ext_ship_cost#5))#21,17,2) AS total shipping cost #28, MakeDecimal(sum(UnscaledValue(ws_net_profit#6))#22,17,2) AS total net profit #29]
+
+(63) ColumnarToRow [codegen id : 15]
+Input [3]: [order count #27, total shipping cost #28, total net profit #29]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt
index 2ad651cb64..335ef0af24 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt
@@ -1,99 +1,101 @@
 WholeStageCodegen (15)
-  HashAggregate [sum,sum,count] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (14)
-          HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
-            HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-              HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-                Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                  BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                    Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                      BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
-                        Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                          BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
-                            SortMergeJoin [ws_order_number,wr_order_number]
-                              InputAdapter
-                                WholeStageCodegen (5)
-                                  SortMergeJoin [ws_order_number,ws_order_number]
-                                    InputAdapter
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
+      CometHashAggregate [sum,sum,count]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (14)
+              HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
+                HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+                  HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+                    Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                      BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                        Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                          BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
+                            Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                              BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
+                                SortMergeJoin [ws_order_number,wr_order_number]
+                                  InputAdapter
+                                    WholeStageCodegen (5)
+                                      SortMergeJoin [ws_order_number,ws_order_number]
+                                        InputAdapter
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometSort [ws_order_number]
+                                                  CometColumnarExchange [ws_order_number] #2
+                                                    CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                                                      CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
+                                                        CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
+                                        InputAdapter
+                                          WholeStageCodegen (4)
+                                            Project [ws_order_number]
+                                              SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
+                                                InputAdapter
+                                                  WholeStageCodegen (2)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometSort [ws_order_number]
+                                                          CometColumnarExchange [ws_order_number] #3
+                                                            CometProject [ws_warehouse_sk,ws_order_number]
+                                                              CometFilter [ws_order_number,ws_warehouse_sk]
+                                                                CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
+                                                InputAdapter
+                                                  WholeStageCodegen (3)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometSort [ws_order_number]
+                                                          ReusedExchange [ws_warehouse_sk,ws_order_number] #3
+                                  InputAdapter
+                                    WholeStageCodegen (10)
+                                      Project [wr_order_number]
+                                        SortMergeJoin [wr_order_number,ws_order_number]
                                           InputAdapter
-                                            CometSort [ws_order_number]
-                                              CometExchange [ws_order_number] #2
-                                                CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                                                  CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
-                                    InputAdapter
-                                      WholeStageCodegen (4)
-                                        Project [ws_order_number]
-                                          SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
-                                            InputAdapter
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
+                                            WholeStageCodegen (6)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometSort [wr_order_number]
+                                                    CometColumnarExchange [wr_order_number] #4
+                                                      CometProject [wr_order_number]
+                                                        CometFilter [wr_order_number]
+                                                          CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
+                                          InputAdapter
+                                            WholeStageCodegen (9)
+                                              Project [ws_order_number]
+                                                SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
                                                   InputAdapter
-                                                    CometSort [ws_order_number]
-                                                      CometExchange [ws_order_number] #3
-                                                        CometProject [ws_warehouse_sk,ws_order_number]
-                                                          CometFilter [ws_order_number,ws_warehouse_sk]
-                                                            CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
-                                            InputAdapter
-                                              WholeStageCodegen (3)
-                                                ColumnarToRow
+                                                    WholeStageCodegen (7)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometSort [ws_order_number]
+                                                            ReusedExchange [ws_warehouse_sk,ws_order_number] #3
                                                   InputAdapter
-                                                    CometSort [ws_order_number]
-                                                      ReusedExchange [ws_warehouse_sk,ws_order_number] #3
-                              InputAdapter
-                                WholeStageCodegen (10)
-                                  Project [wr_order_number]
-                                    SortMergeJoin [wr_order_number,ws_order_number]
-                                      InputAdapter
-                                        WholeStageCodegen (6)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [wr_order_number]
-                                                CometExchange [wr_order_number] #4
-                                                  CometProject [wr_order_number]
-                                                    CometFilter [wr_order_number]
-                                                      CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
-                                      InputAdapter
-                                        WholeStageCodegen (9)
-                                          Project [ws_order_number]
-                                            SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
-                                              InputAdapter
-                                                WholeStageCodegen (7)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometSort [ws_order_number]
-                                                        ReusedExchange [ws_warehouse_sk,ws_order_number] #3
-                                              InputAdapter
-                                                WholeStageCodegen (8)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometSort [ws_order_number]
-                                                        ReusedExchange [ws_warehouse_sk,ws_order_number] #3
+                                                    WholeStageCodegen (8)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometSort [ws_order_number]
+                                                            ReusedExchange [ws_warehouse_sk,ws_order_number] #3
+                                InputAdapter
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (11)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [d_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                             InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (11)
+                              BroadcastExchange #6
+                                WholeStageCodegen (12)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [d_date_sk]
-                                        CometFilter [d_date,d_date_sk]
-                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                      CometProject [ca_address_sk]
+                                        CometFilter [ca_state,ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                         InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (12)
+                          BroadcastExchange #7
+                            WholeStageCodegen (13)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [ca_address_sk]
-                                    CometFilter [ca_state,ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (13)
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [web_site_sk]
-                                CometFilter [web_company_name,web_site_sk]
-                                  CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
+                                  CometProject [web_site_sk]
+                                    CometFilter [web_company_name,web_site_sk]
+                                      CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt
index b55971ac80..49062fc63a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt
@@ -1,32 +1,34 @@
 == Physical Plan ==
-* HashAggregate (28)
-+- Exchange (27)
-   +- * HashAggregate (26)
-      +- * Project (25)
-         +- * BroadcastHashJoin Inner BuildRight (24)
-            :- * Project (18)
-            :  +- * BroadcastHashJoin Inner BuildRight (17)
-            :     :- * Project (11)
-            :     :  +- * BroadcastHashJoin Inner BuildRight (10)
-            :     :     :- * ColumnarToRow (4)
-            :     :     :  +- CometProject (3)
-            :     :     :     +- CometFilter (2)
-            :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
-            :     :     +- BroadcastExchange (9)
-            :     :        +- * ColumnarToRow (8)
-            :     :           +- CometProject (7)
-            :     :              +- CometFilter (6)
-            :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
-            :     +- BroadcastExchange (16)
-            :        +- * ColumnarToRow (15)
-            :           +- CometProject (14)
-            :              +- CometFilter (13)
-            :                 +- CometScan parquet spark_catalog.default.time_dim (12)
-            +- BroadcastExchange (23)
-               +- * ColumnarToRow (22)
-                  +- CometProject (21)
-                     +- CometFilter (20)
-                        +- CometScan parquet spark_catalog.default.store (19)
+* ColumnarToRow (30)
++- CometHashAggregate (29)
+   +- CometColumnarExchange (28)
+      +- RowToColumnar (27)
+         +- * HashAggregate (26)
+            +- * Project (25)
+               +- * BroadcastHashJoin Inner BuildRight (24)
+                  :- * Project (18)
+                  :  +- * BroadcastHashJoin Inner BuildRight (17)
+                  :     :- * Project (11)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (10)
+                  :     :     :- * ColumnarToRow (4)
+                  :     :     :  +- CometProject (3)
+                  :     :     :     +- CometFilter (2)
+                  :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :     :     +- BroadcastExchange (9)
+                  :     :        +- * ColumnarToRow (8)
+                  :     :           +- CometProject (7)
+                  :     :              +- CometFilter (6)
+                  :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
+                  :     +- BroadcastExchange (16)
+                  :        +- * ColumnarToRow (15)
+                  :           +- CometProject (14)
+                  :              +- CometFilter (13)
+                  :                 +- CometScan parquet spark_catalog.default.time_dim (12)
+                  +- BroadcastExchange (23)
+                     +- * ColumnarToRow (22)
+                        +- CometProject (21)
+                           +- CometFilter (20)
+                              +- CometScan parquet spark_catalog.default.store (19)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -150,14 +152,18 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#12]
 Results [1]: [count#13]
 
-(27) Exchange
+(27) RowToColumnar
 Input [1]: [count#13]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 5]
+(28) CometColumnarExchange
+Input [1]: [count#13]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [1]: [count#13]
 Keys: []
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#14]
-Results [1]: [count(1)#14 AS count(1)#15]
+
+(30) ColumnarToRow [codegen id : 5]
+Input [1]: [count(1)#14]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt
index d1438f48eb..647015f01c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt
@@ -1,41 +1,43 @@
 WholeStageCodegen (5)
-  HashAggregate [count] [count(1),count(1),count]
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (4)
-          HashAggregate [count,count]
-            Project
-              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                Project [ss_store_sk]
-                  BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                    Project [ss_sold_time_sk,ss_store_sk]
-                      BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                              CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+      CometHashAggregate [count]
+        CometColumnarExchange #1
+          RowToColumnar
+            WholeStageCodegen (4)
+              HashAggregate [count,count]
+                Project
+                  BroadcastHashJoin [ss_store_sk,s_store_sk]
+                    Project [ss_store_sk]
+                      BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                        Project [ss_sold_time_sk,ss_store_sk]
+                          BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                  CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                            InputAdapter
+                              BroadcastExchange #2
+                                WholeStageCodegen (1)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [hd_demo_sk]
+                                        CometFilter [hd_dep_count,hd_demo_sk]
+                                          CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
                         InputAdapter
-                          BroadcastExchange #2
-                            WholeStageCodegen (1)
+                          BroadcastExchange #3
+                            WholeStageCodegen (2)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [hd_demo_sk]
-                                    CometFilter [hd_dep_count,hd_demo_sk]
-                                      CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
+                                  CometProject [t_time_sk]
+                                    CometFilter [t_hour,t_minute,t_time_sk]
+                                      CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                     InputAdapter
-                      BroadcastExchange #3
-                        WholeStageCodegen (2)
+                      BroadcastExchange #4
+                        WholeStageCodegen (3)
                           ColumnarToRow
                             InputAdapter
-                              CometProject [t_time_sk]
-                                CometFilter [t_hour,t_minute,t_time_sk]
-                                  CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
-                InputAdapter
-                  BroadcastExchange #4
-                    WholeStageCodegen (3)
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [s_store_sk]
-                            CometFilter [s_store_name,s_store_sk]
-                              CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
+                              CometProject [s_store_sk]
+                                CometFilter [s_store_name,s_store_sk]
+                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt
index 512037f6a3..7f3d3ee195 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt
@@ -1,27 +1,30 @@
 == Physical Plan ==
-* HashAggregate (23)
-+- Exchange (22)
-   +- * HashAggregate (21)
-      +- * Project (20)
-         +- * SortMergeJoin FullOuter (19)
-            :- * Sort (9)
-            :  +- * HashAggregate (8)
-            :     +- Exchange (7)
-            :        +- * HashAggregate (6)
-            :           +- * Project (5)
-            :              +- * BroadcastHashJoin Inner BuildRight (4)
-            :                 :- * ColumnarToRow (2)
-            :                 :  +- CometScan parquet spark_catalog.default.store_sales (1)
-            :                 +- ReusedExchange (3)
-            +- * Sort (18)
-               +- * HashAggregate (17)
-                  +- Exchange (16)
-                     +- * HashAggregate (15)
-                        +- * Project (14)
-                           +- * BroadcastHashJoin Inner BuildRight (13)
-                              :- * ColumnarToRow (11)
-                              :  +- CometScan parquet spark_catalog.default.catalog_sales (10)
-                              +- ReusedExchange (12)
+* ColumnarToRow (26)
++- CometHashAggregate (25)
+   +- CometColumnarExchange (24)
+      +- CometHashAggregate (23)
+         +- CometProject (22)
+            +- CometSortMergeJoin (21)
+               :- CometSort (10)
+               :  +- CometHashAggregate (9)
+               :     +- CometColumnarExchange (8)
+               :        +- RowToColumnar (7)
+               :           +- * HashAggregate (6)
+               :              +- * Project (5)
+               :                 +- * BroadcastHashJoin Inner BuildRight (4)
+               :                    :- * ColumnarToRow (2)
+               :                    :  +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                    +- ReusedExchange (3)
+               +- CometSort (20)
+                  +- CometHashAggregate (19)
+                     +- CometColumnarExchange (18)
+                        +- RowToColumnar (17)
+                           +- * HashAggregate (16)
+                              +- * Project (15)
+                                 +- * BroadcastHashJoin Inner BuildRight (14)
+                                    :- * ColumnarToRow (12)
+                                    :  +- CometScan parquet spark_catalog.default.catalog_sales (11)
+                                    +- ReusedExchange (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -34,7 +37,7 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int>
 (2) ColumnarToRow [codegen id : 2]
 Input [3]: [ss_item_sk#1, ss_customer_sk#2, ss_sold_date_sk#3]
 
-(3) ReusedExchange [Reuses operator id: 28]
+(3) ReusedExchange [Reuses operator id: 31]
 Output [1]: [d_date_sk#5]
 
 (4) BroadcastHashJoin [codegen id : 2]
@@ -54,20 +57,21 @@ Functions: []
 Aggregate Attributes: []
 Results [2]: [ss_customer_sk#2, ss_item_sk#1]
 
-(7) Exchange
+(7) RowToColumnar
 Input [2]: [ss_customer_sk#2, ss_item_sk#1]
-Arguments: hashpartitioning(ss_customer_sk#2, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(8) HashAggregate [codegen id : 3]
+(8) CometColumnarExchange
+Input [2]: [ss_customer_sk#2, ss_item_sk#1]
+Arguments: hashpartitioning(ss_customer_sk#2, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+
+(9) CometHashAggregate
 Input [2]: [ss_customer_sk#2, ss_item_sk#1]
 Keys [2]: [ss_customer_sk#2, ss_item_sk#1]
 Functions: []
-Aggregate Attributes: []
-Results [2]: [ss_customer_sk#2 AS customer_sk#6, ss_item_sk#1 AS item_sk#7]
 
-(9) Sort [codegen id : 3]
+(10) CometSort
 Input [2]: [customer_sk#6, item_sk#7]
-Arguments: [customer_sk#6 ASC NULLS FIRST, item_sk#7 ASC NULLS FIRST], false, 0
+Arguments: [customer_sk#6, item_sk#7], [customer_sk#6 ASC NULLS FIRST, item_sk#7 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [3]: [cs_bill_customer_sk#8, cs_item_sk#9, cs_sold_date_sk#10]
@@ -76,104 +80,103 @@ Location: InMemoryFileIndex []
 PartitionFilters: [isnotnull(cs_sold_date_sk#10), dynamicpruningexpression(cs_sold_date_sk#10 IN dynamicpruning#11)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_item_sk:int>
 
-(11) ColumnarToRow [codegen id : 5]
+(12) ColumnarToRow [codegen id : 4]
 Input [3]: [cs_bill_customer_sk#8, cs_item_sk#9, cs_sold_date_sk#10]
 
-(12) ReusedExchange [Reuses operator id: 28]
+(13) ReusedExchange [Reuses operator id: 31]
 Output [1]: [d_date_sk#12]
 
-(13) BroadcastHashJoin [codegen id : 5]
+(14) BroadcastHashJoin [codegen id : 4]
 Left keys [1]: [cs_sold_date_sk#10]
 Right keys [1]: [d_date_sk#12]
 Join type: Inner
 Join condition: None
 
-(14) Project [codegen id : 5]
+(15) Project [codegen id : 4]
 Output [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Input [4]: [cs_bill_customer_sk#8, cs_item_sk#9, cs_sold_date_sk#10, d_date_sk#12]
 
-(15) HashAggregate [codegen id : 5]
+(16) HashAggregate [codegen id : 4]
 Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Keys [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Functions: []
 Aggregate Attributes: []
 Results [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 
-(16) Exchange
+(17) RowToColumnar
+Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
+
+(18) CometColumnarExchange
 Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
-Arguments: hashpartitioning(cs_bill_customer_sk#8, cs_item_sk#9, 5), ENSURE_REQUIREMENTS, [plan_id=2]
+Arguments: hashpartitioning(cs_bill_customer_sk#8, cs_item_sk#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
-(17) HashAggregate [codegen id : 6]
+(19) CometHashAggregate
 Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Keys [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Functions: []
-Aggregate Attributes: []
-Results [2]: [cs_bill_customer_sk#8 AS customer_sk#13, cs_item_sk#9 AS item_sk#14]
 
-(18) Sort [codegen id : 6]
+(20) CometSort
 Input [2]: [customer_sk#13, item_sk#14]
-Arguments: [customer_sk#13 ASC NULLS FIRST, item_sk#14 ASC NULLS FIRST], false, 0
+Arguments: [customer_sk#13, item_sk#14], [customer_sk#13 ASC NULLS FIRST, item_sk#14 ASC NULLS FIRST]
 
-(19) SortMergeJoin [codegen id : 7]
-Left keys [2]: [customer_sk#6, item_sk#7]
-Right keys [2]: [customer_sk#13, item_sk#14]
-Join type: FullOuter
-Join condition: None
+(21) CometSortMergeJoin
+Left output [2]: [customer_sk#6, item_sk#7]
+Right output [2]: [customer_sk#13, item_sk#14]
+Arguments: [customer_sk#6, item_sk#7], [customer_sk#13, item_sk#14], FullOuter
 
-(20) Project [codegen id : 7]
-Output [2]: [customer_sk#6, customer_sk#13]
+(22) CometProject
 Input [4]: [customer_sk#6, item_sk#7, customer_sk#13, item_sk#14]
+Arguments: [customer_sk#6, customer_sk#13], [customer_sk#6, customer_sk#13]
 
-(21) HashAggregate [codegen id : 7]
+(23) CometHashAggregate
 Input [2]: [customer_sk#6, customer_sk#13]
 Keys: []
 Functions [3]: [partial_sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END), partial_sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END), partial_sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)]
-Aggregate Attributes [3]: [sum#15, sum#16, sum#17]
-Results [3]: [sum#18, sum#19, sum#20]
 
-(22) Exchange
-Input [3]: [sum#18, sum#19, sum#20]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=3]
+(24) CometColumnarExchange
+Input [3]: [sum#15, sum#16, sum#17]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(23) HashAggregate [codegen id : 8]
-Input [3]: [sum#18, sum#19, sum#20]
+(25) CometHashAggregate
+Input [3]: [sum#15, sum#16, sum#17]
 Keys: []
 Functions [3]: [sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END), sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END), sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)]
-Aggregate Attributes [3]: [sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END)#21, sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#22, sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#23]
-Results [3]: [sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END)#21 AS store_only#24, sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#22 AS catalog_only#25, sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#23 AS store_and_catalog#26]
+
+(26) ColumnarToRow [codegen id : 5]
+Input [3]: [store_only#18, catalog_only#19, store_and_catalog#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (28)
-+- * ColumnarToRow (27)
-   +- CometProject (26)
-      +- CometFilter (25)
-         +- CometScan parquet spark_catalog.default.date_dim (24)
+BroadcastExchange (31)
++- * ColumnarToRow (30)
+   +- CometProject (29)
+      +- CometFilter (28)
+         +- CometScan parquet spark_catalog.default.date_dim (27)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#27]
+Output [2]: [d_date_sk#5, d_month_seq#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(25) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#27]
-Condition : (((isnotnull(d_month_seq#27) AND (d_month_seq#27 >= 1200)) AND (d_month_seq#27 <= 1211)) AND isnotnull(d_date_sk#5))
+(28) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#21]
+Condition : (((isnotnull(d_month_seq#21) AND (d_month_seq#21 >= 1200)) AND (d_month_seq#21 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(26) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#27]
+(29) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#21]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(27) ColumnarToRow [codegen id : 1]
+(30) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(28) BroadcastExchange
+(31) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-Subquery:2 Hosting operator id = 10 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 11 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt
index be9c20a560..f4381c85e2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt
@@ -1,47 +1,43 @@
-WholeStageCodegen (8)
-  HashAggregate [sum,sum,sum] [sum(CASE WHEN (isnotnull(customer_sk) AND isnull(customer_sk)) THEN 1 ELSE 0 END),sum(CASE WHEN (isnull(customer_sk) AND isnotnull(customer_sk)) THEN 1 ELSE 0 END),sum(CASE WHEN (isnotnull(customer_sk) AND isnotnull(customer_sk)) THEN 1 ELSE 0 END),store_only,catalog_only,store_and_catalog,sum,sum,sum]
+WholeStageCodegen (5)
+  ColumnarToRow
     InputAdapter
-      Exchange #1
-        WholeStageCodegen (7)
-          HashAggregate [customer_sk,customer_sk] [sum,sum,sum,sum,sum,sum]
-            Project [customer_sk,customer_sk]
-              SortMergeJoin [customer_sk,item_sk,customer_sk,item_sk]
-                InputAdapter
-                  WholeStageCodegen (3)
-                    Sort [customer_sk,item_sk]
-                      HashAggregate [ss_customer_sk,ss_item_sk] [customer_sk,item_sk]
-                        InputAdapter
-                          Exchange [ss_customer_sk,ss_item_sk] #2
-                            WholeStageCodegen (2)
-                              HashAggregate [ss_customer_sk,ss_item_sk]
-                                Project [ss_item_sk,ss_customer_sk]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #3
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_month_seq,d_date_sk]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #3
-                InputAdapter
-                  WholeStageCodegen (6)
-                    Sort [customer_sk,item_sk]
-                      HashAggregate [cs_bill_customer_sk,cs_item_sk] [customer_sk,item_sk]
-                        InputAdapter
-                          Exchange [cs_bill_customer_sk,cs_item_sk] #4
-                            WholeStageCodegen (5)
-                              HashAggregate [cs_bill_customer_sk,cs_item_sk]
-                                Project [cs_bill_customer_sk,cs_item_sk]
-                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
-                                          ReusedSubquery [d_date_sk] #1
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #3
+      CometHashAggregate [sum,sum,sum]
+        CometColumnarExchange #1
+          CometHashAggregate [customer_sk,customer_sk]
+            CometProject [customer_sk,customer_sk]
+              CometSortMergeJoin [customer_sk,item_sk,customer_sk,item_sk]
+                CometSort [customer_sk,item_sk]
+                  CometHashAggregate [ss_customer_sk,ss_item_sk]
+                    CometColumnarExchange [ss_customer_sk,ss_item_sk] #2
+                      RowToColumnar
+                        WholeStageCodegen (2)
+                          HashAggregate [ss_customer_sk,ss_item_sk]
+                            Project [ss_item_sk,ss_customer_sk]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #3
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [d_date_sk]
+                                                  CometFilter [d_month_seq,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #3
+                CometSort [customer_sk,item_sk]
+                  CometHashAggregate [cs_bill_customer_sk,cs_item_sk]
+                    CometColumnarExchange [cs_bill_customer_sk,cs_item_sk] #4
+                      RowToColumnar
+                        WholeStageCodegen (4)
+                          HashAggregate [cs_bill_customer_sk,cs_item_sk]
+                            Project [cs_bill_customer_sk,cs_item_sk]
+                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #1
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
index b69f690810..457e702c53 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
@@ -1,26 +1,30 @@
 == Physical Plan ==
-* Project (22)
-+- * Sort (21)
-   +- Exchange (20)
-      +- * Project (19)
-         +- Window (18)
-            +- * Sort (17)
-               +- Exchange (16)
-                  +- * HashAggregate (15)
-                     +- Exchange (14)
-                        +- * HashAggregate (13)
-                           +- * Project (12)
-                              +- * BroadcastHashJoin Inner BuildRight (11)
-                                 :- * Project (9)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                 :     :- * ColumnarToRow (3)
-                                 :     :  +- CometFilter (2)
-                                 :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                                 :     +- BroadcastExchange (7)
-                                 :        +- * ColumnarToRow (6)
-                                 :           +- CometFilter (5)
-                                 :              +- CometScan parquet spark_catalog.default.item (4)
-                                 +- ReusedExchange (10)
+* ColumnarToRow (26)
++- CometProject (25)
+   +- CometSort (24)
+      +- CometColumnarExchange (23)
+         +- RowToColumnar (22)
+            +- * Project (21)
+               +- Window (20)
+                  +- * ColumnarToRow (19)
+                     +- CometSort (18)
+                        +- CometColumnarExchange (17)
+                           +- CometHashAggregate (16)
+                              +- CometColumnarExchange (15)
+                                 +- RowToColumnar (14)
+                                    +- * HashAggregate (13)
+                                       +- * Project (12)
+                                          +- * BroadcastHashJoin Inner BuildRight (11)
+                                             :- * Project (9)
+                                             :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                             :     :- * ColumnarToRow (3)
+                                             :     :  +- CometFilter (2)
+                                             :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                                             :     +- BroadcastExchange (7)
+                                             :        +- * ColumnarToRow (6)
+                                             :           +- CometFilter (5)
+                                             :              +- CometScan parquet spark_catalog.default.item (4)
+                                             +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -66,7 +70,7 @@ Join condition: None
 Output [7]: [ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 27]
+(10) ReusedExchange [Reuses operator id: 31]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -86,74 +90,84 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) Exchange
+(14) RowToColumnar
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#14]
-Results [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS _w0#16, i_item_id#6]
 
-(16) Exchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(17) CometColumnarExchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(17) Sort [codegen id : 5]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: [i_class#9 ASC NULLS FIRST], false, 0
+(18) CometSort
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6], [i_class#9 ASC NULLS FIRST]
 
-(18) Window
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
-Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
+(19) ColumnarToRow [codegen id : 4]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
 
-(19) Project [codegen id : 6]
-Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18, i_item_id#6]
-Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6, _we0#17]
+(20) Window
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
 
-(20) Exchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
-Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(21) Project [codegen id : 5]
+Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
+Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
 
-(21) Sort [codegen id : 7]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
-Arguments: [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], true, 0
+(22) RowToColumnar
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
 
-(22) Project [codegen id : 7]
-Output [6]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
+(23) CometColumnarExchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(24) CometSort
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6], [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST]
+
+(25) CometProject
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+
+(26) ColumnarToRow [codegen id : 6]
+Input [6]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (31)
++- * ColumnarToRow (30)
+   +- CometProject (29)
+      +- CometFilter (28)
+         +- CometScan parquet spark_catalog.default.date_dim (27)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#19]
+Output [2]: [d_date_sk#11, d_date#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(24) CometFilter
-Input [2]: [d_date_sk#11, d_date#19]
-Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(28) CometFilter
+Input [2]: [d_date_sk#11, d_date#18]
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(25) CometProject
-Input [2]: [d_date_sk#11, d_date#19]
+(29) CometProject
+Input [2]: [d_date_sk#11, d_date#18]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(26) ColumnarToRow [codegen id : 1]
+(30) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(27) BroadcastExchange
+(31) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
index 9eabb9977c..2e9931a8ea 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
@@ -1,44 +1,46 @@
-WholeStageCodegen (7)
-  Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio]
-    Sort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
-      InputAdapter
-        Exchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
-          WholeStageCodegen (6)
-            Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
-              InputAdapter
-                Window [_w0,i_class]
-                  WholeStageCodegen (5)
-                    Sort [i_class]
-                      InputAdapter
-                        Exchange [i_class] #2
-                          WholeStageCodegen (4)
-                            HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ss_ext_sales_price)),itemrevenue,_w0,sum]
-                              InputAdapter
-                                Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
-                                  WholeStageCodegen (3)
-                                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
-                                      Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_item_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #4
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_date,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometProject [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio]
+        CometSort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
+          CometColumnarExchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
+                  InputAdapter
+                    Window [_w0,i_class]
+                      WholeStageCodegen (4)
+                        ColumnarToRow
+                          InputAdapter
+                            CometSort [i_class]
+                              CometColumnarExchange [i_class] #2
+                                CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
+                                  CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
+                                    RowToColumnar
+                                      WholeStageCodegen (3)
+                                        HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
+                                          Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [ss_item_sk]
+                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                          SubqueryBroadcast [d_date_sk] #1
+                                                            BroadcastExchange #4
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [d_date_sk]
+                                                                      CometFilter [d_date,d_date_sk]
+                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                  InputAdapter
+                                                    BroadcastExchange #5
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [i_category,i_item_sk]
+                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
                                               InputAdapter
-                                                BroadcastExchange #5
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [i_category,i_item_sk]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #4
+                                                ReusedExchange [d_date_sk] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt
index 8420e644cc..c8d7d7eaf3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt
@@ -1,36 +1,38 @@
 == Physical Plan ==
-TakeOrderedAndProject (32)
-+- * HashAggregate (31)
-   +- Exchange (30)
-      +- * HashAggregate (29)
-         +- * Project (28)
-            +- * BroadcastHashJoin Inner BuildRight (27)
-               :- * Project (21)
-               :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :     :- * Project (15)
-               :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :     :- * Project (9)
-               :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :     :     :     :- * ColumnarToRow (3)
-               :     :     :     :  +- CometFilter (2)
-               :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :     :     :     +- BroadcastExchange (7)
-               :     :     :        +- * ColumnarToRow (6)
-               :     :     :           +- CometFilter (5)
-               :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-               :     :     +- BroadcastExchange (13)
-               :     :        +- * ColumnarToRow (12)
-               :     :           +- CometFilter (11)
-               :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
-               :     +- BroadcastExchange (19)
-               :        +- * ColumnarToRow (18)
-               :           +- CometFilter (17)
-               :              +- CometScan parquet spark_catalog.default.call_center (16)
-               +- BroadcastExchange (26)
-                  +- * ColumnarToRow (25)
-                     +- CometProject (24)
-                        +- CometFilter (23)
-                           +- CometScan parquet spark_catalog.default.date_dim (22)
+* ColumnarToRow (34)
++- CometTakeOrderedAndProject (33)
+   +- CometHashAggregate (32)
+      +- CometColumnarExchange (31)
+         +- RowToColumnar (30)
+            +- * HashAggregate (29)
+               +- * Project (28)
+                  +- * BroadcastHashJoin Inner BuildRight (27)
+                     :- * Project (21)
+                     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                     :     :- * Project (15)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :     :- * Project (9)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                     :     :     :     :- * ColumnarToRow (3)
+                     :     :     :     :  +- CometFilter (2)
+                     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                     :     :     :     +- BroadcastExchange (7)
+                     :     :     :        +- * ColumnarToRow (6)
+                     :     :     :           +- CometFilter (5)
+                     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+                     :     :     +- BroadcastExchange (13)
+                     :     :        +- * ColumnarToRow (12)
+                     :     :           +- CometFilter (11)
+                     :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
+                     :     +- BroadcastExchange (19)
+                     :        +- * ColumnarToRow (18)
+                     :           +- CometFilter (17)
+                     :              +- CometScan parquet spark_catalog.default.call_center (16)
+                     +- BroadcastExchange (26)
+                        +- * ColumnarToRow (25)
+                           +- CometProject (24)
+                              +- CometFilter (23)
+                                 +- CometScan parquet spark_catalog.default.date_dim (22)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -170,18 +172,22 @@ Functions [5]: [partial_sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <
 Aggregate Attributes [5]: [sum#15, sum#16, sum#17, sum#18, sum#19]
 Results [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 
-(30) Exchange
+(30) RowToColumnar
 Input [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, cc_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(31) HashAggregate [codegen id : 6]
+(31) CometColumnarExchange
+Input [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, cc_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(32) CometHashAggregate
 Input [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 Keys [3]: [_groupingexpression#14, sm_type#9, cc_name#11]
 Functions [5]: [sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END), sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 30) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END), sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 60) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END), sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 90) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END), sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)]
-Aggregate Attributes [5]: [sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 30) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 60) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 90) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28, sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29]
-Results [8]: [_groupingexpression#14 AS substr(w_warehouse_name, 1, 20)#30, sm_type#9, cc_name#11, sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25 AS 30 days #31, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 30) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26 AS 31 - 60 days #32, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 60) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27 AS 61 - 90 days #33, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 90) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28 AS 91 - 120 days #34, sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29 AS >120 days #35]
 
-(32) TakeOrderedAndProject
-Input [8]: [substr(w_warehouse_name, 1, 20)#30, sm_type#9, cc_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
-Arguments: 100, [substr(w_warehouse_name, 1, 20)#30 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, cc_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#30, sm_type#9, cc_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
+(33) CometTakeOrderedAndProject
+Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, cc_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST,sm_type#9 ASC NULLS FIRST,cc_name#11 ASC NULLS FIRST], output=[substr(w_warehouse_name, 1, 20)#25,sm_type#9,cc_name#11,30 days #26,31 - 60 days #27,61 - 90 days #28,91 - 120 days #29,>120 days #30]), 100, [substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, cc_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#25, sm_type#9, cc_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
+
+(34) ColumnarToRow [codegen id : 6]
+Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, cc_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt
index c5f25f0795..e24461c48c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt
@@ -1,48 +1,50 @@
-TakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,cc_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
-  WholeStageCodegen (6)
-    HashAggregate [_groupingexpression,sm_type,cc_name,sum,sum,sum,sum,sum] [sum(CASE WHEN ((cs_ship_date_sk - cs_sold_date_sk) <= 30) THEN 1 ELSE 0 END),sum(CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 30) AND ((cs_ship_date_sk - cs_sold_date_sk) <= 60)) THEN 1 ELSE 0 END),sum(CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 60) AND ((cs_ship_date_sk - cs_sold_date_sk) <= 90)) THEN 1 ELSE 0 END),sum(CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 90) AND ((cs_ship_date_sk - cs_sold_date_sk) <= 120)) THEN 1 ELSE 0 END),sum(CASE WHEN ((cs_ship_date_sk - cs_sold_date_sk) > 120) THEN 1 ELSE 0 END),substr(w_warehouse_name, 1, 20),30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ,sum,sum,sum,sum,sum]
-      InputAdapter
-        Exchange [_groupingexpression,sm_type,cc_name] #1
-          WholeStageCodegen (5)
-            HashAggregate [_groupingexpression,sm_type,cc_name,cs_ship_date_sk,cs_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-              Project [cs_ship_date_sk,cs_sold_date_sk,sm_type,cc_name,w_warehouse_name]
-                BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
-                  Project [cs_ship_date_sk,cs_sold_date_sk,w_warehouse_name,sm_type,cc_name]
-                    BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
-                      Project [cs_ship_date_sk,cs_call_center_sk,cs_sold_date_sk,w_warehouse_name,sm_type]
-                        BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
-                          Project [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_sold_date_sk,w_warehouse_name]
-                            BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [cs_warehouse_sk,cs_ship_mode_sk,cs_call_center_sk,cs_ship_date_sk]
-                                    CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_sold_date_sk]
+WholeStageCodegen (6)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,cc_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
+        CometHashAggregate [_groupingexpression,sm_type,cc_name,sum,sum,sum,sum,sum]
+          CometColumnarExchange [_groupingexpression,sm_type,cc_name] #1
+            RowToColumnar
+              WholeStageCodegen (5)
+                HashAggregate [_groupingexpression,sm_type,cc_name,cs_ship_date_sk,cs_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                  Project [cs_ship_date_sk,cs_sold_date_sk,sm_type,cc_name,w_warehouse_name]
+                    BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
+                      Project [cs_ship_date_sk,cs_sold_date_sk,w_warehouse_name,sm_type,cc_name]
+                        BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
+                          Project [cs_ship_date_sk,cs_call_center_sk,cs_sold_date_sk,w_warehouse_name,sm_type]
+                            BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
+                              Project [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_sold_date_sk,w_warehouse_name]
+                                BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [cs_warehouse_sk,cs_ship_mode_sk,cs_call_center_sk,cs_ship_date_sk]
+                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_sold_date_sk]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [w_warehouse_sk]
+                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                               InputAdapter
-                                BroadcastExchange #2
-                                  WholeStageCodegen (1)
+                                BroadcastExchange #3
+                                  WholeStageCodegen (2)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [w_warehouse_sk]
-                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                        CometFilter [sm_ship_mode_sk]
+                                          CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
                           InputAdapter
-                            BroadcastExchange #3
-                              WholeStageCodegen (2)
+                            BroadcastExchange #4
+                              WholeStageCodegen (3)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [sm_ship_mode_sk]
-                                      CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
+                                    CometFilter [cc_call_center_sk]
+                                      CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
                       InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (3)
+                        BroadcastExchange #5
+                          WholeStageCodegen (4)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cc_call_center_sk]
-                                  CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
-                  InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (4)
-                        ColumnarToRow
-                          InputAdapter
-                            CometProject [d_date_sk]
-                              CometFilter [d_month_seq,d_date_sk]
-                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                CometProject [d_date_sk]
+                                  CometFilter [d_month_seq,d_date_sk]
+                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt
index ea5dac96e7..b413027c7e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt
@@ -1,45 +1,47 @@
 == Physical Plan ==
-TakeOrderedAndProject (41)
-+- * HashAggregate (40)
-   +- Exchange (39)
-      +- * HashAggregate (38)
-         +- * Project (37)
-            +- * BroadcastHashJoin Inner BuildRight (36)
-               :- * Project (31)
-               :  +- * BroadcastHashJoin Inner BuildRight (30)
-               :     :- * Project (24)
-               :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
-               :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
-               :     :     :  :- * ColumnarToRow (3)
-               :     :     :  :  +- CometFilter (2)
-               :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
-               :     :     :  +- BroadcastExchange (9)
-               :     :     :     +- * Project (8)
-               :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :     :           :- * ColumnarToRow (5)
-               :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-               :     :     :           +- ReusedExchange (6)
-               :     :     +- BroadcastExchange (22)
-               :     :        +- Union (21)
-               :     :           :- * Project (15)
-               :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :           :     :- * ColumnarToRow (12)
-               :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
-               :     :           :     +- ReusedExchange (13)
-               :     :           +- * Project (20)
-               :     :              +- * BroadcastHashJoin Inner BuildRight (19)
-               :     :                 :- * ColumnarToRow (17)
-               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
-               :     :                 +- ReusedExchange (18)
-               :     +- BroadcastExchange (29)
-               :        +- * ColumnarToRow (28)
-               :           +- CometProject (27)
-               :              +- CometFilter (26)
-               :                 +- CometScan parquet spark_catalog.default.customer_address (25)
-               +- BroadcastExchange (35)
-                  +- * ColumnarToRow (34)
-                     +- CometFilter (33)
-                        +- CometScan parquet spark_catalog.default.customer_demographics (32)
+* ColumnarToRow (43)
++- CometTakeOrderedAndProject (42)
+   +- CometHashAggregate (41)
+      +- CometColumnarExchange (40)
+         +- RowToColumnar (39)
+            +- * HashAggregate (38)
+               +- * Project (37)
+                  +- * BroadcastHashJoin Inner BuildRight (36)
+                     :- * Project (31)
+                     :  +- * BroadcastHashJoin Inner BuildRight (30)
+                     :     :- * Project (24)
+                     :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
+                     :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
+                     :     :     :  :- * ColumnarToRow (3)
+                     :     :     :  :  +- CometFilter (2)
+                     :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
+                     :     :     :  +- BroadcastExchange (9)
+                     :     :     :     +- * Project (8)
+                     :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
+                     :     :     :           :- * ColumnarToRow (5)
+                     :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+                     :     :     :           +- ReusedExchange (6)
+                     :     :     +- BroadcastExchange (22)
+                     :     :        +- Union (21)
+                     :     :           :- * Project (15)
+                     :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :           :     :- * ColumnarToRow (12)
+                     :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
+                     :     :           :     +- ReusedExchange (13)
+                     :     :           +- * Project (20)
+                     :     :              +- * BroadcastHashJoin Inner BuildRight (19)
+                     :     :                 :- * ColumnarToRow (17)
+                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
+                     :     :                 +- ReusedExchange (18)
+                     :     +- BroadcastExchange (29)
+                     :        +- * ColumnarToRow (28)
+                     :           +- CometProject (27)
+                     :              +- CometFilter (26)
+                     :                 +- CometScan parquet spark_catalog.default.customer_address (25)
+                     +- BroadcastExchange (35)
+                        +- * ColumnarToRow (34)
+                           +- CometFilter (33)
+                              +- CometScan parquet spark_catalog.default.customer_demographics (32)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -66,7 +68,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#4, ss_sold_date_sk#5]
 
-(6) ReusedExchange [Reuses operator id: 46]
+(6) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#7]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -99,7 +101,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#8, ws_sold_date_sk#9]
 
-(13) ReusedExchange [Reuses operator id: 46]
+(13) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#11]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -122,7 +124,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (17) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#13, cs_sold_date_sk#14]
 
-(18) ReusedExchange [Reuses operator id: 46]
+(18) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#16]
 
 (19) BroadcastHashJoin [codegen id : 6]
@@ -218,50 +220,54 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#29]
 Results [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 
-(39) Exchange
+(39) RowToColumnar
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
-Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(40) HashAggregate [codegen id : 10]
+(40) CometColumnarExchange
+Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
+Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(41) CometHashAggregate
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 Keys [8]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#31]
-Results [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, count(1)#31 AS cnt1#32, cd_purchase_estimate#24, count(1)#31 AS cnt2#33, cd_credit_rating#25, count(1)#31 AS cnt3#34, cd_dep_count#26, count(1)#31 AS cnt4#35, cd_dep_employed_count#27, count(1)#31 AS cnt5#36, cd_dep_college_count#28, count(1)#31 AS cnt6#37]
 
-(41) TakeOrderedAndProject
-Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
-Arguments: 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
+(42) CometTakeOrderedAndProject
+Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_education_status#23 ASC NULLS FIRST,cd_purchase_estimate#24 ASC NULLS FIRST,cd_credit_rating#25 ASC NULLS FIRST,cd_dep_count#26 ASC NULLS FIRST,cd_dep_employed_count#27 ASC NULLS FIRST,cd_dep_college_count#28 ASC NULLS FIRST], output=[cd_gender#21,cd_marital_status#22,cd_education_status#23,cnt1#31,cd_purchase_estimate#24,cnt2#32,cd_credit_rating#25,cnt3#33,cd_dep_count#26,cnt4#34,cd_dep_employed_count#27,cnt5#35,cd_dep_college_count#28,cnt6#36]), 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
+
+(43) ColumnarToRow [codegen id : 10]
+Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (46)
-+- * ColumnarToRow (45)
-   +- CometProject (44)
-      +- CometFilter (43)
-         +- CometScan parquet spark_catalog.default.date_dim (42)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#38, d_moy#39]
+Output [3]: [d_date_sk#7, d_year#37, d_moy#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2002), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,7), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(43) CometFilter
-Input [3]: [d_date_sk#7, d_year#38, d_moy#39]
-Condition : (((((isnotnull(d_year#38) AND isnotnull(d_moy#39)) AND (d_year#38 = 2002)) AND (d_moy#39 >= 4)) AND (d_moy#39 <= 7)) AND isnotnull(d_date_sk#7))
+(45) CometFilter
+Input [3]: [d_date_sk#7, d_year#37, d_moy#38]
+Condition : (((((isnotnull(d_year#37) AND isnotnull(d_moy#38)) AND (d_year#37 = 2002)) AND (d_moy#38 >= 4)) AND (d_moy#38 <= 7)) AND isnotnull(d_date_sk#7))
 
-(44) CometProject
-Input [3]: [d_date_sk#7, d_year#38, d_moy#39]
+(46) CometProject
+Input [3]: [d_date_sk#7, d_year#37, d_moy#38]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(45) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(46) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt
index 3eb2210a6e..440bda63b9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt
@@ -1,72 +1,74 @@
-TakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
-  WholeStageCodegen (10)
-    HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count] [count(1),cnt1,cnt2,cnt3,cnt4,cnt5,cnt6,count]
-      InputAdapter
-        Exchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-          WholeStageCodegen (9)
-            HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
-              Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                  Project [c_current_cdemo_sk]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [c_current_cdemo_sk,c_current_addr_sk]
-                        BroadcastHashJoin [c_customer_sk,customer_sk]
-                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                            ColumnarToRow
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
+        CometHashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count]
+          CometColumnarExchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+            RowToColumnar
+              WholeStageCodegen (9)
+                HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
+                  Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                      Project [c_current_cdemo_sk]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [c_current_cdemo_sk,c_current_addr_sk]
+                            BroadcastHashJoin [c_customer_sk,customer_sk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                InputAdapter
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (2)
+                                      Project [ss_customer_sk]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                               InputAdapter
-                                CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                            InputAdapter
-                              BroadcastExchange #2
-                                WholeStageCodegen (2)
-                                  Project [ss_customer_sk]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_moy,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                BroadcastExchange #4
+                                  Union
+                                    WholeStageCodegen (4)
+                                      Project [ws_bill_customer_sk]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
+                                    WholeStageCodegen (6)
+                                      Project [cs_ship_customer_sk]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                           InputAdapter
-                            BroadcastExchange #4
-                              Union
-                                WholeStageCodegen (4)
-                                  Project [ws_bill_customer_sk]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                WholeStageCodegen (6)
-                                  Project [cs_ship_customer_sk]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                            BroadcastExchange #5
+                              WholeStageCodegen (7)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ca_address_sk]
+                                      CometFilter [ca_county,ca_address_sk]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (7)
+                        BroadcastExchange #6
+                          WholeStageCodegen (8)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [ca_address_sk]
-                                  CometFilter [ca_county,ca_address_sk]
-                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
-                  InputAdapter
-                    BroadcastExchange #6
-                      WholeStageCodegen (8)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cd_demo_sk]
-                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [cd_demo_sk]
+                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt
index befc87707c..0052afc39e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt
@@ -1,75 +1,83 @@
 == Physical Plan ==
-TakeOrderedAndProject (71)
-+- * Project (70)
-   +- * BroadcastHashJoin Inner BuildRight (69)
-      :- * Project (52)
-      :  +- * BroadcastHashJoin Inner BuildRight (51)
-      :     :- * BroadcastHashJoin Inner BuildRight (33)
-      :     :  :- * Filter (16)
-      :     :  :  +- * HashAggregate (15)
-      :     :  :     +- Exchange (14)
-      :     :  :        +- * HashAggregate (13)
-      :     :  :           +- * Project (12)
-      :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :  :                 :- * Project (9)
-      :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :  :                 :     :- * ColumnarToRow (3)
-      :     :  :                 :     :  +- CometFilter (2)
-      :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :  :                 :     +- BroadcastExchange (7)
-      :     :  :                 :        +- * ColumnarToRow (6)
-      :     :  :                 :           +- CometFilter (5)
-      :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :  :                 +- ReusedExchange (10)
-      :     :  +- BroadcastExchange (32)
-      :     :     +- * HashAggregate (31)
-      :     :        +- Exchange (30)
-      :     :           +- * HashAggregate (29)
-      :     :              +- * Project (28)
-      :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
-      :     :                    :- * Project (25)
-      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :                    :     :- * ColumnarToRow (19)
-      :     :                    :     :  +- CometFilter (18)
-      :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
-      :     :                    :     +- BroadcastExchange (23)
-      :     :                    :        +- * ColumnarToRow (22)
-      :     :                    :           +- CometFilter (21)
-      :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
-      :     :                    +- ReusedExchange (26)
-      :     +- BroadcastExchange (50)
-      :        +- * Filter (49)
-      :           +- * HashAggregate (48)
-      :              +- Exchange (47)
-      :                 +- * HashAggregate (46)
-      :                    +- * Project (45)
-      :                       +- * BroadcastHashJoin Inner BuildRight (44)
-      :                          :- * Project (42)
-      :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
-      :                          :     :- * ColumnarToRow (36)
-      :                          :     :  +- CometFilter (35)
-      :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
-      :                          :     +- BroadcastExchange (40)
-      :                          :        +- * ColumnarToRow (39)
-      :                          :           +- CometFilter (38)
-      :                          :              +- CometScan parquet spark_catalog.default.web_sales (37)
-      :                          +- ReusedExchange (43)
-      +- BroadcastExchange (68)
-         +- * HashAggregate (67)
-            +- Exchange (66)
-               +- * HashAggregate (65)
-                  +- * Project (64)
-                     +- * BroadcastHashJoin Inner BuildRight (63)
-                        :- * Project (61)
-                        :  +- * BroadcastHashJoin Inner BuildRight (60)
-                        :     :- * ColumnarToRow (55)
-                        :     :  +- CometFilter (54)
-                        :     :     +- CometScan parquet spark_catalog.default.customer (53)
-                        :     +- BroadcastExchange (59)
-                        :        +- * ColumnarToRow (58)
-                        :           +- CometFilter (57)
-                        :              +- CometScan parquet spark_catalog.default.web_sales (56)
-                        +- ReusedExchange (62)
+TakeOrderedAndProject (79)
++- * Project (78)
+   +- * BroadcastHashJoin Inner BuildRight (77)
+      :- * Project (58)
+      :  +- * BroadcastHashJoin Inner BuildRight (57)
+      :     :- * BroadcastHashJoin Inner BuildRight (37)
+      :     :  :- * ColumnarToRow (18)
+      :     :  :  +- CometFilter (17)
+      :     :  :     +- CometHashAggregate (16)
+      :     :  :        +- CometColumnarExchange (15)
+      :     :  :           +- RowToColumnar (14)
+      :     :  :              +- * HashAggregate (13)
+      :     :  :                 +- * Project (12)
+      :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :  :                       :- * Project (9)
+      :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :  :                       :     :- * ColumnarToRow (3)
+      :     :  :                       :     :  +- CometFilter (2)
+      :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :  :                       :     +- BroadcastExchange (7)
+      :     :  :                       :        +- * ColumnarToRow (6)
+      :     :  :                       :           +- CometFilter (5)
+      :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :  :                       +- ReusedExchange (10)
+      :     :  +- BroadcastExchange (36)
+      :     :     +- * ColumnarToRow (35)
+      :     :        +- CometHashAggregate (34)
+      :     :           +- CometColumnarExchange (33)
+      :     :              +- RowToColumnar (32)
+      :     :                 +- * HashAggregate (31)
+      :     :                    +- * Project (30)
+      :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :                          :- * Project (27)
+      :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :                          :     :- * ColumnarToRow (21)
+      :     :                          :     :  +- CometFilter (20)
+      :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
+      :     :                          :     +- BroadcastExchange (25)
+      :     :                          :        +- * ColumnarToRow (24)
+      :     :                          :           +- CometFilter (23)
+      :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
+      :     :                          +- ReusedExchange (28)
+      :     +- BroadcastExchange (56)
+      :        +- * ColumnarToRow (55)
+      :           +- CometFilter (54)
+      :              +- CometHashAggregate (53)
+      :                 +- CometColumnarExchange (52)
+      :                    +- RowToColumnar (51)
+      :                       +- * HashAggregate (50)
+      :                          +- * Project (49)
+      :                             +- * BroadcastHashJoin Inner BuildRight (48)
+      :                                :- * Project (46)
+      :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
+      :                                :     :- * ColumnarToRow (40)
+      :                                :     :  +- CometFilter (39)
+      :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
+      :                                :     +- BroadcastExchange (44)
+      :                                :        +- * ColumnarToRow (43)
+      :                                :           +- CometFilter (42)
+      :                                :              +- CometScan parquet spark_catalog.default.web_sales (41)
+      :                                +- ReusedExchange (47)
+      +- BroadcastExchange (76)
+         +- * ColumnarToRow (75)
+            +- CometHashAggregate (74)
+               +- CometColumnarExchange (73)
+                  +- RowToColumnar (72)
+                     +- * HashAggregate (71)
+                        +- * Project (70)
+                           +- * BroadcastHashJoin Inner BuildRight (69)
+                              :- * Project (67)
+                              :  +- * BroadcastHashJoin Inner BuildRight (66)
+                              :     :- * ColumnarToRow (61)
+                              :     :  +- CometFilter (60)
+                              :     :     +- CometScan parquet spark_catalog.default.customer (59)
+                              :     +- BroadcastExchange (65)
+                              :        +- * ColumnarToRow (64)
+                              :           +- CometFilter (63)
+                              :              +- CometScan parquet spark_catalog.default.web_sales (62)
+                              +- ReusedExchange (68)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -115,7 +123,7 @@ Join condition: None
 Output [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 Input [12]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_customer_sk#9, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 
-(10) ReusedExchange [Reuses operator id: 75]
+(10) ReusedExchange [Reuses operator id: 83]
 Output [2]: [d_date_sk#14, d_year#15]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -135,296 +143,312 @@ Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discoun
 Aggregate Attributes [1]: [sum#16]
 Results [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 
-(14) Exchange
+(14) RowToColumnar
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 16]
+(15) CometColumnarExchange
+Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 Keys [8]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8]
 Functions [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18]
-Results [2]: [c_customer_id#2 AS customer_id#19, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18,18,2) AS year_total#20]
 
-(16) Filter [codegen id : 16]
-Input [2]: [customer_id#19, year_total#20]
-Condition : (isnotnull(year_total#20) AND (year_total#20 > 0.00))
+(17) CometFilter
+Input [2]: [customer_id#18, year_total#19]
+Condition : (isnotnull(year_total#19) AND (year_total#19 > 0.00))
+
+(18) ColumnarToRow [codegen id : 16]
+Input [2]: [customer_id#18, year_total#19]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Output [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(18) CometFilter
-Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
-Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_customer_id#22))
+(20) CometFilter
+Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Condition : (isnotnull(c_customer_sk#20) AND isnotnull(c_customer_id#21))
 
-(19) ColumnarToRow [codegen id : 6]
-Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+(21) ColumnarToRow [codegen id : 6]
+Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+Output [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#32), dynamicpruningexpression(ss_sold_date_sk#32 IN dynamicpruning#33)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#31), dynamicpruningexpression(ss_sold_date_sk#31 IN dynamicpruning#32)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_discount_amt:decimal(7,2),ss_ext_list_price:decimal(7,2)>
 
-(21) CometFilter
-Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
-Condition : isnotnull(ss_customer_sk#29)
+(23) CometFilter
+Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+Condition : isnotnull(ss_customer_sk#28)
 
-(22) ColumnarToRow [codegen id : 4]
-Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+(24) ColumnarToRow [codegen id : 4]
+Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 
-(23) BroadcastExchange
-Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+(25) BroadcastExchange
+Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#21]
-Right keys [1]: [ss_customer_sk#29]
+(26) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#20]
+Right keys [1]: [ss_customer_sk#28]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
-Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
-Input [12]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+(27) Project [codegen id : 6]
+Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+Input [12]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
 
-(26) ReusedExchange [Reuses operator id: 79]
-Output [2]: [d_date_sk#34, d_year#35]
+(28) ReusedExchange [Reuses operator id: 87]
+Output [2]: [d_date_sk#33, d_year#34]
 
-(27) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#32]
-Right keys [1]: [d_date_sk#34]
+(29) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#31]
+Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
-Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
-Input [12]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32, d_date_sk#34, d_year#35]
-
-(29) HashAggregate [codegen id : 6]
-Input [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
-Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
-Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
-Aggregate Attributes [1]: [sum#36]
-Results [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
-
-(30) Exchange
-Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
-Arguments: hashpartitioning(c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 7]
-Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
-Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
-Functions [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18]
-Results [5]: [c_customer_id#22 AS customer_id#38, c_first_name#23 AS customer_first_name#39, c_last_name#24 AS customer_last_name#40, c_email_address#28 AS customer_email_address#41, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18,18,2) AS year_total#42]
-
-(32) BroadcastExchange
-Input [5]: [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42]
+(30) Project [codegen id : 6]
+Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
+Input [12]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31, d_date_sk#33, d_year#34]
+
+(31) HashAggregate [codegen id : 6]
+Input [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
+Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
+Aggregate Attributes [1]: [sum#35]
+Results [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+
+(32) RowToColumnar
+Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+
+(33) CometColumnarExchange
+Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+Arguments: hashpartitioning(c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
+Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Functions [1]: [sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
+
+(35) ColumnarToRow [codegen id : 7]
+Input [5]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41]
+
+(36) BroadcastExchange
+Input [5]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#19]
-Right keys [1]: [customer_id#38]
+(37) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#18]
+Right keys [1]: [customer_id#37]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50]
+Output [8]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(35) CometFilter
-Input [8]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50]
-Condition : (isnotnull(c_customer_sk#43) AND isnotnull(c_customer_id#44))
+(39) CometFilter
+Input [8]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49]
+Condition : (isnotnull(c_customer_sk#42) AND isnotnull(c_customer_id#43))
 
-(36) ColumnarToRow [codegen id : 10]
-Input [8]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50]
+(40) ColumnarToRow [codegen id : 10]
+Input [8]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
+Output [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#54), dynamicpruningexpression(ws_sold_date_sk#54 IN dynamicpruning#55)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(38) CometFilter
-Input [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
-Condition : isnotnull(ws_bill_customer_sk#51)
+(42) CometFilter
+Input [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
+Condition : isnotnull(ws_bill_customer_sk#50)
 
-(39) ColumnarToRow [codegen id : 8]
-Input [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
+(43) ColumnarToRow [codegen id : 8]
+Input [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
 
-(40) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
+(44) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#43]
-Right keys [1]: [ws_bill_customer_sk#51]
+(45) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#42]
+Right keys [1]: [ws_bill_customer_sk#50]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
-Output [10]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
-Input [12]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
+(46) Project [codegen id : 10]
+Output [10]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
+Input [12]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
 
-(43) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#56, d_year#57]
+(47) ReusedExchange [Reuses operator id: 83]
+Output [2]: [d_date_sk#55, d_year#56]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#54]
-Right keys [1]: [d_date_sk#56]
+(48) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#53]
+Right keys [1]: [d_date_sk#55]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [10]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, d_year#57]
-Input [12]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54, d_date_sk#56, d_year#57]
-
-(46) HashAggregate [codegen id : 10]
-Input [10]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, d_year#57]
-Keys [8]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))]
-Aggregate Attributes [1]: [sum#58]
-Results [9]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, sum#59]
-
-(47) Exchange
-Input [9]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, sum#59]
-Arguments: hashpartitioning(c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(48) HashAggregate [codegen id : 11]
-Input [9]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, sum#59]
-Keys [8]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))#60]
-Results [2]: [c_customer_id#44 AS customer_id#61, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))#60,18,2) AS year_total#62]
-
-(49) Filter [codegen id : 11]
-Input [2]: [customer_id#61, year_total#62]
-Condition : (isnotnull(year_total#62) AND (year_total#62 > 0.00))
-
-(50) BroadcastExchange
-Input [2]: [customer_id#61, year_total#62]
+(49) Project [codegen id : 10]
+Output [10]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, d_year#56]
+Input [12]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56]
+
+(50) HashAggregate [codegen id : 10]
+Input [10]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, d_year#56]
+Keys [8]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#52 - ws_ext_discount_amt#51)))]
+Aggregate Attributes [1]: [sum#57]
+Results [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
+
+(51) RowToColumnar
+Input [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
+
+(52) CometColumnarExchange
+Input [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
+Arguments: hashpartitioning(c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(53) CometHashAggregate
+Input [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
+Keys [8]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#52 - ws_ext_discount_amt#51)))]
+
+(54) CometFilter
+Input [2]: [customer_id#59, year_total#60]
+Condition : (isnotnull(year_total#60) AND (year_total#60 > 0.00))
+
+(55) ColumnarToRow [codegen id : 11]
+Input [2]: [customer_id#59, year_total#60]
+
+(56) BroadcastExchange
+Input [2]: [customer_id#59, year_total#60]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(51) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#19]
-Right keys [1]: [customer_id#61]
+(57) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#18]
+Right keys [1]: [customer_id#59]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 16]
-Output [8]: [customer_id#19, year_total#20, customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42, year_total#62]
-Input [9]: [customer_id#19, year_total#20, customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42, customer_id#61, year_total#62]
+(58) Project [codegen id : 16]
+Output [8]: [customer_id#18, year_total#19, customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41, year_total#60]
+Input [9]: [customer_id#18, year_total#19, customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41, customer_id#59, year_total#60]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70]
+Output [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(54) CometFilter
-Input [8]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70]
-Condition : (isnotnull(c_customer_sk#63) AND isnotnull(c_customer_id#64))
+(60) CometFilter
+Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
+Condition : (isnotnull(c_customer_sk#61) AND isnotnull(c_customer_id#62))
 
-(55) ColumnarToRow [codegen id : 14]
-Input [8]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70]
+(61) ColumnarToRow [codegen id : 14]
+Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
+Output [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#74), dynamicpruningexpression(ws_sold_date_sk#74 IN dynamicpruning#75)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#72), dynamicpruningexpression(ws_sold_date_sk#72 IN dynamicpruning#73)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(57) CometFilter
-Input [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
-Condition : isnotnull(ws_bill_customer_sk#71)
+(63) CometFilter
+Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+Condition : isnotnull(ws_bill_customer_sk#69)
 
-(58) ColumnarToRow [codegen id : 12]
-Input [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
+(64) ColumnarToRow [codegen id : 12]
+Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 
-(59) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
+(65) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#63]
-Right keys [1]: [ws_bill_customer_sk#71]
+(66) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#61]
+Right keys [1]: [ws_bill_customer_sk#69]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 14]
-Output [10]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
-Input [12]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
+(67) Project [codegen id : 14]
+Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+Input [12]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 
-(62) ReusedExchange [Reuses operator id: 79]
-Output [2]: [d_date_sk#76, d_year#77]
+(68) ReusedExchange [Reuses operator id: 87]
+Output [2]: [d_date_sk#74, d_year#75]
 
-(63) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#74]
-Right keys [1]: [d_date_sk#76]
+(69) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#72]
+Right keys [1]: [d_date_sk#74]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 14]
-Output [10]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, d_year#77]
-Input [12]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74, d_date_sk#76, d_year#77]
-
-(65) HashAggregate [codegen id : 14]
-Input [10]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, d_year#77]
-Keys [8]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))]
-Aggregate Attributes [1]: [sum#78]
-Results [9]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, sum#79]
-
-(66) Exchange
-Input [9]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, sum#79]
-Arguments: hashpartitioning(c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(67) HashAggregate [codegen id : 15]
-Input [9]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, sum#79]
-Keys [8]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))]
-Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))#60]
-Results [2]: [c_customer_id#64 AS customer_id#80, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))#60,18,2) AS year_total#81]
-
-(68) BroadcastExchange
-Input [2]: [customer_id#80, year_total#81]
+(70) Project [codegen id : 14]
+Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
+Input [12]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72, d_date_sk#74, d_year#75]
+
+(71) HashAggregate [codegen id : 14]
+Input [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
+Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
+Aggregate Attributes [1]: [sum#76]
+Results [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+
+(72) RowToColumnar
+Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+
+(73) CometColumnarExchange
+Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+Arguments: hashpartitioning(c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(74) CometHashAggregate
+Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
+
+(75) ColumnarToRow [codegen id : 15]
+Input [2]: [customer_id#78, year_total#79]
+
+(76) BroadcastExchange
+Input [2]: [customer_id#78, year_total#79]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(69) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#19]
-Right keys [1]: [customer_id#80]
+(77) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#18]
+Right keys [1]: [customer_id#78]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#62 > 0.00) THEN (year_total#81 / year_total#62) ELSE 0E-20 END > CASE WHEN (year_total#20 > 0.00) THEN (year_total#42 / year_total#20) ELSE 0E-20 END)
+Join condition: (CASE WHEN (year_total#60 > 0.00) THEN (year_total#79 / year_total#60) ELSE 0E-20 END > CASE WHEN (year_total#19 > 0.00) THEN (year_total#41 / year_total#19) ELSE 0E-20 END)
 
-(70) Project [codegen id : 16]
-Output [4]: [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41]
-Input [10]: [customer_id#19, year_total#20, customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42, year_total#62, customer_id#80, year_total#81]
+(78) Project [codegen id : 16]
+Output [4]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40]
+Input [10]: [customer_id#18, year_total#19, customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41, year_total#60, customer_id#78, year_total#79]
 
-(71) TakeOrderedAndProject
-Input [4]: [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41]
-Arguments: 100, [customer_id#38 ASC NULLS FIRST, customer_first_name#39 ASC NULLS FIRST, customer_last_name#40 ASC NULLS FIRST, customer_email_address#41 ASC NULLS FIRST], [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41]
+(79) TakeOrderedAndProject
+Input [4]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40]
+Arguments: 100, [customer_id#37 ASC NULLS FIRST, customer_first_name#38 ASC NULLS FIRST, customer_last_name#39 ASC NULLS FIRST, customer_email_address#40 ASC NULLS FIRST], [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometFilter (73)
-      +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (83)
++- * ColumnarToRow (82)
+   +- CometFilter (81)
+      +- CometScan parquet spark_catalog.default.date_dim (80)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -434,44 +458,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(73) CometFilter
+(81) CometFilter
 Input [2]: [d_date_sk#14, d_year#15]
 Condition : ((isnotnull(d_year#15) AND (d_year#15 = 2001)) AND isnotnull(d_date_sk#14))
 
-(74) ColumnarToRow [codegen id : 1]
+(82) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#14, d_year#15]
 
-(75) BroadcastExchange
+(83) BroadcastExchange
 Input [2]: [d_date_sk#14, d_year#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#32 IN dynamicpruning#33
-BroadcastExchange (79)
-+- * ColumnarToRow (78)
-   +- CometFilter (77)
-      +- CometScan parquet spark_catalog.default.date_dim (76)
+Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#31 IN dynamicpruning#32
+BroadcastExchange (87)
++- * ColumnarToRow (86)
+   +- CometFilter (85)
+      +- CometScan parquet spark_catalog.default.date_dim (84)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#34, d_year#35]
+Output [2]: [d_date_sk#33, d_year#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(77) CometFilter
-Input [2]: [d_date_sk#34, d_year#35]
-Condition : ((isnotnull(d_year#35) AND (d_year#35 = 2002)) AND isnotnull(d_date_sk#34))
+(85) CometFilter
+Input [2]: [d_date_sk#33, d_year#34]
+Condition : ((isnotnull(d_year#34) AND (d_year#34 = 2002)) AND isnotnull(d_date_sk#33))
 
-(78) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#34, d_year#35]
+(86) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#33, d_year#34]
 
-(79) BroadcastExchange
-Input [2]: [d_date_sk#34, d_year#35]
+(87) BroadcastExchange
+Input [2]: [d_date_sk#33, d_year#34]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#54 IN dynamicpruning#13
+Subquery:3 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#13
 
-Subquery:4 Hosting operator id = 56 Hosting Expression = ws_sold_date_sk#74 IN dynamicpruning#33
+Subquery:4 Hosting operator id = 62 Hosting Expression = ws_sold_date_sk#72 IN dynamicpruning#32
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt
index 0a30aba051..6e42d76f1c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt
@@ -5,43 +5,13 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
         Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,customer_email_address,year_total,year_total]
           BroadcastHashJoin [customer_id,customer_id]
             BroadcastHashJoin [customer_id,customer_id]
-              Filter [year_total]
-                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,year_total,sum]
-                  InputAdapter
-                    Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
-                      WholeStageCodegen (3)
-                        HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
-                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [c_customer_sk,c_customer_id]
-                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ss_customer_sk]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                              InputAdapter
-                                ReusedExchange [d_date_sk,d_year] #3
-              InputAdapter
-                BroadcastExchange #4
-                  WholeStageCodegen (7)
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,customer_first_name,customer_last_name,customer_email_address,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
-                          WholeStageCodegen (6)
+              ColumnarToRow
+                InputAdapter
+                  CometFilter [year_total]
+                    CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
+                      CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
+                        RowToColumnar
+                          WholeStageCodegen (3)
                             HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
                               Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
                                 BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -52,71 +22,109 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
                                           CometFilter [c_customer_sk,c_customer_id]
                                             CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                       InputAdapter
-                                        BroadcastExchange #6
-                                          WholeStageCodegen (4)
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometFilter [ss_customer_sk]
                                                   CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #2
-                                                      BroadcastExchange #7
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
                                                         WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
                                                               CometFilter [d_year,d_date_sk]
                                                                 CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #7
+                                    ReusedExchange [d_date_sk,d_year] #3
+              InputAdapter
+                BroadcastExchange #4
+                  WholeStageCodegen (7)
+                    ColumnarToRow
+                      InputAdapter
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
+                            RowToColumnar
+                              WholeStageCodegen (6)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (4)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ss_customer_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #2
+                                                          BroadcastExchange #7
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  Filter [year_total]
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
-                          WholeStageCodegen (10)
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk,c_customer_id]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [year_total]
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
+                            RowToColumnar
+                              WholeStageCodegen (10)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                          InputAdapter
+                                            BroadcastExchange #10
+                                              WholeStageCodegen (8)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (8)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
+                                        ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
+              ColumnarToRow
                 InputAdapter
-                  Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
-                    WholeStageCodegen (14)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_customer_sk,c_customer_id]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
+                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
+                      RowToColumnar
+                        WholeStageCodegen (14)
+                          HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_customer_id]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                    InputAdapter
+                                      BroadcastExchange #13
+                                        WholeStageCodegen (12)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #13
-                                    WholeStageCodegen (12)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_customer_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #2
-                            InputAdapter
-                              ReusedExchange [d_date_sk,d_year] #7
+                                  ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt
index f3c5c46098..c60f2045af 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt
@@ -1,24 +1,26 @@
 == Physical Plan ==
-TakeOrderedAndProject (20)
-+- * Project (19)
-   +- Window (18)
-      +- * Sort (17)
-         +- Exchange (16)
-            +- * HashAggregate (15)
-               +- Exchange (14)
-                  +- * HashAggregate (13)
-                     +- * Project (12)
-                        +- * BroadcastHashJoin Inner BuildRight (11)
-                           :- * Project (9)
-                           :  +- * BroadcastHashJoin Inner BuildRight (8)
-                           :     :- * ColumnarToRow (3)
-                           :     :  +- CometFilter (2)
-                           :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                           :     +- BroadcastExchange (7)
-                           :        +- * ColumnarToRow (6)
-                           :           +- CometFilter (5)
-                           :              +- CometScan parquet spark_catalog.default.item (4)
-                           +- ReusedExchange (10)
+TakeOrderedAndProject (22)
++- * Project (21)
+   +- Window (20)
+      +- * ColumnarToRow (19)
+         +- CometSort (18)
+            +- CometColumnarExchange (17)
+               +- CometHashAggregate (16)
+                  +- CometColumnarExchange (15)
+                     +- RowToColumnar (14)
+                        +- * HashAggregate (13)
+                           +- * Project (12)
+                              +- * BroadcastHashJoin Inner BuildRight (11)
+                                 :- * Project (9)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                 :     :- * ColumnarToRow (3)
+                                 :     :  +- CometFilter (2)
+                                 :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                                 :     +- BroadcastExchange (7)
+                                 :        +- * ColumnarToRow (6)
+                                 :           +- CometFilter (5)
+                                 :              +- CometScan parquet spark_catalog.default.item (4)
+                                 +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -64,7 +66,7 @@ Join condition: None
 Output [7]: [ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ws_item_sk#1, ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 25]
+(10) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -84,66 +86,70 @@ Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) Exchange
+(14) RowToColumnar
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#2))#14]
-Results [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS _w0#16]
 
-(16) Exchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(17) CometColumnarExchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(18) CometSort
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15], [i_class#9 ASC NULLS FIRST]
 
-(17) Sort [codegen id : 5]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: [i_class#9 ASC NULLS FIRST], false, 0
+(19) ColumnarToRow [codegen id : 4]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
 
-(18) Window
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
+(20) Window
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
 
-(19) Project [codegen id : 6]
-Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18]
-Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, _we0#17]
+(21) Project [codegen id : 5]
+Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17]
+Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, _we0#16]
 
-(20) TakeOrderedAndProject
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+(22) TakeOrderedAndProject
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (25)
-+- * ColumnarToRow (24)
-   +- CometProject (23)
-      +- CometFilter (22)
-         +- CometScan parquet spark_catalog.default.date_dim (21)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#19]
+Output [2]: [d_date_sk#11, d_date#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(22) CometFilter
-Input [2]: [d_date_sk#11, d_date#19]
-Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(24) CometFilter
+Input [2]: [d_date_sk#11, d_date#18]
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(23) CometProject
-Input [2]: [d_date_sk#11, d_date#19]
+(25) CometProject
+Input [2]: [d_date_sk#11, d_date#18]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(24) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(25) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt
index 1bc2538b48..03091f0fbb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (6)
+  WholeStageCodegen (5)
     Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (5)
-            Sort [i_class]
+          WholeStageCodegen (4)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_class] #1
-                  WholeStageCodegen (4)
-                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ws_ext_sales_price)),itemrevenue,_w0,sum]
-                      InputAdapter
-                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                CometSort [i_class]
+                  CometColumnarExchange [i_class] #1
+                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
+                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                        RowToColumnar
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ws_ext_sales_price] [sum,sum]
                               Project [ws_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt
index 6fdb365c5b..377f8ee690 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt
@@ -1,88 +1,94 @@
 == Physical Plan ==
-TakeOrderedAndProject (84)
-+- * BroadcastHashJoin Inner BuildRight (83)
-   :- * Filter (66)
-   :  +- * HashAggregate (65)
-   :     +- Exchange (64)
-   :        +- * HashAggregate (63)
-   :           +- * Project (62)
-   :              +- * BroadcastHashJoin Inner BuildRight (61)
-   :                 :- * Project (59)
-   :                 :  +- * BroadcastHashJoin Inner BuildRight (58)
-   :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
-   :                 :     :  :- * ColumnarToRow (3)
-   :                 :     :  :  +- CometFilter (2)
-   :                 :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :                 :     :  +- BroadcastExchange (50)
-   :                 :     :     +- * Project (49)
-   :                 :     :        +- * BroadcastHashJoin Inner BuildRight (48)
-   :                 :     :           :- * ColumnarToRow (6)
-   :                 :     :           :  +- CometFilter (5)
-   :                 :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-   :                 :     :           +- BroadcastExchange (47)
-   :                 :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
-   :                 :     :                 :- * HashAggregate (35)
-   :                 :     :                 :  +- Exchange (34)
-   :                 :     :                 :     +- * HashAggregate (33)
-   :                 :     :                 :        +- * Project (32)
-   :                 :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
-   :                 :     :                 :              :- * Project (29)
-   :                 :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
-   :                 :     :                 :              :     :- * ColumnarToRow (9)
-   :                 :     :                 :              :     :  +- CometFilter (8)
-   :                 :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-   :                 :     :                 :              :     +- BroadcastExchange (27)
-   :                 :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-   :                 :     :                 :              :           :- * ColumnarToRow (12)
-   :                 :     :                 :              :           :  +- CometFilter (11)
-   :                 :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
-   :                 :     :                 :              :           +- BroadcastExchange (25)
-   :                 :     :                 :              :              +- * Project (24)
-   :                 :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
-   :                 :     :                 :              :                    :- * Project (21)
-   :                 :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-   :                 :     :                 :              :                    :     :- * ColumnarToRow (15)
-   :                 :     :                 :              :                    :     :  +- CometFilter (14)
-   :                 :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-   :                 :     :                 :              :                    :     +- BroadcastExchange (19)
-   :                 :     :                 :              :                    :        +- * ColumnarToRow (18)
-   :                 :     :                 :              :                    :           +- CometFilter (17)
-   :                 :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
-   :                 :     :                 :              :                    +- ReusedExchange (22)
-   :                 :     :                 :              +- ReusedExchange (30)
-   :                 :     :                 +- BroadcastExchange (45)
-   :                 :     :                    +- * Project (44)
-   :                 :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
-   :                 :     :                          :- * Project (41)
-   :                 :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
-   :                 :     :                          :     :- * ColumnarToRow (38)
-   :                 :     :                          :     :  +- CometFilter (37)
-   :                 :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
-   :                 :     :                          :     +- ReusedExchange (39)
-   :                 :     :                          +- ReusedExchange (42)
-   :                 :     +- BroadcastExchange (57)
-   :                 :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
-   :                 :           :- * ColumnarToRow (54)
-   :                 :           :  +- CometFilter (53)
-   :                 :           :     +- CometScan parquet spark_catalog.default.item (52)
-   :                 :           +- ReusedExchange (55)
-   :                 +- ReusedExchange (60)
-   +- BroadcastExchange (82)
-      +- * Filter (81)
-         +- * HashAggregate (80)
-            +- Exchange (79)
-               +- * HashAggregate (78)
-                  +- * Project (77)
-                     +- * BroadcastHashJoin Inner BuildRight (76)
-                        :- * Project (74)
-                        :  +- * BroadcastHashJoin Inner BuildRight (73)
-                        :     :- * BroadcastHashJoin LeftSemi BuildRight (71)
-                        :     :  :- * ColumnarToRow (69)
-                        :     :  :  +- CometFilter (68)
-                        :     :  :     +- CometScan parquet spark_catalog.default.store_sales (67)
-                        :     :  +- ReusedExchange (70)
-                        :     +- ReusedExchange (72)
-                        +- ReusedExchange (75)
+TakeOrderedAndProject (90)
++- * BroadcastHashJoin Inner BuildRight (89)
+   :- * ColumnarToRow (70)
+   :  +- CometFilter (69)
+   :     +- CometHashAggregate (68)
+   :        +- CometColumnarExchange (67)
+   :           +- RowToColumnar (66)
+   :              +- * HashAggregate (65)
+   :                 +- * Project (64)
+   :                    +- * BroadcastHashJoin Inner BuildRight (63)
+   :                       :- * Project (61)
+   :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
+   :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
+   :                       :     :  :- * ColumnarToRow (3)
+   :                       :     :  :  +- CometFilter (2)
+   :                       :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :                       :     :  +- BroadcastExchange (52)
+   :                       :     :     +- * Project (51)
+   :                       :     :        +- * BroadcastHashJoin Inner BuildRight (50)
+   :                       :     :           :- * ColumnarToRow (6)
+   :                       :     :           :  +- CometFilter (5)
+   :                       :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+   :                       :     :           +- BroadcastExchange (49)
+   :                       :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
+   :                       :     :                 :- * ColumnarToRow (37)
+   :                       :     :                 :  +- CometHashAggregate (36)
+   :                       :     :                 :     +- CometColumnarExchange (35)
+   :                       :     :                 :        +- RowToColumnar (34)
+   :                       :     :                 :           +- * HashAggregate (33)
+   :                       :     :                 :              +- * Project (32)
+   :                       :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
+   :                       :     :                 :                    :- * Project (29)
+   :                       :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
+   :                       :     :                 :                    :     :- * ColumnarToRow (9)
+   :                       :     :                 :                    :     :  +- CometFilter (8)
+   :                       :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+   :                       :     :                 :                    :     +- BroadcastExchange (27)
+   :                       :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+   :                       :     :                 :                    :           :- * ColumnarToRow (12)
+   :                       :     :                 :                    :           :  +- CometFilter (11)
+   :                       :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
+   :                       :     :                 :                    :           +- BroadcastExchange (25)
+   :                       :     :                 :                    :              +- * Project (24)
+   :                       :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
+   :                       :     :                 :                    :                    :- * Project (21)
+   :                       :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+   :                       :     :                 :                    :                    :     :- * ColumnarToRow (15)
+   :                       :     :                 :                    :                    :     :  +- CometFilter (14)
+   :                       :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+   :                       :     :                 :                    :                    :     +- BroadcastExchange (19)
+   :                       :     :                 :                    :                    :        +- * ColumnarToRow (18)
+   :                       :     :                 :                    :                    :           +- CometFilter (17)
+   :                       :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
+   :                       :     :                 :                    :                    +- ReusedExchange (22)
+   :                       :     :                 :                    +- ReusedExchange (30)
+   :                       :     :                 +- BroadcastExchange (47)
+   :                       :     :                    +- * Project (46)
+   :                       :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
+   :                       :     :                          :- * Project (43)
+   :                       :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
+   :                       :     :                          :     :- * ColumnarToRow (40)
+   :                       :     :                          :     :  +- CometFilter (39)
+   :                       :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
+   :                       :     :                          :     +- ReusedExchange (41)
+   :                       :     :                          +- ReusedExchange (44)
+   :                       :     +- BroadcastExchange (59)
+   :                       :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
+   :                       :           :- * ColumnarToRow (56)
+   :                       :           :  +- CometFilter (55)
+   :                       :           :     +- CometScan parquet spark_catalog.default.item (54)
+   :                       :           +- ReusedExchange (57)
+   :                       +- ReusedExchange (62)
+   +- BroadcastExchange (88)
+      +- * ColumnarToRow (87)
+         +- CometFilter (86)
+            +- CometHashAggregate (85)
+               +- CometColumnarExchange (84)
+                  +- RowToColumnar (83)
+                     +- * HashAggregate (82)
+                        +- * Project (81)
+                           +- * BroadcastHashJoin Inner BuildRight (80)
+                              :- * Project (78)
+                              :  +- * BroadcastHashJoin Inner BuildRight (77)
+                              :     :- * BroadcastHashJoin LeftSemi BuildRight (75)
+                              :     :  :- * ColumnarToRow (73)
+                              :     :  :  +- CometFilter (72)
+                              :     :  :     +- CometScan parquet spark_catalog.default.store_sales (71)
+                              :     :  +- ReusedExchange (74)
+                              :     +- ReusedExchange (76)
+                              +- ReusedExchange (79)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -186,7 +192,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 117]
+(22) ReusedExchange [Reuses operator id: 125]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -223,7 +229,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 117]
+(30) ReusedExchange [Reuses operator id: 125]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -243,16 +249,20 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) Exchange
+(34) RowToColumnar
 Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) HashAggregate [codegen id : 10]
+(35) CometColumnarExchange
+Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(36) CometHashAggregate
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [brand_id#26, class_id#27, category_id#28]
+
+(37) ColumnarToRow [codegen id : 10]
+Input [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -262,68 +272,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(37) CometFilter
+(39) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(38) ColumnarToRow [codegen id : 9]
+(40) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(39) ReusedExchange [Reuses operator id: 19]
+(41) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(40) BroadcastHashJoin [codegen id : 9]
+(42) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 9]
+(43) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) ReusedExchange [Reuses operator id: 117]
+(44) ReusedExchange [Reuses operator id: 125]
 Output [1]: [d_date_sk#36]
 
-(43) BroadcastHashJoin [codegen id : 9]
+(45) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 9]
+(46) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(46) BroadcastHashJoin [codegen id : 10]
+(48) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(48) BroadcastHashJoin [codegen id : 11]
+(50) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 11]
+(51) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(51) BroadcastHashJoin [codegen id : 25]
+(53) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -336,420 +346,434 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk), IsNotNull(i_brand_id), IsNotNull(i_class_id), IsNotNull(i_category_id)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(53) CometFilter
+(55) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : (((isnotnull(i_item_sk#38) AND isnotnull(i_brand_id#39)) AND isnotnull(i_class_id#40)) AND isnotnull(i_category_id#41))
 
-(54) ColumnarToRow [codegen id : 23]
+(56) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(55) ReusedExchange [Reuses operator id: 50]
+(57) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(56) BroadcastHashJoin [codegen id : 23]
+(58) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(57) BroadcastExchange
+(59) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(58) BroadcastHashJoin [codegen id : 25]
+(60) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 25]
+(61) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(60) ReusedExchange [Reuses operator id: 108]
+(62) ReusedExchange [Reuses operator id: 116]
 Output [1]: [d_date_sk#42]
 
-(61) BroadcastHashJoin [codegen id : 25]
+(63) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 25]
+(64) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(63) HashAggregate [codegen id : 25]
+(65) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(64) Exchange
+(66) RowToColumnar
+Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
+
+(67) CometColumnarExchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(65) HashAggregate [codegen id : 52]
+(68) CometHashAggregate
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
-Results [6]: [store AS channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#52, count(1)#50 AS number_sales#53]
 
-(66) Filter [codegen id : 52]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
-Condition : (isnotnull(sales#52) AND (cast(sales#52 as decimal(32,6)) > cast(Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+(69) CometFilter
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+Condition : (isnotnull(sales#50) AND (cast(sales#50 as decimal(32,6)) > cast(Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+
+(70) ColumnarToRow [codegen id : 52]
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
+Output [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#59), dynamicpruningexpression(ss_sold_date_sk#59 IN dynamicpruning#60)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#57), dynamicpruningexpression(ss_sold_date_sk#57 IN dynamicpruning#58)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(68) CometFilter
-Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
-Condition : isnotnull(ss_item_sk#56)
+(72) CometFilter
+Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
+Condition : isnotnull(ss_item_sk#54)
 
-(69) ColumnarToRow [codegen id : 50]
-Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
+(73) ColumnarToRow [codegen id : 50]
+Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
 
-(70) ReusedExchange [Reuses operator id: 50]
+(74) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(71) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#56]
+(75) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#54]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(72) ReusedExchange [Reuses operator id: 57]
-Output [4]: [i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
+(76) ReusedExchange [Reuses operator id: 59]
+Output [4]: [i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
 
-(73) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#56]
-Right keys [1]: [i_item_sk#61]
+(77) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#54]
+Right keys [1]: [i_item_sk#59]
 Join type: Inner
 Join condition: None
 
-(74) Project [codegen id : 50]
-Output [6]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64]
-Input [8]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
+(78) Project [codegen id : 50]
+Output [6]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62]
+Input [8]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
 
-(75) ReusedExchange [Reuses operator id: 122]
-Output [1]: [d_date_sk#65]
+(79) ReusedExchange [Reuses operator id: 130]
+Output [1]: [d_date_sk#63]
 
-(76) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_sold_date_sk#59]
-Right keys [1]: [d_date_sk#65]
+(80) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_sold_date_sk#57]
+Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 50]
-Output [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
-Input [7]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64, d_date_sk#65]
-
-(78) HashAggregate [codegen id : 50]
-Input [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
-Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
-Functions [2]: [partial_sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), partial_count(1)]
-Aggregate Attributes [3]: [sum#66, isEmpty#67, count#68]
-Results [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-
-(79) Exchange
-Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-Arguments: hashpartitioning(i_brand_id#62, i_class_id#63, i_category_id#64, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(80) HashAggregate [codegen id : 51]
-Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
-Functions [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72, count(1)#73]
-Results [6]: [store AS channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72 AS sales#75, count(1)#73 AS number_sales#76]
-
-(81) Filter [codegen id : 51]
-Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
-Condition : (isnotnull(sales#75) AND (cast(sales#75 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
-
-(82) BroadcastExchange
-Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+(81) Project [codegen id : 50]
+Output [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
+Input [7]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62, d_date_sk#63]
+
+(82) HashAggregate [codegen id : 50]
+Input [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
+Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Functions [2]: [partial_sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), partial_count(1)]
+Aggregate Attributes [3]: [sum#64, isEmpty#65, count#66]
+Results [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+
+(83) RowToColumnar
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+
+(84) CometColumnarExchange
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+Arguments: hashpartitioning(i_brand_id#60, i_class_id#61, i_category_id#62, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(85) CometHashAggregate
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Functions [2]: [sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), count(1)]
+
+(86) CometFilter
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+Condition : (isnotnull(sales#71) AND (cast(sales#71 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+
+(87) ColumnarToRow [codegen id : 51]
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+
+(88) BroadcastExchange
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
 Arguments: HashedRelationBroadcastMode(List(input[1, int, true], input[2, int, true], input[3, int, true]),false), [plan_id=11]
 
-(83) BroadcastHashJoin [codegen id : 52]
+(89) BroadcastHashJoin [codegen id : 52]
 Left keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
-Right keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Right keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
 Join type: Inner
 Join condition: None
 
-(84) TakeOrderedAndProject
-Input [12]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
-Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+(90) TakeOrderedAndProject
+Input [12]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#54, [id=#55]
-* HashAggregate (103)
-+- Exchange (102)
-   +- * HashAggregate (101)
-      +- Union (100)
-         :- * Project (89)
-         :  +- * BroadcastHashJoin Inner BuildRight (88)
-         :     :- * ColumnarToRow (86)
-         :     :  +- CometScan parquet spark_catalog.default.store_sales (85)
-         :     +- ReusedExchange (87)
-         :- * Project (94)
-         :  +- * BroadcastHashJoin Inner BuildRight (93)
-         :     :- * ColumnarToRow (91)
-         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (90)
-         :     +- ReusedExchange (92)
-         +- * Project (99)
-            +- * BroadcastHashJoin Inner BuildRight (98)
-               :- * ColumnarToRow (96)
-               :  +- CometScan parquet spark_catalog.default.web_sales (95)
-               +- ReusedExchange (97)
+Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#52, [id=#53]
+* ColumnarToRow (111)
++- CometHashAggregate (110)
+   +- CometColumnarExchange (109)
+      +- RowToColumnar (108)
+         +- * HashAggregate (107)
+            +- Union (106)
+               :- * Project (95)
+               :  +- * BroadcastHashJoin Inner BuildRight (94)
+               :     :- * ColumnarToRow (92)
+               :     :  +- CometScan parquet spark_catalog.default.store_sales (91)
+               :     +- ReusedExchange (93)
+               :- * Project (100)
+               :  +- * BroadcastHashJoin Inner BuildRight (99)
+               :     :- * ColumnarToRow (97)
+               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (96)
+               :     +- ReusedExchange (98)
+               +- * Project (105)
+                  +- * BroadcastHashJoin Inner BuildRight (104)
+                     :- * ColumnarToRow (102)
+                     :  +- CometScan parquet spark_catalog.default.web_sales (101)
+                     +- ReusedExchange (103)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
+Output [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#79), dynamicpruningexpression(ss_sold_date_sk#79 IN dynamicpruning#80)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#75), dynamicpruningexpression(ss_sold_date_sk#75 IN dynamicpruning#76)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(86) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
+(92) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
 
-(87) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#81]
+(93) ReusedExchange [Reuses operator id: 125]
+Output [1]: [d_date_sk#77]
 
-(88) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#79]
-Right keys [1]: [d_date_sk#81]
+(94) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#75]
+Right keys [1]: [d_date_sk#77]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 2]
-Output [2]: [ss_quantity#77 AS quantity#82, ss_list_price#78 AS list_price#83]
-Input [4]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79, d_date_sk#81]
+(95) Project [codegen id : 2]
+Output [2]: [ss_quantity#73 AS quantity#78, ss_list_price#74 AS list_price#79]
+Input [4]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75, d_date_sk#77]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
+Output [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#86), dynamicpruningexpression(cs_sold_date_sk#86 IN dynamicpruning#87)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#82), dynamicpruningexpression(cs_sold_date_sk#82 IN dynamicpruning#83)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(91) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
+(97) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
 
-(92) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#88]
+(98) ReusedExchange [Reuses operator id: 125]
+Output [1]: [d_date_sk#84]
 
-(93) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#86]
-Right keys [1]: [d_date_sk#88]
+(99) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#82]
+Right keys [1]: [d_date_sk#84]
 Join type: Inner
 Join condition: None
 
-(94) Project [codegen id : 4]
-Output [2]: [cs_quantity#84 AS quantity#89, cs_list_price#85 AS list_price#90]
-Input [4]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86, d_date_sk#88]
+(100) Project [codegen id : 4]
+Output [2]: [cs_quantity#80 AS quantity#85, cs_list_price#81 AS list_price#86]
+Input [4]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82, d_date_sk#84]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
+Output [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#93), dynamicpruningexpression(ws_sold_date_sk#93 IN dynamicpruning#94)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#89), dynamicpruningexpression(ws_sold_date_sk#89 IN dynamicpruning#90)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(96) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
+(102) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
 
-(97) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#95]
+(103) ReusedExchange [Reuses operator id: 125]
+Output [1]: [d_date_sk#91]
 
-(98) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#93]
-Right keys [1]: [d_date_sk#95]
+(104) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#89]
+Right keys [1]: [d_date_sk#91]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 6]
-Output [2]: [ws_quantity#91 AS quantity#96, ws_list_price#92 AS list_price#97]
-Input [4]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93, d_date_sk#95]
+(105) Project [codegen id : 6]
+Output [2]: [ws_quantity#87 AS quantity#92, ws_list_price#88 AS list_price#93]
+Input [4]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89, d_date_sk#91]
 
-(100) Union
+(106) Union
 
-(101) HashAggregate [codegen id : 7]
-Input [2]: [quantity#82, list_price#83]
+(107) HashAggregate [codegen id : 7]
+Input [2]: [quantity#78, list_price#79]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
-Aggregate Attributes [2]: [sum#98, count#99]
-Results [2]: [sum#100, count#101]
+Functions [1]: [partial_avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
+Aggregate Attributes [2]: [sum#94, count#95]
+Results [2]: [sum#96, count#97]
 
-(102) Exchange
-Input [2]: [sum#100, count#101]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
+(108) RowToColumnar
+Input [2]: [sum#96, count#97]
 
-(103) HashAggregate [codegen id : 8]
-Input [2]: [sum#100, count#101]
+(109) CometColumnarExchange
+Input [2]: [sum#96, count#97]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+
+(110) CometHashAggregate
+Input [2]: [sum#96, count#97]
 Keys: []
-Functions [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
-Aggregate Attributes [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102]
-Results [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102 AS average_sales#103]
+Functions [1]: [avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
+
+(111) ColumnarToRow [codegen id : 8]
+Input [1]: [average_sales#98]
 
-Subquery:2 Hosting operator id = 85 Hosting Expression = ss_sold_date_sk#79 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 91 Hosting Expression = ss_sold_date_sk#75 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 90 Hosting Expression = cs_sold_date_sk#86 IN dynamicpruning#12
+Subquery:3 Hosting operator id = 96 Hosting Expression = cs_sold_date_sk#82 IN dynamicpruning#12
 
-Subquery:4 Hosting operator id = 95 Hosting Expression = ws_sold_date_sk#93 IN dynamicpruning#12
+Subquery:4 Hosting operator id = 101 Hosting Expression = ws_sold_date_sk#89 IN dynamicpruning#12
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (108)
-+- * ColumnarToRow (107)
-   +- CometProject (106)
-      +- CometFilter (105)
-         +- CometScan parquet spark_catalog.default.date_dim (104)
+BroadcastExchange (116)
++- * ColumnarToRow (115)
+   +- CometProject (114)
+      +- CometFilter (113)
+         +- CometScan parquet spark_catalog.default.date_dim (112)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#42, d_week_seq#104]
+Output [2]: [d_date_sk#42, d_week_seq#99]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(105) CometFilter
-Input [2]: [d_date_sk#42, d_week_seq#104]
-Condition : ((isnotnull(d_week_seq#104) AND (d_week_seq#104 = Subquery scalar-subquery#105, [id=#106])) AND isnotnull(d_date_sk#42))
+(113) CometFilter
+Input [2]: [d_date_sk#42, d_week_seq#99]
+Condition : ((isnotnull(d_week_seq#99) AND (d_week_seq#99 = Subquery scalar-subquery#100, [id=#101])) AND isnotnull(d_date_sk#42))
 
-(106) CometProject
-Input [2]: [d_date_sk#42, d_week_seq#104]
+(114) CometProject
+Input [2]: [d_date_sk#42, d_week_seq#99]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(107) ColumnarToRow [codegen id : 1]
+(115) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(108) BroadcastExchange
+(116) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:6 Hosting operator id = 105 Hosting Expression = Subquery scalar-subquery#105, [id=#106]
-* ColumnarToRow (112)
-+- CometProject (111)
-   +- CometFilter (110)
-      +- CometScan parquet spark_catalog.default.date_dim (109)
+Subquery:6 Hosting operator id = 113 Hosting Expression = Subquery scalar-subquery#100, [id=#101]
+* ColumnarToRow (120)
++- CometProject (119)
+   +- CometFilter (118)
+      +- CometScan parquet spark_catalog.default.date_dim (117)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
+Output [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,1999), EqualTo(d_moy,12), EqualTo(d_dom,16)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(110) CometFilter
-Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
-Condition : (((((isnotnull(d_year#108) AND isnotnull(d_moy#109)) AND isnotnull(d_dom#110)) AND (d_year#108 = 1999)) AND (d_moy#109 = 12)) AND (d_dom#110 = 16))
+(118) CometFilter
+Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
+Condition : (((((isnotnull(d_year#103) AND isnotnull(d_moy#104)) AND isnotnull(d_dom#105)) AND (d_year#103 = 1999)) AND (d_moy#104 = 12)) AND (d_dom#105 = 16))
 
-(111) CometProject
-Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
-Arguments: [d_week_seq#107], [d_week_seq#107]
+(119) CometProject
+Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
+Arguments: [d_week_seq#102], [d_week_seq#102]
 
-(112) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#107]
+(120) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#102]
 
 Subquery:7 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (117)
-+- * ColumnarToRow (116)
-   +- CometProject (115)
-      +- CometFilter (114)
-         +- CometScan parquet spark_catalog.default.date_dim (113)
+BroadcastExchange (125)
++- * ColumnarToRow (124)
+   +- CometProject (123)
+      +- CometFilter (122)
+         +- CometScan parquet spark_catalog.default.date_dim (121)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#111]
+Output [2]: [d_date_sk#25, d_year#106]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1998), LessThanOrEqual(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(114) CometFilter
-Input [2]: [d_date_sk#25, d_year#111]
-Condition : (((isnotnull(d_year#111) AND (d_year#111 >= 1998)) AND (d_year#111 <= 2000)) AND isnotnull(d_date_sk#25))
+(122) CometFilter
+Input [2]: [d_date_sk#25, d_year#106]
+Condition : (((isnotnull(d_year#106) AND (d_year#106 >= 1998)) AND (d_year#106 <= 2000)) AND isnotnull(d_date_sk#25))
 
-(115) CometProject
-Input [2]: [d_date_sk#25, d_year#111]
+(123) CometProject
+Input [2]: [d_date_sk#25, d_year#106]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(116) ColumnarToRow [codegen id : 1]
+(124) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(117) BroadcastExchange
+(125) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
 Subquery:8 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:9 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:10 Hosting operator id = 81 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
+Subquery:10 Hosting operator id = 86 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
 
-Subquery:11 Hosting operator id = 67 Hosting Expression = ss_sold_date_sk#59 IN dynamicpruning#60
-BroadcastExchange (122)
-+- * ColumnarToRow (121)
-   +- CometProject (120)
-      +- CometFilter (119)
-         +- CometScan parquet spark_catalog.default.date_dim (118)
+Subquery:11 Hosting operator id = 71 Hosting Expression = ss_sold_date_sk#57 IN dynamicpruning#58
+BroadcastExchange (130)
++- * ColumnarToRow (129)
+   +- CometProject (128)
+      +- CometFilter (127)
+         +- CometScan parquet spark_catalog.default.date_dim (126)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#65, d_week_seq#112]
+Output [2]: [d_date_sk#63, d_week_seq#107]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(119) CometFilter
-Input [2]: [d_date_sk#65, d_week_seq#112]
-Condition : ((isnotnull(d_week_seq#112) AND (d_week_seq#112 = Subquery scalar-subquery#113, [id=#114])) AND isnotnull(d_date_sk#65))
+(127) CometFilter
+Input [2]: [d_date_sk#63, d_week_seq#107]
+Condition : ((isnotnull(d_week_seq#107) AND (d_week_seq#107 = Subquery scalar-subquery#108, [id=#109])) AND isnotnull(d_date_sk#63))
 
-(120) CometProject
-Input [2]: [d_date_sk#65, d_week_seq#112]
-Arguments: [d_date_sk#65], [d_date_sk#65]
+(128) CometProject
+Input [2]: [d_date_sk#63, d_week_seq#107]
+Arguments: [d_date_sk#63], [d_date_sk#63]
 
-(121) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#65]
+(129) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#63]
 
-(122) BroadcastExchange
-Input [1]: [d_date_sk#65]
+(130) BroadcastExchange
+Input [1]: [d_date_sk#63]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
-Subquery:12 Hosting operator id = 119 Hosting Expression = Subquery scalar-subquery#113, [id=#114]
-* ColumnarToRow (126)
-+- CometProject (125)
-   +- CometFilter (124)
-      +- CometScan parquet spark_catalog.default.date_dim (123)
+Subquery:12 Hosting operator id = 127 Hosting Expression = Subquery scalar-subquery#108, [id=#109]
+* ColumnarToRow (134)
++- CometProject (133)
+   +- CometFilter (132)
+      +- CometScan parquet spark_catalog.default.date_dim (131)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
+Output [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,1998), EqualTo(d_moy,12), EqualTo(d_dom,16)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(124) CometFilter
-Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
-Condition : (((((isnotnull(d_year#116) AND isnotnull(d_moy#117)) AND isnotnull(d_dom#118)) AND (d_year#116 = 1998)) AND (d_moy#117 = 12)) AND (d_dom#118 = 16))
+(132) CometFilter
+Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
+Condition : (((((isnotnull(d_year#111) AND isnotnull(d_moy#112)) AND isnotnull(d_dom#113)) AND (d_year#111 = 1998)) AND (d_moy#112 = 12)) AND (d_dom#113 = 16))
 
-(125) CometProject
-Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
-Arguments: [d_week_seq#115], [d_week_seq#115]
+(133) CometProject
+Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
+Arguments: [d_week_seq#110], [d_week_seq#110]
 
-(126) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#115]
+(134) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#110]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt
index 09d8d9dde3..13ac319fbd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt
@@ -1,202 +1,210 @@
 TakeOrderedAndProject [i_brand_id,i_class_id,i_category_id,channel,sales,number_sales,channel,i_brand_id,i_class_id,i_category_id,sales,number_sales]
   WholeStageCodegen (52)
     BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-      Filter [sales]
-        Subquery #4
-          WholeStageCodegen (8)
-            HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
-              InputAdapter
-                Exchange #12
-                  WholeStageCodegen (7)
-                    HashAggregate [quantity,list_price] [sum,count,sum,count]
-                      InputAdapter
-                        Union
-                          WholeStageCodegen (2)
-                            Project [ss_quantity,ss_list_price]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #3
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #6
-                          WholeStageCodegen (4)
-                            Project [cs_quantity,cs_list_price]
-                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #3
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #6
-                          WholeStageCodegen (6)
-                            Project [ws_quantity,ws_list_price]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+      ColumnarToRow
+        InputAdapter
+          CometFilter [sales]
+            Subquery #4
+              WholeStageCodegen (8)
+                ColumnarToRow
+                  InputAdapter
+                    CometHashAggregate [sum,count]
+                      CometColumnarExchange #12
+                        RowToColumnar
+                          WholeStageCodegen (7)
+                            HashAggregate [quantity,list_price] [sum,count,sum,count]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (2)
+                                    Project [ss_quantity,ss_list_price]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #6
+                                  WholeStageCodegen (4)
+                                    Project [cs_quantity,cs_list_price]
+                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #6
+                                  WholeStageCodegen (6)
+                                    Project [ws_quantity,ws_list_price]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #6
+            CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+              CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #1
+                RowToColumnar
+                  WholeStageCodegen (25)
+                    HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                      Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                          Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              BroadcastHashJoin [ss_item_sk,ss_item_sk]
                                 ColumnarToRow
                                   InputAdapter
-                                    CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #3
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_week_seq,d_date_sk]
+                                                      Subquery #2
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_week_seq]
+                                                                CometFilter [d_year,d_moy,d_dom]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #6
-        HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
-          InputAdapter
-            Exchange [i_brand_id,i_class_id,i_category_id] #1
-              WholeStageCodegen (25)
-                HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                  Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                      Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                          BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ss_item_sk]
-                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (11)
+                                      Project [i_item_sk]
+                                        BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_week_seq,d_date_sk]
-                                                  Subquery #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_week_seq]
-                                                            CometFilter [d_year,d_moy,d_dom]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
-                            InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (11)
-                                  Project [i_item_sk]
-                                    BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_brand_id,i_class_id,i_category_id]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                      InputAdapter
-                                        BroadcastExchange #4
-                                          WholeStageCodegen (10)
-                                            BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
-                                              HashAggregate [brand_id,class_id,category_id]
-                                                InputAdapter
-                                                  Exchange [brand_id,class_id,category_id] #5
-                                                    WholeStageCodegen (6)
-                                                      HashAggregate [brand_id,class_id,category_id]
-                                                        Project [i_brand_id,i_class_id,i_category_id]
-                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                            Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [ss_item_sk]
-                                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                        SubqueryBroadcast [d_date_sk] #3
-                                                                          BroadcastExchange #6
-                                                                            WholeStageCodegen (1)
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometProject [d_date_sk]
-                                                                                    CometFilter [d_year,d_date_sk]
-                                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                InputAdapter
-                                                                  BroadcastExchange #7
-                                                                    WholeStageCodegen (4)
-                                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
+                                              CometFilter [i_brand_id,i_class_id,i_category_id]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                          InputAdapter
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (10)
+                                                BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometHashAggregate [brand_id,class_id,category_id]
+                                                        CometColumnarExchange [brand_id,class_id,category_id] #5
+                                                          RowToColumnar
+                                                            WholeStageCodegen (6)
+                                                              HashAggregate [brand_id,class_id,category_id]
+                                                                Project [i_brand_id,i_class_id,i_category_id]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #8
-                                                                            WholeStageCodegen (3)
-                                                                              Project [i_brand_id,i_class_id,i_category_id]
-                                                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                                  Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                            CometFilter [ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #3
+                                                                                  BroadcastExchange #6
+                                                                                    WholeStageCodegen (1)
                                                                                       ColumnarToRow
                                                                                         InputAdapter
-                                                                                          CometFilter [cs_item_sk]
-                                                                                            CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
-                                                                                              ReusedSubquery [d_date_sk] #3
-                                                                                      InputAdapter
-                                                                                        BroadcastExchange #9
-                                                                                          WholeStageCodegen (1)
-                                                                                            ColumnarToRow
-                                                                                              InputAdapter
-                                                                                                CometFilter [i_item_sk]
-                                                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                          CometProject [d_date_sk]
+                                                                                            CometFilter [d_year,d_date_sk]
+                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                        InputAdapter
+                                                                          BroadcastExchange #7
+                                                                            WholeStageCodegen (4)
+                                                                              BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
+                                                                                ColumnarToRow
                                                                                   InputAdapter
-                                                                                    ReusedExchange [d_date_sk] #6
+                                                                                    CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                InputAdapter
+                                                                                  BroadcastExchange #8
+                                                                                    WholeStageCodegen (3)
+                                                                                      Project [i_brand_id,i_class_id,i_category_id]
+                                                                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                                          Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                            BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                                              ColumnarToRow
+                                                                                                InputAdapter
+                                                                                                  CometFilter [cs_item_sk]
+                                                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                                                                                      ReusedSubquery [d_date_sk] #3
+                                                                                              InputAdapter
+                                                                                                BroadcastExchange #9
+                                                                                                  WholeStageCodegen (1)
+                                                                                                    ColumnarToRow
+                                                                                                      InputAdapter
+                                                                                                        CometFilter [i_item_sk]
+                                                                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                          InputAdapter
+                                                                                            ReusedExchange [d_date_sk] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk] #6
+                                                  InputAdapter
+                                                    BroadcastExchange #10
+                                                      WholeStageCodegen (9)
+                                                        Project [i_brand_id,i_class_id,i_category_id]
+                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                            Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                              BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [ws_item_sk]
+                                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                        ReusedSubquery [d_date_sk] #3
+                                                                InputAdapter
+                                                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
                                                             InputAdapter
                                                               ReusedExchange [d_date_sk] #6
-                                              InputAdapter
-                                                BroadcastExchange #10
-                                                  WholeStageCodegen (9)
-                                                    Project [i_brand_id,i_class_id,i_category_id]
-                                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                        Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [ws_item_sk]
-                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                    ReusedSubquery [d_date_sk] #3
-                                                            InputAdapter
-                                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
-                                                        InputAdapter
-                                                          ReusedExchange [d_date_sk] #6
+                              InputAdapter
+                                BroadcastExchange #11
+                                  WholeStageCodegen (23)
+                                    BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                      InputAdapter
+                                        ReusedExchange [ss_item_sk] #3
                           InputAdapter
-                            BroadcastExchange #11
-                              WholeStageCodegen (23)
-                                BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                  InputAdapter
-                                    ReusedExchange [ss_item_sk] #3
-                      InputAdapter
-                        ReusedExchange [d_date_sk] #2
+                            ReusedExchange [d_date_sk] #2
       InputAdapter
         BroadcastExchange #13
           WholeStageCodegen (51)
-            Filter [sales]
-              ReusedSubquery [average_sales] #4
-              HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
-                InputAdapter
-                  Exchange [i_brand_id,i_class_id,i_category_id] #14
-                    WholeStageCodegen (50)
-                      HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                        Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                  ColumnarToRow
+            ColumnarToRow
+              InputAdapter
+                CometFilter [sales]
+                  ReusedSubquery [average_sales] #4
+                  CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                    CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #14
+                      RowToColumnar
+                        WholeStageCodegen (50)
+                          HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                            Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                    BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #5
+                                                BroadcastExchange #15
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_week_seq,d_date_sk]
+                                                            Subquery #6
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [d_week_seq]
+                                                                      CometFilter [d_year,d_moy,d_dom]
+                                                                        CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                      InputAdapter
+                                        ReusedExchange [ss_item_sk] #3
                                     InputAdapter
-                                      CometFilter [ss_item_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #5
-                                            BroadcastExchange #15
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_week_seq,d_date_sk]
-                                                        Subquery #6
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_week_seq]
-                                                                  CometFilter [d_year,d_moy,d_dom]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
-                                  InputAdapter
-                                    ReusedExchange [ss_item_sk] #3
+                                      ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
                                 InputAdapter
-                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
-                            InputAdapter
-                              ReusedExchange [d_date_sk] #15
+                                  ReusedExchange [d_date_sk] #15
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt
index a8db177f87..0085b3b4c6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt
@@ -1,129 +1,135 @@
 == Physical Plan ==
-TakeOrderedAndProject (125)
-+- * HashAggregate (124)
-   +- Exchange (123)
-      +- * HashAggregate (122)
-         +- Union (121)
-            :- * HashAggregate (100)
-            :  +- Exchange (99)
-            :     +- * HashAggregate (98)
-            :        +- Union (97)
-            :           :- * Filter (66)
-            :           :  +- * HashAggregate (65)
-            :           :     +- Exchange (64)
-            :           :        +- * HashAggregate (63)
-            :           :           +- * Project (62)
-            :           :              +- * BroadcastHashJoin Inner BuildRight (61)
-            :           :                 :- * Project (59)
-            :           :                 :  +- * BroadcastHashJoin Inner BuildRight (58)
-            :           :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
-            :           :                 :     :  :- * ColumnarToRow (3)
-            :           :                 :     :  :  +- CometFilter (2)
-            :           :                 :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :           :                 :     :  +- BroadcastExchange (50)
-            :           :                 :     :     +- * Project (49)
-            :           :                 :     :        +- * BroadcastHashJoin Inner BuildRight (48)
-            :           :                 :     :           :- * ColumnarToRow (6)
-            :           :                 :     :           :  +- CometFilter (5)
-            :           :                 :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-            :           :                 :     :           +- BroadcastExchange (47)
-            :           :                 :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
-            :           :                 :     :                 :- * HashAggregate (35)
-            :           :                 :     :                 :  +- Exchange (34)
-            :           :                 :     :                 :     +- * HashAggregate (33)
-            :           :                 :     :                 :        +- * Project (32)
-            :           :                 :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
-            :           :                 :     :                 :              :- * Project (29)
-            :           :                 :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
-            :           :                 :     :                 :              :     :- * ColumnarToRow (9)
-            :           :                 :     :                 :              :     :  +- CometFilter (8)
-            :           :                 :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-            :           :                 :     :                 :              :     +- BroadcastExchange (27)
-            :           :                 :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-            :           :                 :     :                 :              :           :- * ColumnarToRow (12)
-            :           :                 :     :                 :              :           :  +- CometFilter (11)
-            :           :                 :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
-            :           :                 :     :                 :              :           +- BroadcastExchange (25)
-            :           :                 :     :                 :              :              +- * Project (24)
-            :           :                 :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
-            :           :                 :     :                 :              :                    :- * Project (21)
-            :           :                 :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-            :           :                 :     :                 :              :                    :     :- * ColumnarToRow (15)
-            :           :                 :     :                 :              :                    :     :  +- CometFilter (14)
-            :           :                 :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-            :           :                 :     :                 :              :                    :     +- BroadcastExchange (19)
-            :           :                 :     :                 :              :                    :        +- * ColumnarToRow (18)
-            :           :                 :     :                 :              :                    :           +- CometFilter (17)
-            :           :                 :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
-            :           :                 :     :                 :              :                    +- ReusedExchange (22)
-            :           :                 :     :                 :              +- ReusedExchange (30)
-            :           :                 :     :                 +- BroadcastExchange (45)
-            :           :                 :     :                    +- * Project (44)
-            :           :                 :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
-            :           :                 :     :                          :- * Project (41)
-            :           :                 :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
-            :           :                 :     :                          :     :- * ColumnarToRow (38)
-            :           :                 :     :                          :     :  +- CometFilter (37)
-            :           :                 :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
-            :           :                 :     :                          :     +- ReusedExchange (39)
-            :           :                 :     :                          +- ReusedExchange (42)
-            :           :                 :     +- BroadcastExchange (57)
-            :           :                 :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
-            :           :                 :           :- * ColumnarToRow (54)
-            :           :                 :           :  +- CometFilter (53)
-            :           :                 :           :     +- CometScan parquet spark_catalog.default.item (52)
-            :           :                 :           +- ReusedExchange (55)
-            :           :                 +- ReusedExchange (60)
-            :           :- * Filter (81)
-            :           :  +- * HashAggregate (80)
-            :           :     +- Exchange (79)
-            :           :        +- * HashAggregate (78)
-            :           :           +- * Project (77)
-            :           :              +- * BroadcastHashJoin Inner BuildRight (76)
-            :           :                 :- * Project (74)
-            :           :                 :  +- * BroadcastHashJoin Inner BuildRight (73)
-            :           :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (71)
-            :           :                 :     :  :- * ColumnarToRow (69)
-            :           :                 :     :  :  +- CometFilter (68)
-            :           :                 :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (67)
-            :           :                 :     :  +- ReusedExchange (70)
-            :           :                 :     +- ReusedExchange (72)
-            :           :                 +- ReusedExchange (75)
-            :           +- * Filter (96)
-            :              +- * HashAggregate (95)
-            :                 +- Exchange (94)
-            :                    +- * HashAggregate (93)
-            :                       +- * Project (92)
-            :                          +- * BroadcastHashJoin Inner BuildRight (91)
-            :                             :- * Project (89)
-            :                             :  +- * BroadcastHashJoin Inner BuildRight (88)
-            :                             :     :- * BroadcastHashJoin LeftSemi BuildRight (86)
-            :                             :     :  :- * ColumnarToRow (84)
-            :                             :     :  :  +- CometFilter (83)
-            :                             :     :  :     +- CometScan parquet spark_catalog.default.web_sales (82)
-            :                             :     :  +- ReusedExchange (85)
-            :                             :     +- ReusedExchange (87)
-            :                             +- ReusedExchange (90)
-            :- * HashAggregate (105)
-            :  +- Exchange (104)
-            :     +- * HashAggregate (103)
-            :        +- * HashAggregate (102)
-            :           +- ReusedExchange (101)
-            :- * HashAggregate (110)
-            :  +- Exchange (109)
-            :     +- * HashAggregate (108)
-            :        +- * HashAggregate (107)
-            :           +- ReusedExchange (106)
-            :- * HashAggregate (115)
-            :  +- Exchange (114)
-            :     +- * HashAggregate (113)
-            :        +- * HashAggregate (112)
-            :           +- ReusedExchange (111)
-            +- * HashAggregate (120)
-               +- Exchange (119)
-                  +- * HashAggregate (118)
-                     +- * HashAggregate (117)
-                        +- ReusedExchange (116)
+* ColumnarToRow (131)
++- CometTakeOrderedAndProject (130)
+   +- CometHashAggregate (129)
+      +- CometColumnarExchange (128)
+         +- CometHashAggregate (127)
+            +- CometUnion (126)
+               :- CometHashAggregate (105)
+               :  +- CometColumnarExchange (104)
+               :     +- CometHashAggregate (103)
+               :        +- CometUnion (102)
+               :           :- CometFilter (69)
+               :           :  +- CometHashAggregate (68)
+               :           :     +- CometColumnarExchange (67)
+               :           :        +- RowToColumnar (66)
+               :           :           +- * HashAggregate (65)
+               :           :              +- * Project (64)
+               :           :                 +- * BroadcastHashJoin Inner BuildRight (63)
+               :           :                    :- * Project (61)
+               :           :                    :  +- * BroadcastHashJoin Inner BuildRight (60)
+               :           :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
+               :           :                    :     :  :- * ColumnarToRow (3)
+               :           :                    :     :  :  +- CometFilter (2)
+               :           :                    :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :           :                    :     :  +- BroadcastExchange (52)
+               :           :                    :     :     +- * Project (51)
+               :           :                    :     :        +- * BroadcastHashJoin Inner BuildRight (50)
+               :           :                    :     :           :- * ColumnarToRow (6)
+               :           :                    :     :           :  +- CometFilter (5)
+               :           :                    :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+               :           :                    :     :           +- BroadcastExchange (49)
+               :           :                    :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
+               :           :                    :     :                 :- * ColumnarToRow (37)
+               :           :                    :     :                 :  +- CometHashAggregate (36)
+               :           :                    :     :                 :     +- CometColumnarExchange (35)
+               :           :                    :     :                 :        +- RowToColumnar (34)
+               :           :                    :     :                 :           +- * HashAggregate (33)
+               :           :                    :     :                 :              +- * Project (32)
+               :           :                    :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
+               :           :                    :     :                 :                    :- * Project (29)
+               :           :                    :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
+               :           :                    :     :                 :                    :     :- * ColumnarToRow (9)
+               :           :                    :     :                 :                    :     :  +- CometFilter (8)
+               :           :                    :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+               :           :                    :     :                 :                    :     +- BroadcastExchange (27)
+               :           :                    :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+               :           :                    :     :                 :                    :           :- * ColumnarToRow (12)
+               :           :                    :     :                 :                    :           :  +- CometFilter (11)
+               :           :                    :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
+               :           :                    :     :                 :                    :           +- BroadcastExchange (25)
+               :           :                    :     :                 :                    :              +- * Project (24)
+               :           :                    :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
+               :           :                    :     :                 :                    :                    :- * Project (21)
+               :           :                    :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :           :                    :     :                 :                    :                    :     :- * ColumnarToRow (15)
+               :           :                    :     :                 :                    :                    :     :  +- CometFilter (14)
+               :           :                    :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+               :           :                    :     :                 :                    :                    :     +- BroadcastExchange (19)
+               :           :                    :     :                 :                    :                    :        +- * ColumnarToRow (18)
+               :           :                    :     :                 :                    :                    :           +- CometFilter (17)
+               :           :                    :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
+               :           :                    :     :                 :                    :                    +- ReusedExchange (22)
+               :           :                    :     :                 :                    +- ReusedExchange (30)
+               :           :                    :     :                 +- BroadcastExchange (47)
+               :           :                    :     :                    +- * Project (46)
+               :           :                    :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
+               :           :                    :     :                          :- * Project (43)
+               :           :                    :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
+               :           :                    :     :                          :     :- * ColumnarToRow (40)
+               :           :                    :     :                          :     :  +- CometFilter (39)
+               :           :                    :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
+               :           :                    :     :                          :     +- ReusedExchange (41)
+               :           :                    :     :                          +- ReusedExchange (44)
+               :           :                    :     +- BroadcastExchange (59)
+               :           :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
+               :           :                    :           :- * ColumnarToRow (56)
+               :           :                    :           :  +- CometFilter (55)
+               :           :                    :           :     +- CometScan parquet spark_catalog.default.item (54)
+               :           :                    :           +- ReusedExchange (57)
+               :           :                    +- ReusedExchange (62)
+               :           :- CometFilter (85)
+               :           :  +- CometHashAggregate (84)
+               :           :     +- CometColumnarExchange (83)
+               :           :        +- RowToColumnar (82)
+               :           :           +- * HashAggregate (81)
+               :           :              +- * Project (80)
+               :           :                 +- * BroadcastHashJoin Inner BuildRight (79)
+               :           :                    :- * Project (77)
+               :           :                    :  +- * BroadcastHashJoin Inner BuildRight (76)
+               :           :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (74)
+               :           :                    :     :  :- * ColumnarToRow (72)
+               :           :                    :     :  :  +- CometFilter (71)
+               :           :                    :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (70)
+               :           :                    :     :  +- ReusedExchange (73)
+               :           :                    :     +- ReusedExchange (75)
+               :           :                    +- ReusedExchange (78)
+               :           +- CometFilter (101)
+               :              +- CometHashAggregate (100)
+               :                 +- CometColumnarExchange (99)
+               :                    +- RowToColumnar (98)
+               :                       +- * HashAggregate (97)
+               :                          +- * Project (96)
+               :                             +- * BroadcastHashJoin Inner BuildRight (95)
+               :                                :- * Project (93)
+               :                                :  +- * BroadcastHashJoin Inner BuildRight (92)
+               :                                :     :- * BroadcastHashJoin LeftSemi BuildRight (90)
+               :                                :     :  :- * ColumnarToRow (88)
+               :                                :     :  :  +- CometFilter (87)
+               :                                :     :  :     +- CometScan parquet spark_catalog.default.web_sales (86)
+               :                                :     :  +- ReusedExchange (89)
+               :                                :     +- ReusedExchange (91)
+               :                                +- ReusedExchange (94)
+               :- CometHashAggregate (110)
+               :  +- CometColumnarExchange (109)
+               :     +- CometHashAggregate (108)
+               :        +- CometHashAggregate (107)
+               :           +- ReusedExchange (106)
+               :- CometHashAggregate (115)
+               :  +- CometColumnarExchange (114)
+               :     +- CometHashAggregate (113)
+               :        +- CometHashAggregate (112)
+               :           +- ReusedExchange (111)
+               :- CometHashAggregate (120)
+               :  +- CometColumnarExchange (119)
+               :     +- CometHashAggregate (118)
+               :        +- CometHashAggregate (117)
+               :           +- ReusedExchange (116)
+               +- CometHashAggregate (125)
+                  +- CometColumnarExchange (124)
+                     +- CometHashAggregate (123)
+                        +- CometHashAggregate (122)
+                           +- ReusedExchange (121)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -227,7 +233,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 159]
+(22) ReusedExchange [Reuses operator id: 167]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -264,7 +270,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 159]
+(30) ReusedExchange [Reuses operator id: 167]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -284,16 +290,20 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) Exchange
+(34) RowToColumnar
 Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) HashAggregate [codegen id : 10]
+(35) CometColumnarExchange
+Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(36) CometHashAggregate
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-Aggregate Attributes: []
-Results [3]: [brand_id#26, class_id#27, category_id#28]
+
+(37) ColumnarToRow [codegen id : 10]
+Input [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -303,68 +313,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(37) CometFilter
+(39) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(38) ColumnarToRow [codegen id : 9]
+(40) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(39) ReusedExchange [Reuses operator id: 19]
+(41) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(40) BroadcastHashJoin [codegen id : 9]
+(42) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 9]
+(43) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) ReusedExchange [Reuses operator id: 159]
+(44) ReusedExchange [Reuses operator id: 167]
 Output [1]: [d_date_sk#36]
 
-(43) BroadcastHashJoin [codegen id : 9]
+(45) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 9]
+(46) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(46) BroadcastHashJoin [codegen id : 10]
+(48) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(48) BroadcastHashJoin [codegen id : 11]
+(50) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 11]
+(51) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(51) BroadcastHashJoin [codegen id : 25]
+(53) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -377,588 +387,576 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(53) CometFilter
+(55) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : isnotnull(i_item_sk#38)
 
-(54) ColumnarToRow [codegen id : 23]
+(56) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(55) ReusedExchange [Reuses operator id: 50]
+(57) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(56) BroadcastHashJoin [codegen id : 23]
+(58) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(57) BroadcastExchange
+(59) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(58) BroadcastHashJoin [codegen id : 25]
+(60) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 25]
+(61) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(60) ReusedExchange [Reuses operator id: 154]
+(62) ReusedExchange [Reuses operator id: 162]
 Output [1]: [d_date_sk#42]
 
-(61) BroadcastHashJoin [codegen id : 25]
+(63) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 25]
+(64) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(63) HashAggregate [codegen id : 25]
+(65) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(64) Exchange
+(66) RowToColumnar
+Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
+
+(67) CometColumnarExchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(65) HashAggregate [codegen id : 26]
+(68) CometHashAggregate
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
-Results [6]: [store AS channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#52, count(1)#50 AS number_sales#53]
 
-(66) Filter [codegen id : 26]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
-Condition : (isnotnull(sales#52) AND (cast(sales#52 as decimal(32,6)) > cast(Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+(69) CometFilter
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+Condition : (isnotnull(sales#50) AND (cast(sales#50 as decimal(32,6)) > cast(Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59]
+Output [4]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#59), dynamicpruningexpression(cs_sold_date_sk#59 IN dynamicpruning#60)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#57), dynamicpruningexpression(cs_sold_date_sk#57 IN dynamicpruning#58)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(68) CometFilter
-Input [4]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59]
-Condition : isnotnull(cs_item_sk#56)
+(71) CometFilter
+Input [4]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57]
+Condition : isnotnull(cs_item_sk#54)
 
-(69) ColumnarToRow [codegen id : 51]
-Input [4]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59]
+(72) ColumnarToRow [codegen id : 50]
+Input [4]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57]
 
-(70) ReusedExchange [Reuses operator id: 50]
+(73) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(71) BroadcastHashJoin [codegen id : 51]
-Left keys [1]: [cs_item_sk#56]
+(74) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [cs_item_sk#54]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(72) ReusedExchange [Reuses operator id: 57]
-Output [4]: [i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
+(75) ReusedExchange [Reuses operator id: 59]
+Output [4]: [i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
 
-(73) BroadcastHashJoin [codegen id : 51]
-Left keys [1]: [cs_item_sk#56]
-Right keys [1]: [i_item_sk#61]
+(76) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [cs_item_sk#54]
+Right keys [1]: [i_item_sk#59]
 Join type: Inner
 Join condition: None
 
-(74) Project [codegen id : 51]
-Output [6]: [cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64]
-Input [8]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59, i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
+(77) Project [codegen id : 50]
+Output [6]: [cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62]
+Input [8]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57, i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
 
-(75) ReusedExchange [Reuses operator id: 154]
-Output [1]: [d_date_sk#65]
+(78) ReusedExchange [Reuses operator id: 162]
+Output [1]: [d_date_sk#63]
 
-(76) BroadcastHashJoin [codegen id : 51]
-Left keys [1]: [cs_sold_date_sk#59]
-Right keys [1]: [d_date_sk#65]
+(79) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [cs_sold_date_sk#57]
+Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 51]
-Output [5]: [cs_quantity#57, cs_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
-Input [7]: [cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64, d_date_sk#65]
+(80) Project [codegen id : 50]
+Output [5]: [cs_quantity#55, cs_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
+Input [7]: [cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62, d_date_sk#63]
+
+(81) HashAggregate [codegen id : 50]
+Input [5]: [cs_quantity#55, cs_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
+Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Functions [2]: [partial_sum((cast(cs_quantity#55 as decimal(10,0)) * cs_list_price#56)), partial_count(1)]
+Aggregate Attributes [3]: [sum#64, isEmpty#65, count#66]
+Results [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
 
-(78) HashAggregate [codegen id : 51]
-Input [5]: [cs_quantity#57, cs_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
-Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
-Functions [2]: [partial_sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58)), partial_count(1)]
-Aggregate Attributes [3]: [sum#66, isEmpty#67, count#68]
-Results [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+(82) RowToColumnar
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
 
-(79) Exchange
-Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-Arguments: hashpartitioning(i_brand_id#62, i_class_id#63, i_category_id#64, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(83) CometColumnarExchange
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+Arguments: hashpartitioning(i_brand_id#60, i_class_id#61, i_category_id#62, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(80) HashAggregate [codegen id : 52]
-Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
-Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
-Functions [2]: [sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58)), count(1)]
-Aggregate Attributes [2]: [sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58))#72, count(1)#73]
-Results [6]: [catalog AS channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58))#72 AS sales#75, count(1)#73 AS number_sales#76]
+(84) CometHashAggregate
+Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Functions [2]: [sum((cast(cs_quantity#55 as decimal(10,0)) * cs_list_price#56)), count(1)]
 
-(81) Filter [codegen id : 52]
-Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
-Condition : (isnotnull(sales#75) AND (cast(sales#75 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+(85) CometFilter
+Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+Condition : (isnotnull(sales#71) AND (cast(sales#71 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80]
+Output [4]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#80), dynamicpruningexpression(ws_sold_date_sk#80 IN dynamicpruning#81)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#76), dynamicpruningexpression(ws_sold_date_sk#76 IN dynamicpruning#77)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(83) CometFilter
-Input [4]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80]
-Condition : isnotnull(ws_item_sk#77)
+(87) CometFilter
+Input [4]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76]
+Condition : isnotnull(ws_item_sk#73)
 
-(84) ColumnarToRow [codegen id : 77]
-Input [4]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80]
+(88) ColumnarToRow [codegen id : 75]
+Input [4]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76]
 
-(85) ReusedExchange [Reuses operator id: 50]
+(89) ReusedExchange [Reuses operator id: 52]
 Output [1]: [ss_item_sk#37]
 
-(86) BroadcastHashJoin [codegen id : 77]
-Left keys [1]: [ws_item_sk#77]
+(90) BroadcastHashJoin [codegen id : 75]
+Left keys [1]: [ws_item_sk#73]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(87) ReusedExchange [Reuses operator id: 57]
-Output [4]: [i_item_sk#82, i_brand_id#83, i_class_id#84, i_category_id#85]
+(91) ReusedExchange [Reuses operator id: 59]
+Output [4]: [i_item_sk#78, i_brand_id#79, i_class_id#80, i_category_id#81]
 
-(88) BroadcastHashJoin [codegen id : 77]
-Left keys [1]: [ws_item_sk#77]
-Right keys [1]: [i_item_sk#82]
+(92) BroadcastHashJoin [codegen id : 75]
+Left keys [1]: [ws_item_sk#73]
+Right keys [1]: [i_item_sk#78]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 77]
-Output [6]: [ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80, i_brand_id#83, i_class_id#84, i_category_id#85]
-Input [8]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80, i_item_sk#82, i_brand_id#83, i_class_id#84, i_category_id#85]
+(93) Project [codegen id : 75]
+Output [6]: [ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76, i_brand_id#79, i_class_id#80, i_category_id#81]
+Input [8]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76, i_item_sk#78, i_brand_id#79, i_class_id#80, i_category_id#81]
 
-(90) ReusedExchange [Reuses operator id: 154]
-Output [1]: [d_date_sk#86]
+(94) ReusedExchange [Reuses operator id: 162]
+Output [1]: [d_date_sk#82]
 
-(91) BroadcastHashJoin [codegen id : 77]
-Left keys [1]: [ws_sold_date_sk#80]
-Right keys [1]: [d_date_sk#86]
+(95) BroadcastHashJoin [codegen id : 75]
+Left keys [1]: [ws_sold_date_sk#76]
+Right keys [1]: [d_date_sk#82]
 Join type: Inner
 Join condition: None
 
-(92) Project [codegen id : 77]
-Output [5]: [ws_quantity#78, ws_list_price#79, i_brand_id#83, i_class_id#84, i_category_id#85]
-Input [7]: [ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80, i_brand_id#83, i_class_id#84, i_category_id#85, d_date_sk#86]
-
-(93) HashAggregate [codegen id : 77]
-Input [5]: [ws_quantity#78, ws_list_price#79, i_brand_id#83, i_class_id#84, i_category_id#85]
-Keys [3]: [i_brand_id#83, i_class_id#84, i_category_id#85]
-Functions [2]: [partial_sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79)), partial_count(1)]
-Aggregate Attributes [3]: [sum#87, isEmpty#88, count#89]
-Results [6]: [i_brand_id#83, i_class_id#84, i_category_id#85, sum#90, isEmpty#91, count#92]
-
-(94) Exchange
-Input [6]: [i_brand_id#83, i_class_id#84, i_category_id#85, sum#90, isEmpty#91, count#92]
-Arguments: hashpartitioning(i_brand_id#83, i_class_id#84, i_category_id#85, 5), ENSURE_REQUIREMENTS, [plan_id=11]
-
-(95) HashAggregate [codegen id : 78]
-Input [6]: [i_brand_id#83, i_class_id#84, i_category_id#85, sum#90, isEmpty#91, count#92]
-Keys [3]: [i_brand_id#83, i_class_id#84, i_category_id#85]
-Functions [2]: [sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79)), count(1)]
-Aggregate Attributes [2]: [sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79))#93, count(1)#94]
-Results [6]: [web AS channel#95, i_brand_id#83, i_class_id#84, i_category_id#85, sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79))#93 AS sales#96, count(1)#94 AS number_sales#97]
-
-(96) Filter [codegen id : 78]
-Input [6]: [channel#95, i_brand_id#83, i_class_id#84, i_category_id#85, sales#96, number_sales#97]
-Condition : (isnotnull(sales#96) AND (cast(sales#96 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
-
-(97) Union
-
-(98) HashAggregate [codegen id : 79]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
-Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [partial_sum(sales#52), partial_sum(number_sales#53)]
-Aggregate Attributes [3]: [sum#98, isEmpty#99, sum#100]
-Results [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-
-(99) Exchange
-Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-Arguments: hashpartitioning(channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=12]
-
-(100) HashAggregate [codegen id : 80]
-Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#52), sum(number_sales#53)]
-Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
-Results [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
-
-(101) ReusedExchange [Reuses operator id: 99]
-Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-
-(102) HashAggregate [codegen id : 160]
-Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#52), sum(number_sales#53)]
-Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
-Results [5]: [channel#51, i_brand_id#39, i_class_id#40, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
-
-(103) HashAggregate [codegen id : 160]
-Input [5]: [channel#51, i_brand_id#39, i_class_id#40, sum_sales#106, number_sales#107]
-Keys [3]: [channel#51, i_brand_id#39, i_class_id#40]
-Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
-Aggregate Attributes [3]: [sum#108, isEmpty#109, sum#110]
-Results [6]: [channel#51, i_brand_id#39, i_class_id#40, sum#111, isEmpty#112, sum#113]
-
-(104) Exchange
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, sum#111, isEmpty#112, sum#113]
-Arguments: hashpartitioning(channel#51, i_brand_id#39, i_class_id#40, 5), ENSURE_REQUIREMENTS, [plan_id=13]
-
-(105) HashAggregate [codegen id : 161]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, sum#111, isEmpty#112, sum#113]
-Keys [3]: [channel#51, i_brand_id#39, i_class_id#40]
-Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
-Aggregate Attributes [2]: [sum(sum_sales#106)#114, sum(number_sales#107)#115]
-Results [6]: [channel#51, i_brand_id#39, i_class_id#40, null AS i_category_id#116, sum(sum_sales#106)#114 AS sum(sum_sales)#117, sum(number_sales#107)#115 AS sum(number_sales)#118]
-
-(106) ReusedExchange [Reuses operator id: 99]
-Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-
-(107) HashAggregate [codegen id : 241]
-Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#52), sum(number_sales#53)]
-Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
-Results [4]: [channel#51, i_brand_id#39, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
-
-(108) HashAggregate [codegen id : 241]
-Input [4]: [channel#51, i_brand_id#39, sum_sales#106, number_sales#107]
-Keys [2]: [channel#51, i_brand_id#39]
-Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
-Aggregate Attributes [3]: [sum#119, isEmpty#120, sum#121]
-Results [5]: [channel#51, i_brand_id#39, sum#122, isEmpty#123, sum#124]
-
-(109) Exchange
-Input [5]: [channel#51, i_brand_id#39, sum#122, isEmpty#123, sum#124]
-Arguments: hashpartitioning(channel#51, i_brand_id#39, 5), ENSURE_REQUIREMENTS, [plan_id=14]
-
-(110) HashAggregate [codegen id : 242]
-Input [5]: [channel#51, i_brand_id#39, sum#122, isEmpty#123, sum#124]
-Keys [2]: [channel#51, i_brand_id#39]
-Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
-Aggregate Attributes [2]: [sum(sum_sales#106)#125, sum(number_sales#107)#126]
-Results [6]: [channel#51, i_brand_id#39, null AS i_class_id#127, null AS i_category_id#128, sum(sum_sales#106)#125 AS sum(sum_sales)#129, sum(number_sales#107)#126 AS sum(number_sales)#130]
-
-(111) ReusedExchange [Reuses operator id: 99]
-Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-
-(112) HashAggregate [codegen id : 322]
-Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#52), sum(number_sales#53)]
-Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
-Results [3]: [channel#51, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
-
-(113) HashAggregate [codegen id : 322]
-Input [3]: [channel#51, sum_sales#106, number_sales#107]
-Keys [1]: [channel#51]
-Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
-Aggregate Attributes [3]: [sum#131, isEmpty#132, sum#133]
-Results [4]: [channel#51, sum#134, isEmpty#135, sum#136]
-
-(114) Exchange
-Input [4]: [channel#51, sum#134, isEmpty#135, sum#136]
-Arguments: hashpartitioning(channel#51, 5), ENSURE_REQUIREMENTS, [plan_id=15]
-
-(115) HashAggregate [codegen id : 323]
-Input [4]: [channel#51, sum#134, isEmpty#135, sum#136]
-Keys [1]: [channel#51]
-Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
-Aggregate Attributes [2]: [sum(sum_sales#106)#137, sum(number_sales#107)#138]
-Results [6]: [channel#51, null AS i_brand_id#139, null AS i_class_id#140, null AS i_category_id#141, sum(sum_sales#106)#137 AS sum(sum_sales)#142, sum(number_sales#107)#138 AS sum(number_sales)#143]
-
-(116) ReusedExchange [Reuses operator id: 99]
-Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-
-(117) HashAggregate [codegen id : 403]
-Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
-Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#52), sum(number_sales#53)]
-Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
-Results [2]: [sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
-
-(118) HashAggregate [codegen id : 403]
-Input [2]: [sum_sales#106, number_sales#107]
+(96) Project [codegen id : 75]
+Output [5]: [ws_quantity#74, ws_list_price#75, i_brand_id#79, i_class_id#80, i_category_id#81]
+Input [7]: [ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76, i_brand_id#79, i_class_id#80, i_category_id#81, d_date_sk#82]
+
+(97) HashAggregate [codegen id : 75]
+Input [5]: [ws_quantity#74, ws_list_price#75, i_brand_id#79, i_class_id#80, i_category_id#81]
+Keys [3]: [i_brand_id#79, i_class_id#80, i_category_id#81]
+Functions [2]: [partial_sum((cast(ws_quantity#74 as decimal(10,0)) * ws_list_price#75)), partial_count(1)]
+Aggregate Attributes [3]: [sum#83, isEmpty#84, count#85]
+Results [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
+
+(98) RowToColumnar
+Input [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
+
+(99) CometColumnarExchange
+Input [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
+Arguments: hashpartitioning(i_brand_id#79, i_class_id#80, i_category_id#81, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+
+(100) CometHashAggregate
+Input [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
+Keys [3]: [i_brand_id#79, i_class_id#80, i_category_id#81]
+Functions [2]: [sum((cast(ws_quantity#74 as decimal(10,0)) * ws_list_price#75)), count(1)]
+
+(101) CometFilter
+Input [6]: [channel#89, i_brand_id#79, i_class_id#80, i_category_id#81, sales#90, number_sales#91]
+Condition : (isnotnull(sales#90) AND (cast(sales#90 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+
+(102) CometUnion
+Child 0 Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+Child 1 Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+Child 2 Input [6]: [channel#89, i_brand_id#79, i_class_id#80, i_category_id#81, sales#90, number_sales#91]
+
+(103) CometHashAggregate
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [partial_sum(sales#50), partial_sum(number_sales#51)]
+
+(104) CometColumnarExchange
+Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+Arguments: hashpartitioning(channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+
+(105) CometHashAggregate
+Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#50), sum(number_sales#51)]
+
+(106) ReusedExchange [Reuses operator id: 104]
+Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+
+(107) CometHashAggregate
+Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#50), sum(number_sales#51)]
+
+(108) CometHashAggregate
+Input [5]: [channel#49, i_brand_id#39, i_class_id#40, sum_sales#95, number_sales#96]
+Keys [3]: [channel#49, i_brand_id#39, i_class_id#40]
+Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
+
+(109) CometColumnarExchange
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, sum#97, isEmpty#98, sum#99]
+Arguments: hashpartitioning(channel#49, i_brand_id#39, i_class_id#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+
+(110) CometHashAggregate
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, sum#97, isEmpty#98, sum#99]
+Keys [3]: [channel#49, i_brand_id#39, i_class_id#40]
+Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
+
+(111) ReusedExchange [Reuses operator id: 104]
+Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+
+(112) CometHashAggregate
+Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#50), sum(number_sales#51)]
+
+(113) CometHashAggregate
+Input [4]: [channel#49, i_brand_id#39, sum_sales#95, number_sales#96]
+Keys [2]: [channel#49, i_brand_id#39]
+Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
+
+(114) CometColumnarExchange
+Input [5]: [channel#49, i_brand_id#39, sum#100, isEmpty#101, sum#102]
+Arguments: hashpartitioning(channel#49, i_brand_id#39, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+
+(115) CometHashAggregate
+Input [5]: [channel#49, i_brand_id#39, sum#100, isEmpty#101, sum#102]
+Keys [2]: [channel#49, i_brand_id#39]
+Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
+
+(116) ReusedExchange [Reuses operator id: 104]
+Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+
+(117) CometHashAggregate
+Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#50), sum(number_sales#51)]
+
+(118) CometHashAggregate
+Input [3]: [channel#49, sum_sales#95, number_sales#96]
+Keys [1]: [channel#49]
+Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
+
+(119) CometColumnarExchange
+Input [4]: [channel#49, sum#103, isEmpty#104, sum#105]
+Arguments: hashpartitioning(channel#49, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+
+(120) CometHashAggregate
+Input [4]: [channel#49, sum#103, isEmpty#104, sum#105]
+Keys [1]: [channel#49]
+Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
+
+(121) ReusedExchange [Reuses operator id: 104]
+Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+
+(122) CometHashAggregate
+Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
+Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#50), sum(number_sales#51)]
+
+(123) CometHashAggregate
+Input [2]: [sum_sales#95, number_sales#96]
 Keys: []
-Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
-Aggregate Attributes [3]: [sum#144, isEmpty#145, sum#146]
-Results [3]: [sum#147, isEmpty#148, sum#149]
+Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
 
-(119) Exchange
-Input [3]: [sum#147, isEmpty#148, sum#149]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=16]
+(124) CometColumnarExchange
+Input [3]: [sum#106, isEmpty#107, sum#108]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
 
-(120) HashAggregate [codegen id : 404]
-Input [3]: [sum#147, isEmpty#148, sum#149]
+(125) CometHashAggregate
+Input [3]: [sum#106, isEmpty#107, sum#108]
 Keys: []
-Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
-Aggregate Attributes [2]: [sum(sum_sales#106)#150, sum(number_sales#107)#151]
-Results [6]: [null AS channel#152, null AS i_brand_id#153, null AS i_class_id#154, null AS i_category_id#155, sum(sum_sales#106)#150 AS sum(sum_sales)#156, sum(number_sales#107)#151 AS sum(number_sales)#157]
-
-(121) Union
-
-(122) HashAggregate [codegen id : 405]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
-Keys [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
+
+(126) CometUnion
+Child 0 Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+Child 1 Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#109, sum(sum_sales)#110, sum(number_sales)#111]
+Child 2 Input [6]: [channel#49, i_brand_id#39, i_class_id#112, i_category_id#113, sum(sum_sales)#114, sum(number_sales)#115]
+Child 3 Input [6]: [channel#49, i_brand_id#116, i_class_id#117, i_category_id#118, sum(sum_sales)#119, sum(number_sales)#120]
+Child 4 Input [6]: [channel#121, i_brand_id#122, i_class_id#123, i_category_id#124, sum(sum_sales)#125, sum(number_sales)#126]
+
+(127) CometHashAggregate
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+Keys [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
 Functions: []
-Aggregate Attributes: []
-Results [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
 
-(123) Exchange
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
-Arguments: hashpartitioning(channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107, 5), ENSURE_REQUIREMENTS, [plan_id=17]
+(128) CometColumnarExchange
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+Arguments: hashpartitioning(channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
 
-(124) HashAggregate [codegen id : 406]
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
-Keys [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+(129) CometHashAggregate
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+Keys [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
 Functions: []
-Aggregate Attributes: []
-Results [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
 
-(125) TakeOrderedAndProject
-Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
-Arguments: 100, [channel#51 ASC NULLS FIRST, i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+(130) CometTakeOrderedAndProject
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#49 ASC NULLS FIRST,i_brand_id#39 ASC NULLS FIRST,i_class_id#40 ASC NULLS FIRST,i_category_id#41 ASC NULLS FIRST], output=[channel#49,i_brand_id#39,i_class_id#40,i_category_id#41,sum_sales#95,number_sales#96]), 100, [channel#49 ASC NULLS FIRST, i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+
+(131) ColumnarToRow [codegen id : 376]
+Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#54, [id=#55]
-* HashAggregate (144)
-+- Exchange (143)
-   +- * HashAggregate (142)
-      +- Union (141)
-         :- * Project (130)
-         :  +- * BroadcastHashJoin Inner BuildRight (129)
-         :     :- * ColumnarToRow (127)
-         :     :  +- CometScan parquet spark_catalog.default.store_sales (126)
-         :     +- ReusedExchange (128)
-         :- * Project (135)
-         :  +- * BroadcastHashJoin Inner BuildRight (134)
-         :     :- * ColumnarToRow (132)
-         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (131)
-         :     +- ReusedExchange (133)
-         +- * Project (140)
-            +- * BroadcastHashJoin Inner BuildRight (139)
-               :- * ColumnarToRow (137)
-               :  +- CometScan parquet spark_catalog.default.web_sales (136)
-               +- ReusedExchange (138)
+Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#52, [id=#53]
+* ColumnarToRow (152)
++- CometHashAggregate (151)
+   +- CometColumnarExchange (150)
+      +- RowToColumnar (149)
+         +- * HashAggregate (148)
+            +- Union (147)
+               :- * Project (136)
+               :  +- * BroadcastHashJoin Inner BuildRight (135)
+               :     :- * ColumnarToRow (133)
+               :     :  +- CometScan parquet spark_catalog.default.store_sales (132)
+               :     +- ReusedExchange (134)
+               :- * Project (141)
+               :  +- * BroadcastHashJoin Inner BuildRight (140)
+               :     :- * ColumnarToRow (138)
+               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (137)
+               :     +- ReusedExchange (139)
+               +- * Project (146)
+                  +- * BroadcastHashJoin Inner BuildRight (145)
+                     :- * ColumnarToRow (143)
+                     :  +- CometScan parquet spark_catalog.default.web_sales (142)
+                     +- ReusedExchange (144)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#158, ss_list_price#159, ss_sold_date_sk#160]
+Output [3]: [ss_quantity#127, ss_list_price#128, ss_sold_date_sk#129]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#160), dynamicpruningexpression(ss_sold_date_sk#160 IN dynamicpruning#161)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#129), dynamicpruningexpression(ss_sold_date_sk#129 IN dynamicpruning#130)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(127) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#158, ss_list_price#159, ss_sold_date_sk#160]
+(133) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#127, ss_list_price#128, ss_sold_date_sk#129]
 
-(128) ReusedExchange [Reuses operator id: 159]
-Output [1]: [d_date_sk#162]
+(134) ReusedExchange [Reuses operator id: 167]
+Output [1]: [d_date_sk#131]
 
-(129) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#160]
-Right keys [1]: [d_date_sk#162]
+(135) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#129]
+Right keys [1]: [d_date_sk#131]
 Join type: Inner
 Join condition: None
 
-(130) Project [codegen id : 2]
-Output [2]: [ss_quantity#158 AS quantity#163, ss_list_price#159 AS list_price#164]
-Input [4]: [ss_quantity#158, ss_list_price#159, ss_sold_date_sk#160, d_date_sk#162]
+(136) Project [codegen id : 2]
+Output [2]: [ss_quantity#127 AS quantity#132, ss_list_price#128 AS list_price#133]
+Input [4]: [ss_quantity#127, ss_list_price#128, ss_sold_date_sk#129, d_date_sk#131]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#165, cs_list_price#166, cs_sold_date_sk#167]
+Output [3]: [cs_quantity#134, cs_list_price#135, cs_sold_date_sk#136]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#167), dynamicpruningexpression(cs_sold_date_sk#167 IN dynamicpruning#168)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#136), dynamicpruningexpression(cs_sold_date_sk#136 IN dynamicpruning#137)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(132) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#165, cs_list_price#166, cs_sold_date_sk#167]
+(138) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#134, cs_list_price#135, cs_sold_date_sk#136]
 
-(133) ReusedExchange [Reuses operator id: 149]
-Output [1]: [d_date_sk#169]
+(139) ReusedExchange [Reuses operator id: 157]
+Output [1]: [d_date_sk#138]
 
-(134) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#167]
-Right keys [1]: [d_date_sk#169]
+(140) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#136]
+Right keys [1]: [d_date_sk#138]
 Join type: Inner
 Join condition: None
 
-(135) Project [codegen id : 4]
-Output [2]: [cs_quantity#165 AS quantity#170, cs_list_price#166 AS list_price#171]
-Input [4]: [cs_quantity#165, cs_list_price#166, cs_sold_date_sk#167, d_date_sk#169]
+(141) Project [codegen id : 4]
+Output [2]: [cs_quantity#134 AS quantity#139, cs_list_price#135 AS list_price#140]
+Input [4]: [cs_quantity#134, cs_list_price#135, cs_sold_date_sk#136, d_date_sk#138]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#172, ws_list_price#173, ws_sold_date_sk#174]
+Output [3]: [ws_quantity#141, ws_list_price#142, ws_sold_date_sk#143]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#174), dynamicpruningexpression(ws_sold_date_sk#174 IN dynamicpruning#175)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#143), dynamicpruningexpression(ws_sold_date_sk#143 IN dynamicpruning#144)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(137) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#172, ws_list_price#173, ws_sold_date_sk#174]
+(143) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#141, ws_list_price#142, ws_sold_date_sk#143]
 
-(138) ReusedExchange [Reuses operator id: 149]
-Output [1]: [d_date_sk#176]
+(144) ReusedExchange [Reuses operator id: 157]
+Output [1]: [d_date_sk#145]
 
-(139) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#174]
-Right keys [1]: [d_date_sk#176]
+(145) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#143]
+Right keys [1]: [d_date_sk#145]
 Join type: Inner
 Join condition: None
 
-(140) Project [codegen id : 6]
-Output [2]: [ws_quantity#172 AS quantity#177, ws_list_price#173 AS list_price#178]
-Input [4]: [ws_quantity#172, ws_list_price#173, ws_sold_date_sk#174, d_date_sk#176]
+(146) Project [codegen id : 6]
+Output [2]: [ws_quantity#141 AS quantity#146, ws_list_price#142 AS list_price#147]
+Input [4]: [ws_quantity#141, ws_list_price#142, ws_sold_date_sk#143, d_date_sk#145]
 
-(141) Union
+(147) Union
 
-(142) HashAggregate [codegen id : 7]
-Input [2]: [quantity#163, list_price#164]
+(148) HashAggregate [codegen id : 7]
+Input [2]: [quantity#132, list_price#133]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#163 as decimal(10,0)) * list_price#164))]
-Aggregate Attributes [2]: [sum#179, count#180]
-Results [2]: [sum#181, count#182]
+Functions [1]: [partial_avg((cast(quantity#132 as decimal(10,0)) * list_price#133))]
+Aggregate Attributes [2]: [sum#148, count#149]
+Results [2]: [sum#150, count#151]
 
-(143) Exchange
-Input [2]: [sum#181, count#182]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=18]
+(149) RowToColumnar
+Input [2]: [sum#150, count#151]
 
-(144) HashAggregate [codegen id : 8]
-Input [2]: [sum#181, count#182]
+(150) CometColumnarExchange
+Input [2]: [sum#150, count#151]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
+
+(151) CometHashAggregate
+Input [2]: [sum#150, count#151]
 Keys: []
-Functions [1]: [avg((cast(quantity#163 as decimal(10,0)) * list_price#164))]
-Aggregate Attributes [1]: [avg((cast(quantity#163 as decimal(10,0)) * list_price#164))#183]
-Results [1]: [avg((cast(quantity#163 as decimal(10,0)) * list_price#164))#183 AS average_sales#184]
+Functions [1]: [avg((cast(quantity#132 as decimal(10,0)) * list_price#133))]
+
+(152) ColumnarToRow [codegen id : 8]
+Input [1]: [average_sales#152]
 
-Subquery:2 Hosting operator id = 126 Hosting Expression = ss_sold_date_sk#160 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 132 Hosting Expression = ss_sold_date_sk#129 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 131 Hosting Expression = cs_sold_date_sk#167 IN dynamicpruning#168
-BroadcastExchange (149)
-+- * ColumnarToRow (148)
-   +- CometProject (147)
-      +- CometFilter (146)
-         +- CometScan parquet spark_catalog.default.date_dim (145)
+Subquery:3 Hosting operator id = 137 Hosting Expression = cs_sold_date_sk#136 IN dynamicpruning#137
+BroadcastExchange (157)
++- * ColumnarToRow (156)
+   +- CometProject (155)
+      +- CometFilter (154)
+         +- CometScan parquet spark_catalog.default.date_dim (153)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#169, d_year#185]
+Output [2]: [d_date_sk#138, d_year#153]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1998), LessThanOrEqual(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(146) CometFilter
-Input [2]: [d_date_sk#169, d_year#185]
-Condition : (((isnotnull(d_year#185) AND (d_year#185 >= 1998)) AND (d_year#185 <= 2000)) AND isnotnull(d_date_sk#169))
+(154) CometFilter
+Input [2]: [d_date_sk#138, d_year#153]
+Condition : (((isnotnull(d_year#153) AND (d_year#153 >= 1998)) AND (d_year#153 <= 2000)) AND isnotnull(d_date_sk#138))
 
-(147) CometProject
-Input [2]: [d_date_sk#169, d_year#185]
-Arguments: [d_date_sk#169], [d_date_sk#169]
+(155) CometProject
+Input [2]: [d_date_sk#138, d_year#153]
+Arguments: [d_date_sk#138], [d_date_sk#138]
 
-(148) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#169]
+(156) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#138]
 
-(149) BroadcastExchange
-Input [1]: [d_date_sk#169]
+(157) BroadcastExchange
+Input [1]: [d_date_sk#138]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=19]
 
-Subquery:4 Hosting operator id = 136 Hosting Expression = ws_sold_date_sk#174 IN dynamicpruning#168
+Subquery:4 Hosting operator id = 142 Hosting Expression = ws_sold_date_sk#143 IN dynamicpruning#137
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (154)
-+- * ColumnarToRow (153)
-   +- CometProject (152)
-      +- CometFilter (151)
-         +- CometScan parquet spark_catalog.default.date_dim (150)
+BroadcastExchange (162)
++- * ColumnarToRow (161)
+   +- CometProject (160)
+      +- CometFilter (159)
+         +- CometScan parquet spark_catalog.default.date_dim (158)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#42, d_year#186, d_moy#187]
+Output [3]: [d_date_sk#42, d_year#154, d_moy#155]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(151) CometFilter
-Input [3]: [d_date_sk#42, d_year#186, d_moy#187]
-Condition : ((((isnotnull(d_year#186) AND isnotnull(d_moy#187)) AND (d_year#186 = 2000)) AND (d_moy#187 = 11)) AND isnotnull(d_date_sk#42))
+(159) CometFilter
+Input [3]: [d_date_sk#42, d_year#154, d_moy#155]
+Condition : ((((isnotnull(d_year#154) AND isnotnull(d_moy#155)) AND (d_year#154 = 2000)) AND (d_moy#155 = 11)) AND isnotnull(d_date_sk#42))
 
-(152) CometProject
-Input [3]: [d_date_sk#42, d_year#186, d_moy#187]
+(160) CometProject
+Input [3]: [d_date_sk#42, d_year#154, d_moy#155]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(153) ColumnarToRow [codegen id : 1]
+(161) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(154) BroadcastExchange
+(162) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=20]
 
 Subquery:6 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (159)
-+- * ColumnarToRow (158)
-   +- CometProject (157)
-      +- CometFilter (156)
-         +- CometScan parquet spark_catalog.default.date_dim (155)
+BroadcastExchange (167)
++- * ColumnarToRow (166)
+   +- CometProject (165)
+      +- CometFilter (164)
+         +- CometScan parquet spark_catalog.default.date_dim (163)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#188]
+Output [2]: [d_date_sk#25, d_year#156]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1999), LessThanOrEqual(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(156) CometFilter
-Input [2]: [d_date_sk#25, d_year#188]
-Condition : (((isnotnull(d_year#188) AND (d_year#188 >= 1999)) AND (d_year#188 <= 2001)) AND isnotnull(d_date_sk#25))
+(164) CometFilter
+Input [2]: [d_date_sk#25, d_year#156]
+Condition : (((isnotnull(d_year#156) AND (d_year#156 >= 1999)) AND (d_year#156 <= 2001)) AND isnotnull(d_date_sk#25))
 
-(157) CometProject
-Input [2]: [d_date_sk#25, d_year#188]
+(165) CometProject
+Input [2]: [d_date_sk#25, d_year#156]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(158) ColumnarToRow [codegen id : 1]
+(166) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(159) BroadcastExchange
+(167) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=21]
 
 Subquery:7 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:8 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:8 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 81 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
+Subquery:9 Hosting operator id = 85 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
 
-Subquery:10 Hosting operator id = 67 Hosting Expression = cs_sold_date_sk#59 IN dynamicpruning#5
+Subquery:10 Hosting operator id = 70 Hosting Expression = cs_sold_date_sk#57 IN dynamicpruning#5
 
-Subquery:11 Hosting operator id = 96 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
+Subquery:11 Hosting operator id = 101 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
 
-Subquery:12 Hosting operator id = 82 Hosting Expression = ws_sold_date_sk#80 IN dynamicpruning#5
+Subquery:12 Hosting operator id = 86 Hosting Expression = ws_sold_date_sk#76 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt
index a203f9620b..becceb8614 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt
@@ -1,261 +1,241 @@
-TakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
-  WholeStageCodegen (406)
-    HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
-      InputAdapter
-        Exchange [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales] #1
-          WholeStageCodegen (405)
-            HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
-              InputAdapter
-                Union
-                  WholeStageCodegen (80)
-                    HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
-                      InputAdapter
-                        Exchange [channel,i_brand_id,i_class_id,i_category_id] #2
-                          WholeStageCodegen (79)
-                            HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (26)
-                                    Filter [sales]
-                                      Subquery #3
-                                        WholeStageCodegen (8)
-                                          HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
+WholeStageCodegen (376)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
+        CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
+          CometColumnarExchange [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales] #1
+            CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
+              CometUnion
+                CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
+                  CometColumnarExchange [channel,i_brand_id,i_class_id,i_category_id] #2
+                    CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sales,number_sales]
+                      CometUnion
+                        CometFilter [sales]
+                          Subquery #3
+                            WholeStageCodegen (8)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometHashAggregate [sum,count]
+                                    CometColumnarExchange #14
+                                      RowToColumnar
+                                        WholeStageCodegen (7)
+                                          HashAggregate [quantity,list_price] [sum,count,sum,count]
                                             InputAdapter
-                                              Exchange #14
-                                                WholeStageCodegen (7)
-                                                  HashAggregate [quantity,list_price] [sum,count,sum,count]
-                                                    InputAdapter
-                                                      Union
-                                                        WholeStageCodegen (2)
-                                                          Project [ss_quantity,ss_list_price]
-                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
-                                                                    ReusedSubquery [d_date_sk] #2
-                                                              InputAdapter
-                                                                ReusedExchange [d_date_sk] #8
-                                                        WholeStageCodegen (4)
-                                                          Project [cs_quantity,cs_list_price]
-                                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                                    SubqueryBroadcast [d_date_sk] #4
-                                                                      BroadcastExchange #15
-                                                                        WholeStageCodegen (1)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [d_date_sk]
-                                                                                CometFilter [d_year,d_date_sk]
-                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                              InputAdapter
-                                                                ReusedExchange [d_date_sk] #15
-                                                        WholeStageCodegen (6)
-                                                          Project [ws_quantity,ws_list_price]
-                                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                                    ReusedSubquery [d_date_sk] #4
+                                              Union
+                                                WholeStageCodegen (2)
+                                                  Project [ss_quantity,ss_list_price]
+                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #2
+                                                      InputAdapter
+                                                        ReusedExchange [d_date_sk] #8
+                                                WholeStageCodegen (4)
+                                                  Project [cs_quantity,cs_list_price]
+                                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                            SubqueryBroadcast [d_date_sk] #4
+                                                              BroadcastExchange #15
+                                                                WholeStageCodegen (1)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [d_date_sk]
+                                                                        CometFilter [d_year,d_date_sk]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                      InputAdapter
+                                                        ReusedExchange [d_date_sk] #15
+                                                WholeStageCodegen (6)
+                                                  Project [ws_quantity,ws_list_price]
+                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #4
+                                                      InputAdapter
+                                                        ReusedExchange [d_date_sk] #15
+                          CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                            CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #3
+                              RowToColumnar
+                                WholeStageCodegen (25)
+                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                    Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                        Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                            BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_item_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #4
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
                                                               InputAdapter
-                                                                ReusedExchange [d_date_sk] #15
-                                      HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
-                                        InputAdapter
-                                          Exchange [i_brand_id,i_class_id,i_category_id] #3
-                                            WholeStageCodegen (25)
-                                              HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                                Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                        BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [ss_item_sk]
-                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                                                  SubqueryBroadcast [d_date_sk] #1
-                                                                    BroadcastExchange #4
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometProject [d_date_sk]
-                                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_year,d_moy,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #5
+                                                  WholeStageCodegen (11)
+                                                    Project [i_item_sk]
+                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                                        ColumnarToRow
                                                           InputAdapter
-                                                            BroadcastExchange #5
-                                                              WholeStageCodegen (11)
-                                                                Project [i_item_sk]
-                                                                  BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometFilter [i_brand_id,i_class_id,i_category_id]
-                                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #6
-                                                                        WholeStageCodegen (10)
-                                                                          BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                                            CometFilter [i_brand_id,i_class_id,i_category_id]
+                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                        InputAdapter
+                                                          BroadcastExchange #6
+                                                            WholeStageCodegen (10)
+                                                              BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometHashAggregate [brand_id,class_id,category_id]
+                                                                      CometColumnarExchange [brand_id,class_id,category_id] #7
+                                                                        RowToColumnar
+                                                                          WholeStageCodegen (6)
                                                                             HashAggregate [brand_id,class_id,category_id]
-                                                                              InputAdapter
-                                                                                Exchange [brand_id,class_id,category_id] #7
-                                                                                  WholeStageCodegen (6)
-                                                                                    HashAggregate [brand_id,class_id,category_id]
-                                                                                      Project [i_brand_id,i_class_id,i_category_id]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                              Project [i_brand_id,i_class_id,i_category_id]
+                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                  Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometFilter [ss_item_sk]
+                                                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                                              SubqueryBroadcast [d_date_sk] #2
+                                                                                                BroadcastExchange #8
+                                                                                                  WholeStageCodegen (1)
+                                                                                                    ColumnarToRow
+                                                                                                      InputAdapter
+                                                                                                        CometProject [d_date_sk]
+                                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                      InputAdapter
+                                                                                        BroadcastExchange #9
+                                                                                          WholeStageCodegen (4)
+                                                                                            BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
                                                                                               ColumnarToRow
                                                                                                 InputAdapter
-                                                                                                  CometFilter [ss_item_sk]
-                                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                                                      SubqueryBroadcast [d_date_sk] #2
-                                                                                                        BroadcastExchange #8
-                                                                                                          WholeStageCodegen (1)
+                                                                                                  CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                              InputAdapter
+                                                                                                BroadcastExchange #10
+                                                                                                  WholeStageCodegen (3)
+                                                                                                    Project [i_brand_id,i_class_id,i_category_id]
+                                                                                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                                                        Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                          BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                                                                             ColumnarToRow
                                                                                                               InputAdapter
-                                                                                                                CometProject [d_date_sk]
-                                                                                                                  CometFilter [d_year,d_date_sk]
-                                                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                              InputAdapter
-                                                                                                BroadcastExchange #9
-                                                                                                  WholeStageCodegen (4)
-                                                                                                    BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-                                                                                                      ColumnarToRow
-                                                                                                        InputAdapter
-                                                                                                          CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                                      InputAdapter
-                                                                                                        BroadcastExchange #10
-                                                                                                          WholeStageCodegen (3)
-                                                                                                            Project [i_brand_id,i_class_id,i_category_id]
-                                                                                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                                                                Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                                                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                                                                    ColumnarToRow
-                                                                                                                      InputAdapter
-                                                                                                                        CometFilter [cs_item_sk]
-                                                                                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
-                                                                                                                            ReusedSubquery [d_date_sk] #2
+                                                                                                                CometFilter [cs_item_sk]
+                                                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                                                                                                    ReusedSubquery [d_date_sk] #2
+                                                                                                            InputAdapter
+                                                                                                              BroadcastExchange #11
+                                                                                                                WholeStageCodegen (1)
+                                                                                                                  ColumnarToRow
                                                                                                                     InputAdapter
-                                                                                                                      BroadcastExchange #11
-                                                                                                                        WholeStageCodegen (1)
-                                                                                                                          ColumnarToRow
-                                                                                                                            InputAdapter
-                                                                                                                              CometFilter [i_item_sk]
-                                                                                                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                                                InputAdapter
-                                                                                                                  ReusedExchange [d_date_sk] #8
-                                                                                          InputAdapter
-                                                                                            ReusedExchange [d_date_sk] #8
-                                                                            InputAdapter
-                                                                              BroadcastExchange #12
-                                                                                WholeStageCodegen (9)
-                                                                                  Project [i_brand_id,i_class_id,i_category_id]
-                                                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                                      Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                        BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometFilter [ws_item_sk]
-                                                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                                                  ReusedSubquery [d_date_sk] #2
-                                                                                          InputAdapter
-                                                                                            ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
-                                                                                      InputAdapter
-                                                                                        ReusedExchange [d_date_sk] #8
-                                                        InputAdapter
-                                                          BroadcastExchange #13
-                                                            WholeStageCodegen (23)
-                                                              BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [i_item_sk]
-                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                                      CometFilter [i_item_sk]
+                                                                                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                        InputAdapter
+                                                                                                          ReusedExchange [d_date_sk] #8
+                                                                                  InputAdapter
+                                                                                    ReusedExchange [d_date_sk] #8
                                                                 InputAdapter
-                                                                  ReusedExchange [ss_item_sk] #5
+                                                                  BroadcastExchange #12
+                                                                    WholeStageCodegen (9)
+                                                                      Project [i_brand_id,i_class_id,i_category_id]
+                                                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                          Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                            BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometFilter [ws_item_sk]
+                                                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                                      ReusedSubquery [d_date_sk] #2
+                                                                              InputAdapter
+                                                                                ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
+                                                                          InputAdapter
+                                                                            ReusedExchange [d_date_sk] #8
+                                            InputAdapter
+                                              BroadcastExchange #13
+                                                WholeStageCodegen (23)
+                                                  BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [i_item_sk]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk] #4
-                                  WholeStageCodegen (52)
-                                    Filter [sales]
-                                      ReusedSubquery [average_sales] #3
-                                      HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(cs_quantity as decimal(10,0)) * cs_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+                                                      ReusedExchange [ss_item_sk] #5
                                         InputAdapter
-                                          Exchange [i_brand_id,i_class_id,i_category_id] #16
-                                            WholeStageCodegen (51)
-                                              HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                                Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
-                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                    Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                        BroadcastHashJoin [cs_item_sk,ss_item_sk]
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [cs_item_sk]
-                                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                                  ReusedSubquery [d_date_sk] #1
-                                                          InputAdapter
-                                                            ReusedExchange [ss_item_sk] #5
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
-                                                    InputAdapter
-                                                      ReusedExchange [d_date_sk] #4
-                                  WholeStageCodegen (78)
-                                    Filter [sales]
-                                      ReusedSubquery [average_sales] #3
-                                      HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ws_quantity as decimal(10,0)) * ws_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+                                          ReusedExchange [d_date_sk] #4
+                        CometFilter [sales]
+                          ReusedSubquery [average_sales] #3
+                          CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                            CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #16
+                              RowToColumnar
+                                WholeStageCodegen (50)
+                                  HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                    Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                        Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                          BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                            BroadcastHashJoin [cs_item_sk,ss_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [cs_item_sk]
+                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [ss_item_sk] #5
+                                            InputAdapter
+                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
                                         InputAdapter
-                                          Exchange [i_brand_id,i_class_id,i_category_id] #17
-                                            WholeStageCodegen (77)
-                                              HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                                Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                        BroadcastHashJoin [ws_item_sk,ss_item_sk]
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [ws_item_sk]
-                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                                  ReusedSubquery [d_date_sk] #1
-                                                          InputAdapter
-                                                            ReusedExchange [ss_item_sk] #5
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
-                                                    InputAdapter
-                                                      ReusedExchange [d_date_sk] #4
-                  WholeStageCodegen (161)
-                    HashAggregate [channel,i_brand_id,i_class_id,sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
-                      InputAdapter
-                        Exchange [channel,i_brand_id,i_class_id] #18
-                          WholeStageCodegen (160)
-                            HashAggregate [channel,i_brand_id,i_class_id,sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
-                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
-                                InputAdapter
-                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
-                  WholeStageCodegen (242)
-                    HashAggregate [channel,i_brand_id,sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),i_class_id,i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
-                      InputAdapter
-                        Exchange [channel,i_brand_id] #19
-                          WholeStageCodegen (241)
-                            HashAggregate [channel,i_brand_id,sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
-                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
-                                InputAdapter
-                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
-                  WholeStageCodegen (323)
-                    HashAggregate [channel,sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),i_brand_id,i_class_id,i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
-                      InputAdapter
-                        Exchange [channel] #20
-                          WholeStageCodegen (322)
-                            HashAggregate [channel,sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
-                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
-                                InputAdapter
-                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
-                  WholeStageCodegen (404)
-                    HashAggregate [sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),channel,i_brand_id,i_class_id,i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
-                      InputAdapter
-                        Exchange #21
-                          WholeStageCodegen (403)
-                            HashAggregate [sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
-                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
-                                InputAdapter
-                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                                          ReusedExchange [d_date_sk] #4
+                        CometFilter [sales]
+                          ReusedSubquery [average_sales] #3
+                          CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
+                            CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #17
+                              RowToColumnar
+                                WholeStageCodegen (75)
+                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                    Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                            BroadcastHashJoin [ws_item_sk,ss_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ws_item_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [ss_item_sk] #5
+                                            InputAdapter
+                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #4
+                CometHashAggregate [channel,i_brand_id,i_class_id,sum,isEmpty,sum]
+                  CometColumnarExchange [channel,i_brand_id,i_class_id] #18
+                    CometHashAggregate [channel,i_brand_id,i_class_id,sum_sales,number_sales]
+                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
+                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                CometHashAggregate [channel,i_brand_id,sum,isEmpty,sum]
+                  CometColumnarExchange [channel,i_brand_id] #19
+                    CometHashAggregate [channel,i_brand_id,sum_sales,number_sales]
+                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
+                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                CometHashAggregate [channel,sum,isEmpty,sum]
+                  CometColumnarExchange [channel] #20
+                    CometHashAggregate [channel,sum_sales,number_sales]
+                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
+                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                CometHashAggregate [sum,isEmpty,sum]
+                  CometColumnarExchange #21
+                    CometHashAggregate [sum_sales,number_sales]
+                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
+                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt
index 4d23b269c1..7130612b73 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt
@@ -1,157 +1,163 @@
 == Physical Plan ==
-TakeOrderedAndProject (153)
-+- Union (152)
-   :- * HashAggregate (41)
-   :  +- Exchange (40)
-   :     +- * HashAggregate (39)
-   :        +- * Project (38)
-   :           +- * BroadcastHashJoin Inner BuildRight (37)
-   :              :- * Project (32)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (31)
-   :              :     :- * Project (29)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (28)
-   :              :     :     :- * Project (23)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
-   :              :     :     :     :- * Project (17)
-   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-   :              :     :     :     :     :- * Project (10)
-   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-   :              :     :     :     :     :     :- * ColumnarToRow (3)
-   :              :     :     :     :     :     :  +- CometFilter (2)
-   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-   :              :     :     :     :     :     +- BroadcastExchange (8)
-   :              :     :     :     :     :        +- * ColumnarToRow (7)
-   :              :     :     :     :     :           +- CometProject (6)
-   :              :     :     :     :     :              +- CometFilter (5)
-   :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-   :              :     :     :     :     +- BroadcastExchange (15)
-   :              :     :     :     :        +- * ColumnarToRow (14)
-   :              :     :     :     :           +- CometProject (13)
-   :              :     :     :     :              +- CometFilter (12)
-   :              :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
-   :              :     :     :     +- BroadcastExchange (21)
-   :              :     :     :        +- * ColumnarToRow (20)
-   :              :     :     :           +- CometFilter (19)
-   :              :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
-   :              :     :     +- BroadcastExchange (27)
-   :              :     :        +- * ColumnarToRow (26)
-   :              :     :           +- CometFilter (25)
-   :              :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
-   :              :     +- ReusedExchange (30)
-   :              +- BroadcastExchange (36)
-   :                 +- * ColumnarToRow (35)
-   :                    +- CometFilter (34)
-   :                       +- CometScan parquet spark_catalog.default.item (33)
-   :- * HashAggregate (68)
-   :  +- Exchange (67)
-   :     +- * HashAggregate (66)
-   :        +- * Project (65)
-   :           +- * BroadcastHashJoin Inner BuildRight (64)
-   :              :- * Project (62)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (61)
-   :              :     :- * Project (59)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (58)
-   :              :     :     :- * Project (53)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (52)
-   :              :     :     :     :- * Project (50)
-   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (49)
-   :              :     :     :     :     :- * Project (47)
-   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (46)
-   :              :     :     :     :     :     :- * ColumnarToRow (44)
-   :              :     :     :     :     :     :  +- CometFilter (43)
-   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (42)
-   :              :     :     :     :     :     +- ReusedExchange (45)
-   :              :     :     :     :     +- ReusedExchange (48)
-   :              :     :     :     +- ReusedExchange (51)
-   :              :     :     +- BroadcastExchange (57)
-   :              :     :        +- * ColumnarToRow (56)
-   :              :     :           +- CometFilter (55)
-   :              :     :              +- CometScan parquet spark_catalog.default.customer_address (54)
-   :              :     +- ReusedExchange (60)
-   :              +- ReusedExchange (63)
-   :- * HashAggregate (96)
-   :  +- Exchange (95)
-   :     +- * HashAggregate (94)
-   :        +- * Project (93)
-   :           +- * BroadcastHashJoin Inner BuildRight (92)
-   :              :- * Project (90)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (89)
-   :              :     :- * Project (87)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (86)
-   :              :     :     :- * Project (80)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (79)
-   :              :     :     :     :- * Project (77)
-   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (76)
-   :              :     :     :     :     :- * Project (74)
-   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (73)
-   :              :     :     :     :     :     :- * ColumnarToRow (71)
-   :              :     :     :     :     :     :  +- CometFilter (70)
-   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (69)
-   :              :     :     :     :     :     +- ReusedExchange (72)
-   :              :     :     :     :     +- ReusedExchange (75)
-   :              :     :     :     +- ReusedExchange (78)
-   :              :     :     +- BroadcastExchange (85)
-   :              :     :        +- * ColumnarToRow (84)
-   :              :     :           +- CometProject (83)
-   :              :     :              +- CometFilter (82)
-   :              :     :                 +- CometScan parquet spark_catalog.default.customer_address (81)
-   :              :     +- ReusedExchange (88)
-   :              +- ReusedExchange (91)
-   :- * HashAggregate (124)
-   :  +- Exchange (123)
-   :     +- * HashAggregate (122)
-   :        +- * Project (121)
-   :           +- * BroadcastHashJoin Inner BuildRight (120)
-   :              :- * Project (118)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (117)
-   :              :     :- * Project (115)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (114)
-   :              :     :     :- * Project (108)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (107)
-   :              :     :     :     :- * Project (105)
-   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (104)
-   :              :     :     :     :     :- * Project (102)
-   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (101)
-   :              :     :     :     :     :     :- * ColumnarToRow (99)
-   :              :     :     :     :     :     :  +- CometFilter (98)
-   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (97)
-   :              :     :     :     :     :     +- ReusedExchange (100)
-   :              :     :     :     :     +- ReusedExchange (103)
-   :              :     :     :     +- ReusedExchange (106)
-   :              :     :     +- BroadcastExchange (113)
-   :              :     :        +- * ColumnarToRow (112)
-   :              :     :           +- CometProject (111)
-   :              :     :              +- CometFilter (110)
-   :              :     :                 +- CometScan parquet spark_catalog.default.customer_address (109)
-   :              :     +- ReusedExchange (116)
-   :              +- ReusedExchange (119)
-   +- * HashAggregate (151)
-      +- Exchange (150)
-         +- * HashAggregate (149)
-            +- * Project (148)
-               +- * BroadcastHashJoin Inner BuildRight (147)
-                  :- * Project (142)
-                  :  +- * BroadcastHashJoin Inner BuildRight (141)
-                  :     :- * Project (139)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (138)
-                  :     :     :- * Project (136)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (135)
-                  :     :     :     :- * Project (133)
-                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (132)
-                  :     :     :     :     :- * Project (130)
-                  :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (129)
-                  :     :     :     :     :     :- * ColumnarToRow (127)
-                  :     :     :     :     :     :  +- CometFilter (126)
-                  :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (125)
-                  :     :     :     :     :     +- ReusedExchange (128)
-                  :     :     :     :     +- ReusedExchange (131)
-                  :     :     :     +- ReusedExchange (134)
-                  :     :     +- ReusedExchange (137)
-                  :     +- ReusedExchange (140)
-                  +- BroadcastExchange (146)
-                     +- * ColumnarToRow (145)
-                        +- CometFilter (144)
-                           +- CometScan parquet spark_catalog.default.item (143)
+* ColumnarToRow (159)
++- CometTakeOrderedAndProject (158)
+   +- CometUnion (157)
+      :- CometHashAggregate (42)
+      :  +- CometColumnarExchange (41)
+      :     +- RowToColumnar (40)
+      :        +- * HashAggregate (39)
+      :           +- * Project (38)
+      :              +- * BroadcastHashJoin Inner BuildRight (37)
+      :                 :- * Project (32)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (31)
+      :                 :     :- * Project (29)
+      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (28)
+      :                 :     :     :- * Project (23)
+      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
+      :                 :     :     :     :- * Project (17)
+      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+      :                 :     :     :     :     :- * Project (10)
+      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+      :                 :     :     :     :     :     :- * ColumnarToRow (3)
+      :                 :     :     :     :     :     :  +- CometFilter (2)
+      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+      :                 :     :     :     :     :     +- BroadcastExchange (8)
+      :                 :     :     :     :     :        +- * ColumnarToRow (7)
+      :                 :     :     :     :     :           +- CometProject (6)
+      :                 :     :     :     :     :              +- CometFilter (5)
+      :                 :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+      :                 :     :     :     :     +- BroadcastExchange (15)
+      :                 :     :     :     :        +- * ColumnarToRow (14)
+      :                 :     :     :     :           +- CometProject (13)
+      :                 :     :     :     :              +- CometFilter (12)
+      :                 :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
+      :                 :     :     :     +- BroadcastExchange (21)
+      :                 :     :     :        +- * ColumnarToRow (20)
+      :                 :     :     :           +- CometFilter (19)
+      :                 :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
+      :                 :     :     +- BroadcastExchange (27)
+      :                 :     :        +- * ColumnarToRow (26)
+      :                 :     :           +- CometFilter (25)
+      :                 :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
+      :                 :     +- ReusedExchange (30)
+      :                 +- BroadcastExchange (36)
+      :                    +- * ColumnarToRow (35)
+      :                       +- CometFilter (34)
+      :                          +- CometScan parquet spark_catalog.default.item (33)
+      :- CometHashAggregate (70)
+      :  +- CometColumnarExchange (69)
+      :     +- RowToColumnar (68)
+      :        +- * HashAggregate (67)
+      :           +- * Project (66)
+      :              +- * BroadcastHashJoin Inner BuildRight (65)
+      :                 :- * Project (63)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (62)
+      :                 :     :- * Project (60)
+      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (59)
+      :                 :     :     :- * Project (54)
+      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
+      :                 :     :     :     :- * Project (51)
+      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (50)
+      :                 :     :     :     :     :- * Project (48)
+      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (47)
+      :                 :     :     :     :     :     :- * ColumnarToRow (45)
+      :                 :     :     :     :     :     :  +- CometFilter (44)
+      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (43)
+      :                 :     :     :     :     :     +- ReusedExchange (46)
+      :                 :     :     :     :     +- ReusedExchange (49)
+      :                 :     :     :     +- ReusedExchange (52)
+      :                 :     :     +- BroadcastExchange (58)
+      :                 :     :        +- * ColumnarToRow (57)
+      :                 :     :           +- CometFilter (56)
+      :                 :     :              +- CometScan parquet spark_catalog.default.customer_address (55)
+      :                 :     +- ReusedExchange (61)
+      :                 +- ReusedExchange (64)
+      :- CometHashAggregate (99)
+      :  +- CometColumnarExchange (98)
+      :     +- RowToColumnar (97)
+      :        +- * HashAggregate (96)
+      :           +- * Project (95)
+      :              +- * BroadcastHashJoin Inner BuildRight (94)
+      :                 :- * Project (92)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (91)
+      :                 :     :- * Project (89)
+      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (88)
+      :                 :     :     :- * Project (82)
+      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (81)
+      :                 :     :     :     :- * Project (79)
+      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (78)
+      :                 :     :     :     :     :- * Project (76)
+      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (75)
+      :                 :     :     :     :     :     :- * ColumnarToRow (73)
+      :                 :     :     :     :     :     :  +- CometFilter (72)
+      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (71)
+      :                 :     :     :     :     :     +- ReusedExchange (74)
+      :                 :     :     :     :     +- ReusedExchange (77)
+      :                 :     :     :     +- ReusedExchange (80)
+      :                 :     :     +- BroadcastExchange (87)
+      :                 :     :        +- * ColumnarToRow (86)
+      :                 :     :           +- CometProject (85)
+      :                 :     :              +- CometFilter (84)
+      :                 :     :                 +- CometScan parquet spark_catalog.default.customer_address (83)
+      :                 :     +- ReusedExchange (90)
+      :                 +- ReusedExchange (93)
+      :- CometHashAggregate (128)
+      :  +- CometColumnarExchange (127)
+      :     +- RowToColumnar (126)
+      :        +- * HashAggregate (125)
+      :           +- * Project (124)
+      :              +- * BroadcastHashJoin Inner BuildRight (123)
+      :                 :- * Project (121)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (120)
+      :                 :     :- * Project (118)
+      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (117)
+      :                 :     :     :- * Project (111)
+      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (110)
+      :                 :     :     :     :- * Project (108)
+      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (107)
+      :                 :     :     :     :     :- * Project (105)
+      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (104)
+      :                 :     :     :     :     :     :- * ColumnarToRow (102)
+      :                 :     :     :     :     :     :  +- CometFilter (101)
+      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (100)
+      :                 :     :     :     :     :     +- ReusedExchange (103)
+      :                 :     :     :     :     +- ReusedExchange (106)
+      :                 :     :     :     +- ReusedExchange (109)
+      :                 :     :     +- BroadcastExchange (116)
+      :                 :     :        +- * ColumnarToRow (115)
+      :                 :     :           +- CometProject (114)
+      :                 :     :              +- CometFilter (113)
+      :                 :     :                 +- CometScan parquet spark_catalog.default.customer_address (112)
+      :                 :     +- ReusedExchange (119)
+      :                 +- ReusedExchange (122)
+      +- CometHashAggregate (156)
+         +- CometColumnarExchange (155)
+            +- RowToColumnar (154)
+               +- * HashAggregate (153)
+                  +- * Project (152)
+                     +- * BroadcastHashJoin Inner BuildRight (151)
+                        :- * Project (146)
+                        :  +- * BroadcastHashJoin Inner BuildRight (145)
+                        :     :- * Project (143)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (142)
+                        :     :     :- * Project (140)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (139)
+                        :     :     :     :- * Project (137)
+                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (136)
+                        :     :     :     :     :- * Project (134)
+                        :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (133)
+                        :     :     :     :     :     :- * ColumnarToRow (131)
+                        :     :     :     :     :     :  +- CometFilter (130)
+                        :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (129)
+                        :     :     :     :     :     +- ReusedExchange (132)
+                        :     :     :     :     +- ReusedExchange (135)
+                        :     :     :     +- ReusedExchange (138)
+                        :     :     +- ReusedExchange (141)
+                        :     +- ReusedExchange (144)
+                        +- BroadcastExchange (150)
+                           +- * ColumnarToRow (149)
+                              +- CometFilter (148)
+                                 +- CometScan parquet spark_catalog.default.item (147)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -289,7 +295,7 @@ Join condition: None
 Output [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_county#22, ca_state#23, ca_country#24]
 Input [14]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_county#22, ca_state#23, ca_country#24]
 
-(30) ReusedExchange [Reuses operator id: 158]
+(30) ReusedExchange [Reuses operator id: 164]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 7]
@@ -337,68 +343,69 @@ Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30)
 Aggregate Attributes [14]: [sum#35, count#36, sum#37, count#38, sum#39, count#40, sum#41, count#42, sum#43, count#44, sum#45, count#46, sum#47, count#48]
 Results [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
 
-(40) Exchange
+(40) RowToColumnar
 Input [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
-Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, ca_county#22, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) HashAggregate [codegen id : 8]
+(41) CometColumnarExchange
+Input [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
+Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, ca_county#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometHashAggregate
 Input [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
 Keys [4]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
-Aggregate Attributes [7]: [avg(agg1#28)#63, avg(agg2#29)#64, avg(agg3#30)#65, avg(agg4#31)#66, avg(agg5#32)#67, avg(agg6#33)#68, avg(agg7#34)#69]
-Results [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, avg(agg1#28)#63 AS agg1#70, avg(agg2#29)#64 AS agg2#71, avg(agg3#30)#65 AS agg3#72, avg(agg4#31)#66 AS agg4#73, avg(agg5#32)#67 AS agg5#74, avg(agg6#33)#68 AS agg6#75, avg(agg7#34)#69 AS agg7#76]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#77)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#63)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(43) CometFilter
+(44) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(44) ColumnarToRow [codegen id : 15]
+(45) ColumnarToRow [codegen id : 14]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(45) ReusedExchange [Reuses operator id: 8]
+(46) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(46) BroadcastHashJoin [codegen id : 15]
+(47) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 15]
+(48) Project [codegen id : 14]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(48) ReusedExchange [Reuses operator id: 15]
+(49) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(49) BroadcastHashJoin [codegen id : 15]
+(50) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 15]
+(51) Project [codegen id : 14]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(51) ReusedExchange [Reuses operator id: 21]
+(52) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(52) BroadcastHashJoin [codegen id : 15]
+(53) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 15]
+(54) Project [codegen id : 14]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
@@ -409,122 +416,123 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [In(ca_state, [AL,MS,NC,ND,OK,TN,WI]), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string,ca_country:string>
 
-(55) CometFilter
+(56) CometFilter
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Condition : (ca_state#23 IN (ND,WI,AL,NC,OK,MS,TN) AND isnotnull(ca_address_sk#21))
 
-(56) ColumnarToRow [codegen id : 12]
+(57) ColumnarToRow [codegen id : 11]
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 
-(57) BroadcastExchange
+(58) BroadcastExchange
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(58) BroadcastHashJoin [codegen id : 15]
+(59) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 15]
+(60) Project [codegen id : 14]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24]
 Input [13]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_state#23, ca_country#24]
 
-(60) ReusedExchange [Reuses operator id: 158]
+(61) ReusedExchange [Reuses operator id: 164]
 Output [1]: [d_date_sk#25]
 
-(61) BroadcastHashJoin [codegen id : 15]
+(62) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 15]
+(63) Project [codegen id : 14]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24, d_date_sk#25]
 
-(63) ReusedExchange [Reuses operator id: 36]
+(64) ReusedExchange [Reuses operator id: 36]
 Output [2]: [i_item_sk#26, i_item_id#27]
 
-(64) BroadcastHashJoin [codegen id : 15]
+(65) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(65) Project [codegen id : 15]
+(66) Project [codegen id : 14]
 Output [10]: [i_item_id#27, ca_country#24, ca_state#23, cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24, i_item_sk#26, i_item_id#27]
 
-(66) HashAggregate [codegen id : 15]
+(67) HashAggregate [codegen id : 14]
 Input [10]: [i_item_id#27, ca_country#24, ca_state#23, agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys [3]: [i_item_id#27, ca_country#24, ca_state#23]
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
-Results [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#92, count#93, sum#94, count#95, sum#96, count#97, sum#98, count#99, sum#100, count#101, sum#102, count#103, sum#104, count#105]
+Aggregate Attributes [14]: [sum#64, count#65, sum#66, count#67, sum#68, count#69, sum#70, count#71, sum#72, count#73, sum#74, count#75, sum#76, count#77]
+Results [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+
+(68) RowToColumnar
+Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
 
-(67) Exchange
-Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#92, count#93, sum#94, count#95, sum#96, count#97, sum#98, count#99, sum#100, count#101, sum#102, count#103, sum#104, count#105]
-Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(69) CometColumnarExchange
+Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(68) HashAggregate [codegen id : 16]
-Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#92, count#93, sum#94, count#95, sum#96, count#97, sum#98, count#99, sum#100, count#101, sum#102, count#103, sum#104, count#105]
+(70) CometHashAggregate
+Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
 Keys [3]: [i_item_id#27, ca_country#24, ca_state#23]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
-Aggregate Attributes [7]: [avg(agg1#28)#106, avg(agg2#29)#107, avg(agg3#30)#108, avg(agg4#31)#109, avg(agg5#32)#110, avg(agg6#33)#111, avg(agg7#34)#112]
-Results [11]: [i_item_id#27, ca_country#24, ca_state#23, null AS county#113, avg(agg1#28)#106 AS agg1#114, avg(agg2#29)#107 AS agg2#115, avg(agg3#30)#108 AS agg3#116, avg(agg4#31)#109 AS agg4#117, avg(agg5#32)#110 AS agg5#118, avg(agg6#33)#111 AS agg6#119, avg(agg7#34)#112 AS agg7#120]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#121)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#92)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(70) CometFilter
+(72) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(71) ColumnarToRow [codegen id : 23]
+(73) ColumnarToRow [codegen id : 21]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(72) ReusedExchange [Reuses operator id: 8]
+(74) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(73) BroadcastHashJoin [codegen id : 23]
+(75) BroadcastHashJoin [codegen id : 21]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(74) Project [codegen id : 23]
+(76) Project [codegen id : 21]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(75) ReusedExchange [Reuses operator id: 15]
+(77) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(76) BroadcastHashJoin [codegen id : 23]
+(78) BroadcastHashJoin [codegen id : 21]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 23]
+(79) Project [codegen id : 21]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(78) ReusedExchange [Reuses operator id: 21]
+(80) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(79) BroadcastHashJoin [codegen id : 23]
+(81) BroadcastHashJoin [codegen id : 21]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(80) Project [codegen id : 23]
+(82) Project [codegen id : 21]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
@@ -535,126 +543,127 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [In(ca_state, [AL,MS,NC,ND,OK,TN,WI]), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string,ca_country:string>
 
-(82) CometFilter
+(84) CometFilter
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Condition : (ca_state#23 IN (ND,WI,AL,NC,OK,MS,TN) AND isnotnull(ca_address_sk#21))
 
-(83) CometProject
+(85) CometProject
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Arguments: [ca_address_sk#21, ca_country#24], [ca_address_sk#21, ca_country#24]
 
-(84) ColumnarToRow [codegen id : 20]
+(86) ColumnarToRow [codegen id : 18]
 Input [2]: [ca_address_sk#21, ca_country#24]
 
-(85) BroadcastExchange
+(87) BroadcastExchange
 Input [2]: [ca_address_sk#21, ca_country#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-(86) BroadcastHashJoin [codegen id : 23]
+(88) BroadcastHashJoin [codegen id : 21]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 23]
+(89) Project [codegen id : 21]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_country#24]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_country#24]
 
-(88) ReusedExchange [Reuses operator id: 158]
+(90) ReusedExchange [Reuses operator id: 164]
 Output [1]: [d_date_sk#25]
 
-(89) BroadcastHashJoin [codegen id : 23]
+(91) BroadcastHashJoin [codegen id : 21]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(90) Project [codegen id : 23]
+(92) Project [codegen id : 21]
 Output [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_country#24]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_country#24, d_date_sk#25]
 
-(91) ReusedExchange [Reuses operator id: 36]
+(93) ReusedExchange [Reuses operator id: 36]
 Output [2]: [i_item_sk#26, i_item_id#27]
 
-(92) BroadcastHashJoin [codegen id : 23]
+(94) BroadcastHashJoin [codegen id : 21]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(93) Project [codegen id : 23]
+(95) Project [codegen id : 21]
 Output [9]: [i_item_id#27, ca_country#24, cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_country#24, i_item_sk#26, i_item_id#27]
 
-(94) HashAggregate [codegen id : 23]
+(96) HashAggregate [codegen id : 21]
 Input [9]: [i_item_id#27, ca_country#24, agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys [2]: [i_item_id#27, ca_country#24]
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#122, count#123, sum#124, count#125, sum#126, count#127, sum#128, count#129, sum#130, count#131, sum#132, count#133, sum#134, count#135]
-Results [16]: [i_item_id#27, ca_country#24, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+Aggregate Attributes [14]: [sum#93, count#94, sum#95, count#96, sum#97, count#98, sum#99, count#100, sum#101, count#102, sum#103, count#104, sum#105, count#106]
+Results [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
+
+(97) RowToColumnar
+Input [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
 
-(95) Exchange
-Input [16]: [i_item_id#27, ca_country#24, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
-Arguments: hashpartitioning(i_item_id#27, ca_country#24, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(98) CometColumnarExchange
+Input [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
+Arguments: hashpartitioning(i_item_id#27, ca_country#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(96) HashAggregate [codegen id : 24]
-Input [16]: [i_item_id#27, ca_country#24, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+(99) CometHashAggregate
+Input [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
 Keys [2]: [i_item_id#27, ca_country#24]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
-Aggregate Attributes [7]: [avg(agg1#28)#150, avg(agg2#29)#151, avg(agg3#30)#152, avg(agg4#31)#153, avg(agg5#32)#154, avg(agg6#33)#155, avg(agg7#34)#156]
-Results [11]: [i_item_id#27, ca_country#24, null AS ca_state#157, null AS county#158, avg(agg1#28)#150 AS agg1#159, avg(agg2#29)#151 AS agg2#160, avg(agg3#30)#152 AS agg3#161, avg(agg4#31)#153 AS agg4#162, avg(agg5#32)#154 AS agg5#163, avg(agg6#33)#155 AS agg6#164, avg(agg7#34)#156 AS agg7#165]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#166)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#121)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(98) CometFilter
+(101) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(99) ColumnarToRow [codegen id : 31]
+(102) ColumnarToRow [codegen id : 28]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(100) ReusedExchange [Reuses operator id: 8]
+(103) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(101) BroadcastHashJoin [codegen id : 31]
+(104) BroadcastHashJoin [codegen id : 28]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(102) Project [codegen id : 31]
+(105) Project [codegen id : 28]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(103) ReusedExchange [Reuses operator id: 15]
+(106) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(104) BroadcastHashJoin [codegen id : 31]
+(107) BroadcastHashJoin [codegen id : 28]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(105) Project [codegen id : 31]
+(108) Project [codegen id : 28]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(106) ReusedExchange [Reuses operator id: 21]
+(109) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(107) BroadcastHashJoin [codegen id : 31]
+(110) BroadcastHashJoin [codegen id : 28]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(108) Project [codegen id : 31]
+(111) Project [codegen id : 28]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
@@ -665,152 +674,153 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [In(ca_state, [AL,MS,NC,ND,OK,TN,WI]), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string>
 
-(110) CometFilter
+(113) CometFilter
 Input [2]: [ca_address_sk#21, ca_state#23]
 Condition : (ca_state#23 IN (ND,WI,AL,NC,OK,MS,TN) AND isnotnull(ca_address_sk#21))
 
-(111) CometProject
+(114) CometProject
 Input [2]: [ca_address_sk#21, ca_state#23]
 Arguments: [ca_address_sk#21], [ca_address_sk#21]
 
-(112) ColumnarToRow [codegen id : 28]
+(115) ColumnarToRow [codegen id : 25]
 Input [1]: [ca_address_sk#21]
 
-(113) BroadcastExchange
+(116) BroadcastExchange
 Input [1]: [ca_address_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(114) BroadcastHashJoin [codegen id : 31]
+(117) BroadcastHashJoin [codegen id : 28]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(115) Project [codegen id : 31]
+(118) Project [codegen id : 28]
 Output [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21]
 
-(116) ReusedExchange [Reuses operator id: 158]
+(119) ReusedExchange [Reuses operator id: 164]
 Output [1]: [d_date_sk#25]
 
-(117) BroadcastHashJoin [codegen id : 31]
+(120) BroadcastHashJoin [codegen id : 28]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(118) Project [codegen id : 31]
+(121) Project [codegen id : 28]
 Output [8]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19]
 Input [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, d_date_sk#25]
 
-(119) ReusedExchange [Reuses operator id: 36]
+(122) ReusedExchange [Reuses operator id: 36]
 Output [2]: [i_item_sk#26, i_item_id#27]
 
-(120) BroadcastHashJoin [codegen id : 31]
+(123) BroadcastHashJoin [codegen id : 28]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(121) Project [codegen id : 31]
+(124) Project [codegen id : 28]
 Output [8]: [i_item_id#27, cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, i_item_sk#26, i_item_id#27]
 
-(122) HashAggregate [codegen id : 31]
+(125) HashAggregate [codegen id : 28]
 Input [8]: [i_item_id#27, agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys [1]: [i_item_id#27]
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178, sum#179, count#180]
-Results [15]: [i_item_id#27, sum#181, count#182, sum#183, count#184, sum#185, count#186, sum#187, count#188, sum#189, count#190, sum#191, count#192, sum#193, count#194]
+Aggregate Attributes [14]: [sum#122, count#123, sum#124, count#125, sum#126, count#127, sum#128, count#129, sum#130, count#131, sum#132, count#133, sum#134, count#135]
+Results [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+
+(126) RowToColumnar
+Input [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
 
-(123) Exchange
-Input [15]: [i_item_id#27, sum#181, count#182, sum#183, count#184, sum#185, count#186, sum#187, count#188, sum#189, count#190, sum#191, count#192, sum#193, count#194]
-Arguments: hashpartitioning(i_item_id#27, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+(127) CometColumnarExchange
+Input [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+Arguments: hashpartitioning(i_item_id#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(124) HashAggregate [codegen id : 32]
-Input [15]: [i_item_id#27, sum#181, count#182, sum#183, count#184, sum#185, count#186, sum#187, count#188, sum#189, count#190, sum#191, count#192, sum#193, count#194]
+(128) CometHashAggregate
+Input [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
 Keys [1]: [i_item_id#27]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
-Aggregate Attributes [7]: [avg(agg1#28)#195, avg(agg2#29)#196, avg(agg3#30)#197, avg(agg4#31)#198, avg(agg5#32)#199, avg(agg6#33)#200, avg(agg7#34)#201]
-Results [11]: [i_item_id#27, null AS ca_country#202, null AS ca_state#203, null AS county#204, avg(agg1#28)#195 AS agg1#205, avg(agg2#29)#196 AS agg2#206, avg(agg3#30)#197 AS agg3#207, avg(agg4#31)#198 AS agg4#208, avg(agg5#32)#199 AS agg5#209, avg(agg6#33)#200 AS agg6#210, avg(agg7#34)#201 AS agg7#211]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#212)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#150)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(126) CometFilter
+(130) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(127) ColumnarToRow [codegen id : 39]
+(131) ColumnarToRow [codegen id : 35]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(128) ReusedExchange [Reuses operator id: 8]
+(132) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(129) BroadcastHashJoin [codegen id : 39]
+(133) BroadcastHashJoin [codegen id : 35]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(130) Project [codegen id : 39]
+(134) Project [codegen id : 35]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(131) ReusedExchange [Reuses operator id: 15]
+(135) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(132) BroadcastHashJoin [codegen id : 39]
+(136) BroadcastHashJoin [codegen id : 35]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(133) Project [codegen id : 39]
+(137) Project [codegen id : 35]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(134) ReusedExchange [Reuses operator id: 21]
+(138) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(135) BroadcastHashJoin [codegen id : 39]
+(139) BroadcastHashJoin [codegen id : 35]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(136) Project [codegen id : 39]
+(140) Project [codegen id : 35]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
-(137) ReusedExchange [Reuses operator id: 113]
+(141) ReusedExchange [Reuses operator id: 116]
 Output [1]: [ca_address_sk#21]
 
-(138) BroadcastHashJoin [codegen id : 39]
+(142) BroadcastHashJoin [codegen id : 35]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(139) Project [codegen id : 39]
+(143) Project [codegen id : 35]
 Output [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21]
 
-(140) ReusedExchange [Reuses operator id: 158]
+(144) ReusedExchange [Reuses operator id: 164]
 Output [1]: [d_date_sk#25]
 
-(141) BroadcastHashJoin [codegen id : 39]
+(145) BroadcastHashJoin [codegen id : 35]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(142) Project [codegen id : 39]
+(146) Project [codegen id : 35]
 Output [8]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19]
 Input [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, d_date_sk#25]
 
@@ -821,89 +831,98 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int>
 
-(144) CometFilter
+(148) CometFilter
 Input [1]: [i_item_sk#26]
 Condition : isnotnull(i_item_sk#26)
 
-(145) ColumnarToRow [codegen id : 38]
+(149) ColumnarToRow [codegen id : 34]
 Input [1]: [i_item_sk#26]
 
-(146) BroadcastExchange
+(150) BroadcastExchange
 Input [1]: [i_item_sk#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(147) BroadcastHashJoin [codegen id : 39]
+(151) BroadcastHashJoin [codegen id : 35]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(148) Project [codegen id : 39]
+(152) Project [codegen id : 35]
 Output [7]: [cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, i_item_sk#26]
 
-(149) HashAggregate [codegen id : 39]
+(153) HashAggregate [codegen id : 35]
 Input [7]: [agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys: []
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#213, count#214, sum#215, count#216, sum#217, count#218, sum#219, count#220, sum#221, count#222, sum#223, count#224, sum#225, count#226]
-Results [14]: [sum#227, count#228, sum#229, count#230, sum#231, count#232, sum#233, count#234, sum#235, count#236, sum#237, count#238, sum#239, count#240]
+Aggregate Attributes [14]: [sum#151, count#152, sum#153, count#154, sum#155, count#156, sum#157, count#158, sum#159, count#160, sum#161, count#162, sum#163, count#164]
+Results [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
 
-(150) Exchange
-Input [14]: [sum#227, count#228, sum#229, count#230, sum#231, count#232, sum#233, count#234, sum#235, count#236, sum#237, count#238, sum#239, count#240]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=14]
+(154) RowToColumnar
+Input [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
 
-(151) HashAggregate [codegen id : 40]
-Input [14]: [sum#227, count#228, sum#229, count#230, sum#231, count#232, sum#233, count#234, sum#235, count#236, sum#237, count#238, sum#239, count#240]
+(155) CometColumnarExchange
+Input [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+
+(156) CometHashAggregate
+Input [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
 Keys: []
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
-Aggregate Attributes [7]: [avg(agg1#28)#241, avg(agg2#29)#242, avg(agg3#30)#243, avg(agg4#31)#244, avg(agg5#32)#245, avg(agg6#33)#246, avg(agg7#34)#247]
-Results [11]: [null AS i_item_id#248, null AS ca_country#249, null AS ca_state#250, null AS county#251, avg(agg1#28)#241 AS agg1#252, avg(agg2#29)#242 AS agg2#253, avg(agg3#30)#243 AS agg3#254, avg(agg4#31)#244 AS agg4#255, avg(agg5#32)#245 AS agg5#256, avg(agg6#33)#246 AS agg6#257, avg(agg7#34)#247 AS agg7#258]
 
-(152) Union
+(157) CometUnion
+Child 0 Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
+Child 1 Input [11]: [i_item_id#27, ca_country#24, ca_state#23, county#186, agg1#187, agg2#188, agg3#189, agg4#190, agg5#191, agg6#192, agg7#193]
+Child 2 Input [11]: [i_item_id#27, ca_country#24, ca_state#194, county#195, agg1#196, agg2#197, agg3#198, agg4#199, agg5#200, agg6#201, agg7#202]
+Child 3 Input [11]: [i_item_id#27, ca_country#203, ca_state#204, county#205, agg1#206, agg2#207, agg3#208, agg4#209, agg5#210, agg6#211, agg7#212]
+Child 4 Input [11]: [i_item_id#213, ca_country#214, ca_state#215, county#216, agg1#217, agg2#218, agg3#219, agg4#220, agg5#221, agg6#222, agg7#223]
+
+(158) CometTakeOrderedAndProject
+Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_country#24 ASC NULLS FIRST,ca_state#23 ASC NULLS FIRST,ca_county#22 ASC NULLS FIRST,i_item_id#27 ASC NULLS FIRST], output=[i_item_id#27,ca_country#24,ca_state#23,ca_county#22,agg1#179,agg2#180,agg3#181,agg4#182,agg5#183,agg6#184,agg7#185]), 100, [ca_country#24 ASC NULLS FIRST, ca_state#23 ASC NULLS FIRST, ca_county#22 ASC NULLS FIRST, i_item_id#27 ASC NULLS FIRST], [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
 
-(153) TakeOrderedAndProject
-Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#70, agg2#71, agg3#72, agg4#73, agg5#74, agg6#75, agg7#76]
-Arguments: 100, [ca_country#24 ASC NULLS FIRST, ca_state#23 ASC NULLS FIRST, ca_county#22 ASC NULLS FIRST, i_item_id#27 ASC NULLS FIRST], [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#70, agg2#71, agg3#72, agg4#73, agg5#74, agg6#75, agg7#76]
+(159) ColumnarToRow [codegen id : 36]
+Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (158)
-+- * ColumnarToRow (157)
-   +- CometProject (156)
-      +- CometFilter (155)
-         +- CometScan parquet spark_catalog.default.date_dim (154)
+BroadcastExchange (164)
++- * ColumnarToRow (163)
+   +- CometProject (162)
+      +- CometFilter (161)
+         +- CometScan parquet spark_catalog.default.date_dim (160)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#259]
+Output [2]: [d_date_sk#25, d_year#224]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(155) CometFilter
-Input [2]: [d_date_sk#25, d_year#259]
-Condition : ((isnotnull(d_year#259) AND (d_year#259 = 2001)) AND isnotnull(d_date_sk#25))
+(161) CometFilter
+Input [2]: [d_date_sk#25, d_year#224]
+Condition : ((isnotnull(d_year#224) AND (d_year#224 = 2001)) AND isnotnull(d_date_sk#25))
 
-(156) CometProject
-Input [2]: [d_date_sk#25, d_year#259]
+(162) CometProject
+Input [2]: [d_date_sk#25, d_year#224]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(157) ColumnarToRow [codegen id : 1]
+(163) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(158) BroadcastExchange
+(164) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
-Subquery:2 Hosting operator id = 42 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:2 Hosting operator id = 43 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
-Subquery:3 Hosting operator id = 69 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:3 Hosting operator id = 71 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
-Subquery:4 Hosting operator id = 97 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:4 Hosting operator id = 100 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
-Subquery:5 Hosting operator id = 125 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:5 Hosting operator id = 129 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt
index f02809572c..e0eebcd657 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt
@@ -1,233 +1,231 @@
-TakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
-  Union
-    WholeStageCodegen (8)
-      HashAggregate [i_item_id,ca_country,ca_state,ca_county,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange [i_item_id,ca_country,ca_state,ca_county] #1
-            WholeStageCodegen (7)
-              HashAggregate [i_item_id,ca_country,ca_state,ca_county,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [i_item_id,ca_country,ca_state,ca_county,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+WholeStageCodegen (36)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
+        CometUnion
+          CometHashAggregate [i_item_id,ca_country,ca_state,ca_county,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange [i_item_id,ca_country,ca_state,ca_county] #1
+              RowToColumnar
+                WholeStageCodegen (7)
+                  HashAggregate [i_item_id,ca_country,ca_state,ca_county,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [i_item_id,ca_country,ca_state,ca_county,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #2
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                            InputAdapter
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [cd_demo_sk,cd_dep_count]
+                                                        CometFilter [cd_gender,cd_education_status,cd_demo_sk]
+                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
                                         InputAdapter
-                                          BroadcastExchange #3
-                                            WholeStageCodegen (1)
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometProject [cd_demo_sk,cd_dep_count]
-                                                    CometFilter [cd_gender,cd_education_status,cd_demo_sk]
-                                                      CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
+                                                  CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                                    CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
                                     InputAdapter
-                                      BroadcastExchange #4
-                                        WholeStageCodegen (2)
+                                      BroadcastExchange #5
+                                        WholeStageCodegen (3)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                                CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
+                                              CometFilter [cd_demo_sk]
+                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
                                 InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (3)
+                                  BroadcastExchange #6
+                                    WholeStageCodegen (4)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [cd_demo_sk]
-                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
+                                          CometFilter [ca_state,ca_address_sk]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
                             InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (4)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ca_state,ca_address_sk]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (6)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-    WholeStageCodegen (16)
-      HashAggregate [i_item_id,ca_country,ca_state,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange [i_item_id,ca_country,ca_state] #8
-            WholeStageCodegen (15)
-              HashAggregate [i_item_id,ca_country,ca_state,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [i_item_id,ca_country,ca_state,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_state,ca_country]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_state,ca_country]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                          BroadcastExchange #7
+                            WholeStageCodegen (6)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+          CometHashAggregate [i_item_id,ca_country,ca_state,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange [i_item_id,ca_country,ca_state] #8
+              RowToColumnar
+                WholeStageCodegen (14)
+                  HashAggregate [i_item_id,ca_country,ca_state,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [i_item_id,ca_country,ca_state,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_state,ca_country]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_state,ca_country]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                         InputAdapter
-                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                     InputAdapter
-                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                      ReusedExchange [cd_demo_sk] #5
                                 InputAdapter
-                                  ReusedExchange [cd_demo_sk] #5
+                                  BroadcastExchange #9
+                                    WholeStageCodegen (11)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ca_state,ca_address_sk]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                             InputAdapter
-                              BroadcastExchange #9
-                                WholeStageCodegen (12)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ca_state,ca_address_sk]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
-                    InputAdapter
-                      ReusedExchange [i_item_sk,i_item_id] #7
-    WholeStageCodegen (24)
-      HashAggregate [i_item_id,ca_country,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),ca_state,county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange [i_item_id,ca_country] #10
-            WholeStageCodegen (23)
-              HashAggregate [i_item_id,ca_country,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [i_item_id,ca_country,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_country]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_country]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                          ReusedExchange [i_item_sk,i_item_id] #7
+          CometHashAggregate [i_item_id,ca_country,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange [i_item_id,ca_country] #10
+              RowToColumnar
+                WholeStageCodegen (21)
+                  HashAggregate [i_item_id,ca_country,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [i_item_id,ca_country,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_country]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_country]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                         InputAdapter
-                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                     InputAdapter
-                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                      ReusedExchange [cd_demo_sk] #5
                                 InputAdapter
-                                  ReusedExchange [cd_demo_sk] #5
+                                  BroadcastExchange #11
+                                    WholeStageCodegen (18)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [ca_address_sk,ca_country]
+                                            CometFilter [ca_state,ca_address_sk]
+                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                             InputAdapter
-                              BroadcastExchange #11
-                                WholeStageCodegen (20)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [ca_address_sk,ca_country]
-                                        CometFilter [ca_state,ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
-                    InputAdapter
-                      ReusedExchange [i_item_sk,i_item_id] #7
-    WholeStageCodegen (32)
-      HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),ca_country,ca_state,county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange [i_item_id] #12
-            WholeStageCodegen (31)
-              HashAggregate [i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                          ReusedExchange [i_item_sk,i_item_id] #7
+          CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange [i_item_id] #12
+              RowToColumnar
+                WholeStageCodegen (28)
+                  HashAggregate [i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                         InputAdapter
-                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                     InputAdapter
-                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                      ReusedExchange [cd_demo_sk] #5
                                 InputAdapter
-                                  ReusedExchange [cd_demo_sk] #5
+                                  BroadcastExchange #13
+                                    WholeStageCodegen (25)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [ca_address_sk]
+                                            CometFilter [ca_state,ca_address_sk]
+                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                             InputAdapter
-                              BroadcastExchange #13
-                                WholeStageCodegen (28)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [ca_address_sk]
-                                        CometFilter [ca_state,ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
-                    InputAdapter
-                      ReusedExchange [i_item_sk,i_item_id] #7
-    WholeStageCodegen (40)
-      HashAggregate [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),i_item_id,ca_country,ca_state,county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange #14
-            WholeStageCodegen (39)
-              HashAggregate [agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                  BroadcastHashJoin [cs_item_sk,i_item_sk]
-                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                          ReusedExchange [i_item_sk,i_item_id] #7
+          CometHashAggregate [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange #14
+              RowToColumnar
+                WholeStageCodegen (35)
+                  HashAggregate [agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
+                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                         InputAdapter
-                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                     InputAdapter
-                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                      ReusedExchange [cd_demo_sk] #5
                                 InputAdapter
-                                  ReusedExchange [cd_demo_sk] #5
+                                  ReusedExchange [ca_address_sk] #13
                             InputAdapter
-                              ReusedExchange [ca_address_sk] #13
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          ReusedExchange [d_date_sk] #2
-                    InputAdapter
-                      BroadcastExchange #15
-                        WholeStageCodegen (38)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk]
+                          BroadcastExchange #15
+                            WholeStageCodegen (34)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt
index ad52796edc..f62cbd1f86 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt
@@ -1,24 +1,26 @@
 == Physical Plan ==
-TakeOrderedAndProject (20)
-+- * Project (19)
-   +- Window (18)
-      +- * Sort (17)
-         +- Exchange (16)
-            +- * HashAggregate (15)
-               +- Exchange (14)
-                  +- * HashAggregate (13)
-                     +- * Project (12)
-                        +- * BroadcastHashJoin Inner BuildRight (11)
-                           :- * Project (9)
-                           :  +- * BroadcastHashJoin Inner BuildRight (8)
-                           :     :- * ColumnarToRow (3)
-                           :     :  +- CometFilter (2)
-                           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                           :     +- BroadcastExchange (7)
-                           :        +- * ColumnarToRow (6)
-                           :           +- CometFilter (5)
-                           :              +- CometScan parquet spark_catalog.default.item (4)
-                           +- ReusedExchange (10)
+TakeOrderedAndProject (22)
++- * Project (21)
+   +- Window (20)
+      +- * ColumnarToRow (19)
+         +- CometSort (18)
+            +- CometColumnarExchange (17)
+               +- CometHashAggregate (16)
+                  +- CometColumnarExchange (15)
+                     +- RowToColumnar (14)
+                        +- * HashAggregate (13)
+                           +- * Project (12)
+                              +- * BroadcastHashJoin Inner BuildRight (11)
+                                 :- * Project (9)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                 :     :- * ColumnarToRow (3)
+                                 :     :  +- CometFilter (2)
+                                 :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                                 :     +- BroadcastExchange (7)
+                                 :        +- * ColumnarToRow (6)
+                                 :           +- CometFilter (5)
+                                 :              +- CometScan parquet spark_catalog.default.item (4)
+                                 +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -64,7 +66,7 @@ Join condition: None
 Output [7]: [cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [cs_item_sk#1, cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 25]
+(10) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -84,66 +86,70 @@ Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) Exchange
+(14) RowToColumnar
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#2))#14]
-Results [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS _w0#16]
 
-(16) Exchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(17) CometColumnarExchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(18) CometSort
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15], [i_class#9 ASC NULLS FIRST]
 
-(17) Sort [codegen id : 5]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: [i_class#9 ASC NULLS FIRST], false, 0
+(19) ColumnarToRow [codegen id : 4]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
 
-(18) Window
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
+(20) Window
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
 
-(19) Project [codegen id : 6]
-Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18]
-Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, _we0#17]
+(21) Project [codegen id : 5]
+Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17]
+Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, _we0#16]
 
-(20) TakeOrderedAndProject
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+(22) TakeOrderedAndProject
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (25)
-+- * ColumnarToRow (24)
-   +- CometProject (23)
-      +- CometFilter (22)
-         +- CometScan parquet spark_catalog.default.date_dim (21)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#19]
+Output [2]: [d_date_sk#11, d_date#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(22) CometFilter
-Input [2]: [d_date_sk#11, d_date#19]
-Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(24) CometFilter
+Input [2]: [d_date_sk#11, d_date#18]
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(23) CometProject
-Input [2]: [d_date_sk#11, d_date#19]
+(25) CometProject
+Input [2]: [d_date_sk#11, d_date#18]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(24) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(25) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt
index 2a2a392cd0..4cf648ccf6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (6)
+  WholeStageCodegen (5)
     Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (5)
-            Sort [i_class]
+          WholeStageCodegen (4)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_class] #1
-                  WholeStageCodegen (4)
-                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(cs_ext_sales_price)),itemrevenue,_w0,sum]
-                      InputAdapter
-                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                CometSort [i_class]
+                  CometColumnarExchange [i_class] #1
+                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
+                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
+                        RowToColumnar
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,cs_ext_sales_price] [sum,sum]
                               Project [cs_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt
index bdfd6eee0d..9328d2b49d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt
@@ -1,26 +1,28 @@
 == Physical Plan ==
-TakeOrderedAndProject (22)
-+- * HashAggregate (21)
-   +- Exchange (20)
-      +- * HashAggregate (19)
-         +- * Expand (18)
-            +- * Project (17)
-               +- * BroadcastNestedLoopJoin Inner BuildRight (16)
-                  :- * Project (12)
-                  :  +- * BroadcastHashJoin Inner BuildRight (11)
-                  :     :- * Project (6)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                  :     :     :- * ColumnarToRow (3)
-                  :     :     :  +- CometFilter (2)
-                  :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-                  :     :     +- ReusedExchange (4)
-                  :     +- BroadcastExchange (10)
-                  :        +- * ColumnarToRow (9)
-                  :           +- CometFilter (8)
-                  :              +- CometScan parquet spark_catalog.default.item (7)
-                  +- BroadcastExchange (15)
-                     +- * ColumnarToRow (14)
-                        +- CometScan parquet spark_catalog.default.warehouse (13)
+* ColumnarToRow (24)
++- CometTakeOrderedAndProject (23)
+   +- CometHashAggregate (22)
+      +- CometColumnarExchange (21)
+         +- RowToColumnar (20)
+            +- * HashAggregate (19)
+               +- * Expand (18)
+                  +- * Project (17)
+                     +- * BroadcastNestedLoopJoin Inner BuildRight (16)
+                        :- * Project (12)
+                        :  +- * BroadcastHashJoin Inner BuildRight (11)
+                        :     :- * Project (6)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                        :     :     :- * ColumnarToRow (3)
+                        :     :     :  +- CometFilter (2)
+                        :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+                        :     :     +- ReusedExchange (4)
+                        :     +- BroadcastExchange (10)
+                        :        +- * ColumnarToRow (9)
+                        :           +- CometFilter (8)
+                        :              +- CometScan parquet spark_catalog.default.item (7)
+                        +- BroadcastExchange (15)
+                           +- * ColumnarToRow (14)
+                              +- CometScan parquet spark_catalog.default.warehouse (13)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -38,7 +40,7 @@ Condition : isnotnull(inv_item_sk#1)
 (3) ColumnarToRow [codegen id : 4]
 Input [3]: [inv_item_sk#1, inv_quantity_on_hand#2, inv_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 27]
+(4) ReusedExchange [Reuses operator id: 29]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -111,50 +113,54 @@ Functions [1]: [partial_avg(inv_quantity_on_hand#2)]
 Aggregate Attributes [2]: [sum#16, count#17]
 Results [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
 
-(20) Exchange
+(20) RowToColumnar
 Input [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
-Arguments: hashpartitioning(i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
+Arguments: hashpartitioning(i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
 Keys [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15]
 Functions [1]: [avg(inv_quantity_on_hand#2)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#2)#20]
-Results [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, avg(inv_quantity_on_hand#2)#20 AS qoh#21]
 
-(22) TakeOrderedAndProject
-Input [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#21]
-Arguments: 100, [qoh#21 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#12 ASC NULLS FIRST, i_class#13 ASC NULLS FIRST, i_category#14 ASC NULLS FIRST], [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#21]
+(23) CometTakeOrderedAndProject
+Input [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#20]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[qoh#20 ASC NULLS FIRST,i_product_name#11 ASC NULLS FIRST,i_brand#12 ASC NULLS FIRST,i_class#13 ASC NULLS FIRST,i_category#14 ASC NULLS FIRST], output=[i_product_name#11,i_brand#12,i_class#13,i_category#14,qoh#20]), 100, [qoh#20 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#12 ASC NULLS FIRST, i_class#13 ASC NULLS FIRST, i_category#14 ASC NULLS FIRST], [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#20]
+
+(24) ColumnarToRow [codegen id : 5]
+Input [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (29)
++- * ColumnarToRow (28)
+   +- CometProject (27)
+      +- CometFilter (26)
+         +- CometScan parquet spark_catalog.default.date_dim (25)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#22]
+Output [2]: [d_date_sk#5, d_month_seq#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(24) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#22]
-Condition : (((isnotnull(d_month_seq#22) AND (d_month_seq#22 >= 1200)) AND (d_month_seq#22 <= 1211)) AND isnotnull(d_date_sk#5))
+(26) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#21]
+Condition : (((isnotnull(d_month_seq#21) AND (d_month_seq#21 >= 1200)) AND (d_month_seq#21 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(25) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#22]
+(27) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#21]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(26) ColumnarToRow [codegen id : 1]
+(28) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(27) BroadcastExchange
+(29) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt
index 63a428d4e4..797b870040 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt
@@ -1,41 +1,43 @@
-TakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
-  WholeStageCodegen (5)
-    HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-      InputAdapter
-        Exchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
-          WholeStageCodegen (4)
-            HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
-              Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                  BroadcastNestedLoopJoin
-                    Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                      BroadcastHashJoin [inv_item_sk,i_item_sk]
-                        Project [inv_item_sk,inv_quantity_on_hand]
-                          BroadcastHashJoin [inv_date_sk,d_date_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [inv_item_sk]
-                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_month_seq,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+WholeStageCodegen (5)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
+        CometHashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count]
+          CometColumnarExchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
+            RowToColumnar
+              WholeStageCodegen (4)
+                HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
+                  Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                    Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                      BroadcastNestedLoopJoin
+                        Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                          BroadcastHashJoin [inv_item_sk,i_item_sk]
+                            Project [inv_item_sk,inv_quantity_on_hand]
+                              BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [inv_item_sk]
+                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_month_seq,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
                         InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (2)
+                          BroadcastExchange #4
+                            WholeStageCodegen (3)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
-                    InputAdapter
-                      BroadcastExchange #4
-                        WholeStageCodegen (3)
-                          ColumnarToRow
-                            InputAdapter
-                              CometScan parquet spark_catalog.default.warehouse
+                                  CometScan parquet spark_catalog.default.warehouse
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt
index e0a290cea7..3911ebef4c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-TakeOrderedAndProject (45)
-+- Union (44)
-   :- * HashAggregate (23)
-   :  +- * HashAggregate (22)
-   :     +- * HashAggregate (21)
-   :        +- Exchange (20)
-   :           +- * HashAggregate (19)
-   :              +- * Project (18)
-   :                 +- * BroadcastHashJoin Inner BuildRight (17)
-   :                    :- * Project (12)
-   :                    :  +- * BroadcastHashJoin Inner BuildRight (11)
-   :                    :     :- * Project (6)
-   :                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-   :                    :     :     :- * ColumnarToRow (3)
-   :                    :     :     :  +- CometFilter (2)
-   :                    :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-   :                    :     :     +- ReusedExchange (4)
-   :                    :     +- BroadcastExchange (10)
-   :                    :        +- * ColumnarToRow (9)
-   :                    :           +- CometFilter (8)
-   :                    :              +- CometScan parquet spark_catalog.default.item (7)
-   :                    +- BroadcastExchange (16)
-   :                       +- * ColumnarToRow (15)
-   :                          +- CometFilter (14)
-   :                             +- CometScan parquet spark_catalog.default.warehouse (13)
-   :- * HashAggregate (28)
-   :  +- Exchange (27)
-   :     +- * HashAggregate (26)
-   :        +- * HashAggregate (25)
-   :           +- ReusedExchange (24)
-   :- * HashAggregate (33)
-   :  +- Exchange (32)
-   :     +- * HashAggregate (31)
-   :        +- * HashAggregate (30)
-   :           +- ReusedExchange (29)
-   :- * HashAggregate (38)
-   :  +- Exchange (37)
-   :     +- * HashAggregate (36)
-   :        +- * HashAggregate (35)
-   :           +- ReusedExchange (34)
-   +- * HashAggregate (43)
-      +- Exchange (42)
-         +- * HashAggregate (41)
-            +- * HashAggregate (40)
-               +- ReusedExchange (39)
+* ColumnarToRow (47)
++- CometTakeOrderedAndProject (46)
+   +- CometUnion (45)
+      :- CometHashAggregate (24)
+      :  +- CometHashAggregate (23)
+      :     +- CometHashAggregate (22)
+      :        +- CometColumnarExchange (21)
+      :           +- RowToColumnar (20)
+      :              +- * HashAggregate (19)
+      :                 +- * Project (18)
+      :                    +- * BroadcastHashJoin Inner BuildRight (17)
+      :                       :- * Project (12)
+      :                       :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :                       :     :- * Project (6)
+      :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :                       :     :     :- * ColumnarToRow (3)
+      :                       :     :     :  +- CometFilter (2)
+      :                       :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+      :                       :     :     +- ReusedExchange (4)
+      :                       :     +- BroadcastExchange (10)
+      :                       :        +- * ColumnarToRow (9)
+      :                       :           +- CometFilter (8)
+      :                       :              +- CometScan parquet spark_catalog.default.item (7)
+      :                       +- BroadcastExchange (16)
+      :                          +- * ColumnarToRow (15)
+      :                             +- CometFilter (14)
+      :                                +- CometScan parquet spark_catalog.default.warehouse (13)
+      :- CometHashAggregate (29)
+      :  +- CometColumnarExchange (28)
+      :     +- CometHashAggregate (27)
+      :        +- CometHashAggregate (26)
+      :           +- ReusedExchange (25)
+      :- CometHashAggregate (34)
+      :  +- CometColumnarExchange (33)
+      :     +- CometHashAggregate (32)
+      :        +- CometHashAggregate (31)
+      :           +- ReusedExchange (30)
+      :- CometHashAggregate (39)
+      :  +- CometColumnarExchange (38)
+      :     +- CometHashAggregate (37)
+      :        +- CometHashAggregate (36)
+      :           +- ReusedExchange (35)
+      +- CometHashAggregate (44)
+         +- CometColumnarExchange (43)
+            +- CometHashAggregate (42)
+               +- CometHashAggregate (41)
+                  +- ReusedExchange (40)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -61,7 +63,7 @@ Condition : (isnotnull(inv_item_sk#1) AND isnotnull(inv_warehouse_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [4]: [inv_item_sk#1, inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 50]
+(4) ReusedExchange [Reuses operator id: 52]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -137,178 +139,159 @@ Functions [1]: [partial_avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [sum#13, count#14]
 Results [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(20) Exchange
+(20) RowToColumnar
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
-Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, i_category#10, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
+Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, i_category#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
-Results [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(22) HashAggregate [codegen id : 5]
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#18]
+(23) CometHashAggregate
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#17]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
-Functions [1]: [partial_avg(qoh#18)]
-Aggregate Attributes [2]: [sum#19, count#20]
-Results [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#21, count#22]
+Functions [1]: [partial_avg(qoh#17)]
 
-(23) HashAggregate [codegen id : 5]
-Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#21, count#22]
+(24) CometHashAggregate
+Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#18, count#19]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
-Functions [1]: [avg(qoh#18)]
-Aggregate Attributes [1]: [avg(qoh#18)#23]
-Results [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, avg(qoh#18)#23 AS qoh#24]
+Functions [1]: [avg(qoh#17)]
 
-(24) ReusedExchange [Reuses operator id: 20]
+(25) ReusedExchange [Reuses operator id: 21]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(25) HashAggregate [codegen id : 10]
+(26) CometHashAggregate
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
-Results [4]: [i_product_name#11, i_brand#8, i_class#9, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(26) HashAggregate [codegen id : 10]
-Input [4]: [i_product_name#11, i_brand#8, i_class#9, qoh#18]
+(27) CometHashAggregate
+Input [4]: [i_product_name#11, i_brand#8, i_class#9, qoh#17]
 Keys [3]: [i_product_name#11, i_brand#8, i_class#9]
-Functions [1]: [partial_avg(qoh#18)]
-Aggregate Attributes [2]: [sum#25, count#26]
-Results [5]: [i_product_name#11, i_brand#8, i_class#9, sum#27, count#28]
+Functions [1]: [partial_avg(qoh#17)]
 
-(27) Exchange
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#27, count#28]
-Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(28) CometColumnarExchange
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#20, count#21]
+Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(28) HashAggregate [codegen id : 11]
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#27, count#28]
+(29) CometHashAggregate
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#20, count#21]
 Keys [3]: [i_product_name#11, i_brand#8, i_class#9]
-Functions [1]: [avg(qoh#18)]
-Aggregate Attributes [1]: [avg(qoh#18)#29]
-Results [5]: [i_product_name#11, i_brand#8, i_class#9, null AS i_category#30, avg(qoh#18)#29 AS qoh#31]
+Functions [1]: [avg(qoh#17)]
 
-(29) ReusedExchange [Reuses operator id: 20]
+(30) ReusedExchange [Reuses operator id: 21]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(30) HashAggregate [codegen id : 16]
+(31) CometHashAggregate
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
-Results [3]: [i_product_name#11, i_brand#8, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(31) HashAggregate [codegen id : 16]
-Input [3]: [i_product_name#11, i_brand#8, qoh#18]
+(32) CometHashAggregate
+Input [3]: [i_product_name#11, i_brand#8, qoh#17]
 Keys [2]: [i_product_name#11, i_brand#8]
-Functions [1]: [partial_avg(qoh#18)]
-Aggregate Attributes [2]: [sum#32, count#33]
-Results [4]: [i_product_name#11, i_brand#8, sum#34, count#35]
+Functions [1]: [partial_avg(qoh#17)]
 
-(32) Exchange
-Input [4]: [i_product_name#11, i_brand#8, sum#34, count#35]
-Arguments: hashpartitioning(i_product_name#11, i_brand#8, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(33) CometColumnarExchange
+Input [4]: [i_product_name#11, i_brand#8, sum#22, count#23]
+Arguments: hashpartitioning(i_product_name#11, i_brand#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(33) HashAggregate [codegen id : 17]
-Input [4]: [i_product_name#11, i_brand#8, sum#34, count#35]
+(34) CometHashAggregate
+Input [4]: [i_product_name#11, i_brand#8, sum#22, count#23]
 Keys [2]: [i_product_name#11, i_brand#8]
-Functions [1]: [avg(qoh#18)]
-Aggregate Attributes [1]: [avg(qoh#18)#36]
-Results [5]: [i_product_name#11, i_brand#8, null AS i_class#37, null AS i_category#38, avg(qoh#18)#36 AS qoh#39]
+Functions [1]: [avg(qoh#17)]
 
-(34) ReusedExchange [Reuses operator id: 20]
+(35) ReusedExchange [Reuses operator id: 21]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(35) HashAggregate [codegen id : 22]
+(36) CometHashAggregate
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
-Results [2]: [i_product_name#11, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(36) HashAggregate [codegen id : 22]
-Input [2]: [i_product_name#11, qoh#18]
+(37) CometHashAggregate
+Input [2]: [i_product_name#11, qoh#17]
 Keys [1]: [i_product_name#11]
-Functions [1]: [partial_avg(qoh#18)]
-Aggregate Attributes [2]: [sum#40, count#41]
-Results [3]: [i_product_name#11, sum#42, count#43]
+Functions [1]: [partial_avg(qoh#17)]
 
-(37) Exchange
-Input [3]: [i_product_name#11, sum#42, count#43]
-Arguments: hashpartitioning(i_product_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(38) CometColumnarExchange
+Input [3]: [i_product_name#11, sum#24, count#25]
+Arguments: hashpartitioning(i_product_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(38) HashAggregate [codegen id : 23]
-Input [3]: [i_product_name#11, sum#42, count#43]
+(39) CometHashAggregate
+Input [3]: [i_product_name#11, sum#24, count#25]
 Keys [1]: [i_product_name#11]
-Functions [1]: [avg(qoh#18)]
-Aggregate Attributes [1]: [avg(qoh#18)#44]
-Results [5]: [i_product_name#11, null AS i_brand#45, null AS i_class#46, null AS i_category#47, avg(qoh#18)#44 AS qoh#48]
+Functions [1]: [avg(qoh#17)]
 
-(39) ReusedExchange [Reuses operator id: 20]
+(40) ReusedExchange [Reuses operator id: 21]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(40) HashAggregate [codegen id : 28]
+(41) CometHashAggregate
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
-Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
-Results [1]: [avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(41) HashAggregate [codegen id : 28]
-Input [1]: [qoh#18]
+(42) CometHashAggregate
+Input [1]: [qoh#17]
 Keys: []
-Functions [1]: [partial_avg(qoh#18)]
-Aggregate Attributes [2]: [sum#49, count#50]
-Results [2]: [sum#51, count#52]
+Functions [1]: [partial_avg(qoh#17)]
 
-(42) Exchange
-Input [2]: [sum#51, count#52]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
+(43) CometColumnarExchange
+Input [2]: [sum#26, count#27]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(43) HashAggregate [codegen id : 29]
-Input [2]: [sum#51, count#52]
+(44) CometHashAggregate
+Input [2]: [sum#26, count#27]
 Keys: []
-Functions [1]: [avg(qoh#18)]
-Aggregate Attributes [1]: [avg(qoh#18)#53]
-Results [5]: [null AS i_product_name#54, null AS i_brand#55, null AS i_class#56, null AS i_category#57, avg(qoh#18)#53 AS qoh#58]
+Functions [1]: [avg(qoh#17)]
+
+(45) CometUnion
+Child 0 Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
+Child 1 Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#29, qoh#30]
+Child 2 Input [5]: [i_product_name#11, i_brand#8, i_class#31, i_category#32, qoh#33]
+Child 3 Input [5]: [i_product_name#11, i_brand#34, i_class#35, i_category#36, qoh#37]
+Child 4 Input [5]: [i_product_name#38, i_brand#39, i_class#40, i_category#41, qoh#42]
 
-(44) Union
+(46) CometTakeOrderedAndProject
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[qoh#28 ASC NULLS FIRST,i_product_name#11 ASC NULLS FIRST,i_brand#8 ASC NULLS FIRST,i_class#9 ASC NULLS FIRST,i_category#10 ASC NULLS FIRST], output=[i_product_name#11,i_brand#8,i_class#9,i_category#10,qoh#28]), 100, [qoh#28 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#8 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_category#10 ASC NULLS FIRST], [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
 
-(45) TakeOrderedAndProject
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#24]
-Arguments: 100, [qoh#24 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#8 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_category#10 ASC NULLS FIRST], [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#24]
+(47) ColumnarToRow [codegen id : 21]
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (52)
++- * ColumnarToRow (51)
+   +- CometProject (50)
+      +- CometFilter (49)
+         +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_month_seq#59]
+Output [2]: [d_date_sk#6, d_month_seq#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(47) CometFilter
-Input [2]: [d_date_sk#6, d_month_seq#59]
-Condition : (((isnotnull(d_month_seq#59) AND (d_month_seq#59 >= 1212)) AND (d_month_seq#59 <= 1223)) AND isnotnull(d_date_sk#6))
+(49) CometFilter
+Input [2]: [d_date_sk#6, d_month_seq#43]
+Condition : (((isnotnull(d_month_seq#43) AND (d_month_seq#43 >= 1212)) AND (d_month_seq#43 <= 1223)) AND isnotnull(d_date_sk#6))
 
-(48) CometProject
-Input [2]: [d_date_sk#6, d_month_seq#59]
+(50) CometProject
+Input [2]: [d_date_sk#6, d_month_seq#43]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(49) ColumnarToRow [codegen id : 1]
+(51) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(50) BroadcastExchange
+(52) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt
index a8d71b06ac..442e169eb9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt
@@ -1,80 +1,66 @@
-TakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
-  Union
-    WholeStageCodegen (5)
-      HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(qoh),qoh,sum,count]
-        HashAggregate [i_product_name,i_brand,i_class,i_category,qoh] [sum,count,sum,count]
-          HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-            InputAdapter
-              Exchange [i_product_name,i_brand,i_class,i_category] #1
-                WholeStageCodegen (4)
-                  HashAggregate [i_product_name,i_brand,i_class,i_category,inv_quantity_on_hand] [sum,count,sum,count]
-                    Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                        Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                          BroadcastHashJoin [inv_item_sk,i_item_sk]
-                            Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
-                              BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [inv_item_sk,inv_warehouse_sk]
-                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_month_seq,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+WholeStageCodegen (21)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
+        CometUnion
+          CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
+            CometHashAggregate [i_product_name,i_brand,i_class,i_category,qoh]
+              CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
+                CometColumnarExchange [i_product_name,i_brand,i_class,i_category] #1
+                  RowToColumnar
+                    WholeStageCodegen (4)
+                      HashAggregate [i_product_name,i_brand,i_class,i_category,inv_quantity_on_hand] [sum,count,sum,count]
+                        Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                          BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                            Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                              BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
+                                  BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [inv_item_sk,inv_warehouse_sk]
+                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_month_seq,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #2
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (2)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
+                              BroadcastExchange #4
+                                WholeStageCodegen (3)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
-                        InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (3)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [w_warehouse_sk]
-                                    CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
-    WholeStageCodegen (11)
-      HashAggregate [i_product_name,i_brand,i_class,sum,count] [avg(qoh),i_category,qoh,sum,count]
-        InputAdapter
-          Exchange [i_product_name,i_brand,i_class] #5
-            WholeStageCodegen (10)
-              HashAggregate [i_product_name,i_brand,i_class,qoh] [sum,count,sum,count]
-                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-                  InputAdapter
-                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
-    WholeStageCodegen (17)
-      HashAggregate [i_product_name,i_brand,sum,count] [avg(qoh),i_class,i_category,qoh,sum,count]
-        InputAdapter
-          Exchange [i_product_name,i_brand] #6
-            WholeStageCodegen (16)
-              HashAggregate [i_product_name,i_brand,qoh] [sum,count,sum,count]
-                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-                  InputAdapter
-                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
-    WholeStageCodegen (23)
-      HashAggregate [i_product_name,sum,count] [avg(qoh),i_brand,i_class,i_category,qoh,sum,count]
-        InputAdapter
-          Exchange [i_product_name] #7
-            WholeStageCodegen (22)
-              HashAggregate [i_product_name,qoh] [sum,count,sum,count]
-                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-                  InputAdapter
-                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
-    WholeStageCodegen (29)
-      HashAggregate [sum,count] [avg(qoh),i_product_name,i_brand,i_class,i_category,qoh,sum,count]
-        InputAdapter
-          Exchange #8
-            WholeStageCodegen (28)
-              HashAggregate [qoh] [sum,count,sum,count]
-                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
-                  InputAdapter
-                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+                                      CometFilter [w_warehouse_sk]
+                                        CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
+          CometHashAggregate [i_product_name,i_brand,i_class,sum,count]
+            CometColumnarExchange [i_product_name,i_brand,i_class] #5
+              CometHashAggregate [i_product_name,i_brand,i_class,qoh]
+                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
+                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+          CometHashAggregate [i_product_name,i_brand,sum,count]
+            CometColumnarExchange [i_product_name,i_brand] #6
+              CometHashAggregate [i_product_name,i_brand,qoh]
+                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
+                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+          CometHashAggregate [i_product_name,sum,count]
+            CometColumnarExchange [i_product_name] #7
+              CometHashAggregate [i_product_name,qoh]
+                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
+                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+          CometHashAggregate [sum,count]
+            CometColumnarExchange #8
+              CometHashAggregate [qoh]
+                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
+                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt
index 9bbf5e9847..c19e023683 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt
@@ -1,51 +1,53 @@
 == Physical Plan ==
-* Sort (47)
-+- Exchange (46)
-   +- * Filter (45)
-      +- * HashAggregate (44)
-         +- Exchange (43)
-            +- * HashAggregate (42)
-               +- * HashAggregate (41)
-                  +- Exchange (40)
-                     +- * HashAggregate (39)
-                        +- * Project (38)
-                           +- * BroadcastHashJoin Inner BuildRight (37)
-                              :- * Project (32)
-                              :  +- * BroadcastHashJoin Inner BuildRight (31)
-                              :     :- * Project (26)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                              :     :     :- * Project (20)
-                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-                              :     :     :     :- * ColumnarToRow (13)
-                              :     :     :     :  +- CometProject (12)
-                              :     :     :     :     +- CometSortMergeJoin (11)
-                              :     :     :     :        :- CometSort (5)
-                              :     :     :     :        :  +- CometExchange (4)
-                              :     :     :     :        :     +- CometProject (3)
-                              :     :     :     :        :        +- CometFilter (2)
-                              :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     :     :     :        +- CometSort (10)
-                              :     :     :     :           +- CometExchange (9)
-                              :     :     :     :              +- CometProject (8)
-                              :     :     :     :                 +- CometFilter (7)
-                              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
-                              :     :     :     +- BroadcastExchange (18)
-                              :     :     :        +- * ColumnarToRow (17)
-                              :     :     :           +- CometProject (16)
-                              :     :     :              +- CometFilter (15)
-                              :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
-                              :     :     +- BroadcastExchange (24)
-                              :     :        +- * ColumnarToRow (23)
-                              :     :           +- CometFilter (22)
-                              :     :              +- CometScan parquet spark_catalog.default.item (21)
-                              :     +- BroadcastExchange (30)
-                              :        +- * ColumnarToRow (29)
-                              :           +- CometFilter (28)
-                              :              +- CometScan parquet spark_catalog.default.customer (27)
-                              +- BroadcastExchange (36)
-                                 +- * ColumnarToRow (35)
-                                    +- CometFilter (34)
-                                       +- CometScan parquet spark_catalog.default.customer_address (33)
+* ColumnarToRow (49)
++- CometSort (48)
+   +- CometColumnarExchange (47)
+      +- CometFilter (46)
+         +- CometHashAggregate (45)
+            +- CometColumnarExchange (44)
+               +- CometHashAggregate (43)
+                  +- CometHashAggregate (42)
+                     +- CometColumnarExchange (41)
+                        +- RowToColumnar (40)
+                           +- * HashAggregate (39)
+                              +- * Project (38)
+                                 +- * BroadcastHashJoin Inner BuildRight (37)
+                                    :- * Project (32)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (31)
+                                    :     :- * Project (26)
+                                    :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                                    :     :     :- * Project (20)
+                                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+                                    :     :     :     :- * ColumnarToRow (13)
+                                    :     :     :     :  +- CometProject (12)
+                                    :     :     :     :     +- CometSortMergeJoin (11)
+                                    :     :     :     :        :- CometSort (5)
+                                    :     :     :     :        :  +- CometColumnarExchange (4)
+                                    :     :     :     :        :     +- CometProject (3)
+                                    :     :     :     :        :        +- CometFilter (2)
+                                    :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
+                                    :     :     :     :        +- CometSort (10)
+                                    :     :     :     :           +- CometColumnarExchange (9)
+                                    :     :     :     :              +- CometProject (8)
+                                    :     :     :     :                 +- CometFilter (7)
+                                    :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
+                                    :     :     :     +- BroadcastExchange (18)
+                                    :     :     :        +- * ColumnarToRow (17)
+                                    :     :     :           +- CometProject (16)
+                                    :     :     :              +- CometFilter (15)
+                                    :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
+                                    :     :     +- BroadcastExchange (24)
+                                    :     :        +- * ColumnarToRow (23)
+                                    :     :           +- CometFilter (22)
+                                    :     :              +- CometScan parquet spark_catalog.default.item (21)
+                                    :     +- BroadcastExchange (30)
+                                    :        +- * ColumnarToRow (29)
+                                    :           +- CometFilter (28)
+                                    :              +- CometScan parquet spark_catalog.default.customer (27)
+                                    +- BroadcastExchange (36)
+                                       +- * ColumnarToRow (35)
+                                          +- CometFilter (34)
+                                             +- CometScan parquet spark_catalog.default.customer_address (33)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -63,9 +65,9 @@ Condition : (((isnotnull(ss_ticket_number#4) AND isnotnull(ss_item_sk#1)) AND is
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(4) CometExchange
+(4) CometColumnarExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (5) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
@@ -86,9 +88,9 @@ Condition : (isnotnull(sr_ticket_number#8) AND isnotnull(sr_item_sk#7))
 Input [3]: [sr_item_sk#7, sr_ticket_number#8, sr_returned_date_sk#9]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_item_sk#7, sr_ticket_number#8]
 
-(9) CometExchange
+(9) CometColumnarExchange
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
-Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
@@ -229,116 +231,118 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
 Aggregate Attributes [1]: [sum#30]
 Results [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
 
-(40) Exchange
+(40) RowToColumnar
 Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) HashAggregate [codegen id : 6]
+(41) CometColumnarExchange
+Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(42) CometHashAggregate
 Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
 Keys [10]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#32]
-Results [4]: [c_last_name#24, c_first_name#23, s_store_name#11, MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#32,17,2) AS netpaid#33]
 
-(42) HashAggregate [codegen id : 6]
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, netpaid#33]
+(43) CometHashAggregate
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, netpaid#32]
 Keys [3]: [c_last_name#24, c_first_name#23, s_store_name#11]
-Functions [1]: [partial_sum(netpaid#33)]
-Aggregate Attributes [2]: [sum#34, isEmpty#35]
-Results [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#36, isEmpty#37]
+Functions [1]: [partial_sum(netpaid#32)]
 
-(43) Exchange
-Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#36, isEmpty#37]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(44) CometColumnarExchange
+Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#33, isEmpty#34]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(44) HashAggregate [codegen id : 7]
-Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#36, isEmpty#37]
+(45) CometHashAggregate
+Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#33, isEmpty#34]
 Keys [3]: [c_last_name#24, c_first_name#23, s_store_name#11]
-Functions [1]: [sum(netpaid#33)]
-Aggregate Attributes [1]: [sum(netpaid#33)#38]
-Results [4]: [c_last_name#24, c_first_name#23, s_store_name#11, sum(netpaid#33)#38 AS paid#39]
+Functions [1]: [sum(netpaid#32)]
 
-(45) Filter [codegen id : 7]
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#39]
-Condition : (isnotnull(paid#39) AND (cast(paid#39 as decimal(33,8)) > cast(Subquery scalar-subquery#40, [id=#41] as decimal(33,8))))
+(46) CometFilter
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
+Condition : (isnotnull(paid#35) AND (cast(paid#35 as decimal(33,8)) > cast(Subquery scalar-subquery#36, [id=#37] as decimal(33,8))))
 
-(46) Exchange
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#39]
-Arguments: rangepartitioning(c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(47) CometColumnarExchange
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
+Arguments: rangepartitioning(c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(47) Sort [codegen id : 8]
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#39]
-Arguments: [c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST], true, 0
+(48) CometSort
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
+Arguments: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35], [c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST]
+
+(49) ColumnarToRow [codegen id : 6]
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 45 Hosting Expression = Subquery scalar-subquery#40, [id=#41]
-* HashAggregate (75)
-+- Exchange (74)
-   +- * HashAggregate (73)
-      +- * HashAggregate (72)
-         +- Exchange (71)
-            +- * HashAggregate (70)
-               +- * Project (69)
-                  +- * BroadcastHashJoin Inner BuildRight (68)
-                     :- * Project (66)
-                     :  +- * BroadcastHashJoin Inner BuildRight (65)
-                     :     :- * Project (63)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (62)
-                     :     :     :- * Project (57)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-                     :     :     :     :- * ColumnarToRow (54)
-                     :     :     :     :  +- CometProject (53)
-                     :     :     :     :     +- CometSortMergeJoin (52)
-                     :     :     :     :        :- CometSort (49)
-                     :     :     :     :        :  +- ReusedExchange (48)
-                     :     :     :     :        +- CometSort (51)
-                     :     :     :     :           +- ReusedExchange (50)
-                     :     :     :     +- ReusedExchange (55)
-                     :     :     +- BroadcastExchange (61)
-                     :     :        +- * ColumnarToRow (60)
-                     :     :           +- CometFilter (59)
-                     :     :              +- CometScan parquet spark_catalog.default.item (58)
-                     :     +- ReusedExchange (64)
-                     +- ReusedExchange (67)
-
-
-(48) ReusedExchange [Reuses operator id: 4]
+Subquery:1 Hosting operator id = 46 Hosting Expression = Subquery scalar-subquery#36, [id=#37]
+* ColumnarToRow (79)
++- CometHashAggregate (78)
+   +- CometColumnarExchange (77)
+      +- CometHashAggregate (76)
+         +- CometHashAggregate (75)
+            +- CometColumnarExchange (74)
+               +- RowToColumnar (73)
+                  +- * HashAggregate (72)
+                     +- * Project (71)
+                        +- * BroadcastHashJoin Inner BuildRight (70)
+                           :- * Project (68)
+                           :  +- * BroadcastHashJoin Inner BuildRight (67)
+                           :     :- * Project (65)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (64)
+                           :     :     :- * Project (59)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (58)
+                           :     :     :     :- * ColumnarToRow (56)
+                           :     :     :     :  +- CometProject (55)
+                           :     :     :     :     +- CometSortMergeJoin (54)
+                           :     :     :     :        :- CometSort (51)
+                           :     :     :     :        :  +- ReusedExchange (50)
+                           :     :     :     :        +- CometSort (53)
+                           :     :     :     :           +- ReusedExchange (52)
+                           :     :     :     +- ReusedExchange (57)
+                           :     :     +- BroadcastExchange (63)
+                           :     :        +- * ColumnarToRow (62)
+                           :     :           +- CometFilter (61)
+                           :     :              +- CometScan parquet spark_catalog.default.item (60)
+                           :     +- ReusedExchange (66)
+                           +- ReusedExchange (69)
+
+
+(50) ReusedExchange [Reuses operator id: 4]
 Output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(49) CometSort
+(51) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_ticket_number#4 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST]
 
-(50) ReusedExchange [Reuses operator id: 9]
+(52) ReusedExchange [Reuses operator id: 9]
 Output [2]: [sr_item_sk#7, sr_ticket_number#8]
 
-(51) CometSort
+(53) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_ticket_number#8 ASC NULLS FIRST, sr_item_sk#7 ASC NULLS FIRST]
 
-(52) CometSortMergeJoin
+(54) CometSortMergeJoin
 Left output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Right output [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_ticket_number#4, ss_item_sk#1], [sr_ticket_number#8, sr_item_sk#7], Inner
 
-(53) CometProject
+(55) CometProject
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(54) ColumnarToRow [codegen id : 5]
+(56) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(55) ReusedExchange [Reuses operator id: 18]
+(57) ReusedExchange [Reuses operator id: 18]
 Output [4]: [s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
-(56) BroadcastHashJoin [codegen id : 5]
+(58) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#10]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 5]
+(59) Project [codegen id : 5]
 Output [6]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14]
 Input [8]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5, s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
@@ -349,87 +353,87 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_size:string,i_color:string,i_units:string,i_manager_id:int>
 
-(59) CometFilter
+(61) CometFilter
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Condition : isnotnull(i_item_sk#15)
 
-(60) ColumnarToRow [codegen id : 2]
+(62) ColumnarToRow [codegen id : 2]
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(61) BroadcastExchange
+(63) BroadcastExchange
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-(62) BroadcastHashJoin [codegen id : 5]
+(64) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#15]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 5]
+(65) Project [codegen id : 5]
 Output [10]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(64) ReusedExchange [Reuses operator id: 30]
+(66) ReusedExchange [Reuses operator id: 30]
 Output [5]: [c_customer_sk#21, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25]
 
-(65) BroadcastHashJoin [codegen id : 5]
+(67) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(66) Project [codegen id : 5]
+(68) Project [codegen id : 5]
 Output [13]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25]
 Input [15]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_customer_sk#21, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25]
 
-(67) ReusedExchange [Reuses operator id: 36]
+(69) ReusedExchange [Reuses operator id: 36]
 Output [4]: [ca_address_sk#26, ca_state#27, ca_zip#28, ca_country#29]
 
-(68) BroadcastHashJoin [codegen id : 5]
+(70) BroadcastHashJoin [codegen id : 5]
 Left keys [3]: [c_current_addr_sk#22, c_birth_country#25, s_zip#14]
 Right keys [3]: [ca_address_sk#26, upper(ca_country#29), ca_zip#28]
 Join type: Inner
 Join condition: None
 
-(69) Project [codegen id : 5]
+(71) Project [codegen id : 5]
 Output [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#23, c_last_name#24, ca_state#27]
 Input [17]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25, ca_address_sk#26, ca_state#27, ca_zip#28, ca_country#29]
 
-(70) HashAggregate [codegen id : 5]
+(72) HashAggregate [codegen id : 5]
 Input [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#23, c_last_name#24, ca_state#27]
 Keys [10]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum#42]
-Results [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#43]
+Aggregate Attributes [1]: [sum#38]
+Results [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
+
+(73) RowToColumnar
+Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
 
-(71) Exchange
-Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#43]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(74) CometColumnarExchange
+Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(72) HashAggregate [codegen id : 6]
-Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#43]
+(75) CometHashAggregate
+Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
 Keys [10]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#32]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#32,17,2) AS netpaid#33]
 
-(73) HashAggregate [codegen id : 6]
-Input [1]: [netpaid#33]
+(76) CometHashAggregate
+Input [1]: [netpaid#32]
 Keys: []
-Functions [1]: [partial_avg(netpaid#33)]
-Aggregate Attributes [2]: [sum#44, count#45]
-Results [2]: [sum#46, count#47]
+Functions [1]: [partial_avg(netpaid#32)]
 
-(74) Exchange
-Input [2]: [sum#46, count#47]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
+(77) CometColumnarExchange
+Input [2]: [sum#40, count#41]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(75) HashAggregate [codegen id : 7]
-Input [2]: [sum#46, count#47]
+(78) CometHashAggregate
+Input [2]: [sum#40, count#41]
 Keys: []
-Functions [1]: [avg(netpaid#33)]
-Aggregate Attributes [1]: [avg(netpaid#33)#48]
-Results [1]: [(0.05 * avg(netpaid#33)#48) AS (0.05 * avg(netpaid))#49]
+Functions [1]: [avg(netpaid#32)]
+
+(79) ColumnarToRow [codegen id : 6]
+Input [1]: [(0.05 * avg(netpaid))#42]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt
index b22891cebe..05de849be4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt
@@ -1,19 +1,19 @@
-WholeStageCodegen (8)
-  Sort [c_last_name,c_first_name,s_store_name]
+WholeStageCodegen (6)
+  ColumnarToRow
     InputAdapter
-      Exchange [c_last_name,c_first_name,s_store_name] #1
-        WholeStageCodegen (7)
-          Filter [paid]
+      CometSort [c_last_name,c_first_name,s_store_name]
+        CometColumnarExchange [c_last_name,c_first_name,s_store_name] #1
+          CometFilter [paid]
             Subquery #1
-              WholeStageCodegen (7)
-                HashAggregate [sum,count] [avg(netpaid),(0.05 * avg(netpaid)),sum,count]
+              WholeStageCodegen (6)
+                ColumnarToRow
                   InputAdapter
-                    Exchange #10
-                      WholeStageCodegen (6)
-                        HashAggregate [netpaid] [sum,count,sum,count]
-                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
-                            InputAdapter
-                              Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #11
+                    CometHashAggregate [sum,count]
+                      CometColumnarExchange #10
+                        CometHashAggregate [netpaid]
+                          CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
+                            CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #11
+                              RowToColumnar
                                 WholeStageCodegen (5)
                                   HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
                                     Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
@@ -45,64 +45,62 @@ WholeStageCodegen (8)
                                               ReusedExchange [c_customer_sk,c_current_addr_sk,c_first_name,c_last_name,c_birth_country] #8
                                         InputAdapter
                                           ReusedExchange [ca_address_sk,ca_state,ca_zip,ca_country] #9
-            HashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty] [sum(netpaid),paid,sum,isEmpty]
-              InputAdapter
-                Exchange [c_last_name,c_first_name,s_store_name] #2
-                  WholeStageCodegen (6)
-                    HashAggregate [c_last_name,c_first_name,s_store_name,netpaid] [sum,isEmpty,sum,isEmpty]
-                      HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
-                        InputAdapter
-                          Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #3
-                            WholeStageCodegen (5)
-                              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
-                                Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
-                                  BroadcastHashJoin [c_current_addr_sk,c_birth_country,s_zip,ca_address_sk,ca_country,ca_zip]
-                                    Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
-                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                        Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
-                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                            Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
-                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
-                                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                        CometSort [ss_ticket_number,ss_item_sk]
-                                                          CometExchange [ss_ticket_number,ss_item_sk] #4
-                                                            CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
-                                                              CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
-                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
-                                                        CometSort [sr_ticket_number,sr_item_sk]
-                                                          CometExchange [sr_ticket_number,sr_item_sk] #5
-                                                            CometProject [sr_item_sk,sr_ticket_number]
-                                                              CometFilter [sr_ticket_number,sr_item_sk]
-                                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                                InputAdapter
-                                                  BroadcastExchange #6
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [s_store_sk,s_store_name,s_state,s_zip]
-                                                            CometFilter [s_market_id,s_store_sk,s_zip]
-                                                              CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_market_id,s_state,s_zip]
+            CometHashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty]
+              CometColumnarExchange [c_last_name,c_first_name,s_store_name] #2
+                CometHashAggregate [c_last_name,c_first_name,s_store_name,netpaid]
+                  CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
+                    CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #3
+                      RowToColumnar
+                        WholeStageCodegen (5)
+                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
+                            Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
+                              BroadcastHashJoin [c_current_addr_sk,c_birth_country,s_zip,ca_address_sk,ca_country,ca_zip]
+                                Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
+                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                    Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                        Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
+                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
+                                                  CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                    CometSort [ss_ticket_number,ss_item_sk]
+                                                      CometColumnarExchange [ss_ticket_number,ss_item_sk] #4
+                                                        CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
+                                                          CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
+                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
+                                                    CometSort [sr_ticket_number,sr_item_sk]
+                                                      CometColumnarExchange [sr_ticket_number,sr_item_sk] #5
+                                                        CometProject [sr_item_sk,sr_ticket_number]
+                                                          CometFilter [sr_ticket_number,sr_item_sk]
+                                                            CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                             InputAdapter
-                                              BroadcastExchange #7
-                                                WholeStageCodegen (2)
+                                              BroadcastExchange #6
+                                                WholeStageCodegen (1)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [i_color,i_item_sk]
-                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                                      CometProject [s_store_sk,s_store_name,s_state,s_zip]
+                                                        CometFilter [s_market_id,s_store_sk,s_zip]
+                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_market_id,s_state,s_zip]
                                         InputAdapter
-                                          BroadcastExchange #8
-                                            WholeStageCodegen (3)
+                                          BroadcastExchange #7
+                                            WholeStageCodegen (2)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometFilter [c_customer_sk,c_current_addr_sk,c_birth_country]
-                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
+                                                  CometFilter [i_color,i_item_sk]
+                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
                                     InputAdapter
-                                      BroadcastExchange #9
-                                        WholeStageCodegen (4)
+                                      BroadcastExchange #8
+                                        WholeStageCodegen (3)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [ca_address_sk,ca_country,ca_zip]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip,ca_country]
+                                              CometFilter [c_customer_sk,c_current_addr_sk,c_birth_country]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
+                                InputAdapter
+                                  BroadcastExchange #9
+                                    WholeStageCodegen (4)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ca_address_sk,ca_country,ca_zip]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip,ca_country]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt
index 54aadf2cf5..d689cb65a9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt
@@ -1,77 +1,81 @@
 == Physical Plan ==
-TakeOrderedAndProject (73)
-+- Union (72)
-   :- * HashAggregate (28)
-   :  +- Exchange (27)
-   :     +- * HashAggregate (26)
-   :        +- * Project (25)
-   :           +- * BroadcastHashJoin Inner BuildRight (24)
-   :              :- * Project (19)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (18)
-   :              :     :- * Project (13)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-   :              :     :     :- * Project (10)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-   :              :     :     :     :- * ColumnarToRow (3)
-   :              :     :     :     :  +- CometFilter (2)
-   :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :              :     :     :     +- BroadcastExchange (8)
-   :              :     :     :        +- * ColumnarToRow (7)
-   :              :     :     :           +- CometProject (6)
-   :              :     :     :              +- CometFilter (5)
-   :              :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-   :              :     :     +- ReusedExchange (11)
-   :              :     +- BroadcastExchange (17)
-   :              :        +- * ColumnarToRow (16)
-   :              :           +- CometFilter (15)
-   :              :              +- CometScan parquet spark_catalog.default.store (14)
-   :              +- BroadcastExchange (23)
-   :                 +- * ColumnarToRow (22)
-   :                    +- CometFilter (21)
-   :                       +- CometScan parquet spark_catalog.default.item (20)
-   :- * HashAggregate (50)
-   :  +- Exchange (49)
-   :     +- * HashAggregate (48)
-   :        +- * Project (47)
-   :           +- * BroadcastHashJoin Inner BuildRight (46)
-   :              :- * Project (44)
-   :              :  +- * BroadcastHashJoin Inner BuildRight (43)
-   :              :     :- * Project (37)
-   :              :     :  +- * BroadcastHashJoin Inner BuildRight (36)
-   :              :     :     :- * Project (34)
-   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (33)
-   :              :     :     :     :- * ColumnarToRow (31)
-   :              :     :     :     :  +- CometFilter (30)
-   :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (29)
-   :              :     :     :     +- ReusedExchange (32)
-   :              :     :     +- ReusedExchange (35)
-   :              :     +- BroadcastExchange (42)
-   :              :        +- * ColumnarToRow (41)
-   :              :           +- CometProject (40)
-   :              :              +- CometFilter (39)
-   :              :                 +- CometScan parquet spark_catalog.default.store (38)
-   :              +- ReusedExchange (45)
-   +- * HashAggregate (71)
-      +- Exchange (70)
-         +- * HashAggregate (69)
-            +- * Project (68)
-               +- * BroadcastHashJoin Inner BuildRight (67)
-                  :- * Project (62)
-                  :  +- * BroadcastHashJoin Inner BuildRight (61)
-                  :     :- * Project (59)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (58)
-                  :     :     :- * Project (56)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (55)
-                  :     :     :     :- * ColumnarToRow (53)
-                  :     :     :     :  +- CometFilter (52)
-                  :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (51)
-                  :     :     :     +- ReusedExchange (54)
-                  :     :     +- ReusedExchange (57)
-                  :     +- ReusedExchange (60)
-                  +- BroadcastExchange (66)
-                     +- * ColumnarToRow (65)
-                        +- CometFilter (64)
-                           +- CometScan parquet spark_catalog.default.item (63)
+* ColumnarToRow (77)
++- CometTakeOrderedAndProject (76)
+   +- CometUnion (75)
+      :- CometHashAggregate (29)
+      :  +- CometColumnarExchange (28)
+      :     +- RowToColumnar (27)
+      :        +- * HashAggregate (26)
+      :           +- * Project (25)
+      :              +- * BroadcastHashJoin Inner BuildRight (24)
+      :                 :- * Project (19)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (18)
+      :                 :     :- * Project (13)
+      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :                 :     :     :- * Project (10)
+      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+      :                 :     :     :     :- * ColumnarToRow (3)
+      :                 :     :     :     :  +- CometFilter (2)
+      :                 :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :                 :     :     :     +- BroadcastExchange (8)
+      :                 :     :     :        +- * ColumnarToRow (7)
+      :                 :     :     :           +- CometProject (6)
+      :                 :     :     :              +- CometFilter (5)
+      :                 :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+      :                 :     :     +- ReusedExchange (11)
+      :                 :     +- BroadcastExchange (17)
+      :                 :        +- * ColumnarToRow (16)
+      :                 :           +- CometFilter (15)
+      :                 :              +- CometScan parquet spark_catalog.default.store (14)
+      :                 +- BroadcastExchange (23)
+      :                    +- * ColumnarToRow (22)
+      :                       +- CometFilter (21)
+      :                          +- CometScan parquet spark_catalog.default.item (20)
+      :- CometHashAggregate (52)
+      :  +- CometColumnarExchange (51)
+      :     +- RowToColumnar (50)
+      :        +- * HashAggregate (49)
+      :           +- * Project (48)
+      :              +- * BroadcastHashJoin Inner BuildRight (47)
+      :                 :- * Project (45)
+      :                 :  +- * BroadcastHashJoin Inner BuildRight (44)
+      :                 :     :- * Project (38)
+      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+      :                 :     :     :- * Project (35)
+      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+      :                 :     :     :     :- * ColumnarToRow (32)
+      :                 :     :     :     :  +- CometFilter (31)
+      :                 :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (30)
+      :                 :     :     :     +- ReusedExchange (33)
+      :                 :     :     +- ReusedExchange (36)
+      :                 :     +- BroadcastExchange (43)
+      :                 :        +- * ColumnarToRow (42)
+      :                 :           +- CometProject (41)
+      :                 :              +- CometFilter (40)
+      :                 :                 +- CometScan parquet spark_catalog.default.store (39)
+      :                 +- ReusedExchange (46)
+      +- CometHashAggregate (74)
+         +- CometColumnarExchange (73)
+            +- RowToColumnar (72)
+               +- * HashAggregate (71)
+                  +- * Project (70)
+                     +- * BroadcastHashJoin Inner BuildRight (69)
+                        :- * Project (64)
+                        :  +- * BroadcastHashJoin Inner BuildRight (63)
+                        :     :- * Project (61)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (60)
+                        :     :     :- * Project (58)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
+                        :     :     :     :- * ColumnarToRow (55)
+                        :     :     :     :  +- CometFilter (54)
+                        :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (53)
+                        :     :     :     +- ReusedExchange (56)
+                        :     :     +- ReusedExchange (59)
+                        :     +- ReusedExchange (62)
+                        +- BroadcastExchange (68)
+                           +- * ColumnarToRow (67)
+                              +- CometFilter (66)
+                                 +- CometScan parquet spark_catalog.default.item (65)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -121,7 +125,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 78]
+(11) ReusedExchange [Reuses operator id: 82]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -197,55 +201,56 @@ Functions [4]: [partial_avg(agg1#19), partial_avg(UnscaledValue(agg2#20)), parti
 Aggregate Attributes [8]: [sum#23, count#24, sum#25, count#26, sum#27, count#28, sum#29, count#30]
 Results [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
 
-(27) Exchange
+(27) RowToColumnar
 Input [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
-Arguments: hashpartitioning(i_item_id#18, s_state#16, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) HashAggregate [codegen id : 6]
+(28) CometColumnarExchange
+Input [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
+Arguments: hashpartitioning(i_item_id#18, s_state#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(29) CometHashAggregate
 Input [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
 Keys [2]: [i_item_id#18, s_state#16]
 Functions [4]: [avg(agg1#19), avg(UnscaledValue(agg2#20)), avg(UnscaledValue(agg3#21)), avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [4]: [avg(agg1#19)#39, avg(UnscaledValue(agg2#20))#40, avg(UnscaledValue(agg3#21))#41, avg(UnscaledValue(agg4#22))#42]
-Results [7]: [i_item_id#18, s_state#16, 0 AS g_state#43, avg(agg1#19)#39 AS agg1#44, cast((avg(UnscaledValue(agg2#20))#40 / 100.0) as decimal(11,6)) AS agg2#45, cast((avg(UnscaledValue(agg3#21))#41 / 100.0) as decimal(11,6)) AS agg3#46, cast((avg(UnscaledValue(agg4#22))#42 / 100.0) as decimal(11,6)) AS agg4#47]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#48)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#39)]
 PushedFilters: [IsNotNull(ss_cdemo_sk), IsNotNull(ss_store_sk), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_cdemo_sk:int,ss_store_sk:int,ss_quantity:int,ss_list_price:decimal(7,2),ss_sales_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(30) CometFilter
+(31) CometFilter
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Condition : ((isnotnull(ss_cdemo_sk#2) AND isnotnull(ss_store_sk#3)) AND isnotnull(ss_item_sk#1))
 
-(31) ColumnarToRow [codegen id : 11]
+(32) ColumnarToRow [codegen id : 10]
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 
-(32) ReusedExchange [Reuses operator id: 8]
+(33) ReusedExchange [Reuses operator id: 8]
 Output [1]: [cd_demo_sk#10]
 
-(33) BroadcastHashJoin [codegen id : 11]
+(34) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ss_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#10]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 11]
+(35) Project [codegen id : 10]
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(35) ReusedExchange [Reuses operator id: 78]
+(36) ReusedExchange [Reuses operator id: 82]
 Output [1]: [d_date_sk#14]
 
-(36) BroadcastHashJoin [codegen id : 11]
+(37) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ss_sold_date_sk#8]
 Right keys [1]: [d_date_sk#14]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 11]
+(38) Project [codegen id : 10]
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, d_date_sk#14]
 
@@ -256,113 +261,114 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_state), EqualTo(s_state,TN), IsNotNull(s_store_sk)]
 ReadSchema: struct<s_store_sk:int,s_state:string>
 
-(39) CometFilter
+(40) CometFilter
 Input [2]: [s_store_sk#15, s_state#16]
 Condition : ((isnotnull(s_state#16) AND (s_state#16 = TN)) AND isnotnull(s_store_sk#15))
 
-(40) CometProject
+(41) CometProject
 Input [2]: [s_store_sk#15, s_state#16]
 Arguments: [s_store_sk#15], [s_store_sk#15]
 
-(41) ColumnarToRow [codegen id : 9]
+(42) ColumnarToRow [codegen id : 8]
 Input [1]: [s_store_sk#15]
 
-(42) BroadcastExchange
+(43) BroadcastExchange
 Input [1]: [s_store_sk#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(43) BroadcastHashJoin [codegen id : 11]
+(44) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#15]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 11]
+(45) Project [codegen id : 10]
 Output [5]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, s_store_sk#15]
 
-(45) ReusedExchange [Reuses operator id: 23]
+(46) ReusedExchange [Reuses operator id: 23]
 Output [2]: [i_item_sk#17, i_item_id#18]
 
-(46) BroadcastHashJoin [codegen id : 11]
+(47) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#17]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 11]
+(48) Project [codegen id : 10]
 Output [5]: [i_item_id#18, ss_quantity#4 AS agg1#19, ss_list_price#5 AS agg2#20, ss_coupon_amt#7 AS agg3#21, ss_sales_price#6 AS agg4#22]
 Input [7]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, i_item_sk#17, i_item_id#18]
 
-(48) HashAggregate [codegen id : 11]
+(49) HashAggregate [codegen id : 10]
 Input [5]: [i_item_id#18, agg1#19, agg2#20, agg3#21, agg4#22]
 Keys [1]: [i_item_id#18]
 Functions [4]: [partial_avg(agg1#19), partial_avg(UnscaledValue(agg2#20)), partial_avg(UnscaledValue(agg3#21)), partial_avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [8]: [sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56]
-Results [9]: [i_item_id#18, sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
+Aggregate Attributes [8]: [sum#40, count#41, sum#42, count#43, sum#44, count#45, sum#46, count#47]
+Results [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
+
+(50) RowToColumnar
+Input [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
 
-(49) Exchange
-Input [9]: [i_item_id#18, sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
-Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(51) CometColumnarExchange
+Input [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
+Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(50) HashAggregate [codegen id : 12]
-Input [9]: [i_item_id#18, sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
+(52) CometHashAggregate
+Input [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
 Keys [1]: [i_item_id#18]
 Functions [4]: [avg(agg1#19), avg(UnscaledValue(agg2#20)), avg(UnscaledValue(agg3#21)), avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [4]: [avg(agg1#19)#65, avg(UnscaledValue(agg2#20))#66, avg(UnscaledValue(agg3#21))#67, avg(UnscaledValue(agg4#22))#68]
-Results [7]: [i_item_id#18, null AS s_state#69, 1 AS g_state#70, avg(agg1#19)#65 AS agg1#71, cast((avg(UnscaledValue(agg2#20))#66 / 100.0) as decimal(11,6)) AS agg2#72, cast((avg(UnscaledValue(agg3#21))#67 / 100.0) as decimal(11,6)) AS agg3#73, cast((avg(UnscaledValue(agg4#22))#68 / 100.0) as decimal(11,6)) AS agg4#74]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#75)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#56)]
 PushedFilters: [IsNotNull(ss_cdemo_sk), IsNotNull(ss_store_sk), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_cdemo_sk:int,ss_store_sk:int,ss_quantity:int,ss_list_price:decimal(7,2),ss_sales_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(52) CometFilter
+(54) CometFilter
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Condition : ((isnotnull(ss_cdemo_sk#2) AND isnotnull(ss_store_sk#3)) AND isnotnull(ss_item_sk#1))
 
-(53) ColumnarToRow [codegen id : 17]
+(55) ColumnarToRow [codegen id : 15]
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 
-(54) ReusedExchange [Reuses operator id: 8]
+(56) ReusedExchange [Reuses operator id: 8]
 Output [1]: [cd_demo_sk#10]
 
-(55) BroadcastHashJoin [codegen id : 17]
+(57) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ss_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#10]
 Join type: Inner
 Join condition: None
 
-(56) Project [codegen id : 17]
+(58) Project [codegen id : 15]
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(57) ReusedExchange [Reuses operator id: 78]
+(59) ReusedExchange [Reuses operator id: 82]
 Output [1]: [d_date_sk#14]
 
-(58) BroadcastHashJoin [codegen id : 17]
+(60) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ss_sold_date_sk#8]
 Right keys [1]: [d_date_sk#14]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 17]
+(61) Project [codegen id : 15]
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, d_date_sk#14]
 
-(60) ReusedExchange [Reuses operator id: 42]
+(62) ReusedExchange [Reuses operator id: 43]
 Output [1]: [s_store_sk#15]
 
-(61) BroadcastHashJoin [codegen id : 17]
+(63) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#15]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 17]
+(64) Project [codegen id : 15]
 Output [5]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, s_store_sk#15]
 
@@ -373,85 +379,92 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int>
 
-(64) CometFilter
+(66) CometFilter
 Input [1]: [i_item_sk#17]
 Condition : isnotnull(i_item_sk#17)
 
-(65) ColumnarToRow [codegen id : 16]
+(67) ColumnarToRow [codegen id : 14]
 Input [1]: [i_item_sk#17]
 
-(66) BroadcastExchange
+(68) BroadcastExchange
 Input [1]: [i_item_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(67) BroadcastHashJoin [codegen id : 17]
+(69) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#17]
 Join type: Inner
 Join condition: None
 
-(68) Project [codegen id : 17]
+(70) Project [codegen id : 15]
 Output [4]: [ss_quantity#4 AS agg1#19, ss_list_price#5 AS agg2#20, ss_coupon_amt#7 AS agg3#21, ss_sales_price#6 AS agg4#22]
 Input [6]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, i_item_sk#17]
 
-(69) HashAggregate [codegen id : 17]
+(71) HashAggregate [codegen id : 15]
 Input [4]: [agg1#19, agg2#20, agg3#21, agg4#22]
 Keys: []
 Functions [4]: [partial_avg(agg1#19), partial_avg(UnscaledValue(agg2#20)), partial_avg(UnscaledValue(agg3#21)), partial_avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [8]: [sum#76, count#77, sum#78, count#79, sum#80, count#81, sum#82, count#83]
-Results [8]: [sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+Aggregate Attributes [8]: [sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
+Results [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
 
-(70) Exchange
-Input [8]: [sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=8]
+(72) RowToColumnar
+Input [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
 
-(71) HashAggregate [codegen id : 18]
-Input [8]: [sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+(73) CometColumnarExchange
+Input [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+
+(74) CometHashAggregate
+Input [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
 Keys: []
 Functions [4]: [avg(agg1#19), avg(UnscaledValue(agg2#20)), avg(UnscaledValue(agg3#21)), avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [4]: [avg(agg1#19)#92, avg(UnscaledValue(agg2#20))#93, avg(UnscaledValue(agg3#21))#94, avg(UnscaledValue(agg4#22))#95]
-Results [7]: [null AS i_item_id#96, null AS s_state#97, 1 AS g_state#98, avg(agg1#19)#92 AS agg1#99, cast((avg(UnscaledValue(agg2#20))#93 / 100.0) as decimal(11,6)) AS agg2#100, cast((avg(UnscaledValue(agg3#21))#94 / 100.0) as decimal(11,6)) AS agg3#101, cast((avg(UnscaledValue(agg4#22))#95 / 100.0) as decimal(11,6)) AS agg4#102]
 
-(72) Union
+(75) CometUnion
+Child 0 Input [7]: [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
+Child 1 Input [7]: [i_item_id#18, s_state#78, g_state#79, agg1#80, agg2#81, agg3#82, agg4#83]
+Child 2 Input [7]: [i_item_id#84, s_state#85, g_state#86, agg1#87, agg2#88, agg3#89, agg4#90]
+
+(76) CometTakeOrderedAndProject
+Input [7]: [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#18 ASC NULLS FIRST,s_state#16 ASC NULLS FIRST], output=[i_item_id#18,s_state#16,g_state#73,agg1#74,agg2#75,agg3#76,agg4#77]), 100, [i_item_id#18 ASC NULLS FIRST, s_state#16 ASC NULLS FIRST], [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
 
-(73) TakeOrderedAndProject
-Input [7]: [i_item_id#18, s_state#16, g_state#43, agg1#44, agg2#45, agg3#46, agg4#47]
-Arguments: 100, [i_item_id#18 ASC NULLS FIRST, s_state#16 ASC NULLS FIRST], [i_item_id#18, s_state#16, g_state#43, agg1#44, agg2#45, agg3#46, agg4#47]
+(77) ColumnarToRow [codegen id : 16]
+Input [7]: [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (78)
-+- * ColumnarToRow (77)
-   +- CometProject (76)
-      +- CometFilter (75)
-         +- CometScan parquet spark_catalog.default.date_dim (74)
+BroadcastExchange (82)
++- * ColumnarToRow (81)
+   +- CometProject (80)
+      +- CometFilter (79)
+         +- CometScan parquet spark_catalog.default.date_dim (78)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#103]
+Output [2]: [d_date_sk#14, d_year#91]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(75) CometFilter
-Input [2]: [d_date_sk#14, d_year#103]
-Condition : ((isnotnull(d_year#103) AND (d_year#103 = 1998)) AND isnotnull(d_date_sk#14))
+(79) CometFilter
+Input [2]: [d_date_sk#14, d_year#91]
+Condition : ((isnotnull(d_year#91) AND (d_year#91 = 1998)) AND isnotnull(d_date_sk#14))
 
-(76) CometProject
-Input [2]: [d_date_sk#14, d_year#103]
+(80) CometProject
+Input [2]: [d_date_sk#14, d_year#91]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(77) ColumnarToRow [codegen id : 1]
+(81) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(78) BroadcastExchange
+(82) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-Subquery:2 Hosting operator id = 29 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
+Subquery:2 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
 
-Subquery:3 Hosting operator id = 51 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
+Subquery:3 Hosting operator id = 53 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt
index 32f003798d..fec1c27dd3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt
@@ -1,117 +1,117 @@
-TakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
-  Union
-    WholeStageCodegen (6)
-      HashAggregate [i_item_id,s_state,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(UnscaledValue(agg2)),avg(UnscaledValue(agg3)),avg(UnscaledValue(agg4)),g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange [i_item_id,s_state] #1
-            WholeStageCodegen (5)
-              HashAggregate [i_item_id,s_state,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [i_item_id,s_state,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
-                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_year,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+WholeStageCodegen (16)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
+        CometUnion
+          CometHashAggregate [i_item_id,s_state,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange [i_item_id,s_state] #1
+              RowToColumnar
+                WholeStageCodegen (5)
+                  HashAggregate [i_item_id,s_state,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [i_item_id,s_state,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
+                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                    InputAdapter
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [cd_demo_sk]
+                                                CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [cd_demo_sk]
-                                            CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #4
+                                WholeStageCodegen (3)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [s_state,s_store_sk]
+                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (3)
+                          BroadcastExchange #5
+                            WholeStageCodegen (4)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [s_state,s_store_sk]
-                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                    InputAdapter
-                      BroadcastExchange #5
-                        WholeStageCodegen (4)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-    WholeStageCodegen (12)
-      HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(UnscaledValue(agg2)),avg(UnscaledValue(agg3)),avg(UnscaledValue(agg4)),s_state,g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange [i_item_id] #6
-            WholeStageCodegen (11)
-              HashAggregate [i_item_id,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                        ReusedSubquery [d_date_sk] #1
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+          CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange [i_item_id] #6
+              RowToColumnar
+                WholeStageCodegen (10)
+                  HashAggregate [i_item_id,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                    InputAdapter
+                                      ReusedExchange [cd_demo_sk] #3
                                 InputAdapter
-                                  ReusedExchange [cd_demo_sk] #3
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #7
+                                WholeStageCodegen (8)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [s_store_sk]
+                                        CometFilter [s_state,s_store_sk]
+                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (9)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometProject [s_store_sk]
-                                    CometFilter [s_state,s_store_sk]
-                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                    InputAdapter
-                      ReusedExchange [i_item_sk,i_item_id] #5
-    WholeStageCodegen (18)
-      HashAggregate [sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(UnscaledValue(agg2)),avg(UnscaledValue(agg3)),avg(UnscaledValue(agg4)),i_item_id,s_state,g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
-        InputAdapter
-          Exchange #8
-            WholeStageCodegen (17)
-              HashAggregate [agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                Project [ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                        ReusedSubquery [d_date_sk] #1
+                          ReusedExchange [i_item_sk,i_item_id] #5
+          CometHashAggregate [sum,count,sum,count,sum,count,sum,count]
+            CometColumnarExchange #8
+              RowToColumnar
+                WholeStageCodegen (15)
+                  HashAggregate [agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                    Project [ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                    InputAdapter
+                                      ReusedExchange [cd_demo_sk] #3
                                 InputAdapter
-                                  ReusedExchange [cd_demo_sk] #3
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              ReusedExchange [s_store_sk] #7
                         InputAdapter
-                          ReusedExchange [s_store_sk] #7
-                    InputAdapter
-                      BroadcastExchange #9
-                        WholeStageCodegen (16)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [i_item_sk]
-                                CometScan parquet spark_catalog.default.item [i_item_sk]
+                          BroadcastExchange #9
+                            WholeStageCodegen (14)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt
index a86edcfa3a..cd5187ddd2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt
@@ -1,36 +1,40 @@
 == Physical Plan ==
-* Sort (32)
-+- Exchange (31)
-   +- * Project (30)
-      +- * BroadcastHashJoin Inner BuildRight (29)
-         :- * Filter (24)
-         :  +- * HashAggregate (23)
-         :     +- Exchange (22)
-         :        +- * HashAggregate (21)
-         :           +- * Project (20)
-         :              +- * BroadcastHashJoin Inner BuildRight (19)
-         :                 :- * Project (13)
-         :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
-         :                 :     :- * Project (6)
-         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-         :                 :     :     :- * ColumnarToRow (3)
-         :                 :     :     :  +- CometFilter (2)
-         :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-         :                 :     :     +- ReusedExchange (4)
-         :                 :     +- BroadcastExchange (11)
-         :                 :        +- * ColumnarToRow (10)
-         :                 :           +- CometProject (9)
-         :                 :              +- CometFilter (8)
-         :                 :                 +- CometScan parquet spark_catalog.default.store (7)
-         :                 +- BroadcastExchange (18)
-         :                    +- * ColumnarToRow (17)
-         :                       +- CometProject (16)
-         :                          +- CometFilter (15)
-         :                             +- CometScan parquet spark_catalog.default.household_demographics (14)
-         +- BroadcastExchange (28)
-            +- * ColumnarToRow (27)
-               +- CometFilter (26)
-                  +- CometScan parquet spark_catalog.default.customer (25)
+* ColumnarToRow (36)
++- CometSort (35)
+   +- CometColumnarExchange (34)
+      +- RowToColumnar (33)
+         +- * Project (32)
+            +- * BroadcastHashJoin Inner BuildRight (31)
+               :- * ColumnarToRow (26)
+               :  +- CometFilter (25)
+               :     +- CometHashAggregate (24)
+               :        +- CometColumnarExchange (23)
+               :           +- RowToColumnar (22)
+               :              +- * HashAggregate (21)
+               :                 +- * Project (20)
+               :                    +- * BroadcastHashJoin Inner BuildRight (19)
+               :                       :- * Project (13)
+               :                       :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :                       :     :- * Project (6)
+               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :                       :     :     :- * ColumnarToRow (3)
+               :                       :     :     :  +- CometFilter (2)
+               :                       :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                       :     :     +- ReusedExchange (4)
+               :                       :     +- BroadcastExchange (11)
+               :                       :        +- * ColumnarToRow (10)
+               :                       :           +- CometProject (9)
+               :                       :              +- CometFilter (8)
+               :                       :                 +- CometScan parquet spark_catalog.default.store (7)
+               :                       +- BroadcastExchange (18)
+               :                          +- * ColumnarToRow (17)
+               :                             +- CometProject (16)
+               :                                +- CometFilter (15)
+               :                                   +- CometScan parquet spark_catalog.default.household_demographics (14)
+               +- BroadcastExchange (30)
+                  +- * ColumnarToRow (29)
+                     +- CometFilter (28)
+                        +- CometScan parquet spark_catalog.default.customer (27)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -48,7 +52,7 @@ Condition : ((isnotnull(ss_store_sk#3) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 37]
+(4) ReusedExchange [Reuses operator id: 41]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -132,86 +136,96 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#14]
 Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 
-(22) Exchange
+(22) RowToColumnar
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) HashAggregate [codegen id : 6]
+(23) CometColumnarExchange
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(24) CometHashAggregate
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 Keys [2]: [ss_ticket_number#4, ss_customer_sk#1]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#16]
-Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count(1)#16 AS cnt#17]
 
-(24) Filter [codegen id : 6]
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17]
-Condition : ((cnt#17 >= 15) AND (cnt#17 <= 20))
+(25) CometFilter
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
+Condition : ((cnt#16 >= 15) AND (cnt#16 <= 20))
+
+(26) ColumnarToRow [codegen id : 6]
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+Output [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string>
 
-(26) CometFilter
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
-Condition : isnotnull(c_customer_sk#18)
+(28) CometFilter
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+Condition : isnotnull(c_customer_sk#17)
 
-(27) ColumnarToRow [codegen id : 5]
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(29) ColumnarToRow [codegen id : 5]
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 
-(28) BroadcastExchange
-Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(30) BroadcastExchange
+Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 6]
+(31) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#18]
+Right keys [1]: [c_customer_sk#17]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17, c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+(32) Project [codegen id : 6]
+Output [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16, c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+
+(33) RowToColumnar
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+
+(34) CometColumnarExchange
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Arguments: rangepartitioning(c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(31) Exchange
-Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Arguments: rangepartitioning(c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(35) CometSort
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+Arguments: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16], [c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST]
 
-(32) Sort [codegen id : 7]
-Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
-Arguments: [c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST], true, 0
+(36) ColumnarToRow [codegen id : 7]
+Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (41)
++- * ColumnarToRow (40)
+   +- CometProject (39)
+      +- CometFilter (38)
+         +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#23, d_dom#24]
+Output [3]: [d_date_sk#7, d_year#22, d_dom#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(And(GreaterThanOrEqual(d_dom,1),LessThanOrEqual(d_dom,3)),And(GreaterThanOrEqual(d_dom,25),LessThanOrEqual(d_dom,28))), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(34) CometFilter
-Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
-Condition : (((((d_dom#24 >= 1) AND (d_dom#24 <= 3)) OR ((d_dom#24 >= 25) AND (d_dom#24 <= 28))) AND d_year#23 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
+(38) CometFilter
+Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
+Condition : (((((d_dom#23 >= 1) AND (d_dom#23 <= 3)) OR ((d_dom#23 >= 25) AND (d_dom#23 <= 28))) AND d_year#22 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
 
-(35) CometProject
-Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
+(39) CometProject
+Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(36) ColumnarToRow [codegen id : 1]
+(40) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(37) BroadcastExchange
+(41) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt
index b473e48921..9c94a51d26 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt
@@ -1,56 +1,60 @@
 WholeStageCodegen (7)
-  Sort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number]
+  ColumnarToRow
     InputAdapter
-      Exchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number] #1
-        WholeStageCodegen (6)
-          Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
-            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-              Filter [cnt]
-                HashAggregate [ss_ticket_number,ss_customer_sk,count] [count(1),cnt,count]
-                  InputAdapter
-                    Exchange [ss_ticket_number,ss_customer_sk] #2
-                      WholeStageCodegen (4)
-                        HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
-                          Project [ss_customer_sk,ss_ticket_number]
-                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                              Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
-                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_dom,d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                  InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+      CometSort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number]
+        CometColumnarExchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number] #1
+          RowToColumnar
+            WholeStageCodegen (6)
+              Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
+                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [cnt]
+                        CometHashAggregate [ss_ticket_number,ss_customer_sk,count]
+                          CometColumnarExchange [ss_ticket_number,ss_customer_sk] #2
+                            RowToColumnar
+                              WholeStageCodegen (4)
+                                HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
+                                  Project [ss_customer_sk,ss_ticket_number]
+                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                      Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
+                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                          Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_dom,d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
                                           InputAdapter
-                                            CometProject [s_store_sk]
-                                              CometFilter [s_county,s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (3)
-                                    ColumnarToRow
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [s_store_sk]
+                                                      CometFilter [s_county,s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
                                       InputAdapter
-                                        CometProject [hd_demo_sk]
-                                          CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
-                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
-              InputAdapter
-                BroadcastExchange #6
-                  WholeStageCodegen (5)
-                    ColumnarToRow
-                      InputAdapter
-                        CometFilter [c_customer_sk]
-                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (3)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [hd_demo_sk]
+                                                  CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
+                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
+                  InputAdapter
+                    BroadcastExchange #6
+                      WholeStageCodegen (5)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [c_customer_sk]
+                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt
index e723b6c0e6..54878fd686 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt
@@ -1,46 +1,48 @@
 == Physical Plan ==
-TakeOrderedAndProject (42)
-+- * HashAggregate (41)
-   +- Exchange (40)
-      +- * HashAggregate (39)
-         +- * Project (38)
-            +- * BroadcastHashJoin Inner BuildRight (37)
-               :- * Project (32)
-               :  +- * BroadcastHashJoin Inner BuildRight (31)
-               :     :- * Project (26)
-               :     :  +- * Filter (25)
-               :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
-               :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
-               :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-               :     :        :  :  :- * ColumnarToRow (3)
-               :     :        :  :  :  +- CometFilter (2)
-               :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-               :     :        :  :  +- BroadcastExchange (9)
-               :     :        :  :     +- * Project (8)
-               :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :        :  :           :- * ColumnarToRow (5)
-               :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-               :     :        :  :           +- ReusedExchange (6)
-               :     :        :  +- BroadcastExchange (16)
-               :     :        :     +- * Project (15)
-               :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :        :           :- * ColumnarToRow (12)
-               :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-               :     :        :           +- ReusedExchange (13)
-               :     :        +- BroadcastExchange (23)
-               :     :           +- * Project (22)
-               :     :              +- * BroadcastHashJoin Inner BuildRight (21)
-               :     :                 :- * ColumnarToRow (19)
-               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-               :     :                 +- ReusedExchange (20)
-               :     +- BroadcastExchange (30)
-               :        +- * ColumnarToRow (29)
-               :           +- CometFilter (28)
-               :              +- CometScan parquet spark_catalog.default.customer_address (27)
-               +- BroadcastExchange (36)
-                  +- * ColumnarToRow (35)
-                     +- CometFilter (34)
-                        +- CometScan parquet spark_catalog.default.customer_demographics (33)
+* ColumnarToRow (44)
++- CometTakeOrderedAndProject (43)
+   +- CometHashAggregate (42)
+      +- CometColumnarExchange (41)
+         +- RowToColumnar (40)
+            +- * HashAggregate (39)
+               +- * Project (38)
+                  +- * BroadcastHashJoin Inner BuildRight (37)
+                     :- * Project (32)
+                     :  +- * BroadcastHashJoin Inner BuildRight (31)
+                     :     :- * Project (26)
+                     :     :  +- * Filter (25)
+                     :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
+                     :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
+                     :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+                     :     :        :  :  :- * ColumnarToRow (3)
+                     :     :        :  :  :  +- CometFilter (2)
+                     :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+                     :     :        :  :  +- BroadcastExchange (9)
+                     :     :        :  :     +- * Project (8)
+                     :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+                     :     :        :  :           :- * ColumnarToRow (5)
+                     :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+                     :     :        :  :           +- ReusedExchange (6)
+                     :     :        :  +- BroadcastExchange (16)
+                     :     :        :     +- * Project (15)
+                     :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :        :           :- * ColumnarToRow (12)
+                     :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+                     :     :        :           +- ReusedExchange (13)
+                     :     :        +- BroadcastExchange (23)
+                     :     :           +- * Project (22)
+                     :     :              +- * BroadcastHashJoin Inner BuildRight (21)
+                     :     :                 :- * ColumnarToRow (19)
+                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+                     :     :                 +- ReusedExchange (20)
+                     :     +- BroadcastExchange (30)
+                     :        +- * ColumnarToRow (29)
+                     :           +- CometFilter (28)
+                     :              +- CometScan parquet spark_catalog.default.customer_address (27)
+                     +- BroadcastExchange (36)
+                        +- * ColumnarToRow (35)
+                           +- CometFilter (34)
+                              +- CometScan parquet spark_catalog.default.customer_demographics (33)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -67,7 +69,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#6, ss_sold_date_sk#7]
 
-(6) ReusedExchange [Reuses operator id: 47]
+(6) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#9]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -100,7 +102,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#10, ws_sold_date_sk#11]
 
-(13) ReusedExchange [Reuses operator id: 47]
+(13) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#13]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -133,7 +135,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#14, cs_sold_date_sk#15]
 
-(20) ReusedExchange [Reuses operator id: 47]
+(20) ReusedExchange [Reuses operator id: 49]
 Output [1]: [d_date_sk#17]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -227,50 +229,54 @@ Functions [10]: [partial_count(1), partial_avg(cd_dep_count#23), partial_max(cd_
 Aggregate Attributes [13]: [count#26, sum#27, count#28, max#29, sum#30, sum#31, count#32, max#33, sum#34, sum#35, count#36, max#37, sum#38]
 Results [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 
-(40) Exchange
+(40) RowToColumnar
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
-Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) HashAggregate [codegen id : 10]
+(41) CometColumnarExchange
+Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
+Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(42) CometHashAggregate
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 Keys [6]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25]
 Functions [10]: [count(1), avg(cd_dep_count#23), max(cd_dep_count#23), sum(cd_dep_count#23), avg(cd_dep_employed_count#24), max(cd_dep_employed_count#24), sum(cd_dep_employed_count#24), avg(cd_dep_college_count#25), max(cd_dep_college_count#25), sum(cd_dep_college_count#25)]
-Aggregate Attributes [10]: [count(1)#52, avg(cd_dep_count#23)#53, max(cd_dep_count#23)#54, sum(cd_dep_count#23)#55, avg(cd_dep_employed_count#24)#56, max(cd_dep_employed_count#24)#57, sum(cd_dep_employed_count#24)#58, avg(cd_dep_college_count#25)#59, max(cd_dep_college_count#25)#60, sum(cd_dep_college_count#25)#61]
-Results [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, count(1)#52 AS cnt1#62, avg(cd_dep_count#23)#53 AS avg(cd_dep_count)#63, max(cd_dep_count#23)#54 AS max(cd_dep_count)#64, sum(cd_dep_count#23)#55 AS sum(cd_dep_count)#65, cd_dep_employed_count#24, count(1)#52 AS cnt2#66, avg(cd_dep_employed_count#24)#56 AS avg(cd_dep_employed_count)#67, max(cd_dep_employed_count#24)#57 AS max(cd_dep_employed_count)#68, sum(cd_dep_employed_count#24)#58 AS sum(cd_dep_employed_count)#69, cd_dep_college_count#25, count(1)#52 AS cnt3#70, avg(cd_dep_college_count#25)#59 AS avg(cd_dep_college_count)#71, max(cd_dep_college_count#25)#60 AS max(cd_dep_college_count)#72, sum(cd_dep_college_count#25)#61 AS sum(cd_dep_college_count)#73]
 
-(42) TakeOrderedAndProject
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
-Arguments: 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
+(43) CometTakeOrderedAndProject
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_state#19 ASC NULLS FIRST,cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_dep_count#23 ASC NULLS FIRST,cd_dep_employed_count#24 ASC NULLS FIRST,cd_dep_college_count#25 ASC NULLS FIRST], output=[ca_state#19,cd_gender#21,cd_marital_status#22,cd_dep_count#23,cnt1#52,avg(cd_dep_count)#53,max(cd_dep_count)#54,sum(cd_dep_count)#55,cd_dep_employed_count#24,cnt2#56,avg(cd_dep_employed_count)#57,max(cd_dep_employed_count)#58,sum(cd_dep_employed_count)#59,cd_dep_college_count#25,cnt3#60,avg(cd_dep_college_count)#61,max(cd_dep_college_count)#62,sum(cd_dep_college_count)#63]), 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
+
+(44) ColumnarToRow [codegen id : 10]
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#9, d_year#74, d_qoy#75]
+Output [3]: [d_date_sk#9, d_year#64, d_qoy#65]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_qoy), EqualTo(d_year,2002), LessThan(d_qoy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(44) CometFilter
-Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
-Condition : ((((isnotnull(d_year#74) AND isnotnull(d_qoy#75)) AND (d_year#74 = 2002)) AND (d_qoy#75 < 4)) AND isnotnull(d_date_sk#9))
+(46) CometFilter
+Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
+Condition : ((((isnotnull(d_year#64) AND isnotnull(d_qoy#65)) AND (d_year#64 = 2002)) AND (d_qoy#65 < 4)) AND isnotnull(d_date_sk#9))
 
-(45) CometProject
-Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
+(47) CometProject
+Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(46) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(47) BroadcastExchange
+(49) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt
index dc724ca919..549322409a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt
@@ -1,74 +1,76 @@
-TakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
-  WholeStageCodegen (10)
-    HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum] [count(1),avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-      InputAdapter
-        Exchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-          WholeStageCodegen (9)
-            HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-              Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                  Project [c_current_cdemo_sk,ca_state]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [c_current_cdemo_sk,c_current_addr_sk]
-                        Filter [exists,exists]
-                          BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                            BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                ColumnarToRow
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
+        CometHashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+          CometColumnarExchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+            RowToColumnar
+              WholeStageCodegen (9)
+                HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+                  Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                      Project [c_current_cdemo_sk,ca_state]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [c_current_cdemo_sk,c_current_addr_sk]
+                            Filter [exists,exists]
+                              BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                                BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                    InputAdapter
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (2)
+                                          Project [ss_customer_sk]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_qoy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
                                   InputAdapter
-                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (4)
+                                        Project [ws_bill_customer_sk]
+                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk] #3
                                 InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (2)
-                                      Project [ss_customer_sk]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (6)
+                                      Project [cs_ship_customer_sk]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_qoy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                           InputAdapter
                                             ReusedExchange [d_date_sk] #3
-                              InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (4)
-                                    Project [ws_bill_customer_sk]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #3
-                            InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (6)
-                                  Project [cs_ship_customer_sk]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                          InputAdapter
+                            BroadcastExchange #6
+                              WholeStageCodegen (7)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (7)
+                        BroadcastExchange #7
+                          WholeStageCodegen (8)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ca_address_sk]
-                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                  InputAdapter
-                    BroadcastExchange #7
-                      WholeStageCodegen (8)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cd_demo_sk]
-                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [cd_demo_sk]
+                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt
index 29e62c0b79..d12bef6d51 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt
@@ -1,44 +1,46 @@
 == Physical Plan ==
-TakeOrderedAndProject (40)
-+- * HashAggregate (39)
-   +- Exchange (38)
-      +- * HashAggregate (37)
-         +- * Project (36)
-            +- * BroadcastHashJoin Inner BuildRight (35)
-               :- * Project (30)
-               :  +- * BroadcastHashJoin Inner BuildRight (29)
-               :     :- * Project (24)
-               :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
-               :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
-               :     :     :  :- * ColumnarToRow (3)
-               :     :     :  :  +- CometFilter (2)
-               :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
-               :     :     :  +- BroadcastExchange (9)
-               :     :     :     +- * Project (8)
-               :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :     :           :- * ColumnarToRow (5)
-               :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-               :     :     :           +- ReusedExchange (6)
-               :     :     +- BroadcastExchange (22)
-               :     :        +- Union (21)
-               :     :           :- * Project (15)
-               :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :     :           :     :- * ColumnarToRow (12)
-               :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
-               :     :           :     +- ReusedExchange (13)
-               :     :           +- * Project (20)
-               :     :              +- * BroadcastHashJoin Inner BuildRight (19)
-               :     :                 :- * ColumnarToRow (17)
-               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
-               :     :                 +- ReusedExchange (18)
-               :     +- BroadcastExchange (28)
-               :        +- * ColumnarToRow (27)
-               :           +- CometFilter (26)
-               :              +- CometScan parquet spark_catalog.default.customer_address (25)
-               +- BroadcastExchange (34)
-                  +- * ColumnarToRow (33)
-                     +- CometFilter (32)
-                        +- CometScan parquet spark_catalog.default.customer_demographics (31)
+* ColumnarToRow (42)
++- CometTakeOrderedAndProject (41)
+   +- CometHashAggregate (40)
+      +- CometColumnarExchange (39)
+         +- RowToColumnar (38)
+            +- * HashAggregate (37)
+               +- * Project (36)
+                  +- * BroadcastHashJoin Inner BuildRight (35)
+                     :- * Project (30)
+                     :  +- * BroadcastHashJoin Inner BuildRight (29)
+                     :     :- * Project (24)
+                     :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
+                     :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
+                     :     :     :  :- * ColumnarToRow (3)
+                     :     :     :  :  +- CometFilter (2)
+                     :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
+                     :     :     :  +- BroadcastExchange (9)
+                     :     :     :     +- * Project (8)
+                     :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
+                     :     :     :           :- * ColumnarToRow (5)
+                     :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+                     :     :     :           +- ReusedExchange (6)
+                     :     :     +- BroadcastExchange (22)
+                     :     :        +- Union (21)
+                     :     :           :- * Project (15)
+                     :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
+                     :     :           :     :- * ColumnarToRow (12)
+                     :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
+                     :     :           :     +- ReusedExchange (13)
+                     :     :           +- * Project (20)
+                     :     :              +- * BroadcastHashJoin Inner BuildRight (19)
+                     :     :                 :- * ColumnarToRow (17)
+                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
+                     :     :                 +- ReusedExchange (18)
+                     :     +- BroadcastExchange (28)
+                     :        +- * ColumnarToRow (27)
+                     :           +- CometFilter (26)
+                     :              +- CometScan parquet spark_catalog.default.customer_address (25)
+                     +- BroadcastExchange (34)
+                        +- * ColumnarToRow (33)
+                           +- CometFilter (32)
+                              +- CometScan parquet spark_catalog.default.customer_demographics (31)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -65,7 +67,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#4, ss_sold_date_sk#5]
 
-(6) ReusedExchange [Reuses operator id: 45]
+(6) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#7]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -98,7 +100,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#8, ws_sold_date_sk#9]
 
-(13) ReusedExchange [Reuses operator id: 45]
+(13) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#11]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -121,7 +123,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (17) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#13, cs_sold_date_sk#14]
 
-(18) ReusedExchange [Reuses operator id: 45]
+(18) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#16]
 
 (19) BroadcastHashJoin [codegen id : 6]
@@ -213,50 +215,54 @@ Functions [10]: [partial_count(1), partial_avg(cd_dep_count#23), partial_max(cd_
 Aggregate Attributes [13]: [count#26, sum#27, count#28, max#29, sum#30, sum#31, count#32, max#33, sum#34, sum#35, count#36, max#37, sum#38]
 Results [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 
-(38) Exchange
+(38) RowToColumnar
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
-Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) HashAggregate [codegen id : 10]
+(39) CometColumnarExchange
+Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
+Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(40) CometHashAggregate
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 Keys [6]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25]
 Functions [10]: [count(1), avg(cd_dep_count#23), max(cd_dep_count#23), sum(cd_dep_count#23), avg(cd_dep_employed_count#24), max(cd_dep_employed_count#24), sum(cd_dep_employed_count#24), avg(cd_dep_college_count#25), max(cd_dep_college_count#25), sum(cd_dep_college_count#25)]
-Aggregate Attributes [10]: [count(1)#52, avg(cd_dep_count#23)#53, max(cd_dep_count#23)#54, sum(cd_dep_count#23)#55, avg(cd_dep_employed_count#24)#56, max(cd_dep_employed_count#24)#57, sum(cd_dep_employed_count#24)#58, avg(cd_dep_college_count#25)#59, max(cd_dep_college_count#25)#60, sum(cd_dep_college_count#25)#61]
-Results [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, count(1)#52 AS cnt1#62, avg(cd_dep_count#23)#53 AS avg(cd_dep_count)#63, max(cd_dep_count#23)#54 AS max(cd_dep_count)#64, sum(cd_dep_count#23)#55 AS sum(cd_dep_count)#65, cd_dep_employed_count#24, count(1)#52 AS cnt2#66, avg(cd_dep_employed_count#24)#56 AS avg(cd_dep_employed_count)#67, max(cd_dep_employed_count#24)#57 AS max(cd_dep_employed_count)#68, sum(cd_dep_employed_count#24)#58 AS sum(cd_dep_employed_count)#69, cd_dep_college_count#25, count(1)#52 AS cnt3#70, avg(cd_dep_college_count#25)#59 AS avg(cd_dep_college_count)#71, max(cd_dep_college_count#25)#60 AS max(cd_dep_college_count)#72, sum(cd_dep_college_count#25)#61 AS sum(cd_dep_college_count)#73]
 
-(40) TakeOrderedAndProject
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
-Arguments: 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
+(41) CometTakeOrderedAndProject
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_state#19 ASC NULLS FIRST,cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_dep_count#23 ASC NULLS FIRST,cd_dep_employed_count#24 ASC NULLS FIRST,cd_dep_college_count#25 ASC NULLS FIRST], output=[ca_state#19,cd_gender#21,cd_marital_status#22,cd_dep_count#23,cnt1#52,avg(cd_dep_count)#53,max(cd_dep_count)#54,sum(cd_dep_count)#55,cd_dep_employed_count#24,cnt2#56,avg(cd_dep_employed_count)#57,max(cd_dep_employed_count)#58,sum(cd_dep_employed_count)#59,cd_dep_college_count#25,cnt3#60,avg(cd_dep_college_count)#61,max(cd_dep_college_count)#62,sum(cd_dep_college_count)#63]), 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
+
+(42) ColumnarToRow [codegen id : 10]
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (45)
-+- * ColumnarToRow (44)
-   +- CometProject (43)
-      +- CometFilter (42)
-         +- CometScan parquet spark_catalog.default.date_dim (41)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#74, d_qoy#75]
+Output [3]: [d_date_sk#7, d_year#64, d_qoy#65]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_qoy), EqualTo(d_year,1999), LessThan(d_qoy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(42) CometFilter
-Input [3]: [d_date_sk#7, d_year#74, d_qoy#75]
-Condition : ((((isnotnull(d_year#74) AND isnotnull(d_qoy#75)) AND (d_year#74 = 1999)) AND (d_qoy#75 < 4)) AND isnotnull(d_date_sk#7))
+(44) CometFilter
+Input [3]: [d_date_sk#7, d_year#64, d_qoy#65]
+Condition : ((((isnotnull(d_year#64) AND isnotnull(d_qoy#65)) AND (d_year#64 = 1999)) AND (d_qoy#65 < 4)) AND isnotnull(d_date_sk#7))
 
-(43) CometProject
-Input [3]: [d_date_sk#7, d_year#74, d_qoy#75]
+(45) CometProject
+Input [3]: [d_date_sk#7, d_year#64, d_qoy#65]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(44) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(45) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt
index e5cb940552..d5346d83b3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt
@@ -1,71 +1,73 @@
-TakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
-  WholeStageCodegen (10)
-    HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum] [count(1),avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-      InputAdapter
-        Exchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-          WholeStageCodegen (9)
-            HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-              Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                  Project [c_current_cdemo_sk,ca_state]
-                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                      Project [c_current_cdemo_sk,c_current_addr_sk]
-                        BroadcastHashJoin [c_customer_sk,customsk]
-                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                            ColumnarToRow
+WholeStageCodegen (10)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
+        CometHashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+          CometColumnarExchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+            RowToColumnar
+              WholeStageCodegen (9)
+                HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+                  Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                      Project [c_current_cdemo_sk,ca_state]
+                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                          Project [c_current_cdemo_sk,c_current_addr_sk]
+                            BroadcastHashJoin [c_customer_sk,customsk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                InputAdapter
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (2)
+                                      Project [ss_customer_sk]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_qoy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                               InputAdapter
-                                CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                            InputAdapter
-                              BroadcastExchange #2
-                                WholeStageCodegen (2)
-                                  Project [ss_customer_sk]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_qoy,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                BroadcastExchange #4
+                                  Union
+                                    WholeStageCodegen (4)
+                                      Project [ws_bill_customer_sk]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
+                                    WholeStageCodegen (6)
+                                      Project [cs_ship_customer_sk]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                           InputAdapter
-                            BroadcastExchange #4
-                              Union
-                                WholeStageCodegen (4)
-                                  Project [ws_bill_customer_sk]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                WholeStageCodegen (6)
-                                  Project [cs_ship_customer_sk]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                            BroadcastExchange #5
+                              WholeStageCodegen (7)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (7)
+                        BroadcastExchange #6
+                          WholeStageCodegen (8)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [ca_address_sk]
-                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                  InputAdapter
-                    BroadcastExchange #6
-                      WholeStageCodegen (8)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [cd_demo_sk]
-                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [cd_demo_sk]
+                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt
index 2519f23a25..060abaefb8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt
@@ -1,45 +1,47 @@
 == Physical Plan ==
-TakeOrderedAndProject (41)
-+- * Project (40)
-   +- Window (39)
-      +- * Sort (38)
-         +- Exchange (37)
-            +- * HashAggregate (36)
-               +- Exchange (35)
-                  +- * HashAggregate (34)
-                     +- Union (33)
-                        :- * HashAggregate (22)
-                        :  +- Exchange (21)
-                        :     +- * HashAggregate (20)
-                        :        +- * Project (19)
-                        :           +- * BroadcastHashJoin Inner BuildRight (18)
-                        :              :- * Project (12)
-                        :              :  +- * BroadcastHashJoin Inner BuildRight (11)
-                        :              :     :- * Project (6)
-                        :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                        :              :     :     :- * ColumnarToRow (3)
-                        :              :     :     :  +- CometFilter (2)
-                        :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                        :              :     :     +- ReusedExchange (4)
-                        :              :     +- BroadcastExchange (10)
-                        :              :        +- * ColumnarToRow (9)
-                        :              :           +- CometFilter (8)
-                        :              :              +- CometScan parquet spark_catalog.default.item (7)
-                        :              +- BroadcastExchange (17)
-                        :                 +- * ColumnarToRow (16)
-                        :                    +- CometProject (15)
-                        :                       +- CometFilter (14)
-                        :                          +- CometScan parquet spark_catalog.default.store (13)
-                        :- * HashAggregate (27)
-                        :  +- Exchange (26)
-                        :     +- * HashAggregate (25)
-                        :        +- * HashAggregate (24)
-                        :           +- ReusedExchange (23)
-                        +- * HashAggregate (32)
-                           +- Exchange (31)
-                              +- * HashAggregate (30)
-                                 +- * HashAggregate (29)
-                                    +- ReusedExchange (28)
+TakeOrderedAndProject (43)
++- * Project (42)
+   +- Window (41)
+      +- * ColumnarToRow (40)
+         +- CometSort (39)
+            +- CometColumnarExchange (38)
+               +- CometHashAggregate (37)
+                  +- CometColumnarExchange (36)
+                     +- CometHashAggregate (35)
+                        +- CometUnion (34)
+                           :- CometHashAggregate (23)
+                           :  +- CometColumnarExchange (22)
+                           :     +- RowToColumnar (21)
+                           :        +- * HashAggregate (20)
+                           :           +- * Project (19)
+                           :              +- * BroadcastHashJoin Inner BuildRight (18)
+                           :                 :- * Project (12)
+                           :                 :  +- * BroadcastHashJoin Inner BuildRight (11)
+                           :                 :     :- * Project (6)
+                           :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                           :                 :     :     :- * ColumnarToRow (3)
+                           :                 :     :     :  +- CometFilter (2)
+                           :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                           :                 :     :     +- ReusedExchange (4)
+                           :                 :     +- BroadcastExchange (10)
+                           :                 :        +- * ColumnarToRow (9)
+                           :                 :           +- CometFilter (8)
+                           :                 :              +- CometScan parquet spark_catalog.default.item (7)
+                           :                 +- BroadcastExchange (17)
+                           :                    +- * ColumnarToRow (16)
+                           :                       +- CometProject (15)
+                           :                          +- CometFilter (14)
+                           :                             +- CometScan parquet spark_catalog.default.store (13)
+                           :- CometHashAggregate (28)
+                           :  +- CometColumnarExchange (27)
+                           :     +- CometHashAggregate (26)
+                           :        +- CometHashAggregate (25)
+                           :           +- ReusedExchange (24)
+                           +- CometHashAggregate (33)
+                              +- CometColumnarExchange (32)
+                                 +- CometHashAggregate (31)
+                                    +- CometHashAggregate (30)
+                                       +- ReusedExchange (29)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -57,7 +59,7 @@ Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_store_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_ext_sales_price#3, ss_net_profit#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 46]
+(4) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -137,142 +139,133 @@ Functions [2]: [partial_sum(UnscaledValue(ss_net_profit#4)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#13, sum#14]
 Results [4]: [i_category#10, i_class#9, sum#15, sum#16]
 
-(21) Exchange
+(21) RowToColumnar
 Input [4]: [i_category#10, i_class#9, sum#15, sum#16]
-Arguments: hashpartitioning(i_category#10, i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) HashAggregate [codegen id : 5]
+(22) CometColumnarExchange
+Input [4]: [i_category#10, i_class#9, sum#15, sum#16]
+Arguments: hashpartitioning(i_category#10, i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(23) CometHashAggregate
 Input [4]: [i_category#10, i_class#9, sum#15, sum#16]
 Keys [2]: [i_category#10, i_class#9]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#17, sum(UnscaledValue(ss_ext_sales_price#3))#18]
-Results [6]: [cast((MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#17,17,2) / MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#18,17,2)) as decimal(38,20)) AS gross_margin#19, i_category#10, i_class#9, 0 AS t_category#20, 0 AS t_class#21, 0 AS lochierarchy#22]
 
-(23) ReusedExchange [Reuses operator id: 21]
-Output [4]: [i_category#10, i_class#9, sum#23, sum#24]
+(24) ReusedExchange [Reuses operator id: 22]
+Output [4]: [i_category#10, i_class#9, sum#17, sum#18]
 
-(24) HashAggregate [codegen id : 10]
-Input [4]: [i_category#10, i_class#9, sum#23, sum#24]
+(25) CometHashAggregate
+Input [4]: [i_category#10, i_class#9, sum#17, sum#18]
 Keys [2]: [i_category#10, i_class#9]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#25, sum(UnscaledValue(ss_ext_sales_price#3))#26]
-Results [3]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#25,17,2) AS ss_net_profit#27, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#26,17,2) AS ss_ext_sales_price#28, i_category#10]
 
-(25) HashAggregate [codegen id : 10]
-Input [3]: [ss_net_profit#27, ss_ext_sales_price#28, i_category#10]
+(26) CometHashAggregate
+Input [3]: [ss_net_profit#19, ss_ext_sales_price#20, i_category#10]
 Keys [1]: [i_category#10]
-Functions [2]: [partial_sum(ss_net_profit#27), partial_sum(ss_ext_sales_price#28)]
-Aggregate Attributes [4]: [sum#29, isEmpty#30, sum#31, isEmpty#32]
-Results [5]: [i_category#10, sum#33, isEmpty#34, sum#35, isEmpty#36]
+Functions [2]: [partial_sum(ss_net_profit#19), partial_sum(ss_ext_sales_price#20)]
 
-(26) Exchange
-Input [5]: [i_category#10, sum#33, isEmpty#34, sum#35, isEmpty#36]
-Arguments: hashpartitioning(i_category#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(27) CometColumnarExchange
+Input [5]: [i_category#10, sum#21, isEmpty#22, sum#23, isEmpty#24]
+Arguments: hashpartitioning(i_category#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(27) HashAggregate [codegen id : 11]
-Input [5]: [i_category#10, sum#33, isEmpty#34, sum#35, isEmpty#36]
+(28) CometHashAggregate
+Input [5]: [i_category#10, sum#21, isEmpty#22, sum#23, isEmpty#24]
 Keys [1]: [i_category#10]
-Functions [2]: [sum(ss_net_profit#27), sum(ss_ext_sales_price#28)]
-Aggregate Attributes [2]: [sum(ss_net_profit#27)#37, sum(ss_ext_sales_price#28)#38]
-Results [6]: [cast((sum(ss_net_profit#27)#37 / sum(ss_ext_sales_price#28)#38) as decimal(38,20)) AS gross_margin#39, i_category#10, null AS i_class#40, 0 AS t_category#41, 1 AS t_class#42, 1 AS lochierarchy#43]
+Functions [2]: [sum(ss_net_profit#19), sum(ss_ext_sales_price#20)]
 
-(28) ReusedExchange [Reuses operator id: 21]
-Output [4]: [i_category#10, i_class#9, sum#44, sum#45]
+(29) ReusedExchange [Reuses operator id: 22]
+Output [4]: [i_category#10, i_class#9, sum#25, sum#26]
 
-(29) HashAggregate [codegen id : 16]
-Input [4]: [i_category#10, i_class#9, sum#44, sum#45]
+(30) CometHashAggregate
+Input [4]: [i_category#10, i_class#9, sum#25, sum#26]
 Keys [2]: [i_category#10, i_class#9]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#25, sum(UnscaledValue(ss_ext_sales_price#3))#26]
-Results [2]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#25,17,2) AS ss_net_profit#27, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#26,17,2) AS ss_ext_sales_price#28]
 
-(30) HashAggregate [codegen id : 16]
-Input [2]: [ss_net_profit#27, ss_ext_sales_price#28]
+(31) CometHashAggregate
+Input [2]: [ss_net_profit#19, ss_ext_sales_price#20]
 Keys: []
-Functions [2]: [partial_sum(ss_net_profit#27), partial_sum(ss_ext_sales_price#28)]
-Aggregate Attributes [4]: [sum#46, isEmpty#47, sum#48, isEmpty#49]
-Results [4]: [sum#50, isEmpty#51, sum#52, isEmpty#53]
+Functions [2]: [partial_sum(ss_net_profit#19), partial_sum(ss_ext_sales_price#20)]
 
-(31) Exchange
-Input [4]: [sum#50, isEmpty#51, sum#52, isEmpty#53]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=5]
+(32) CometColumnarExchange
+Input [4]: [sum#27, isEmpty#28, sum#29, isEmpty#30]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(32) HashAggregate [codegen id : 17]
-Input [4]: [sum#50, isEmpty#51, sum#52, isEmpty#53]
+(33) CometHashAggregate
+Input [4]: [sum#27, isEmpty#28, sum#29, isEmpty#30]
 Keys: []
-Functions [2]: [sum(ss_net_profit#27), sum(ss_ext_sales_price#28)]
-Aggregate Attributes [2]: [sum(ss_net_profit#27)#54, sum(ss_ext_sales_price#28)#55]
-Results [6]: [cast((sum(ss_net_profit#27)#54 / sum(ss_ext_sales_price#28)#55) as decimal(38,20)) AS gross_margin#56, null AS i_category#57, null AS i_class#58, 1 AS t_category#59, 1 AS t_class#60, 2 AS lochierarchy#61]
+Functions [2]: [sum(ss_net_profit#19), sum(ss_ext_sales_price#20)]
 
-(33) Union
+(34) CometUnion
+Child 0 Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
+Child 1 Input [6]: [gross_margin#35, i_category#10, i_class#36, t_category#37, t_class#38, lochierarchy#39]
+Child 2 Input [6]: [gross_margin#40, i_category#41, i_class#42, t_category#43, t_class#44, lochierarchy#45]
 
-(34) HashAggregate [codegen id : 18]
-Input [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
-Keys [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
+(35) CometHashAggregate
+Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
+Keys [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
 Functions: []
-Aggregate Attributes: []
-Results [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
 
-(35) Exchange
-Input [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
-Arguments: hashpartitioning(gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(36) CometColumnarExchange
+Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
+Arguments: hashpartitioning(gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(36) HashAggregate [codegen id : 19]
-Input [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
-Keys [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
+(37) CometHashAggregate
+Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
+Keys [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, CASE WHEN (t_class#21 = 0) THEN i_category#10 END AS _w0#62]
 
-(37) Exchange
-Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62]
-Arguments: hashpartitioning(lochierarchy#22, _w0#62, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(38) CometColumnarExchange
+Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
+Arguments: hashpartitioning(lochierarchy#34, _w0#46, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(39) CometSort
+Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
+Arguments: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46], [lochierarchy#34 ASC NULLS FIRST, _w0#46 ASC NULLS FIRST, gross_margin#31 ASC NULLS FIRST]
 
-(38) Sort [codegen id : 20]
-Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62]
-Arguments: [lochierarchy#22 ASC NULLS FIRST, _w0#62 ASC NULLS FIRST, gross_margin#19 ASC NULLS FIRST], false, 0
+(40) ColumnarToRow [codegen id : 13]
+Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
 
-(39) Window
-Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62]
-Arguments: [rank(gross_margin#19) windowspecdefinition(lochierarchy#22, _w0#62, gross_margin#19 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#63], [lochierarchy#22, _w0#62], [gross_margin#19 ASC NULLS FIRST]
+(41) Window
+Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
+Arguments: [rank(gross_margin#31) windowspecdefinition(lochierarchy#34, _w0#46, gross_margin#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#47], [lochierarchy#34, _w0#46], [gross_margin#31 ASC NULLS FIRST]
 
-(40) Project [codegen id : 21]
-Output [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, rank_within_parent#63]
-Input [6]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62, rank_within_parent#63]
+(42) Project [codegen id : 14]
+Output [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, rank_within_parent#47]
+Input [6]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46, rank_within_parent#47]
 
-(41) TakeOrderedAndProject
-Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, rank_within_parent#63]
-Arguments: 100, [lochierarchy#22 DESC NULLS LAST, CASE WHEN (lochierarchy#22 = 0) THEN i_category#10 END ASC NULLS FIRST, rank_within_parent#63 ASC NULLS FIRST], [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, rank_within_parent#63]
+(43) TakeOrderedAndProject
+Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, rank_within_parent#47]
+Arguments: 100, [lochierarchy#34 DESC NULLS LAST, CASE WHEN (lochierarchy#34 = 0) THEN i_category#10 END ASC NULLS FIRST, rank_within_parent#47 ASC NULLS FIRST], [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, rank_within_parent#47]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (46)
-+- * ColumnarToRow (45)
-   +- CometProject (44)
-      +- CometFilter (43)
-         +- CometScan parquet spark_catalog.default.date_dim (42)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_year#64]
+Output [2]: [d_date_sk#7, d_year#48]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(43) CometFilter
-Input [2]: [d_date_sk#7, d_year#64]
-Condition : ((isnotnull(d_year#64) AND (d_year#64 = 2001)) AND isnotnull(d_date_sk#7))
+(45) CometFilter
+Input [2]: [d_date_sk#7, d_year#48]
+Condition : ((isnotnull(d_year#48) AND (d_year#48 = 2001)) AND isnotnull(d_date_sk#7))
 
-(44) CometProject
-Input [2]: [d_date_sk#7, d_year#64]
+(46) CometProject
+Input [2]: [d_date_sk#7, d_year#48]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(45) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(46) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt
index f265d20995..29ae8ca601 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt
@@ -1,76 +1,64 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,gross_margin,i_class]
-  WholeStageCodegen (21)
+  WholeStageCodegen (14)
     Project [gross_margin,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [gross_margin,lochierarchy,_w0]
-          WholeStageCodegen (20)
-            Sort [lochierarchy,_w0,gross_margin]
+          WholeStageCodegen (13)
+            ColumnarToRow
               InputAdapter
-                Exchange [lochierarchy,_w0] #1
-                  WholeStageCodegen (19)
-                    HashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy] [_w0]
-                      InputAdapter
-                        Exchange [gross_margin,i_category,i_class,t_category,t_class,lochierarchy] #2
-                          WholeStageCodegen (18)
-                            HashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (5)
-                                    HashAggregate [i_category,i_class,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),gross_margin,t_category,t_class,lochierarchy,sum,sum]
-                                      InputAdapter
-                                        Exchange [i_category,i_class] #3
-                                          WholeStageCodegen (4)
-                                            HashAggregate [i_category,i_class,ss_net_profit,ss_ext_sales_price] [sum,sum,sum,sum]
-                                              Project [ss_ext_sales_price,ss_net_profit,i_class,i_category]
-                                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                  Project [ss_store_sk,ss_ext_sales_price,ss_net_profit,i_class,i_category]
-                                                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                      Project [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit]
-                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [ss_item_sk,ss_store_sk]
-                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                                  SubqueryBroadcast [d_date_sk] #1
-                                                                    BroadcastExchange #4
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometProject [d_date_sk]
-                                                                              CometFilter [d_year,d_date_sk]
-                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                          InputAdapter
-                                                            ReusedExchange [d_date_sk] #4
+                CometSort [lochierarchy,_w0,gross_margin]
+                  CometColumnarExchange [lochierarchy,_w0] #1
+                    CometHashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy]
+                      CometColumnarExchange [gross_margin,i_category,i_class,t_category,t_class,lochierarchy] #2
+                        CometHashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy]
+                          CometUnion
+                            CometHashAggregate [i_category,i_class,sum,sum]
+                              CometColumnarExchange [i_category,i_class] #3
+                                RowToColumnar
+                                  WholeStageCodegen (4)
+                                    HashAggregate [i_category,i_class,ss_net_profit,ss_ext_sales_price] [sum,sum,sum,sum]
+                                      Project [ss_ext_sales_price,ss_net_profit,i_class,i_category]
+                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                          Project [ss_store_sk,ss_ext_sales_price,ss_net_profit,i_class,i_category]
+                                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                              Project [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit]
+                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [ss_item_sk,ss_store_sk]
+                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                          SubqueryBroadcast [d_date_sk] #1
+                                                            BroadcastExchange #4
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [d_date_sk]
+                                                                      CometFilter [d_year,d_date_sk]
+                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk] #4
+                                              InputAdapter
+                                                BroadcastExchange #5
+                                                  WholeStageCodegen (2)
+                                                    ColumnarToRow
                                                       InputAdapter
-                                                        BroadcastExchange #5
-                                                          WholeStageCodegen (2)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [i_item_sk]
-                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
+                                                        CometFilter [i_item_sk]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (3)
+                                                ColumnarToRow
                                                   InputAdapter
-                                                    BroadcastExchange #6
-                                                      WholeStageCodegen (3)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [s_store_sk]
-                                                              CometFilter [s_state,s_store_sk]
-                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                                  WholeStageCodegen (11)
-                                    HashAggregate [i_category,sum,isEmpty,sum,isEmpty] [sum(ss_net_profit),sum(ss_ext_sales_price),gross_margin,i_class,t_category,t_class,lochierarchy,sum,isEmpty,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [i_category] #7
-                                          WholeStageCodegen (10)
-                                            HashAggregate [i_category,ss_net_profit,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                              HashAggregate [i_category,i_class,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),ss_net_profit,ss_ext_sales_price,sum,sum]
-                                                InputAdapter
-                                                  ReusedExchange [i_category,i_class,sum,sum] #3
-                                  WholeStageCodegen (17)
-                                    HashAggregate [sum,isEmpty,sum,isEmpty] [sum(ss_net_profit),sum(ss_ext_sales_price),gross_margin,i_category,i_class,t_category,t_class,lochierarchy,sum,isEmpty,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange #8
-                                          WholeStageCodegen (16)
-                                            HashAggregate [ss_net_profit,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                              HashAggregate [i_category,i_class,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),ss_net_profit,ss_ext_sales_price,sum,sum]
-                                                InputAdapter
-                                                  ReusedExchange [i_category,i_class,sum,sum] #3
+                                                    CometProject [s_store_sk]
+                                                      CometFilter [s_state,s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                            CometHashAggregate [i_category,sum,isEmpty,sum,isEmpty]
+                              CometColumnarExchange [i_category] #7
+                                CometHashAggregate [i_category,ss_net_profit,ss_ext_sales_price]
+                                  CometHashAggregate [i_category,i_class,sum,sum]
+                                    ReusedExchange [i_category,i_class,sum,sum] #3
+                            CometHashAggregate [sum,isEmpty,sum,isEmpty]
+                              CometColumnarExchange #8
+                                CometHashAggregate [ss_net_profit,ss_ext_sales_price]
+                                  CometHashAggregate [i_category,i_class,sum,sum]
+                                    ReusedExchange [i_category,i_class,sum,sum] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt
index 2be3c9c660..aa410a6b55 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-TakeOrderedAndProject (45)
-+- * Project (44)
-   +- * BroadcastHashJoin Inner BuildRight (43)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * Project (28)
-      :     :  +- * Filter (27)
-      :     :     +- Window (26)
-      :     :        +- * Filter (25)
-      :     :           +- Window (24)
-      :     :              +- * Sort (23)
-      :     :                 +- Exchange (22)
-      :     :                    +- * HashAggregate (21)
-      :     :                       +- Exchange (20)
-      :     :                          +- * HashAggregate (19)
-      :     :                             +- * Project (18)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                   :- * Project (12)
-      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                   :     :- * Project (9)
-      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                   :     :     :- * ColumnarToRow (3)
-      :     :                                   :     :     :  +- CometFilter (2)
-      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                   :     :     +- BroadcastExchange (7)
-      :     :                                   :     :        +- * ColumnarToRow (6)
-      :     :                                   :     :           +- CometFilter (5)
-      :     :                                   :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :                                   :     +- ReusedExchange (10)
-      :     :                                   +- BroadcastExchange (16)
-      :     :                                      +- * ColumnarToRow (15)
-      :     :                                         +- CometFilter (14)
-      :     :                                            +- CometScan parquet spark_catalog.default.store (13)
-      :     +- BroadcastExchange (35)
-      :        +- * Project (34)
-      :           +- Window (33)
-      :              +- * Sort (32)
-      :                 +- Exchange (31)
-      :                    +- * HashAggregate (30)
-      :                       +- ReusedExchange (29)
-      +- BroadcastExchange (42)
-         +- * Project (41)
-            +- Window (40)
-               +- * Sort (39)
-                  +- ReusedExchange (38)
+TakeOrderedAndProject (47)
++- * Project (46)
+   +- * BroadcastHashJoin Inner BuildRight (45)
+      :- * Project (38)
+      :  +- * BroadcastHashJoin Inner BuildRight (37)
+      :     :- * Project (30)
+      :     :  +- * Filter (29)
+      :     :     +- Window (28)
+      :     :        +- * Filter (27)
+      :     :           +- Window (26)
+      :     :              +- * ColumnarToRow (25)
+      :     :                 +- CometSort (24)
+      :     :                    +- CometColumnarExchange (23)
+      :     :                       +- CometHashAggregate (22)
+      :     :                          +- CometColumnarExchange (21)
+      :     :                             +- RowToColumnar (20)
+      :     :                                +- * HashAggregate (19)
+      :     :                                   +- * Project (18)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                         :- * Project (12)
+      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                         :     :- * Project (9)
+      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                         :     :     :- * ColumnarToRow (3)
+      :     :                                         :     :     :  +- CometFilter (2)
+      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                         :     :     +- BroadcastExchange (7)
+      :     :                                         :     :        +- * ColumnarToRow (6)
+      :     :                                         :     :           +- CometFilter (5)
+      :     :                                         :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :                                         :     +- ReusedExchange (10)
+      :     :                                         +- BroadcastExchange (16)
+      :     :                                            +- * ColumnarToRow (15)
+      :     :                                               +- CometFilter (14)
+      :     :                                                  +- CometScan parquet spark_catalog.default.store (13)
+      :     +- BroadcastExchange (36)
+      :        +- * Project (35)
+      :           +- Window (34)
+      :              +- * ColumnarToRow (33)
+      :                 +- CometSort (32)
+      :                    +- ReusedExchange (31)
+      +- BroadcastExchange (44)
+         +- * Project (43)
+            +- Window (42)
+               +- * ColumnarToRow (41)
+                  +- CometSort (40)
+                     +- ReusedExchange (39)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -89,7 +91,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, ss_item_sk#4, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 49]
+(10) ReusedExchange [Reuses operator id: 51]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -137,125 +139,124 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#6))]
 Aggregate Attributes [1]: [sum#15]
 Results [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 
-(20) Exchange
+(20) RowToColumnar
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 Keys [6]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#6))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#6))#17]
-Results [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS sum_sales#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS _w0#19]
 
-(22) Exchange
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(23) CometColumnarExchange
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(23) Sort [codegen id : 6]
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
-Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
+(24) CometSort
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(24) Window
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(25) ColumnarToRow [codegen id : 5]
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+
+(26) Window
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(25) Filter [codegen id : 7]
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
+(27) Filter [codegen id : 6]
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(26) Window
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
-Arguments: [avg(_w0#19) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#21], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
-
-(27) Filter [codegen id : 22]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
-Condition : ((isnotnull(avg_monthly_sales#21) AND (avg_monthly_sales#21 > 0.000000)) AND CASE WHEN (avg_monthly_sales#21 > 0.000000) THEN ((abs((sum_sales#18 - avg_monthly_sales#21)) / avg_monthly_sales#21) > 0.1000000000000000) END)
-
-(28) Project [codegen id : 22]
-Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
-
-(29) ReusedExchange [Reuses operator id: 20]
-Output [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
-
-(30) HashAggregate [codegen id : 12]
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
-Keys [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#29))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#29))#17]
-Results [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, MakeDecimal(sum(UnscaledValue(ss_sales_price#29))#17,17,2) AS sum_sales#18]
-
-(31) Exchange
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
-Arguments: hashpartitioning(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(32) Sort [codegen id : 13]
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
-Arguments: [i_category#22 ASC NULLS FIRST, i_brand#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST, s_company_name#25 ASC NULLS FIRST, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST], false, 0
-
-(33) Window
-Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
-Arguments: [rank(d_year#26, d_moy#27) windowspecdefinition(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#30], [i_category#22, i_brand#23, s_store_name#24, s_company_name#25], [d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST]
-
-(34) Project [codegen id : 14]
-Output [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#18 AS sum_sales#31, rn#30]
-Input [8]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18, rn#30]
-
-(35) BroadcastExchange
-Input [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=6]
-
-(36) BroadcastHashJoin [codegen id : 22]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
-Right keys [5]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, (rn#30 + 1)]
+(28) Window
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
+
+(29) Filter [codegen id : 19]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
+
+(30) Project [codegen id : 19]
+Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+
+(31) ReusedExchange [Reuses operator id: 23]
+Output [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+
+(32) CometSort
+Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+Arguments: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17], [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, s_store_name#23 ASC NULLS FIRST, s_company_name#24 ASC NULLS FIRST, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
+
+(33) ColumnarToRow [codegen id : 11]
+Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+
+(34) Window
+Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
+Arguments: [rank(d_year#25, d_moy#26) windowspecdefinition(i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#27], [i_category#21, i_brand#22, s_store_name#23, s_company_name#24], [d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
+
+(35) Project [codegen id : 12]
+Output [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#17 AS sum_sales#28, rn#27]
+Input [8]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17, rn#27]
+
+(36) BroadcastExchange
+Input [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=5]
+
+(37) BroadcastHashJoin [codegen id : 19]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
+Right keys [5]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, (rn#27 + 1)]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 22]
-Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31]
-Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
+(38) Project [codegen id : 19]
+Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28]
+Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
+
+(39) ReusedExchange [Reuses operator id: 23]
+Output [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
 
-(38) ReusedExchange [Reuses operator id: 31]
-Output [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
+(40) CometSort
+Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17], [i_category#29 ASC NULLS FIRST, i_brand#30 ASC NULLS FIRST, s_store_name#31 ASC NULLS FIRST, s_company_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
 
-(39) Sort [codegen id : 20]
-Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
-Arguments: [i_category#32 ASC NULLS FIRST, i_brand#33 ASC NULLS FIRST, s_store_name#34 ASC NULLS FIRST, s_company_name#35 ASC NULLS FIRST, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST], false, 0
+(41) ColumnarToRow [codegen id : 17]
+Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
 
-(40) Window
-Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
-Arguments: [rank(d_year#36, d_moy#37) windowspecdefinition(i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#38], [i_category#32, i_brand#33, s_store_name#34, s_company_name#35], [d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST]
+(42) Window
+Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#29, i_brand#30, s_store_name#31, s_company_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
 
-(41) Project [codegen id : 21]
-Output [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#18 AS sum_sales#39, rn#38]
-Input [8]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18, rn#38]
+(43) Project [codegen id : 18]
+Output [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#17 AS sum_sales#36, rn#35]
+Input [8]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
 
-(42) BroadcastExchange
-Input [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=7]
+(44) BroadcastExchange
+Input [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 22]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
-Right keys [5]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, (rn#38 - 1)]
+(45) BroadcastHashJoin [codegen id : 19]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
+Right keys [5]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, (rn#35 - 1)]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 22]
-Output [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, sum_sales#31 AS psum#40, sum_sales#39 AS nsum#41]
-Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31, i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
+(46) Project [codegen id : 19]
+Output [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#28 AS psum#37, sum_sales#36 AS nsum#38]
+Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28, i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
 
-(45) TakeOrderedAndProject
-Input [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
-Arguments: 100, [(sum_sales#18 - avg_monthly_sales#21) ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
+(47) TakeOrderedAndProject
+Input [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometFilter (47)
-      +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (51)
++- * ColumnarToRow (50)
+   +- CometFilter (49)
+      +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -265,15 +266,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
+(49) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(48) ColumnarToRow [codegen id : 1]
+(50) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(49) BroadcastExchange
+(51) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt
index a548953052..d3aeefb861 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_moy,i_category,d_year,psum,nsum]
-  WholeStageCodegen (22)
+  WholeStageCodegen (19)
     Project [i_category,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,s_store_name,s_company_name,rn,i_category,i_brand,s_store_name,s_company_name,rn]
         Project [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_moy,i_category,d_year,psum,
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,s_store_name,s_company_name,d_year]
-                    WholeStageCodegen (7)
+                    WholeStageCodegen (6)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                            WholeStageCodegen (6)
-                              Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                            WholeStageCodegen (5)
+                              ColumnarToRow
                                 InputAdapter
-                                  Exchange [i_category,i_brand,s_store_name,s_company_name] #1
-                                    WholeStageCodegen (5)
-                                      HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
-                                        InputAdapter
-                                          Exchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
+                                  CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                                    CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name] #1
+                                      CometHashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum]
+                                        CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
+                                          RowToColumnar
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,ss_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,ss_sales_price,d_year,d_moy,s_store_name,s_company_name]
@@ -57,25 +57,23 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_moy,i_category,d_year,psum,
                                                                 CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (14)
+                WholeStageCodegen (12)
                   Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                        WholeStageCodegen (13)
-                          Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                        WholeStageCodegen (11)
+                          ColumnarToRow
                             InputAdapter
-                              Exchange [i_category,i_brand,s_store_name,s_company_name] #7
-                                WholeStageCodegen (12)
-                                  HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,sum]
-                                    InputAdapter
-                                      ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] #2
+                              CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                                ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
         InputAdapter
-          BroadcastExchange #8
-            WholeStageCodegen (21)
+          BroadcastExchange #7
+            WholeStageCodegen (18)
               Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                    WholeStageCodegen (20)
-                      Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                    WholeStageCodegen (17)
+                      ColumnarToRow
                         InputAdapter
-                          ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #7
+                          CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
+                            ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt
index bf9c2c22cc..17d2ccbec9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt
@@ -1,81 +1,89 @@
 == Physical Plan ==
-TakeOrderedAndProject (77)
-+- * HashAggregate (76)
-   +- Exchange (75)
-      +- * HashAggregate (74)
-         +- Union (73)
-            :- * Project (24)
-            :  +- * Filter (23)
-            :     +- Window (22)
-            :        +- * Sort (21)
-            :           +- Window (20)
-            :              +- * Sort (19)
-            :                 +- Exchange (18)
-            :                    +- * HashAggregate (17)
-            :                       +- Exchange (16)
-            :                          +- * HashAggregate (15)
-            :                             +- * Project (14)
-            :                                +- * BroadcastHashJoin Inner BuildRight (13)
-            :                                   :- * Project (11)
-            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (10)
-            :                                   :     :- BroadcastExchange (5)
-            :                                   :     :  +- * ColumnarToRow (4)
-            :                                   :     :     +- CometProject (3)
-            :                                   :     :        +- CometFilter (2)
-            :                                   :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
-            :                                   :     +- * ColumnarToRow (9)
-            :                                   :        +- CometProject (8)
-            :                                   :           +- CometFilter (7)
-            :                                   :              +- CometScan parquet spark_catalog.default.web_returns (6)
-            :                                   +- ReusedExchange (12)
-            :- * Project (48)
-            :  +- * Filter (47)
-            :     +- Window (46)
-            :        +- * Sort (45)
-            :           +- Window (44)
-            :              +- * Sort (43)
-            :                 +- Exchange (42)
-            :                    +- * HashAggregate (41)
-            :                       +- Exchange (40)
-            :                          +- * HashAggregate (39)
-            :                             +- * Project (38)
-            :                                +- * BroadcastHashJoin Inner BuildRight (37)
-            :                                   :- * Project (35)
-            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (34)
-            :                                   :     :- BroadcastExchange (29)
-            :                                   :     :  +- * ColumnarToRow (28)
-            :                                   :     :     +- CometProject (27)
-            :                                   :     :        +- CometFilter (26)
-            :                                   :     :           +- CometScan parquet spark_catalog.default.catalog_sales (25)
-            :                                   :     +- * ColumnarToRow (33)
-            :                                   :        +- CometProject (32)
-            :                                   :           +- CometFilter (31)
-            :                                   :              +- CometScan parquet spark_catalog.default.catalog_returns (30)
-            :                                   +- ReusedExchange (36)
-            +- * Project (72)
-               +- * Filter (71)
-                  +- Window (70)
-                     +- * Sort (69)
-                        +- Window (68)
-                           +- * Sort (67)
-                              +- Exchange (66)
-                                 +- * HashAggregate (65)
-                                    +- Exchange (64)
-                                       +- * HashAggregate (63)
-                                          +- * Project (62)
-                                             +- * BroadcastHashJoin Inner BuildRight (61)
-                                                :- * Project (59)
-                                                :  +- * BroadcastHashJoin Inner BuildLeft (58)
-                                                :     :- BroadcastExchange (53)
-                                                :     :  +- * ColumnarToRow (52)
-                                                :     :     +- CometProject (51)
-                                                :     :        +- CometFilter (50)
-                                                :     :           +- CometScan parquet spark_catalog.default.store_sales (49)
-                                                :     +- * ColumnarToRow (57)
-                                                :        +- CometProject (56)
-                                                :           +- CometFilter (55)
-                                                :              +- CometScan parquet spark_catalog.default.store_returns (54)
-                                                +- ReusedExchange (60)
+* ColumnarToRow (85)
++- CometTakeOrderedAndProject (84)
+   +- CometHashAggregate (83)
+      +- CometColumnarExchange (82)
+         +- RowToColumnar (81)
+            +- * HashAggregate (80)
+               +- Union (79)
+                  :- * Project (26)
+                  :  +- * Filter (25)
+                  :     +- Window (24)
+                  :        +- * Sort (23)
+                  :           +- Window (22)
+                  :              +- * ColumnarToRow (21)
+                  :                 +- CometSort (20)
+                  :                    +- CometColumnarExchange (19)
+                  :                       +- CometHashAggregate (18)
+                  :                          +- CometColumnarExchange (17)
+                  :                             +- RowToColumnar (16)
+                  :                                +- * HashAggregate (15)
+                  :                                   +- * Project (14)
+                  :                                      +- * BroadcastHashJoin Inner BuildRight (13)
+                  :                                         :- * Project (11)
+                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (10)
+                  :                                         :     :- BroadcastExchange (5)
+                  :                                         :     :  +- * ColumnarToRow (4)
+                  :                                         :     :     +- CometProject (3)
+                  :                                         :     :        +- CometFilter (2)
+                  :                                         :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :                                         :     +- * ColumnarToRow (9)
+                  :                                         :        +- CometProject (8)
+                  :                                         :           +- CometFilter (7)
+                  :                                         :              +- CometScan parquet spark_catalog.default.web_returns (6)
+                  :                                         +- ReusedExchange (12)
+                  :- * Project (52)
+                  :  +- * Filter (51)
+                  :     +- Window (50)
+                  :        +- * Sort (49)
+                  :           +- Window (48)
+                  :              +- * ColumnarToRow (47)
+                  :                 +- CometSort (46)
+                  :                    +- CometColumnarExchange (45)
+                  :                       +- CometHashAggregate (44)
+                  :                          +- CometColumnarExchange (43)
+                  :                             +- RowToColumnar (42)
+                  :                                +- * HashAggregate (41)
+                  :                                   +- * Project (40)
+                  :                                      +- * BroadcastHashJoin Inner BuildRight (39)
+                  :                                         :- * Project (37)
+                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (36)
+                  :                                         :     :- BroadcastExchange (31)
+                  :                                         :     :  +- * ColumnarToRow (30)
+                  :                                         :     :     +- CometProject (29)
+                  :                                         :     :        +- CometFilter (28)
+                  :                                         :     :           +- CometScan parquet spark_catalog.default.catalog_sales (27)
+                  :                                         :     +- * ColumnarToRow (35)
+                  :                                         :        +- CometProject (34)
+                  :                                         :           +- CometFilter (33)
+                  :                                         :              +- CometScan parquet spark_catalog.default.catalog_returns (32)
+                  :                                         +- ReusedExchange (38)
+                  +- * Project (78)
+                     +- * Filter (77)
+                        +- Window (76)
+                           +- * Sort (75)
+                              +- Window (74)
+                                 +- * ColumnarToRow (73)
+                                    +- CometSort (72)
+                                       +- CometColumnarExchange (71)
+                                          +- CometHashAggregate (70)
+                                             +- CometColumnarExchange (69)
+                                                +- RowToColumnar (68)
+                                                   +- * HashAggregate (67)
+                                                      +- * Project (66)
+                                                         +- * BroadcastHashJoin Inner BuildRight (65)
+                                                            :- * Project (63)
+                                                            :  +- * BroadcastHashJoin Inner BuildLeft (62)
+                                                            :     :- BroadcastExchange (57)
+                                                            :     :  +- * ColumnarToRow (56)
+                                                            :     :     +- CometProject (55)
+                                                            :     :        +- CometFilter (54)
+                                                            :     :           +- CometScan parquet spark_catalog.default.store_sales (53)
+                                                            :     +- * ColumnarToRow (61)
+                                                            :        +- CometProject (60)
+                                                            :           +- CometFilter (59)
+                                                            :              +- CometScan parquet spark_catalog.default.store_returns (58)
+                                                            +- ReusedExchange (64)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -129,7 +137,7 @@ Join condition: None
 Output [6]: [ws_item_sk#1, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_return_quantity#10, wr_return_amt#11]
 Input [9]: [ws_item_sk#1, ws_order_number#2, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_item_sk#8, wr_order_number#9, wr_return_quantity#10, wr_return_amt#11]
 
-(12) ReusedExchange [Reuses operator id: 82]
+(12) ReusedExchange [Reuses operator id: 90]
 Output [1]: [d_date_sk#13]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -149,323 +157,339 @@ Functions [4]: [partial_sum(coalesce(wr_return_quantity#10, 0)), partial_sum(coa
 Aggregate Attributes [6]: [sum#14, sum#15, sum#16, isEmpty#17, sum#18, isEmpty#19]
 Results [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 
-(16) Exchange
+(16) RowToColumnar
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(17) HashAggregate [codegen id : 4]
+(17) CometColumnarExchange
+Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(18) CometHashAggregate
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Keys [1]: [ws_item_sk#1]
 Functions [4]: [sum(coalesce(wr_return_quantity#10, 0)), sum(coalesce(ws_quantity#3, 0)), sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00)), sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))]
-Aggregate Attributes [4]: [sum(coalesce(wr_return_quantity#10, 0))#26, sum(coalesce(ws_quantity#3, 0))#27, sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28, sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29]
-Results [3]: [ws_item_sk#1 AS item#30, (cast(sum(coalesce(wr_return_quantity#10, 0))#26 as decimal(15,4)) / cast(sum(coalesce(ws_quantity#3, 0))#27 as decimal(15,4))) AS return_ratio#31, (cast(sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28 as decimal(15,4)) / cast(sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29 as decimal(15,4))) AS currency_ratio#32]
-
-(18) Exchange
-Input [3]: [item#30, return_ratio#31, currency_ratio#32]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) Sort [codegen id : 5]
-Input [3]: [item#30, return_ratio#31, currency_ratio#32]
-Arguments: [return_ratio#31 ASC NULLS FIRST], false, 0
+(19) CometColumnarExchange
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(20) Window
-Input [3]: [item#30, return_ratio#31, currency_ratio#32]
-Arguments: [rank(return_ratio#31) windowspecdefinition(return_ratio#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#33], [return_ratio#31 ASC NULLS FIRST]
+(20) CometSort
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+Arguments: [item#26, return_ratio#27, currency_ratio#28], [return_ratio#27 ASC NULLS FIRST]
 
-(21) Sort [codegen id : 6]
-Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
-Arguments: [currency_ratio#32 ASC NULLS FIRST], false, 0
+(21) ColumnarToRow [codegen id : 4]
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
 
 (22) Window
-Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
-Arguments: [rank(currency_ratio#32) windowspecdefinition(currency_ratio#32 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#34], [currency_ratio#32 ASC NULLS FIRST]
+Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+Arguments: [rank(return_ratio#27) windowspecdefinition(return_ratio#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#29], [return_ratio#27 ASC NULLS FIRST]
 
-(23) Filter [codegen id : 7]
-Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
-Condition : ((return_rank#33 <= 10) OR (currency_rank#34 <= 10))
+(23) Sort [codegen id : 5]
+Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
+Arguments: [currency_ratio#28 ASC NULLS FIRST], false, 0
 
-(24) Project [codegen id : 7]
-Output [5]: [web AS channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
+(24) Window
+Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
+Arguments: [rank(currency_ratio#28) windowspecdefinition(currency_ratio#28 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#30], [currency_ratio#28 ASC NULLS FIRST]
+
+(25) Filter [codegen id : 6]
+Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
+Condition : ((return_rank#29 <= 10) OR (currency_rank#30 <= 10))
+
+(26) Project [codegen id : 6]
+Output [5]: [web AS channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
+Output [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#41), dynamicpruningexpression(cs_sold_date_sk#41 IN dynamicpruning#42)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#37), dynamicpruningexpression(cs_sold_date_sk#37 IN dynamicpruning#38)]
 PushedFilters: [IsNotNull(cs_net_profit), IsNotNull(cs_net_paid), IsNotNull(cs_quantity), GreaterThan(cs_net_profit,1.00), GreaterThan(cs_net_paid,0.00), GreaterThan(cs_quantity,0), IsNotNull(cs_order_number), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_net_paid:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(26) CometFilter
-Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
-Condition : (((((((isnotnull(cs_net_profit#40) AND isnotnull(cs_net_paid#39)) AND isnotnull(cs_quantity#38)) AND (cs_net_profit#40 > 1.00)) AND (cs_net_paid#39 > 0.00)) AND (cs_quantity#38 > 0)) AND isnotnull(cs_order_number#37)) AND isnotnull(cs_item_sk#36))
+(28) CometFilter
+Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
+Condition : (((((((isnotnull(cs_net_profit#36) AND isnotnull(cs_net_paid#35)) AND isnotnull(cs_quantity#34)) AND (cs_net_profit#36 > 1.00)) AND (cs_net_paid#35 > 0.00)) AND (cs_quantity#34 > 0)) AND isnotnull(cs_order_number#33)) AND isnotnull(cs_item_sk#32))
 
-(27) CometProject
-Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
-Arguments: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41], [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
+(29) CometProject
+Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
+Arguments: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37], [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
 
-(28) ColumnarToRow [codegen id : 8]
-Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
+(30) ColumnarToRow [codegen id : 7]
+Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
 
-(29) BroadcastExchange
-Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
+(31) BroadcastExchange
+Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=4]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
+Output [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_return_amount), GreaterThan(cr_return_amount,10000.00), IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(31) CometFilter
-Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
-Condition : (((isnotnull(cr_return_amount#46) AND (cr_return_amount#46 > 10000.00)) AND isnotnull(cr_order_number#44)) AND isnotnull(cr_item_sk#43))
+(33) CometFilter
+Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
+Condition : (((isnotnull(cr_return_amount#42) AND (cr_return_amount#42 > 10000.00)) AND isnotnull(cr_order_number#40)) AND isnotnull(cr_item_sk#39))
 
-(32) CometProject
-Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
-Arguments: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46], [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
+(34) CometProject
+Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
+Arguments: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42], [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
 
-(33) ColumnarToRow
-Input [4]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
+(35) ColumnarToRow
+Input [4]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [2]: [cs_order_number#37, cs_item_sk#36]
-Right keys [2]: [cr_order_number#44, cr_item_sk#43]
+(36) BroadcastHashJoin [codegen id : 9]
+Left keys [2]: [cs_order_number#33, cs_item_sk#32]
+Right keys [2]: [cr_order_number#40, cr_item_sk#39]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [6]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46]
-Input [9]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
+(37) Project [codegen id : 9]
+Output [6]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42]
+Input [9]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
 
-(36) ReusedExchange [Reuses operator id: 82]
-Output [1]: [d_date_sk#48]
+(38) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#44]
 
-(37) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#41]
-Right keys [1]: [d_date_sk#48]
+(39) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [cs_sold_date_sk#37]
+Right keys [1]: [d_date_sk#44]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
-Output [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
-Input [7]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46, d_date_sk#48]
+(40) Project [codegen id : 9]
+Output [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
+Input [7]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42, d_date_sk#44]
+
+(41) HashAggregate [codegen id : 9]
+Input [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
+Keys [1]: [cs_item_sk#32]
+Functions [4]: [partial_sum(coalesce(cr_return_quantity#41, 0)), partial_sum(coalesce(cs_quantity#34, 0)), partial_sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#45, sum#46, sum#47, isEmpty#48, sum#49, isEmpty#50]
+Results [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
 
-(39) HashAggregate [codegen id : 10]
-Input [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
-Keys [1]: [cs_item_sk#36]
-Functions [4]: [partial_sum(coalesce(cr_return_quantity#45, 0)), partial_sum(coalesce(cs_quantity#38, 0)), partial_sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#49, sum#50, sum#51, isEmpty#52, sum#53, isEmpty#54]
-Results [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
+(42) RowToColumnar
+Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
 
-(40) Exchange
-Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
-Arguments: hashpartitioning(cs_item_sk#36, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(43) CometColumnarExchange
+Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+Arguments: hashpartitioning(cs_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(41) HashAggregate [codegen id : 11]
-Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
-Keys [1]: [cs_item_sk#36]
-Functions [4]: [sum(coalesce(cr_return_quantity#45, 0)), sum(coalesce(cs_quantity#38, 0)), sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
-Aggregate Attributes [4]: [sum(coalesce(cr_return_quantity#45, 0))#61, sum(coalesce(cs_quantity#38, 0))#62, sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63, sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64]
-Results [3]: [cs_item_sk#36 AS item#65, (cast(sum(coalesce(cr_return_quantity#45, 0))#61 as decimal(15,4)) / cast(sum(coalesce(cs_quantity#38, 0))#62 as decimal(15,4))) AS return_ratio#66, (cast(sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63 as decimal(15,4)) / cast(sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64 as decimal(15,4))) AS currency_ratio#67]
+(44) CometHashAggregate
+Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+Keys [1]: [cs_item_sk#32]
+Functions [4]: [sum(coalesce(cr_return_quantity#41, 0)), sum(coalesce(cs_quantity#34, 0)), sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
 
-(42) Exchange
-Input [3]: [item#65, return_ratio#66, currency_ratio#67]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
+(45) CometColumnarExchange
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(43) Sort [codegen id : 12]
-Input [3]: [item#65, return_ratio#66, currency_ratio#67]
-Arguments: [return_ratio#66 ASC NULLS FIRST], false, 0
+(46) CometSort
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+Arguments: [item#57, return_ratio#58, currency_ratio#59], [return_ratio#58 ASC NULLS FIRST]
 
-(44) Window
-Input [3]: [item#65, return_ratio#66, currency_ratio#67]
-Arguments: [rank(return_ratio#66) windowspecdefinition(return_ratio#66 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#68], [return_ratio#66 ASC NULLS FIRST]
+(47) ColumnarToRow [codegen id : 10]
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
 
-(45) Sort [codegen id : 13]
-Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
-Arguments: [currency_ratio#67 ASC NULLS FIRST], false, 0
+(48) Window
+Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+Arguments: [rank(return_ratio#58) windowspecdefinition(return_ratio#58 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#60], [return_ratio#58 ASC NULLS FIRST]
 
-(46) Window
-Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
-Arguments: [rank(currency_ratio#67) windowspecdefinition(currency_ratio#67 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#69], [currency_ratio#67 ASC NULLS FIRST]
+(49) Sort [codegen id : 11]
+Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
+Arguments: [currency_ratio#59 ASC NULLS FIRST], false, 0
 
-(47) Filter [codegen id : 14]
-Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
-Condition : ((return_rank#68 <= 10) OR (currency_rank#69 <= 10))
+(50) Window
+Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
+Arguments: [rank(currency_ratio#59) windowspecdefinition(currency_ratio#59 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#61], [currency_ratio#59 ASC NULLS FIRST]
 
-(48) Project [codegen id : 14]
-Output [5]: [catalog AS channel#70, item#65, return_ratio#66, return_rank#68, currency_rank#69]
-Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
+(51) Filter [codegen id : 12]
+Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
+Condition : ((return_rank#60 <= 10) OR (currency_rank#61 <= 10))
+
+(52) Project [codegen id : 12]
+Output [5]: [catalog AS channel#62, item#57, return_ratio#58, return_rank#60, currency_rank#61]
+Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
+Output [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#76), dynamicpruningexpression(ss_sold_date_sk#76 IN dynamicpruning#77)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#68), dynamicpruningexpression(ss_sold_date_sk#68 IN dynamicpruning#69)]
 PushedFilters: [IsNotNull(ss_net_profit), IsNotNull(ss_net_paid), IsNotNull(ss_quantity), GreaterThan(ss_net_profit,1.00), GreaterThan(ss_net_paid,0.00), GreaterThan(ss_quantity,0), IsNotNull(ss_ticket_number), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_net_paid:decimal(7,2),ss_net_profit:decimal(7,2)>
 
-(50) CometFilter
-Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
-Condition : (((((((isnotnull(ss_net_profit#75) AND isnotnull(ss_net_paid#74)) AND isnotnull(ss_quantity#73)) AND (ss_net_profit#75 > 1.00)) AND (ss_net_paid#74 > 0.00)) AND (ss_quantity#73 > 0)) AND isnotnull(ss_ticket_number#72)) AND isnotnull(ss_item_sk#71))
+(54) CometFilter
+Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
+Condition : (((((((isnotnull(ss_net_profit#67) AND isnotnull(ss_net_paid#66)) AND isnotnull(ss_quantity#65)) AND (ss_net_profit#67 > 1.00)) AND (ss_net_paid#66 > 0.00)) AND (ss_quantity#65 > 0)) AND isnotnull(ss_ticket_number#64)) AND isnotnull(ss_item_sk#63))
 
-(51) CometProject
-Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
-Arguments: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76], [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
+(55) CometProject
+Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
+Arguments: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68], [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
 
-(52) ColumnarToRow [codegen id : 15]
-Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
+(56) ColumnarToRow [codegen id : 13]
+Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
 
-(53) BroadcastExchange
-Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
+(57) BroadcastExchange
+Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=7]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
+Output [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_return_amt), GreaterThan(sr_return_amt,10000.00), IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(55) CometFilter
-Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
-Condition : (((isnotnull(sr_return_amt#81) AND (sr_return_amt#81 > 10000.00)) AND isnotnull(sr_ticket_number#79)) AND isnotnull(sr_item_sk#78))
+(59) CometFilter
+Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
+Condition : (((isnotnull(sr_return_amt#73) AND (sr_return_amt#73 > 10000.00)) AND isnotnull(sr_ticket_number#71)) AND isnotnull(sr_item_sk#70))
 
-(56) CometProject
-Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
-Arguments: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81], [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
+(60) CometProject
+Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
+Arguments: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73], [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
 
-(57) ColumnarToRow
-Input [4]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
+(61) ColumnarToRow
+Input [4]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
 
-(58) BroadcastHashJoin [codegen id : 17]
-Left keys [2]: [ss_ticket_number#72, ss_item_sk#71]
-Right keys [2]: [sr_ticket_number#79, sr_item_sk#78]
+(62) BroadcastHashJoin [codegen id : 15]
+Left keys [2]: [ss_ticket_number#64, ss_item_sk#63]
+Right keys [2]: [sr_ticket_number#71, sr_item_sk#70]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 17]
-Output [6]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81]
-Input [9]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
+(63) Project [codegen id : 15]
+Output [6]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73]
+Input [9]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
 
-(60) ReusedExchange [Reuses operator id: 82]
-Output [1]: [d_date_sk#83]
+(64) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#75]
 
-(61) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ss_sold_date_sk#76]
-Right keys [1]: [d_date_sk#83]
+(65) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [ss_sold_date_sk#68]
+Right keys [1]: [d_date_sk#75]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 17]
-Output [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
-Input [7]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81, d_date_sk#83]
-
-(63) HashAggregate [codegen id : 17]
-Input [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
-Keys [1]: [ss_item_sk#71]
-Functions [4]: [partial_sum(coalesce(sr_return_quantity#80, 0)), partial_sum(coalesce(ss_quantity#73, 0)), partial_sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#84, sum#85, sum#86, isEmpty#87, sum#88, isEmpty#89]
-Results [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-
-(64) Exchange
-Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-Arguments: hashpartitioning(ss_item_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=8]
-
-(65) HashAggregate [codegen id : 18]
-Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-Keys [1]: [ss_item_sk#71]
-Functions [4]: [sum(coalesce(sr_return_quantity#80, 0)), sum(coalesce(ss_quantity#73, 0)), sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
-Aggregate Attributes [4]: [sum(coalesce(sr_return_quantity#80, 0))#96, sum(coalesce(ss_quantity#73, 0))#97, sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98, sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99]
-Results [3]: [ss_item_sk#71 AS item#100, (cast(sum(coalesce(sr_return_quantity#80, 0))#96 as decimal(15,4)) / cast(sum(coalesce(ss_quantity#73, 0))#97 as decimal(15,4))) AS return_ratio#101, (cast(sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98 as decimal(15,4)) / cast(sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99 as decimal(15,4))) AS currency_ratio#102]
-
-(66) Exchange
-Input [3]: [item#100, return_ratio#101, currency_ratio#102]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=9]
-
-(67) Sort [codegen id : 19]
-Input [3]: [item#100, return_ratio#101, currency_ratio#102]
-Arguments: [return_ratio#101 ASC NULLS FIRST], false, 0
-
-(68) Window
-Input [3]: [item#100, return_ratio#101, currency_ratio#102]
-Arguments: [rank(return_ratio#101) windowspecdefinition(return_ratio#101 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#103], [return_ratio#101 ASC NULLS FIRST]
-
-(69) Sort [codegen id : 20]
-Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
-Arguments: [currency_ratio#102 ASC NULLS FIRST], false, 0
-
-(70) Window
-Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
-Arguments: [rank(currency_ratio#102) windowspecdefinition(currency_ratio#102 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#104], [currency_ratio#102 ASC NULLS FIRST]
-
-(71) Filter [codegen id : 21]
-Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
-Condition : ((return_rank#103 <= 10) OR (currency_rank#104 <= 10))
-
-(72) Project [codegen id : 21]
-Output [5]: [store AS channel#105, item#100, return_ratio#101, return_rank#103, currency_rank#104]
-Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
-
-(73) Union
-
-(74) HashAggregate [codegen id : 22]
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+(66) Project [codegen id : 15]
+Output [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
+Input [7]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73, d_date_sk#75]
+
+(67) HashAggregate [codegen id : 15]
+Input [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
+Keys [1]: [ss_item_sk#63]
+Functions [4]: [partial_sum(coalesce(sr_return_quantity#72, 0)), partial_sum(coalesce(ss_quantity#65, 0)), partial_sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#76, sum#77, sum#78, isEmpty#79, sum#80, isEmpty#81]
+Results [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+
+(68) RowToColumnar
+Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+
+(69) CometColumnarExchange
+Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+Arguments: hashpartitioning(ss_item_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+
+(70) CometHashAggregate
+Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
+Keys [1]: [ss_item_sk#63]
+Functions [4]: [sum(coalesce(sr_return_quantity#72, 0)), sum(coalesce(ss_quantity#65, 0)), sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
+
+(71) CometColumnarExchange
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(72) CometSort
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+Arguments: [item#88, return_ratio#89, currency_ratio#90], [return_ratio#89 ASC NULLS FIRST]
+
+(73) ColumnarToRow [codegen id : 16]
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+
+(74) Window
+Input [3]: [item#88, return_ratio#89, currency_ratio#90]
+Arguments: [rank(return_ratio#89) windowspecdefinition(return_ratio#89 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#91], [return_ratio#89 ASC NULLS FIRST]
+
+(75) Sort [codegen id : 17]
+Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
+Arguments: [currency_ratio#90 ASC NULLS FIRST], false, 0
+
+(76) Window
+Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
+Arguments: [rank(currency_ratio#90) windowspecdefinition(currency_ratio#90 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#92], [currency_ratio#90 ASC NULLS FIRST]
+
+(77) Filter [codegen id : 18]
+Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
+Condition : ((return_rank#91 <= 10) OR (currency_rank#92 <= 10))
+
+(78) Project [codegen id : 18]
+Output [5]: [store AS channel#93, item#88, return_ratio#89, return_rank#91, currency_rank#92]
+Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
+
+(79) Union
+
+(80) HashAggregate [codegen id : 19]
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 Functions: []
 Aggregate Attributes: []
-Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Results [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 
-(75) Exchange
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Arguments: hashpartitioning(channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(81) RowToColumnar
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 
-(76) HashAggregate [codegen id : 23]
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+(82) CometColumnarExchange
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Arguments: hashpartitioning(channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(83) CometHashAggregate
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
-(77) TakeOrderedAndProject
-Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
-Arguments: 100, [channel#35 ASC NULLS FIRST, return_rank#33 ASC NULLS FIRST, currency_rank#34 ASC NULLS FIRST, item#30 ASC NULLS FIRST], [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+(84) CometTakeOrderedAndProject
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#31 ASC NULLS FIRST,return_rank#29 ASC NULLS FIRST,currency_rank#30 ASC NULLS FIRST,item#26 ASC NULLS FIRST], output=[channel#31,item#26,return_ratio#27,return_rank#29,currency_rank#30]), 100, [channel#31 ASC NULLS FIRST, return_rank#29 ASC NULLS FIRST, currency_rank#30 ASC NULLS FIRST, item#26 ASC NULLS FIRST], [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+
+(85) ColumnarToRow [codegen id : 20]
+Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (82)
-+- * ColumnarToRow (81)
-   +- CometProject (80)
-      +- CometFilter (79)
-         +- CometScan parquet spark_catalog.default.date_dim (78)
+BroadcastExchange (90)
++- * ColumnarToRow (89)
+   +- CometProject (88)
+      +- CometFilter (87)
+         +- CometScan parquet spark_catalog.default.date_dim (86)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#13, d_year#106, d_moy#107]
+Output [3]: [d_date_sk#13, d_year#94, d_moy#95]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,12), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(79) CometFilter
-Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
-Condition : ((((isnotnull(d_year#106) AND isnotnull(d_moy#107)) AND (d_year#106 = 2001)) AND (d_moy#107 = 12)) AND isnotnull(d_date_sk#13))
+(87) CometFilter
+Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
+Condition : ((((isnotnull(d_year#94) AND isnotnull(d_moy#95)) AND (d_year#94 = 2001)) AND (d_moy#95 = 12)) AND isnotnull(d_date_sk#13))
 
-(80) CometProject
-Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
+(88) CometProject
+Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
 Arguments: [d_date_sk#13], [d_date_sk#13]
 
-(81) ColumnarToRow [codegen id : 1]
+(89) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#13]
 
-(82) BroadcastExchange
+(90) BroadcastExchange
 Input [1]: [d_date_sk#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-Subquery:2 Hosting operator id = 25 Hosting Expression = cs_sold_date_sk#41 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 27 Hosting Expression = cs_sold_date_sk#37 IN dynamicpruning#7
 
-Subquery:3 Hosting operator id = 49 Hosting Expression = ss_sold_date_sk#76 IN dynamicpruning#7
+Subquery:3 Hosting operator id = 53 Hosting Expression = ss_sold_date_sk#68 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt
index f007c1c663..728ec5ade5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt
@@ -1,133 +1,135 @@
-TakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
-  WholeStageCodegen (23)
-    HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-      InputAdapter
-        Exchange [channel,item,return_ratio,return_rank,currency_rank] #1
-          WholeStageCodegen (22)
-            HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-              InputAdapter
-                Union
-                  WholeStageCodegen (7)
-                    Project [item,return_ratio,return_rank,currency_rank]
-                      Filter [return_rank,currency_rank]
-                        InputAdapter
-                          Window [currency_ratio]
-                            WholeStageCodegen (6)
-                              Sort [currency_ratio]
-                                InputAdapter
-                                  Window [return_ratio]
-                                    WholeStageCodegen (5)
-                                      Sort [return_ratio]
-                                        InputAdapter
-                                          Exchange #2
-                                            WholeStageCodegen (4)
-                                              HashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(wr_return_quantity, 0)),sum(coalesce(ws_quantity, 0)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ws_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [ws_item_sk] #3
-                                                    WholeStageCodegen (3)
-                                                      HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                        Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
-                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
-                                                              BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+WholeStageCodegen (20)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
+        CometHashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+          CometColumnarExchange [channel,item,return_ratio,return_rank,currency_rank] #1
+            RowToColumnar
+              WholeStageCodegen (19)
+                HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+                  InputAdapter
+                    Union
+                      WholeStageCodegen (6)
+                        Project [item,return_ratio,return_rank,currency_rank]
+                          Filter [return_rank,currency_rank]
+                            InputAdapter
+                              Window [currency_ratio]
+                                WholeStageCodegen (5)
+                                  Sort [currency_ratio]
+                                    InputAdapter
+                                      Window [return_ratio]
+                                        WholeStageCodegen (4)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [return_ratio]
+                                                CometColumnarExchange #2
+                                                  CometHashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                    CometColumnarExchange [ws_item_sk] #3
+                                                      RowToColumnar
+                                                        WholeStageCodegen (3)
+                                                          HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
+                                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
+                                                                  BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #4
+                                                                        WholeStageCodegen (1)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
+                                                                                CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
+                                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
+                                                                                    SubqueryBroadcast [d_date_sk] #1
+                                                                                      BroadcastExchange #5
+                                                                                        WholeStageCodegen (1)
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometProject [d_date_sk]
+                                                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                                                          CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
+                                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
                                                                 InputAdapter
-                                                                  BroadcastExchange #4
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
-                                                                            CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
-                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                                  BroadcastExchange #5
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometProject [d_date_sk]
-                                                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                                                      CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
-                                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
-                                                            InputAdapter
-                                                              ReusedExchange [d_date_sk] #5
-                  WholeStageCodegen (14)
-                    Project [item,return_ratio,return_rank,currency_rank]
-                      Filter [return_rank,currency_rank]
-                        InputAdapter
-                          Window [currency_ratio]
-                            WholeStageCodegen (13)
-                              Sort [currency_ratio]
-                                InputAdapter
-                                  Window [return_ratio]
-                                    WholeStageCodegen (12)
-                                      Sort [return_ratio]
-                                        InputAdapter
-                                          Exchange #6
-                                            WholeStageCodegen (11)
-                                              HashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(cr_return_quantity, 0)),sum(coalesce(cs_quantity, 0)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum(coalesce(cast(cs_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [cs_item_sk] #7
-                                                    WholeStageCodegen (10)
-                                                      HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                        Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
-                                                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
-                                                              BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                                  ReusedExchange [d_date_sk] #5
+                      WholeStageCodegen (12)
+                        Project [item,return_ratio,return_rank,currency_rank]
+                          Filter [return_rank,currency_rank]
+                            InputAdapter
+                              Window [currency_ratio]
+                                WholeStageCodegen (11)
+                                  Sort [currency_ratio]
+                                    InputAdapter
+                                      Window [return_ratio]
+                                        WholeStageCodegen (10)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [return_ratio]
+                                                CometColumnarExchange #6
+                                                  CometHashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                    CometColumnarExchange [cs_item_sk] #7
+                                                      RowToColumnar
+                                                        WholeStageCodegen (9)
+                                                          HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
+                                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
+                                                                  BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #8
+                                                                        WholeStageCodegen (7)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
+                                                                                CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
+                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
+                                                                                    ReusedSubquery [d_date_sk] #1
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                                                          CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
+                                                                            CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
                                                                 InputAdapter
-                                                                  BroadcastExchange #8
-                                                                    WholeStageCodegen (8)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
-                                                                            CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
-                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                                                      CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
-                                                                        CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
-                                                            InputAdapter
-                                                              ReusedExchange [d_date_sk] #5
-                  WholeStageCodegen (21)
-                    Project [item,return_ratio,return_rank,currency_rank]
-                      Filter [return_rank,currency_rank]
-                        InputAdapter
-                          Window [currency_ratio]
-                            WholeStageCodegen (20)
-                              Sort [currency_ratio]
-                                InputAdapter
-                                  Window [return_ratio]
-                                    WholeStageCodegen (19)
-                                      Sort [return_ratio]
-                                        InputAdapter
-                                          Exchange #9
-                                            WholeStageCodegen (18)
-                                              HashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(sr_return_quantity, 0)),sum(coalesce(ss_quantity, 0)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ss_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [ss_item_sk] #10
-                                                    WholeStageCodegen (17)
-                                                      HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                        Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
-                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
-                                                              BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                                  ReusedExchange [d_date_sk] #5
+                      WholeStageCodegen (18)
+                        Project [item,return_ratio,return_rank,currency_rank]
+                          Filter [return_rank,currency_rank]
+                            InputAdapter
+                              Window [currency_ratio]
+                                WholeStageCodegen (17)
+                                  Sort [currency_ratio]
+                                    InputAdapter
+                                      Window [return_ratio]
+                                        WholeStageCodegen (16)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [return_ratio]
+                                                CometColumnarExchange #9
+                                                  CometHashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                    CometColumnarExchange [ss_item_sk] #10
+                                                      RowToColumnar
+                                                        WholeStageCodegen (15)
+                                                          HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
+                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
+                                                                  BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #11
+                                                                        WholeStageCodegen (13)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
+                                                                                CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
+                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
+                                                                                    ReusedSubquery [d_date_sk] #1
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                                                          CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
+                                                                            CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
                                                                 InputAdapter
-                                                                  BroadcastExchange #11
-                                                                    WholeStageCodegen (15)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
-                                                                            CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                                                      CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
-                                                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
-                                                            InputAdapter
-                                                              ReusedExchange [d_date_sk] #5
+                                                                  ReusedExchange [d_date_sk] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt
index 0dedd04721..60f983923a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt
@@ -1,71 +1,81 @@
 == Physical Plan ==
-TakeOrderedAndProject (67)
-+- * Filter (66)
-   +- * HashAggregate (65)
-      +- * HashAggregate (64)
-         +- * Project (63)
-            +- * BroadcastHashJoin Inner BuildRight (62)
-               :- Window (56)
-               :  +- * Sort (55)
-               :     +- Exchange (54)
-               :        +- * Project (53)
-               :           +- * Filter (52)
-               :              +- * SortMergeJoin FullOuter (51)
-               :                 :- * Sort (25)
-               :                 :  +- Exchange (24)
-               :                 :     +- * HashAggregate (23)
-               :                 :        +- Exchange (22)
-               :                 :           +- * HashAggregate (21)
-               :                 :              +- * Project (20)
-               :                 :                 +- * BroadcastHashJoin Inner BuildRight (19)
-               :                 :                    :- * Project (13)
-               :                 :                    :  +- Window (12)
-               :                 :                    :     +- * Sort (11)
-               :                 :                    :        +- Exchange (10)
-               :                 :                    :           +- * HashAggregate (9)
-               :                 :                    :              +- Exchange (8)
-               :                 :                    :                 +- * HashAggregate (7)
-               :                 :                    :                    +- * Project (6)
-               :                 :                    :                       +- * BroadcastHashJoin Inner BuildRight (5)
-               :                 :                    :                          :- * ColumnarToRow (3)
-               :                 :                    :                          :  +- CometFilter (2)
-               :                 :                    :                          :     +- CometScan parquet spark_catalog.default.web_sales (1)
-               :                 :                    :                          +- ReusedExchange (4)
-               :                 :                    +- BroadcastExchange (18)
-               :                 :                       +- * Project (17)
-               :                 :                          +- Window (16)
-               :                 :                             +- * Sort (15)
-               :                 :                                +- ReusedExchange (14)
-               :                 +- * Sort (50)
-               :                    +- Exchange (49)
-               :                       +- * HashAggregate (48)
-               :                          +- Exchange (47)
-               :                             +- * HashAggregate (46)
-               :                                +- * Project (45)
-               :                                   +- * BroadcastHashJoin Inner BuildRight (44)
-               :                                      :- * Project (38)
-               :                                      :  +- Window (37)
-               :                                      :     +- * Sort (36)
-               :                                      :        +- Exchange (35)
-               :                                      :           +- * HashAggregate (34)
-               :                                      :              +- Exchange (33)
-               :                                      :                 +- * HashAggregate (32)
-               :                                      :                    +- * Project (31)
-               :                                      :                       +- * BroadcastHashJoin Inner BuildRight (30)
-               :                                      :                          :- * ColumnarToRow (28)
-               :                                      :                          :  +- CometFilter (27)
-               :                                      :                          :     +- CometScan parquet spark_catalog.default.store_sales (26)
-               :                                      :                          +- ReusedExchange (29)
-               :                                      +- BroadcastExchange (43)
-               :                                         +- * Project (42)
-               :                                            +- Window (41)
-               :                                               +- * Sort (40)
-               :                                                  +- ReusedExchange (39)
-               +- BroadcastExchange (61)
-                  +- * Project (60)
-                     +- Window (59)
-                        +- * Sort (58)
-                           +- ReusedExchange (57)
+TakeOrderedAndProject (77)
++- * Filter (76)
+   +- * HashAggregate (75)
+      +- * HashAggregate (74)
+         +- * Project (73)
+            +- * BroadcastHashJoin Inner BuildRight (72)
+               :- Window (65)
+               :  +- * ColumnarToRow (64)
+               :     +- CometSort (63)
+               :        +- CometColumnarExchange (62)
+               :           +- CometProject (61)
+               :              +- CometFilter (60)
+               :                 +- CometSortMergeJoin (59)
+               :                    :- CometSort (29)
+               :                    :  +- CometColumnarExchange (28)
+               :                    :     +- CometHashAggregate (27)
+               :                    :        +- CometColumnarExchange (26)
+               :                    :           +- RowToColumnar (25)
+               :                    :              +- * HashAggregate (24)
+               :                    :                 +- * Project (23)
+               :                    :                    +- * BroadcastHashJoin Inner BuildRight (22)
+               :                    :                       :- * Project (15)
+               :                    :                       :  +- Window (14)
+               :                    :                       :     +- * ColumnarToRow (13)
+               :                    :                       :        +- CometSort (12)
+               :                    :                       :           +- CometColumnarExchange (11)
+               :                    :                       :              +- CometHashAggregate (10)
+               :                    :                       :                 +- CometColumnarExchange (9)
+               :                    :                       :                    +- RowToColumnar (8)
+               :                    :                       :                       +- * HashAggregate (7)
+               :                    :                       :                          +- * Project (6)
+               :                    :                       :                             +- * BroadcastHashJoin Inner BuildRight (5)
+               :                    :                       :                                :- * ColumnarToRow (3)
+               :                    :                       :                                :  +- CometFilter (2)
+               :                    :                       :                                :     +- CometScan parquet spark_catalog.default.web_sales (1)
+               :                    :                       :                                +- ReusedExchange (4)
+               :                    :                       +- BroadcastExchange (21)
+               :                    :                          +- * Project (20)
+               :                    :                             +- Window (19)
+               :                    :                                +- * ColumnarToRow (18)
+               :                    :                                   +- CometSort (17)
+               :                    :                                      +- ReusedExchange (16)
+               :                    +- CometSort (58)
+               :                       +- CometColumnarExchange (57)
+               :                          +- CometHashAggregate (56)
+               :                             +- CometColumnarExchange (55)
+               :                                +- RowToColumnar (54)
+               :                                   +- * HashAggregate (53)
+               :                                      +- * Project (52)
+               :                                         +- * BroadcastHashJoin Inner BuildRight (51)
+               :                                            :- * Project (44)
+               :                                            :  +- Window (43)
+               :                                            :     +- * ColumnarToRow (42)
+               :                                            :        +- CometSort (41)
+               :                                            :           +- CometColumnarExchange (40)
+               :                                            :              +- CometHashAggregate (39)
+               :                                            :                 +- CometColumnarExchange (38)
+               :                                            :                    +- RowToColumnar (37)
+               :                                            :                       +- * HashAggregate (36)
+               :                                            :                          +- * Project (35)
+               :                                            :                             +- * BroadcastHashJoin Inner BuildRight (34)
+               :                                            :                                :- * ColumnarToRow (32)
+               :                                            :                                :  +- CometFilter (31)
+               :                                            :                                :     +- CometScan parquet spark_catalog.default.store_sales (30)
+               :                                            :                                +- ReusedExchange (33)
+               :                                            +- BroadcastExchange (50)
+               :                                               +- * Project (49)
+               :                                                  +- Window (48)
+               :                                                     +- * ColumnarToRow (47)
+               :                                                        +- CometSort (46)
+               :                                                           +- ReusedExchange (45)
+               +- BroadcastExchange (71)
+                  +- * Project (70)
+                     +- Window (69)
+                        +- * ColumnarToRow (68)
+                           +- CometSort (67)
+                              +- ReusedExchange (66)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -83,7 +93,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 2]
 Input [3]: [ws_item_sk#1, ws_sales_price#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 72]
+(4) ReusedExchange [Reuses operator id: 82]
 Output [2]: [d_date_sk#5, d_date#6]
 
 (5) BroadcastHashJoin [codegen id : 2]
@@ -103,314 +113,335 @@ Functions [1]: [partial_sum(UnscaledValue(ws_sales_price#2))]
 Aggregate Attributes [1]: [sum#7]
 Results [3]: [ws_item_sk#1, d_date#6, sum#8]
 
-(8) Exchange
+(8) RowToColumnar
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
-Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(9) HashAggregate [codegen id : 3]
+(9) CometColumnarExchange
+Input [3]: [ws_item_sk#1, d_date#6, sum#8]
+Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+
+(10) CometHashAggregate
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
 Keys [2]: [ws_item_sk#1, d_date#6]
 Functions [1]: [sum(UnscaledValue(ws_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_sales_price#2))#9]
-Results [4]: [ws_item_sk#1 AS item_sk#10, d_date#6, MakeDecimal(sum(UnscaledValue(ws_sales_price#2))#9,17,2) AS sumws#11, ws_item_sk#1]
 
-(10) Exchange
-Input [4]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
+(11) CometColumnarExchange
+Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(12) CometSort
+Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
+Arguments: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1], [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
 
-(11) Sort [codegen id : 4]
-Input [4]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1]
-Arguments: [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
+(13) ColumnarToRow [codegen id : 3]
+Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
 
-(12) Window
-Input [4]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1]
-Arguments: [row_number() windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#12], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
+(14) Window
+Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
+Arguments: [row_number() windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#11], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
 
-(13) Project [codegen id : 10]
-Output [4]: [item_sk#10, d_date#6, sumws#11, rk#12]
-Input [5]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1, rk#12]
+(15) Project [codegen id : 8]
+Output [4]: [item_sk#9, d_date#6, sumws#10, rk#11]
+Input [5]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1, rk#11]
 
-(14) ReusedExchange [Reuses operator id: 10]
-Output [4]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14]
+(16) ReusedExchange [Reuses operator id: 11]
+Output [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
 
-(15) Sort [codegen id : 8]
-Input [4]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14]
-Arguments: [ws_item_sk#14 ASC NULLS FIRST, d_date#13 ASC NULLS FIRST], false, 0
+(17) CometSort
+Input [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
+Arguments: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13], [ws_item_sk#13 ASC NULLS FIRST, d_date#12 ASC NULLS FIRST]
 
-(16) Window
-Input [4]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14]
-Arguments: [row_number() windowspecdefinition(ws_item_sk#14, d_date#13 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#15], [ws_item_sk#14], [d_date#13 ASC NULLS FIRST]
+(18) ColumnarToRow [codegen id : 6]
+Input [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
 
-(17) Project [codegen id : 9]
-Output [3]: [item_sk#10 AS item_sk#16, sumws#11 AS sumws#17, rk#15]
-Input [5]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14, rk#15]
+(19) Window
+Input [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
+Arguments: [row_number() windowspecdefinition(ws_item_sk#13, d_date#12 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#14], [ws_item_sk#13], [d_date#12 ASC NULLS FIRST]
 
-(18) BroadcastExchange
-Input [3]: [item_sk#16, sumws#17, rk#15]
+(20) Project [codegen id : 7]
+Output [3]: [item_sk#9 AS item_sk#15, sumws#10 AS sumws#16, rk#14]
+Input [5]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13, rk#14]
+
+(21) BroadcastExchange
+Input [3]: [item_sk#15, sumws#16, rk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(19) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [item_sk#10]
-Right keys [1]: [item_sk#16]
+(22) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [item_sk#9]
+Right keys [1]: [item_sk#15]
 Join type: Inner
-Join condition: (rk#12 >= rk#15)
-
-(20) Project [codegen id : 10]
-Output [4]: [item_sk#10, d_date#6, sumws#11, sumws#17]
-Input [7]: [item_sk#10, d_date#6, sumws#11, rk#12, item_sk#16, sumws#17, rk#15]
-
-(21) HashAggregate [codegen id : 10]
-Input [4]: [item_sk#10, d_date#6, sumws#11, sumws#17]
-Keys [3]: [item_sk#10, d_date#6, sumws#11]
-Functions [1]: [partial_sum(sumws#17)]
-Aggregate Attributes [2]: [sum#18, isEmpty#19]
-Results [5]: [item_sk#10, d_date#6, sumws#11, sum#20, isEmpty#21]
-
-(22) Exchange
-Input [5]: [item_sk#10, d_date#6, sumws#11, sum#20, isEmpty#21]
-Arguments: hashpartitioning(item_sk#10, d_date#6, sumws#11, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(23) HashAggregate [codegen id : 11]
-Input [5]: [item_sk#10, d_date#6, sumws#11, sum#20, isEmpty#21]
-Keys [3]: [item_sk#10, d_date#6, sumws#11]
-Functions [1]: [sum(sumws#17)]
-Aggregate Attributes [1]: [sum(sumws#17)#22]
-Results [3]: [item_sk#10, d_date#6, sum(sumws#17)#22 AS cume_sales#23]
-
-(24) Exchange
-Input [3]: [item_sk#10, d_date#6, cume_sales#23]
-Arguments: hashpartitioning(item_sk#10, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(25) Sort [codegen id : 12]
-Input [3]: [item_sk#10, d_date#6, cume_sales#23]
-Arguments: [item_sk#10 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
+Join condition: (rk#11 >= rk#14)
+
+(23) Project [codegen id : 8]
+Output [4]: [item_sk#9, d_date#6, sumws#10, sumws#16]
+Input [7]: [item_sk#9, d_date#6, sumws#10, rk#11, item_sk#15, sumws#16, rk#14]
+
+(24) HashAggregate [codegen id : 8]
+Input [4]: [item_sk#9, d_date#6, sumws#10, sumws#16]
+Keys [3]: [item_sk#9, d_date#6, sumws#10]
+Functions [1]: [partial_sum(sumws#16)]
+Aggregate Attributes [2]: [sum#17, isEmpty#18]
+Results [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
+
+(25) RowToColumnar
+Input [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
+
+(26) CometColumnarExchange
+Input [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
+Arguments: hashpartitioning(item_sk#9, d_date#6, sumws#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(27) CometHashAggregate
+Input [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
+Keys [3]: [item_sk#9, d_date#6, sumws#10]
+Functions [1]: [sum(sumws#16)]
+
+(28) CometColumnarExchange
+Input [3]: [item_sk#9, d_date#6, cume_sales#21]
+Arguments: hashpartitioning(item_sk#9, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(29) CometSort
+Input [3]: [item_sk#9, d_date#6, cume_sales#21]
+Arguments: [item_sk#9, d_date#6, cume_sales#21], [item_sk#9 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26]
+Output [3]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#26), dynamicpruningexpression(ss_sold_date_sk#26 IN dynamicpruning#27)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#24), dynamicpruningexpression(ss_sold_date_sk#24 IN dynamicpruning#25)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_sales_price:decimal(7,2)>
 
-(27) CometFilter
-Input [3]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26]
-Condition : isnotnull(ss_item_sk#24)
+(31) CometFilter
+Input [3]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24]
+Condition : isnotnull(ss_item_sk#22)
 
-(28) ColumnarToRow [codegen id : 14]
-Input [3]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26]
+(32) ColumnarToRow [codegen id : 10]
+Input [3]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24]
 
-(29) ReusedExchange [Reuses operator id: 72]
-Output [2]: [d_date_sk#28, d_date#29]
+(33) ReusedExchange [Reuses operator id: 82]
+Output [2]: [d_date_sk#26, d_date#27]
 
-(30) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ss_sold_date_sk#26]
-Right keys [1]: [d_date_sk#28]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ss_sold_date_sk#24]
+Right keys [1]: [d_date_sk#26]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 14]
-Output [3]: [ss_item_sk#24, ss_sales_price#25, d_date#29]
-Input [5]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26, d_date_sk#28, d_date#29]
-
-(32) HashAggregate [codegen id : 14]
-Input [3]: [ss_item_sk#24, ss_sales_price#25, d_date#29]
-Keys [2]: [ss_item_sk#24, d_date#29]
-Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#25))]
-Aggregate Attributes [1]: [sum#30]
-Results [3]: [ss_item_sk#24, d_date#29, sum#31]
-
-(33) Exchange
-Input [3]: [ss_item_sk#24, d_date#29, sum#31]
-Arguments: hashpartitioning(ss_item_sk#24, d_date#29, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(34) HashAggregate [codegen id : 15]
-Input [3]: [ss_item_sk#24, d_date#29, sum#31]
-Keys [2]: [ss_item_sk#24, d_date#29]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#25))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#25))#32]
-Results [4]: [ss_item_sk#24 AS item_sk#33, d_date#29, MakeDecimal(sum(UnscaledValue(ss_sales_price#25))#32,17,2) AS sumss#34, ss_item_sk#24]
-
-(35) Exchange
-Input [4]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24]
-Arguments: hashpartitioning(ss_item_sk#24, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(36) Sort [codegen id : 16]
-Input [4]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24]
-Arguments: [ss_item_sk#24 ASC NULLS FIRST, d_date#29 ASC NULLS FIRST], false, 0
-
-(37) Window
-Input [4]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24]
-Arguments: [row_number() windowspecdefinition(ss_item_sk#24, d_date#29 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#35], [ss_item_sk#24], [d_date#29 ASC NULLS FIRST]
-
-(38) Project [codegen id : 22]
-Output [4]: [item_sk#33, d_date#29, sumss#34, rk#35]
-Input [5]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24, rk#35]
-
-(39) ReusedExchange [Reuses operator id: 35]
-Output [4]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37]
-
-(40) Sort [codegen id : 20]
-Input [4]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37]
-Arguments: [ss_item_sk#37 ASC NULLS FIRST, d_date#36 ASC NULLS FIRST], false, 0
-
-(41) Window
-Input [4]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37]
-Arguments: [row_number() windowspecdefinition(ss_item_sk#37, d_date#36 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#38], [ss_item_sk#37], [d_date#36 ASC NULLS FIRST]
-
-(42) Project [codegen id : 21]
-Output [3]: [item_sk#33 AS item_sk#39, sumss#34 AS sumss#40, rk#38]
-Input [5]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37, rk#38]
-
-(43) BroadcastExchange
-Input [3]: [item_sk#39, sumss#40, rk#38]
+(35) Project [codegen id : 10]
+Output [3]: [ss_item_sk#22, ss_sales_price#23, d_date#27]
+Input [5]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24, d_date_sk#26, d_date#27]
+
+(36) HashAggregate [codegen id : 10]
+Input [3]: [ss_item_sk#22, ss_sales_price#23, d_date#27]
+Keys [2]: [ss_item_sk#22, d_date#27]
+Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#23))]
+Aggregate Attributes [1]: [sum#28]
+Results [3]: [ss_item_sk#22, d_date#27, sum#29]
+
+(37) RowToColumnar
+Input [3]: [ss_item_sk#22, d_date#27, sum#29]
+
+(38) CometColumnarExchange
+Input [3]: [ss_item_sk#22, d_date#27, sum#29]
+Arguments: hashpartitioning(ss_item_sk#22, d_date#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(39) CometHashAggregate
+Input [3]: [ss_item_sk#22, d_date#27, sum#29]
+Keys [2]: [ss_item_sk#22, d_date#27]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#23))]
+
+(40) CometColumnarExchange
+Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
+Arguments: hashpartitioning(ss_item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(41) CometSort
+Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
+Arguments: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22], [ss_item_sk#22 ASC NULLS FIRST, d_date#27 ASC NULLS FIRST]
+
+(42) ColumnarToRow [codegen id : 11]
+Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
+
+(43) Window
+Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
+Arguments: [row_number() windowspecdefinition(ss_item_sk#22, d_date#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#32], [ss_item_sk#22], [d_date#27 ASC NULLS FIRST]
+
+(44) Project [codegen id : 16]
+Output [4]: [item_sk#30, d_date#27, sumss#31, rk#32]
+Input [5]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22, rk#32]
+
+(45) ReusedExchange [Reuses operator id: 40]
+Output [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
+
+(46) CometSort
+Input [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
+Arguments: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34], [ss_item_sk#34 ASC NULLS FIRST, d_date#33 ASC NULLS FIRST]
+
+(47) ColumnarToRow [codegen id : 14]
+Input [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
+
+(48) Window
+Input [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
+Arguments: [row_number() windowspecdefinition(ss_item_sk#34, d_date#33 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#35], [ss_item_sk#34], [d_date#33 ASC NULLS FIRST]
+
+(49) Project [codegen id : 15]
+Output [3]: [item_sk#30 AS item_sk#36, sumss#31 AS sumss#37, rk#35]
+Input [5]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34, rk#35]
+
+(50) BroadcastExchange
+Input [3]: [item_sk#36, sumss#37, rk#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-(44) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [item_sk#33]
-Right keys [1]: [item_sk#39]
+(51) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [item_sk#30]
+Right keys [1]: [item_sk#36]
 Join type: Inner
-Join condition: (rk#35 >= rk#38)
-
-(45) Project [codegen id : 22]
-Output [4]: [item_sk#33, d_date#29, sumss#34, sumss#40]
-Input [7]: [item_sk#33, d_date#29, sumss#34, rk#35, item_sk#39, sumss#40, rk#38]
-
-(46) HashAggregate [codegen id : 22]
-Input [4]: [item_sk#33, d_date#29, sumss#34, sumss#40]
-Keys [3]: [item_sk#33, d_date#29, sumss#34]
-Functions [1]: [partial_sum(sumss#40)]
-Aggregate Attributes [2]: [sum#41, isEmpty#42]
-Results [5]: [item_sk#33, d_date#29, sumss#34, sum#43, isEmpty#44]
-
-(47) Exchange
-Input [5]: [item_sk#33, d_date#29, sumss#34, sum#43, isEmpty#44]
-Arguments: hashpartitioning(item_sk#33, d_date#29, sumss#34, 5), ENSURE_REQUIREMENTS, [plan_id=9]
-
-(48) HashAggregate [codegen id : 23]
-Input [5]: [item_sk#33, d_date#29, sumss#34, sum#43, isEmpty#44]
-Keys [3]: [item_sk#33, d_date#29, sumss#34]
-Functions [1]: [sum(sumss#40)]
-Aggregate Attributes [1]: [sum(sumss#40)#45]
-Results [3]: [item_sk#33, d_date#29, sum(sumss#40)#45 AS cume_sales#46]
-
-(49) Exchange
-Input [3]: [item_sk#33, d_date#29, cume_sales#46]
-Arguments: hashpartitioning(item_sk#33, d_date#29, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(50) Sort [codegen id : 24]
-Input [3]: [item_sk#33, d_date#29, cume_sales#46]
-Arguments: [item_sk#33 ASC NULLS FIRST, d_date#29 ASC NULLS FIRST], false, 0
-
-(51) SortMergeJoin [codegen id : 25]
-Left keys [2]: [item_sk#10, d_date#6]
-Right keys [2]: [item_sk#33, d_date#29]
-Join type: FullOuter
-Join condition: None
+Join condition: (rk#32 >= rk#35)
+
+(52) Project [codegen id : 16]
+Output [4]: [item_sk#30, d_date#27, sumss#31, sumss#37]
+Input [7]: [item_sk#30, d_date#27, sumss#31, rk#32, item_sk#36, sumss#37, rk#35]
+
+(53) HashAggregate [codegen id : 16]
+Input [4]: [item_sk#30, d_date#27, sumss#31, sumss#37]
+Keys [3]: [item_sk#30, d_date#27, sumss#31]
+Functions [1]: [partial_sum(sumss#37)]
+Aggregate Attributes [2]: [sum#38, isEmpty#39]
+Results [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
+
+(54) RowToColumnar
+Input [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
+
+(55) CometColumnarExchange
+Input [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
+Arguments: hashpartitioning(item_sk#30, d_date#27, sumss#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(56) CometHashAggregate
+Input [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
+Keys [3]: [item_sk#30, d_date#27, sumss#31]
+Functions [1]: [sum(sumss#37)]
+
+(57) CometColumnarExchange
+Input [3]: [item_sk#30, d_date#27, cume_sales#42]
+Arguments: hashpartitioning(item_sk#30, d_date#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(58) CometSort
+Input [3]: [item_sk#30, d_date#27, cume_sales#42]
+Arguments: [item_sk#30, d_date#27, cume_sales#42], [item_sk#30 ASC NULLS FIRST, d_date#27 ASC NULLS FIRST]
+
+(59) CometSortMergeJoin
+Left output [3]: [item_sk#9, d_date#6, cume_sales#21]
+Right output [3]: [item_sk#30, d_date#27, cume_sales#42]
+Arguments: [item_sk#9, d_date#6], [item_sk#30, d_date#27], FullOuter
+
+(60) CometFilter
+Input [6]: [item_sk#9, d_date#6, cume_sales#21, item_sk#30, d_date#27, cume_sales#42]
+Condition : isnotnull(CASE WHEN isnotnull(item_sk#9) THEN item_sk#9 ELSE item_sk#30 END)
+
+(61) CometProject
+Input [6]: [item_sk#9, d_date#6, cume_sales#21, item_sk#30, d_date#27, cume_sales#42]
+Arguments: [item_sk#43, d_date#44, web_sales#45, store_sales#46], [CASE WHEN isnotnull(item_sk#9) THEN item_sk#9 ELSE item_sk#30 END AS item_sk#43, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#27 END AS d_date#44, cume_sales#21 AS web_sales#45, cume_sales#42 AS store_sales#46]
 
-(52) Filter [codegen id : 25]
-Input [6]: [item_sk#10, d_date#6, cume_sales#23, item_sk#33, d_date#29, cume_sales#46]
-Condition : isnotnull(CASE WHEN isnotnull(item_sk#10) THEN item_sk#10 ELSE item_sk#33 END)
+(62) CometColumnarExchange
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Arguments: hashpartitioning(item_sk#43, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(53) Project [codegen id : 25]
-Output [4]: [CASE WHEN isnotnull(item_sk#10) THEN item_sk#10 ELSE item_sk#33 END AS item_sk#47, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#29 END AS d_date#48, cume_sales#23 AS web_sales#49, cume_sales#46 AS store_sales#50]
-Input [6]: [item_sk#10, d_date#6, cume_sales#23, item_sk#33, d_date#29, cume_sales#46]
+(63) CometSort
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Arguments: [item_sk#43, d_date#44, web_sales#45, store_sales#46], [item_sk#43 ASC NULLS FIRST, d_date#44 ASC NULLS FIRST]
 
-(54) Exchange
-Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Arguments: hashpartitioning(item_sk#47, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(64) ColumnarToRow [codegen id : 17]
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
 
-(55) Sort [codegen id : 26]
-Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Arguments: [item_sk#47 ASC NULLS FIRST, d_date#48 ASC NULLS FIRST], false, 0
+(65) Window
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Arguments: [row_number() windowspecdefinition(item_sk#43, d_date#44 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#47], [item_sk#43], [d_date#44 ASC NULLS FIRST]
 
-(56) Window
-Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Arguments: [row_number() windowspecdefinition(item_sk#47, d_date#48 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#51], [item_sk#47], [d_date#48 ASC NULLS FIRST]
+(66) ReusedExchange [Reuses operator id: 62]
+Output [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
 
-(57) ReusedExchange [Reuses operator id: 54]
-Output [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+(67) CometSort
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Arguments: [item_sk#43, d_date#44, web_sales#45, store_sales#46], [item_sk#43 ASC NULLS FIRST, d_date#44 ASC NULLS FIRST]
 
-(58) Sort [codegen id : 52]
-Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Arguments: [item_sk#47 ASC NULLS FIRST, d_date#48 ASC NULLS FIRST], false, 0
+(68) ColumnarToRow [codegen id : 34]
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
 
-(59) Window
-Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Arguments: [row_number() windowspecdefinition(item_sk#47, d_date#48 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#52], [item_sk#47], [d_date#48 ASC NULLS FIRST]
+(69) Window
+Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Arguments: [row_number() windowspecdefinition(item_sk#43, d_date#44 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#48], [item_sk#43], [d_date#44 ASC NULLS FIRST]
 
-(60) Project [codegen id : 53]
-Output [4]: [item_sk#47 AS item_sk#53, web_sales#49 AS web_sales#54, store_sales#50 AS store_sales#55, rk#52]
-Input [5]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, rk#52]
+(70) Project [codegen id : 35]
+Output [4]: [item_sk#43 AS item_sk#49, web_sales#45 AS web_sales#50, store_sales#46 AS store_sales#51, rk#48]
+Input [5]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, rk#48]
 
-(61) BroadcastExchange
-Input [4]: [item_sk#53, web_sales#54, store_sales#55, rk#52]
+(71) BroadcastExchange
+Input [4]: [item_sk#49, web_sales#50, store_sales#51, rk#48]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
-(62) BroadcastHashJoin [codegen id : 54]
-Left keys [1]: [item_sk#47]
-Right keys [1]: [item_sk#53]
+(72) BroadcastHashJoin [codegen id : 36]
+Left keys [1]: [item_sk#43]
+Right keys [1]: [item_sk#49]
 Join type: Inner
-Join condition: (rk#51 >= rk#52)
-
-(63) Project [codegen id : 54]
-Output [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_sales#54, store_sales#55]
-Input [9]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, rk#51, item_sk#53, web_sales#54, store_sales#55, rk#52]
-
-(64) HashAggregate [codegen id : 54]
-Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_sales#54, store_sales#55]
-Keys [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Functions [2]: [partial_max(web_sales#54), partial_max(store_sales#55)]
-Aggregate Attributes [2]: [max#56, max#57]
-Results [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, max#58, max#59]
-
-(65) HashAggregate [codegen id : 54]
-Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, max#58, max#59]
-Keys [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
-Functions [2]: [max(web_sales#54), max(store_sales#55)]
-Aggregate Attributes [2]: [max(web_sales#54)#60, max(store_sales#55)#61]
-Results [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, max(web_sales#54)#60 AS web_cumulative#62, max(store_sales#55)#61 AS store_cumulative#63]
-
-(66) Filter [codegen id : 54]
-Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_cumulative#62, store_cumulative#63]
-Condition : ((isnotnull(web_cumulative#62) AND isnotnull(store_cumulative#63)) AND (web_cumulative#62 > store_cumulative#63))
-
-(67) TakeOrderedAndProject
-Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_cumulative#62, store_cumulative#63]
-Arguments: 100, [item_sk#47 ASC NULLS FIRST, d_date#48 ASC NULLS FIRST], [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_cumulative#62, store_cumulative#63]
+Join condition: (rk#47 >= rk#48)
+
+(73) Project [codegen id : 36]
+Output [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_sales#50, store_sales#51]
+Input [9]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, rk#47, item_sk#49, web_sales#50, store_sales#51, rk#48]
+
+(74) HashAggregate [codegen id : 36]
+Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_sales#50, store_sales#51]
+Keys [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Functions [2]: [partial_max(web_sales#50), partial_max(store_sales#51)]
+Aggregate Attributes [2]: [max#52, max#53]
+Results [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, max#54, max#55]
+
+(75) HashAggregate [codegen id : 36]
+Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, max#54, max#55]
+Keys [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+Functions [2]: [max(web_sales#50), max(store_sales#51)]
+Aggregate Attributes [2]: [max(web_sales#50)#56, max(store_sales#51)#57]
+Results [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, max(web_sales#50)#56 AS web_cumulative#58, max(store_sales#51)#57 AS store_cumulative#59]
+
+(76) Filter [codegen id : 36]
+Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_cumulative#58, store_cumulative#59]
+Condition : ((isnotnull(web_cumulative#58) AND isnotnull(store_cumulative#59)) AND (web_cumulative#58 > store_cumulative#59))
+
+(77) TakeOrderedAndProject
+Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_cumulative#58, store_cumulative#59]
+Arguments: 100, [item_sk#43 ASC NULLS FIRST, d_date#44 ASC NULLS FIRST], [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_cumulative#58, store_cumulative#59]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (72)
-+- * ColumnarToRow (71)
-   +- CometProject (70)
-      +- CometFilter (69)
-         +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (82)
++- * ColumnarToRow (81)
+   +- CometProject (80)
+      +- CometFilter (79)
+         +- CometScan parquet spark_catalog.default.date_dim (78)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#5, d_date#6, d_month_seq#64]
+Output [3]: [d_date_sk#5, d_date#6, d_month_seq#60]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(69) CometFilter
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#64]
-Condition : (((isnotnull(d_month_seq#64) AND (d_month_seq#64 >= 1212)) AND (d_month_seq#64 <= 1223)) AND isnotnull(d_date_sk#5))
+(79) CometFilter
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#60]
+Condition : (((isnotnull(d_month_seq#60) AND (d_month_seq#60 >= 1212)) AND (d_month_seq#60 <= 1223)) AND isnotnull(d_date_sk#5))
 
-(70) CometProject
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#64]
+(80) CometProject
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#60]
 Arguments: [d_date_sk#5, d_date#6], [d_date_sk#5, d_date#6]
 
-(71) ColumnarToRow [codegen id : 1]
+(81) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#5, d_date#6]
 
-(72) BroadcastExchange
+(82) BroadcastExchange
 Input [2]: [d_date_sk#5, d_date#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:2 Hosting operator id = 26 Hosting Expression = ss_sold_date_sk#26 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#24 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt
index 3109290dc7..ec52058fb9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-  WholeStageCodegen (54)
+  WholeStageCodegen (36)
     Filter [web_cumulative,store_cumulative]
       HashAggregate [item_sk,d_date,web_sales,store_sales,max,max] [max(web_sales),max(store_sales),web_cumulative,store_cumulative,max,max]
         HashAggregate [item_sk,d_date,web_sales,store_sales,web_sales,store_sales] [max,max,max,max]
@@ -7,118 +7,113 @@ TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store
             BroadcastHashJoin [item_sk,item_sk,rk,rk]
               InputAdapter
                 Window [item_sk,d_date]
-                  WholeStageCodegen (26)
-                    Sort [item_sk,d_date]
+                  WholeStageCodegen (17)
+                    ColumnarToRow
                       InputAdapter
-                        Exchange [item_sk] #1
-                          WholeStageCodegen (25)
-                            Project [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales]
-                              Filter [item_sk,item_sk]
-                                SortMergeJoin [item_sk,d_date,item_sk,d_date]
-                                  InputAdapter
-                                    WholeStageCodegen (12)
-                                      Sort [item_sk,d_date]
-                                        InputAdapter
-                                          Exchange [item_sk,d_date] #2
-                                            WholeStageCodegen (11)
-                                              HashAggregate [item_sk,d_date,sumws,sum,isEmpty] [sum(sumws),cume_sales,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [item_sk,d_date,sumws] #3
-                                                    WholeStageCodegen (10)
-                                                      HashAggregate [item_sk,d_date,sumws,sumws] [sum,isEmpty,sum,isEmpty]
-                                                        Project [item_sk,d_date,sumws,sumws]
-                                                          BroadcastHashJoin [item_sk,item_sk,rk,rk]
-                                                            Project [item_sk,d_date,sumws,rk]
+                        CometSort [item_sk,d_date]
+                          CometColumnarExchange [item_sk] #1
+                            CometProject [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales] [item_sk,d_date,web_sales,store_sales]
+                              CometFilter [item_sk,item_sk]
+                                CometSortMergeJoin [item_sk,d_date,item_sk,d_date]
+                                  CometSort [item_sk,d_date]
+                                    CometColumnarExchange [item_sk,d_date] #2
+                                      CometHashAggregate [item_sk,d_date,sumws,sum,isEmpty]
+                                        CometColumnarExchange [item_sk,d_date,sumws] #3
+                                          RowToColumnar
+                                            WholeStageCodegen (8)
+                                              HashAggregate [item_sk,d_date,sumws,sumws] [sum,isEmpty,sum,isEmpty]
+                                                Project [item_sk,d_date,sumws,sumws]
+                                                  BroadcastHashJoin [item_sk,item_sk,rk,rk]
+                                                    Project [item_sk,d_date,sumws,rk]
+                                                      InputAdapter
+                                                        Window [ws_item_sk,d_date]
+                                                          WholeStageCodegen (3)
+                                                            ColumnarToRow
                                                               InputAdapter
-                                                                Window [ws_item_sk,d_date]
-                                                                  WholeStageCodegen (4)
-                                                                    Sort [ws_item_sk,d_date]
-                                                                      InputAdapter
-                                                                        Exchange [ws_item_sk] #4
-                                                                          WholeStageCodegen (3)
-                                                                            HashAggregate [ws_item_sk,d_date,sum] [sum(UnscaledValue(ws_sales_price)),item_sk,sumws,sum]
-                                                                              InputAdapter
-                                                                                Exchange [ws_item_sk,d_date] #5
-                                                                                  WholeStageCodegen (2)
-                                                                                    HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
-                                                                                      Project [ws_item_sk,ws_sales_price,d_date]
-                                                                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometFilter [ws_item_sk]
-                                                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
-                                                                                                  SubqueryBroadcast [d_date_sk] #1
-                                                                                                    BroadcastExchange #6
-                                                                                                      WholeStageCodegen (1)
-                                                                                                        ColumnarToRow
-                                                                                                          InputAdapter
-                                                                                                            CometProject [d_date_sk,d_date]
-                                                                                                              CometFilter [d_month_seq,d_date_sk]
-                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                                                                          InputAdapter
-                                                                                            ReusedExchange [d_date_sk,d_date] #6
+                                                                CometSort [ws_item_sk,d_date]
+                                                                  CometColumnarExchange [ws_item_sk] #4
+                                                                    CometHashAggregate [ws_item_sk,d_date,sum]
+                                                                      CometColumnarExchange [ws_item_sk,d_date] #5
+                                                                        RowToColumnar
+                                                                          WholeStageCodegen (2)
+                                                                            HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
+                                                                              Project [ws_item_sk,ws_sales_price,d_date]
+                                                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                                  ColumnarToRow
+                                                                                    InputAdapter
+                                                                                      CometFilter [ws_item_sk]
+                                                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
+                                                                                          SubqueryBroadcast [d_date_sk] #1
+                                                                                            BroadcastExchange #6
+                                                                                              WholeStageCodegen (1)
+                                                                                                ColumnarToRow
+                                                                                                  InputAdapter
+                                                                                                    CometProject [d_date_sk,d_date]
+                                                                                                      CometFilter [d_month_seq,d_date_sk]
+                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                                                                  InputAdapter
+                                                                                    ReusedExchange [d_date_sk,d_date] #6
+                                                    InputAdapter
+                                                      BroadcastExchange #7
+                                                        WholeStageCodegen (7)
+                                                          Project [item_sk,sumws,rk]
                                                             InputAdapter
-                                                              BroadcastExchange #7
-                                                                WholeStageCodegen (9)
-                                                                  Project [item_sk,sumws,rk]
+                                                              Window [ws_item_sk,d_date]
+                                                                WholeStageCodegen (6)
+                                                                  ColumnarToRow
                                                                     InputAdapter
-                                                                      Window [ws_item_sk,d_date]
-                                                                        WholeStageCodegen (8)
-                                                                          Sort [ws_item_sk,d_date]
-                                                                            InputAdapter
-                                                                              ReusedExchange [item_sk,d_date,sumws,ws_item_sk] #4
-                                  InputAdapter
-                                    WholeStageCodegen (24)
-                                      Sort [item_sk,d_date]
-                                        InputAdapter
-                                          Exchange [item_sk,d_date] #8
-                                            WholeStageCodegen (23)
-                                              HashAggregate [item_sk,d_date,sumss,sum,isEmpty] [sum(sumss),cume_sales,sum,isEmpty]
-                                                InputAdapter
-                                                  Exchange [item_sk,d_date,sumss] #9
-                                                    WholeStageCodegen (22)
-                                                      HashAggregate [item_sk,d_date,sumss,sumss] [sum,isEmpty,sum,isEmpty]
-                                                        Project [item_sk,d_date,sumss,sumss]
-                                                          BroadcastHashJoin [item_sk,item_sk,rk,rk]
-                                                            Project [item_sk,d_date,sumss,rk]
+                                                                      CometSort [ws_item_sk,d_date]
+                                                                        ReusedExchange [item_sk,d_date,sumws,ws_item_sk] #4
+                                  CometSort [item_sk,d_date]
+                                    CometColumnarExchange [item_sk,d_date] #8
+                                      CometHashAggregate [item_sk,d_date,sumss,sum,isEmpty]
+                                        CometColumnarExchange [item_sk,d_date,sumss] #9
+                                          RowToColumnar
+                                            WholeStageCodegen (16)
+                                              HashAggregate [item_sk,d_date,sumss,sumss] [sum,isEmpty,sum,isEmpty]
+                                                Project [item_sk,d_date,sumss,sumss]
+                                                  BroadcastHashJoin [item_sk,item_sk,rk,rk]
+                                                    Project [item_sk,d_date,sumss,rk]
+                                                      InputAdapter
+                                                        Window [ss_item_sk,d_date]
+                                                          WholeStageCodegen (11)
+                                                            ColumnarToRow
                                                               InputAdapter
-                                                                Window [ss_item_sk,d_date]
-                                                                  WholeStageCodegen (16)
-                                                                    Sort [ss_item_sk,d_date]
-                                                                      InputAdapter
-                                                                        Exchange [ss_item_sk] #10
-                                                                          WholeStageCodegen (15)
-                                                                            HashAggregate [ss_item_sk,d_date,sum] [sum(UnscaledValue(ss_sales_price)),item_sk,sumss,sum]
-                                                                              InputAdapter
-                                                                                Exchange [ss_item_sk,d_date] #11
-                                                                                  WholeStageCodegen (14)
-                                                                                    HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
-                                                                                      Project [ss_item_sk,ss_sales_price,d_date]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometFilter [ss_item_sk]
-                                                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
-                                                                                                  ReusedSubquery [d_date_sk] #1
-                                                                                          InputAdapter
-                                                                                            ReusedExchange [d_date_sk,d_date] #6
+                                                                CometSort [ss_item_sk,d_date]
+                                                                  CometColumnarExchange [ss_item_sk] #10
+                                                                    CometHashAggregate [ss_item_sk,d_date,sum]
+                                                                      CometColumnarExchange [ss_item_sk,d_date] #11
+                                                                        RowToColumnar
+                                                                          WholeStageCodegen (10)
+                                                                            HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
+                                                                              Project [ss_item_sk,ss_sales_price,d_date]
+                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                  ColumnarToRow
+                                                                                    InputAdapter
+                                                                                      CometFilter [ss_item_sk]
+                                                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
+                                                                                          ReusedSubquery [d_date_sk] #1
+                                                                                  InputAdapter
+                                                                                    ReusedExchange [d_date_sk,d_date] #6
+                                                    InputAdapter
+                                                      BroadcastExchange #12
+                                                        WholeStageCodegen (15)
+                                                          Project [item_sk,sumss,rk]
                                                             InputAdapter
-                                                              BroadcastExchange #12
-                                                                WholeStageCodegen (21)
-                                                                  Project [item_sk,sumss,rk]
+                                                              Window [ss_item_sk,d_date]
+                                                                WholeStageCodegen (14)
+                                                                  ColumnarToRow
                                                                     InputAdapter
-                                                                      Window [ss_item_sk,d_date]
-                                                                        WholeStageCodegen (20)
-                                                                          Sort [ss_item_sk,d_date]
-                                                                            InputAdapter
-                                                                              ReusedExchange [item_sk,d_date,sumss,ss_item_sk] #10
+                                                                      CometSort [ss_item_sk,d_date]
+                                                                        ReusedExchange [item_sk,d_date,sumss,ss_item_sk] #10
               InputAdapter
                 BroadcastExchange #13
-                  WholeStageCodegen (53)
+                  WholeStageCodegen (35)
                     Project [item_sk,web_sales,store_sales,rk]
                       InputAdapter
                         Window [item_sk,d_date]
-                          WholeStageCodegen (52)
-                            Sort [item_sk,d_date]
+                          WholeStageCodegen (34)
+                            ColumnarToRow
                               InputAdapter
-                                ReusedExchange [item_sk,d_date,web_sales,store_sales] #1
+                                CometSort [item_sk,d_date]
+                                  ReusedExchange [item_sk,d_date,web_sales,store_sales] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt
index dff12158b6..966f99500b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt
@@ -1,49 +1,51 @@
 == Physical Plan ==
-TakeOrderedAndProject (45)
-+- * Project (44)
-   +- * BroadcastHashJoin Inner BuildRight (43)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * Project (28)
-      :     :  +- * Filter (27)
-      :     :     +- Window (26)
-      :     :        +- * Filter (25)
-      :     :           +- Window (24)
-      :     :              +- * Sort (23)
-      :     :                 +- Exchange (22)
-      :     :                    +- * HashAggregate (21)
-      :     :                       +- Exchange (20)
-      :     :                          +- * HashAggregate (19)
-      :     :                             +- * Project (18)
-      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                   :- * Project (12)
-      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                   :     :- * Project (9)
-      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                   :     :     :- * ColumnarToRow (3)
-      :     :                                   :     :     :  +- CometFilter (2)
-      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                   :     :     +- BroadcastExchange (7)
-      :     :                                   :     :        +- * ColumnarToRow (6)
-      :     :                                   :     :           +- CometFilter (5)
-      :     :                                   :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
-      :     :                                   :     +- ReusedExchange (10)
-      :     :                                   +- BroadcastExchange (16)
-      :     :                                      +- * ColumnarToRow (15)
-      :     :                                         +- CometFilter (14)
-      :     :                                            +- CometScan parquet spark_catalog.default.call_center (13)
-      :     +- BroadcastExchange (35)
-      :        +- * Project (34)
-      :           +- Window (33)
-      :              +- * Sort (32)
-      :                 +- Exchange (31)
-      :                    +- * HashAggregate (30)
-      :                       +- ReusedExchange (29)
-      +- BroadcastExchange (42)
-         +- * Project (41)
-            +- Window (40)
-               +- * Sort (39)
-                  +- ReusedExchange (38)
+TakeOrderedAndProject (47)
++- * Project (46)
+   +- * BroadcastHashJoin Inner BuildRight (45)
+      :- * Project (38)
+      :  +- * BroadcastHashJoin Inner BuildRight (37)
+      :     :- * Project (30)
+      :     :  +- * Filter (29)
+      :     :     +- Window (28)
+      :     :        +- * Filter (27)
+      :     :           +- Window (26)
+      :     :              +- * ColumnarToRow (25)
+      :     :                 +- CometSort (24)
+      :     :                    +- CometColumnarExchange (23)
+      :     :                       +- CometHashAggregate (22)
+      :     :                          +- CometColumnarExchange (21)
+      :     :                             +- RowToColumnar (20)
+      :     :                                +- * HashAggregate (19)
+      :     :                                   +- * Project (18)
+      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                         :- * Project (12)
+      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                         :     :- * Project (9)
+      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                         :     :     :- * ColumnarToRow (3)
+      :     :                                         :     :     :  +- CometFilter (2)
+      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                         :     :     +- BroadcastExchange (7)
+      :     :                                         :     :        +- * ColumnarToRow (6)
+      :     :                                         :     :           +- CometFilter (5)
+      :     :                                         :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
+      :     :                                         :     +- ReusedExchange (10)
+      :     :                                         +- BroadcastExchange (16)
+      :     :                                            +- * ColumnarToRow (15)
+      :     :                                               +- CometFilter (14)
+      :     :                                                  +- CometScan parquet spark_catalog.default.call_center (13)
+      :     +- BroadcastExchange (36)
+      :        +- * Project (35)
+      :           +- Window (34)
+      :              +- * ColumnarToRow (33)
+      :                 +- CometSort (32)
+      :                    +- ReusedExchange (31)
+      +- BroadcastExchange (44)
+         +- * Project (43)
+            +- Window (42)
+               +- * ColumnarToRow (41)
+                  +- CometSort (40)
+                     +- ReusedExchange (39)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -89,7 +91,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, cs_call_center_sk#4, cs_sales_price#6, cs_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, cs_call_center_sk#4, cs_item_sk#5, cs_sales_price#6, cs_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 49]
+(10) ReusedExchange [Reuses operator id: 51]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -137,125 +139,124 @@ Functions [1]: [partial_sum(UnscaledValue(cs_sales_price#6))]
 Aggregate Attributes [1]: [sum#14]
 Results [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 
-(20) Exchange
+(20) RowToColumnar
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 Keys [5]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(cs_sales_price#6))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#6))#16]
-Results [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS sum_sales#17, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS _w0#18]
 
-(22) Exchange
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(23) CometColumnarExchange
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(23) Sort [codegen id : 6]
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
+(24) CometSort
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+Arguments: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(24) Window
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(25) ColumnarToRow [codegen id : 5]
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+
+(26) Window
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#18], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(25) Filter [codegen id : 7]
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+(27) Filter [codegen id : 6]
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(26) Window
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
-Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, cc_name#13, d_year#10]
-
-(27) Filter [codegen id : 22]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
-
-(28) Project [codegen id : 22]
-Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-
-(29) ReusedExchange [Reuses operator id: 20]
-Output [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
-
-(30) HashAggregate [codegen id : 12]
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
-Keys [5]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25]
-Functions [1]: [sum(UnscaledValue(cs_sales_price#27))]
-Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#27))#16]
-Results [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, MakeDecimal(sum(UnscaledValue(cs_sales_price#27))#16,17,2) AS sum_sales#17]
-
-(31) Exchange
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
-Arguments: hashpartitioning(i_category#21, i_brand#22, cc_name#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(32) Sort [codegen id : 13]
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
-Arguments: [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, cc_name#23 ASC NULLS FIRST, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST], false, 0
-
-(33) Window
-Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
-Arguments: [rank(d_year#24, d_moy#25) windowspecdefinition(i_category#21, i_brand#22, cc_name#23, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#28], [i_category#21, i_brand#22, cc_name#23], [d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST]
-
-(34) Project [codegen id : 14]
-Output [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#17 AS sum_sales#29, rn#28]
-Input [7]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17, rn#28]
-
-(35) BroadcastExchange
-Input [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=6]
-
-(36) BroadcastHashJoin [codegen id : 22]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
-Right keys [4]: [i_category#21, i_brand#22, cc_name#23, (rn#28 + 1)]
+(28) Window
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
+Arguments: [avg(_w0#17) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#19], [i_category#3, i_brand#2, cc_name#13, d_year#10]
+
+(29) Filter [codegen id : 19]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
+Condition : ((isnotnull(avg_monthly_sales#19) AND (avg_monthly_sales#19 > 0.000000)) AND CASE WHEN (avg_monthly_sales#19 > 0.000000) THEN ((abs((sum_sales#16 - avg_monthly_sales#19)) / avg_monthly_sales#19) > 0.1000000000000000) END)
+
+(30) Project [codegen id : 19]
+Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
+
+(31) ReusedExchange [Reuses operator id: 23]
+Output [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+
+(32) CometSort
+Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+Arguments: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16], [i_category#20 ASC NULLS FIRST, i_brand#21 ASC NULLS FIRST, cc_name#22 ASC NULLS FIRST, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
+
+(33) ColumnarToRow [codegen id : 11]
+Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+
+(34) Window
+Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
+Arguments: [rank(d_year#23, d_moy#24) windowspecdefinition(i_category#20, i_brand#21, cc_name#22, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#25], [i_category#20, i_brand#21, cc_name#22], [d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
+
+(35) Project [codegen id : 12]
+Output [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#16 AS sum_sales#26, rn#25]
+Input [7]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16, rn#25]
+
+(36) BroadcastExchange
+Input [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=5]
+
+(37) BroadcastHashJoin [codegen id : 19]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
+Right keys [4]: [i_category#20, i_brand#21, cc_name#22, (rn#25 + 1)]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 22]
-Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29]
-Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
+(38) Project [codegen id : 19]
+Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26]
+Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
+
+(39) ReusedExchange [Reuses operator id: 23]
+Output [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
 
-(38) ReusedExchange [Reuses operator id: 31]
-Output [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
+(40) CometSort
+Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+Arguments: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16], [i_category#27 ASC NULLS FIRST, i_brand#28 ASC NULLS FIRST, cc_name#29 ASC NULLS FIRST, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
 
-(39) Sort [codegen id : 20]
-Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [i_category#30 ASC NULLS FIRST, i_brand#31 ASC NULLS FIRST, cc_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST], false, 0
+(41) ColumnarToRow [codegen id : 17]
+Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
 
-(40) Window
-Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#30, i_brand#31, cc_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#30, i_brand#31, cc_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
+(42) Window
+Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+Arguments: [rank(d_year#30, d_moy#31) windowspecdefinition(i_category#27, i_brand#28, cc_name#29, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#32], [i_category#27, i_brand#28, cc_name#29], [d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
 
-(41) Project [codegen id : 21]
-Output [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#17 AS sum_sales#36, rn#35]
-Input [7]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
+(43) Project [codegen id : 18]
+Output [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#16 AS sum_sales#33, rn#32]
+Input [7]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16, rn#32]
 
-(42) BroadcastExchange
-Input [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=7]
+(44) BroadcastExchange
+Input [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=6]
 
-(43) BroadcastHashJoin [codegen id : 22]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
-Right keys [4]: [i_category#30, i_brand#31, cc_name#32, (rn#35 - 1)]
+(45) BroadcastHashJoin [codegen id : 19]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
+Right keys [4]: [i_category#27, i_brand#28, cc_name#29, (rn#32 - 1)]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 22]
-Output [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#29 AS psum#37, sum_sales#36 AS nsum#38]
-Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29, i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
+(46) Project [codegen id : 19]
+Output [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, sum_sales#26 AS psum#34, sum_sales#33 AS nsum#35]
+Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26, i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
 
-(45) TakeOrderedAndProject
-Input [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
-Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, d_year#10 ASC NULLS FIRST], [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+(47) TakeOrderedAndProject
+Input [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
+Arguments: 100, [(sum_sales#16 - avg_monthly_sales#19) ASC NULLS FIRST, d_year#10 ASC NULLS FIRST], [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = cs_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometFilter (47)
-      +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (51)
++- * ColumnarToRow (50)
+   +- CometFilter (49)
+      +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -265,15 +266,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
+(49) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(48) ColumnarToRow [codegen id : 1]
+(50) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(49) BroadcastExchange
+(51) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt
index 56e33be9e4..174e9c66ae 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_year,i_category,i_brand,d_moy,psum,nsum]
-  WholeStageCodegen (22)
+  WholeStageCodegen (19)
     Project [i_category,i_brand,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,cc_name,rn,i_category,i_brand,cc_name,rn]
         Project [i_category,i_brand,cc_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_year,i_category,i_brand,d_m
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,cc_name,d_year]
-                    WholeStageCodegen (7)
+                    WholeStageCodegen (6)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,cc_name]
-                            WholeStageCodegen (6)
-                              Sort [i_category,i_brand,cc_name,d_year,d_moy]
+                            WholeStageCodegen (5)
+                              ColumnarToRow
                                 InputAdapter
-                                  Exchange [i_category,i_brand,cc_name] #1
-                                    WholeStageCodegen (5)
-                                      HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,_w0,sum]
-                                        InputAdapter
-                                          Exchange [i_category,i_brand,cc_name,d_year,d_moy] #2
+                                  CometSort [i_category,i_brand,cc_name,d_year,d_moy]
+                                    CometColumnarExchange [i_category,i_brand,cc_name] #1
+                                      CometHashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum]
+                                        CometColumnarExchange [i_category,i_brand,cc_name,d_year,d_moy] #2
+                                          RowToColumnar
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,cs_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,cs_sales_price,d_year,d_moy,cc_name]
@@ -57,25 +57,23 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_year,i_category,i_brand,d_m
                                                                 CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (14)
+                WholeStageCodegen (12)
                   Project [i_category,i_brand,cc_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,cc_name]
-                        WholeStageCodegen (13)
-                          Sort [i_category,i_brand,cc_name,d_year,d_moy]
+                        WholeStageCodegen (11)
+                          ColumnarToRow
                             InputAdapter
-                              Exchange [i_category,i_brand,cc_name] #7
-                                WholeStageCodegen (12)
-                                  HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,sum]
-                                    InputAdapter
-                                      ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum] #2
+                              CometSort [i_category,i_brand,cc_name,d_year,d_moy]
+                                ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
         InputAdapter
-          BroadcastExchange #8
-            WholeStageCodegen (21)
+          BroadcastExchange #7
+            WholeStageCodegen (18)
               Project [i_category,i_brand,cc_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,cc_name]
-                    WholeStageCodegen (20)
-                      Sort [i_category,i_brand,cc_name,d_year,d_moy]
+                    WholeStageCodegen (17)
+                      ColumnarToRow
                         InputAdapter
-                          ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #7
+                          CometSort [i_category,i_brand,cc_name,d_year,d_moy]
+                            ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
index 0cae422d0a..e38c90c38e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
@@ -1,89 +1,97 @@
 == Physical Plan ==
-TakeOrderedAndProject (85)
-+- * HashAggregate (84)
-   +- Exchange (83)
-      +- * HashAggregate (82)
-         +- Union (81)
-            :- * HashAggregate (70)
-            :  +- Exchange (69)
-            :     +- * HashAggregate (68)
-            :        +- Union (67)
-            :           :- * HashAggregate (20)
-            :           :  +- Exchange (19)
-            :           :     +- * HashAggregate (18)
-            :           :        +- * Project (17)
-            :           :           +- * BroadcastHashJoin Inner BuildRight (16)
-            :           :              :- * Project (11)
-            :           :              :  +- * BroadcastHashJoin Inner BuildRight (10)
-            :           :              :     :- * ColumnarToRow (8)
-            :           :              :     :  +- CometUnion (7)
-            :           :              :     :     :- CometProject (3)
-            :           :              :     :     :  +- CometFilter (2)
-            :           :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :           :              :     :     +- CometProject (6)
-            :           :              :     :        +- CometFilter (5)
-            :           :              :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
-            :           :              :     +- ReusedExchange (9)
-            :           :              +- BroadcastExchange (15)
-            :           :                 +- * ColumnarToRow (14)
-            :           :                    +- CometFilter (13)
-            :           :                       +- CometScan parquet spark_catalog.default.store (12)
-            :           :- * HashAggregate (40)
-            :           :  +- Exchange (39)
-            :           :     +- * HashAggregate (38)
-            :           :        +- * Project (37)
-            :           :           +- * BroadcastHashJoin Inner BuildRight (36)
-            :           :              :- * Project (31)
-            :           :              :  +- * BroadcastHashJoin Inner BuildRight (30)
-            :           :              :     :- * ColumnarToRow (28)
-            :           :              :     :  +- CometUnion (27)
-            :           :              :     :     :- CometProject (23)
-            :           :              :     :     :  +- CometFilter (22)
-            :           :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (21)
-            :           :              :     :     +- CometProject (26)
-            :           :              :     :        +- CometFilter (25)
-            :           :              :     :           +- CometScan parquet spark_catalog.default.catalog_returns (24)
-            :           :              :     +- ReusedExchange (29)
-            :           :              +- BroadcastExchange (35)
-            :           :                 +- * ColumnarToRow (34)
-            :           :                    +- CometFilter (33)
-            :           :                       +- CometScan parquet spark_catalog.default.catalog_page (32)
-            :           +- * HashAggregate (66)
-            :              +- Exchange (65)
-            :                 +- * HashAggregate (64)
-            :                    +- * Project (63)
-            :                       +- * BroadcastHashJoin Inner BuildRight (62)
-            :                          :- * Project (57)
-            :                          :  +- * BroadcastHashJoin Inner BuildRight (56)
-            :                          :     :- Union (54)
-            :                          :     :  :- * ColumnarToRow (44)
-            :                          :     :  :  +- CometProject (43)
-            :                          :     :  :     +- CometFilter (42)
-            :                          :     :  :        +- CometScan parquet spark_catalog.default.web_sales (41)
-            :                          :     :  +- * Project (53)
-            :                          :     :     +- * BroadcastHashJoin Inner BuildLeft (52)
-            :                          :     :        :- BroadcastExchange (47)
-            :                          :     :        :  +- * ColumnarToRow (46)
-            :                          :     :        :     +- CometScan parquet spark_catalog.default.web_returns (45)
-            :                          :     :        +- * ColumnarToRow (51)
-            :                          :     :           +- CometProject (50)
-            :                          :     :              +- CometFilter (49)
-            :                          :     :                 +- CometScan parquet spark_catalog.default.web_sales (48)
-            :                          :     +- ReusedExchange (55)
-            :                          +- BroadcastExchange (61)
-            :                             +- * ColumnarToRow (60)
-            :                                +- CometFilter (59)
-            :                                   +- CometScan parquet spark_catalog.default.web_site (58)
-            :- * HashAggregate (75)
-            :  +- Exchange (74)
-            :     +- * HashAggregate (73)
-            :        +- * HashAggregate (72)
-            :           +- ReusedExchange (71)
-            +- * HashAggregate (80)
-               +- Exchange (79)
-                  +- * HashAggregate (78)
-                     +- * HashAggregate (77)
-                        +- ReusedExchange (76)
+* ColumnarToRow (93)
++- CometTakeOrderedAndProject (92)
+   +- CometHashAggregate (91)
+      +- CometColumnarExchange (90)
+         +- CometHashAggregate (89)
+            +- CometUnion (88)
+               :- CometHashAggregate (77)
+               :  +- CometColumnarExchange (76)
+               :     +- RowToColumnar (75)
+               :        +- * HashAggregate (74)
+               :           +- Union (73)
+               :              :- * HashAggregate (22)
+               :              :  +- * ColumnarToRow (21)
+               :              :     +- CometColumnarExchange (20)
+               :              :        +- RowToColumnar (19)
+               :              :           +- * HashAggregate (18)
+               :              :              +- * Project (17)
+               :              :                 +- * BroadcastHashJoin Inner BuildRight (16)
+               :              :                    :- * Project (11)
+               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (10)
+               :              :                    :     :- * ColumnarToRow (8)
+               :              :                    :     :  +- CometUnion (7)
+               :              :                    :     :     :- CometProject (3)
+               :              :                    :     :     :  +- CometFilter (2)
+               :              :                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :              :                    :     :     +- CometProject (6)
+               :              :                    :     :        +- CometFilter (5)
+               :              :                    :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
+               :              :                    :     +- ReusedExchange (9)
+               :              :                    +- BroadcastExchange (15)
+               :              :                       +- * ColumnarToRow (14)
+               :              :                          +- CometFilter (13)
+               :              :                             +- CometScan parquet spark_catalog.default.store (12)
+               :              :- * HashAggregate (44)
+               :              :  +- * ColumnarToRow (43)
+               :              :     +- CometColumnarExchange (42)
+               :              :        +- RowToColumnar (41)
+               :              :           +- * HashAggregate (40)
+               :              :              +- * Project (39)
+               :              :                 +- * BroadcastHashJoin Inner BuildRight (38)
+               :              :                    :- * Project (33)
+               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (32)
+               :              :                    :     :- * ColumnarToRow (30)
+               :              :                    :     :  +- CometUnion (29)
+               :              :                    :     :     :- CometProject (25)
+               :              :                    :     :     :  +- CometFilter (24)
+               :              :                    :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (23)
+               :              :                    :     :     +- CometProject (28)
+               :              :                    :     :        +- CometFilter (27)
+               :              :                    :     :           +- CometScan parquet spark_catalog.default.catalog_returns (26)
+               :              :                    :     +- ReusedExchange (31)
+               :              :                    +- BroadcastExchange (37)
+               :              :                       +- * ColumnarToRow (36)
+               :              :                          +- CometFilter (35)
+               :              :                             +- CometScan parquet spark_catalog.default.catalog_page (34)
+               :              +- * HashAggregate (72)
+               :                 +- * ColumnarToRow (71)
+               :                    +- CometColumnarExchange (70)
+               :                       +- RowToColumnar (69)
+               :                          +- * HashAggregate (68)
+               :                             +- * Project (67)
+               :                                +- * BroadcastHashJoin Inner BuildRight (66)
+               :                                   :- * Project (61)
+               :                                   :  +- * BroadcastHashJoin Inner BuildRight (60)
+               :                                   :     :- Union (58)
+               :                                   :     :  :- * ColumnarToRow (48)
+               :                                   :     :  :  +- CometProject (47)
+               :                                   :     :  :     +- CometFilter (46)
+               :                                   :     :  :        +- CometScan parquet spark_catalog.default.web_sales (45)
+               :                                   :     :  +- * Project (57)
+               :                                   :     :     +- * BroadcastHashJoin Inner BuildLeft (56)
+               :                                   :     :        :- BroadcastExchange (51)
+               :                                   :     :        :  +- * ColumnarToRow (50)
+               :                                   :     :        :     +- CometScan parquet spark_catalog.default.web_returns (49)
+               :                                   :     :        +- * ColumnarToRow (55)
+               :                                   :     :           +- CometProject (54)
+               :                                   :     :              +- CometFilter (53)
+               :                                   :     :                 +- CometScan parquet spark_catalog.default.web_sales (52)
+               :                                   :     +- ReusedExchange (59)
+               :                                   +- BroadcastExchange (65)
+               :                                      +- * ColumnarToRow (64)
+               :                                         +- CometFilter (63)
+               :                                            +- CometScan parquet spark_catalog.default.web_site (62)
+               :- CometHashAggregate (82)
+               :  +- CometColumnarExchange (81)
+               :     +- CometHashAggregate (80)
+               :        +- CometHashAggregate (79)
+               :           +- ReusedExchange (78)
+               +- CometHashAggregate (87)
+                  +- CometColumnarExchange (86)
+                     +- CometHashAggregate (85)
+                        +- CometHashAggregate (84)
+                           +- ReusedExchange (83)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -125,7 +133,7 @@ Child 1 Input [6]: [store_sk#16, date_sk#17, sales_price#18, profit#19, return_a
 (8) ColumnarToRow [codegen id : 3]
 Input [6]: [store_sk#6, date_sk#7, sales_price#8, profit#9, return_amt#10, net_loss#11]
 
-(9) ReusedExchange [Reuses operator id: 90]
+(9) ReusedExchange [Reuses operator id: 98]
 Output [1]: [d_date_sk#22]
 
 (10) BroadcastHashJoin [codegen id : 3]
@@ -173,11 +181,17 @@ Functions [4]: [partial_sum(UnscaledValue(sales_price#8)), partial_sum(UnscaledV
 Aggregate Attributes [4]: [sum#25, sum#26, sum#27, sum#28]
 Results [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 
-(19) Exchange
+(19) RowToColumnar
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
-Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(20) HashAggregate [codegen id : 4]
+(20) CometColumnarExchange
+Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
+Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(21) ColumnarToRow [codegen id : 4]
+Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
+
+(22) HashAggregate [codegen id : 4]
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 Keys [1]: [s_store_id#24]
 Functions [4]: [sum(UnscaledValue(sales_price#8)), sum(UnscaledValue(return_amt#10)), sum(UnscaledValue(profit#9)), sum(UnscaledValue(net_loss#11))]
@@ -192,11 +206,11 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(22) CometFilter
+(24) CometFilter
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : isnotnull(cs_catalog_page_sk#42)
 
-(23) CometProject
+(25) CometProject
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52], [cs_catalog_page_sk#42 AS page_sk#47, cs_sold_date_sk#45 AS date_sk#48, cs_ext_sales_price#43 AS sales_price#49, cs_net_profit#44 AS profit#50, 0.00 AS return_amt#51, 0.00 AS net_loss#52]
 
@@ -208,31 +222,31 @@ PartitionFilters: [isnotnull(cr_returned_date_sk#56), dynamicpruningexpression(c
 PushedFilters: [IsNotNull(cr_catalog_page_sk)]
 ReadSchema: struct<cr_catalog_page_sk:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(25) CometFilter
+(27) CometFilter
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Condition : isnotnull(cr_catalog_page_sk#53)
 
-(26) CometProject
+(28) CometProject
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Arguments: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62], [cr_catalog_page_sk#53 AS page_sk#57, cr_returned_date_sk#56 AS date_sk#58, 0.00 AS sales_price#59, 0.00 AS profit#60, cr_return_amount#54 AS return_amt#61, cr_net_loss#55 AS net_loss#62]
 
-(27) CometUnion
+(29) CometUnion
 Child 0 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Child 1 Input [6]: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62]
 
-(28) ColumnarToRow [codegen id : 7]
+(30) ColumnarToRow [codegen id : 7]
 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 
-(29) ReusedExchange [Reuses operator id: 90]
+(31) ReusedExchange [Reuses operator id: 98]
 Output [1]: [d_date_sk#63]
 
-(30) BroadcastHashJoin [codegen id : 7]
+(32) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [date_sk#48]
 Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 7]
+(33) Project [codegen id : 7]
 Output [5]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Input [7]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52, d_date_sk#63]
 
@@ -243,39 +257,45 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(33) CometFilter
+(35) CometFilter
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Condition : isnotnull(cp_catalog_page_sk#64)
 
-(34) ColumnarToRow [codegen id : 6]
+(36) ColumnarToRow [codegen id : 6]
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(35) BroadcastExchange
+(37) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(36) BroadcastHashJoin [codegen id : 7]
+(38) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [page_sk#47]
 Right keys [1]: [cp_catalog_page_sk#64]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 7]
+(39) Project [codegen id : 7]
 Output [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Input [7]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(38) HashAggregate [codegen id : 7]
+(40) HashAggregate [codegen id : 7]
 Input [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#49)), partial_sum(UnscaledValue(return_amt#51)), partial_sum(UnscaledValue(profit#50)), partial_sum(UnscaledValue(net_loss#52))]
 Aggregate Attributes [4]: [sum#66, sum#67, sum#68, sum#69]
 Results [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 
-(39) Exchange
+(41) RowToColumnar
+Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
+
+(42) CometColumnarExchange
+Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
+Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(43) ColumnarToRow [codegen id : 8]
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
-Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(40) HashAggregate [codegen id : 8]
+(44) HashAggregate [codegen id : 8]
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [sum(UnscaledValue(sales_price#49)), sum(UnscaledValue(return_amt#51)), sum(UnscaledValue(profit#50)), sum(UnscaledValue(net_loss#52))]
@@ -290,15 +310,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#86), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_web_site_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(42) CometFilter
+(46) CometFilter
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Condition : isnotnull(ws_web_site_sk#83)
 
-(43) CometProject
+(47) CometProject
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Arguments: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93], [ws_web_site_sk#83 AS wsr_web_site_sk#88, ws_sold_date_sk#86 AS date_sk#89, ws_ext_sales_price#84 AS sales_price#90, ws_net_profit#85 AS profit#91, 0.00 AS return_amt#92, 0.00 AS net_loss#93]
 
-(44) ColumnarToRow [codegen id : 9]
+(48) ColumnarToRow [codegen id : 9]
 Input [6]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
@@ -308,10 +328,10 @@ Location: InMemoryFileIndex []
 PartitionFilters: [isnotnull(wr_returned_date_sk#98), dynamicpruningexpression(wr_returned_date_sk#98 IN dynamicpruning#87)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(46) ColumnarToRow [codegen id : 10]
+(50) ColumnarToRow [codegen id : 10]
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 
-(47) BroadcastExchange
+(51) BroadcastExchange
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, true] as bigint), 32) | (cast(input[1, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
@@ -322,39 +342,39 @@ Location [not included in comparison]/{warehouse_dir}/web_sales]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_order_number), IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_order_number:int>
 
-(49) CometFilter
+(53) CometFilter
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Condition : ((isnotnull(ws_item_sk#99) AND isnotnull(ws_order_number#101)) AND isnotnull(ws_web_site_sk#100))
 
-(50) CometProject
+(54) CometProject
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Arguments: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101], [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(51) ColumnarToRow
+(55) ColumnarToRow
 Input [3]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(52) BroadcastHashJoin [codegen id : 11]
+(56) BroadcastHashJoin [codegen id : 11]
 Left keys [2]: [wr_item_sk#94, wr_order_number#95]
 Right keys [2]: [ws_item_sk#99, ws_order_number#101]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 11]
+(57) Project [codegen id : 11]
 Output [6]: [ws_web_site_sk#100 AS wsr_web_site_sk#103, wr_returned_date_sk#98 AS date_sk#104, 0.00 AS sales_price#105, 0.00 AS profit#106, wr_return_amt#96 AS return_amt#107, wr_net_loss#97 AS net_loss#108]
 Input [8]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98, ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(54) Union
+(58) Union
 
-(55) ReusedExchange [Reuses operator id: 90]
+(59) ReusedExchange [Reuses operator id: 98]
 Output [1]: [d_date_sk#109]
 
-(56) BroadcastHashJoin [codegen id : 14]
+(60) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [date_sk#89]
 Right keys [1]: [d_date_sk#109]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 14]
+(61) Project [codegen id : 14]
 Output [5]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93]
 Input [7]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93, d_date_sk#109]
 
@@ -365,185 +385,182 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(59) CometFilter
+(63) CometFilter
 Input [2]: [web_site_sk#110, web_site_id#111]
 Condition : isnotnull(web_site_sk#110)
 
-(60) ColumnarToRow [codegen id : 13]
+(64) ColumnarToRow [codegen id : 13]
 Input [2]: [web_site_sk#110, web_site_id#111]
 
-(61) BroadcastExchange
+(65) BroadcastExchange
 Input [2]: [web_site_sk#110, web_site_id#111]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(62) BroadcastHashJoin [codegen id : 14]
+(66) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [wsr_web_site_sk#88]
 Right keys [1]: [web_site_sk#110]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 14]
+(67) Project [codegen id : 14]
 Output [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Input [7]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_sk#110, web_site_id#111]
 
-(64) HashAggregate [codegen id : 14]
+(68) HashAggregate [codegen id : 14]
 Input [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Keys [1]: [web_site_id#111]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#90)), partial_sum(UnscaledValue(return_amt#92)), partial_sum(UnscaledValue(profit#91)), partial_sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum#112, sum#113, sum#114, sum#115]
 Results [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 
-(65) Exchange
+(69) RowToColumnar
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
-Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(66) HashAggregate [codegen id : 15]
+(70) CometColumnarExchange
+Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
+Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(71) ColumnarToRow [codegen id : 15]
+Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
+
+(72) HashAggregate [codegen id : 15]
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 Keys [1]: [web_site_id#111]
 Functions [4]: [sum(UnscaledValue(sales_price#90)), sum(UnscaledValue(return_amt#92)), sum(UnscaledValue(profit#91)), sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum(UnscaledValue(sales_price#90))#120, sum(UnscaledValue(return_amt#92))#121, sum(UnscaledValue(profit#91))#122, sum(UnscaledValue(net_loss#93))#123]
 Results [5]: [web channel AS channel#124, concat(web_site, web_site_id#111) AS id#125, MakeDecimal(sum(UnscaledValue(sales_price#90))#120,17,2) AS sales#126, MakeDecimal(sum(UnscaledValue(return_amt#92))#121,17,2) AS returns#127, (MakeDecimal(sum(UnscaledValue(profit#91))#122,17,2) - MakeDecimal(sum(UnscaledValue(net_loss#93))#123,17,2)) AS profit#128]
 
-(67) Union
+(73) Union
 
-(68) HashAggregate [codegen id : 16]
+(74) HashAggregate [codegen id : 16]
 Input [5]: [channel#37, id#38, sales#39, returns#40, profit#41]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [partial_sum(sales#39), partial_sum(returns#40), partial_sum(profit#41)]
 Aggregate Attributes [6]: [sum#129, isEmpty#130, sum#131, isEmpty#132, sum#133, isEmpty#134]
 Results [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 
-(69) Exchange
+(75) RowToColumnar
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
-Arguments: hashpartitioning(channel#37, id#38, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(70) HashAggregate [codegen id : 17]
+(76) CometColumnarExchange
+Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
+Arguments: hashpartitioning(channel#37, id#38, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+
+(77) CometHashAggregate
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [sum(sales#39), sum(returns#40), sum(profit#41)]
-Aggregate Attributes [3]: [sum(sales#39)#141, sum(returns#40)#142, sum(profit#41)#143]
-Results [5]: [channel#37, id#38, cast(sum(sales#39)#141 as decimal(37,2)) AS sales#144, cast(sum(returns#40)#142 as decimal(37,2)) AS returns#145, cast(sum(profit#41)#143 as decimal(38,2)) AS profit#146]
 
-(71) ReusedExchange [Reuses operator id: 69]
+(78) ReusedExchange [Reuses operator id: 76]
 Output [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 
-(72) HashAggregate [codegen id : 34]
+(79) CometHashAggregate
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [sum(sales#39), sum(returns#40), sum(profit#41)]
-Aggregate Attributes [3]: [sum(sales#39)#141, sum(returns#40)#142, sum(profit#41)#143]
-Results [4]: [channel#37, sum(sales#39)#141 AS sales#147, sum(returns#40)#142 AS returns#148, sum(profit#41)#143 AS profit#149]
 
-(73) HashAggregate [codegen id : 34]
-Input [4]: [channel#37, sales#147, returns#148, profit#149]
+(80) CometHashAggregate
+Input [4]: [channel#37, sales#141, returns#142, profit#143]
 Keys [1]: [channel#37]
-Functions [3]: [partial_sum(sales#147), partial_sum(returns#148), partial_sum(profit#149)]
-Aggregate Attributes [6]: [sum#150, isEmpty#151, sum#152, isEmpty#153, sum#154, isEmpty#155]
-Results [7]: [channel#37, sum#156, isEmpty#157, sum#158, isEmpty#159, sum#160, isEmpty#161]
+Functions [3]: [partial_sum(sales#141), partial_sum(returns#142), partial_sum(profit#143)]
 
-(74) Exchange
-Input [7]: [channel#37, sum#156, isEmpty#157, sum#158, isEmpty#159, sum#160, isEmpty#161]
-Arguments: hashpartitioning(channel#37, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(81) CometColumnarExchange
+Input [7]: [channel#37, sum#144, isEmpty#145, sum#146, isEmpty#147, sum#148, isEmpty#149]
+Arguments: hashpartitioning(channel#37, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(75) HashAggregate [codegen id : 35]
-Input [7]: [channel#37, sum#156, isEmpty#157, sum#158, isEmpty#159, sum#160, isEmpty#161]
+(82) CometHashAggregate
+Input [7]: [channel#37, sum#144, isEmpty#145, sum#146, isEmpty#147, sum#148, isEmpty#149]
 Keys [1]: [channel#37]
-Functions [3]: [sum(sales#147), sum(returns#148), sum(profit#149)]
-Aggregate Attributes [3]: [sum(sales#147)#162, sum(returns#148)#163, sum(profit#149)#164]
-Results [5]: [channel#37, null AS id#165, sum(sales#147)#162 AS sum(sales)#166, sum(returns#148)#163 AS sum(returns)#167, sum(profit#149)#164 AS sum(profit)#168]
+Functions [3]: [sum(sales#141), sum(returns#142), sum(profit#143)]
 
-(76) ReusedExchange [Reuses operator id: 69]
+(83) ReusedExchange [Reuses operator id: 76]
 Output [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 
-(77) HashAggregate [codegen id : 52]
+(84) CometHashAggregate
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [sum(sales#39), sum(returns#40), sum(profit#41)]
-Aggregate Attributes [3]: [sum(sales#39)#141, sum(returns#40)#142, sum(profit#41)#143]
-Results [3]: [sum(sales#39)#141 AS sales#147, sum(returns#40)#142 AS returns#148, sum(profit#41)#143 AS profit#149]
 
-(78) HashAggregate [codegen id : 52]
-Input [3]: [sales#147, returns#148, profit#149]
+(85) CometHashAggregate
+Input [3]: [sales#141, returns#142, profit#143]
 Keys: []
-Functions [3]: [partial_sum(sales#147), partial_sum(returns#148), partial_sum(profit#149)]
-Aggregate Attributes [6]: [sum#169, isEmpty#170, sum#171, isEmpty#172, sum#173, isEmpty#174]
-Results [6]: [sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180]
+Functions [3]: [partial_sum(sales#141), partial_sum(returns#142), partial_sum(profit#143)]
 
-(79) Exchange
-Input [6]: [sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=10]
+(86) CometColumnarExchange
+Input [6]: [sum#150, isEmpty#151, sum#152, isEmpty#153, sum#154, isEmpty#155]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(80) HashAggregate [codegen id : 53]
-Input [6]: [sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180]
+(87) CometHashAggregate
+Input [6]: [sum#150, isEmpty#151, sum#152, isEmpty#153, sum#154, isEmpty#155]
 Keys: []
-Functions [3]: [sum(sales#147), sum(returns#148), sum(profit#149)]
-Aggregate Attributes [3]: [sum(sales#147)#181, sum(returns#148)#182, sum(profit#149)#183]
-Results [5]: [null AS channel#184, null AS id#185, sum(sales#147)#181 AS sum(sales)#186, sum(returns#148)#182 AS sum(returns)#187, sum(profit#149)#183 AS sum(profit)#188]
+Functions [3]: [sum(sales#141), sum(returns#142), sum(profit#143)]
 
-(81) Union
+(88) CometUnion
+Child 0 Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+Child 1 Input [5]: [channel#37, id#159, sum(sales)#160, sum(returns)#161, sum(profit)#162]
+Child 2 Input [5]: [channel#163, id#164, sum(sales)#165, sum(returns)#166, sum(profit)#167]
 
-(82) HashAggregate [codegen id : 54]
-Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
-Keys [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
+(89) CometHashAggregate
+Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+Keys [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
 
-(83) Exchange
-Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
-Arguments: hashpartitioning(channel#37, id#38, sales#144, returns#145, profit#146, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(90) CometColumnarExchange
+Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+Arguments: hashpartitioning(channel#37, id#38, sales#156, returns#157, profit#158, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(84) HashAggregate [codegen id : 55]
-Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
-Keys [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
+(91) CometHashAggregate
+Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+Keys [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
 
-(85) TakeOrderedAndProject
-Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
-Arguments: 100, [channel#37 ASC NULLS FIRST, id#38 ASC NULLS FIRST], [channel#37, id#38, sales#144, returns#145, profit#146]
+(92) CometTakeOrderedAndProject
+Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#37 ASC NULLS FIRST,id#38 ASC NULLS FIRST], output=[channel#37,id#38,sales#156,returns#157,profit#158]), 100, [channel#37 ASC NULLS FIRST, id#38 ASC NULLS FIRST], [channel#37, id#38, sales#156, returns#157, profit#158]
+
+(93) ColumnarToRow [codegen id : 49]
+Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (90)
-+- * ColumnarToRow (89)
-   +- CometProject (88)
-      +- CometFilter (87)
-         +- CometScan parquet spark_catalog.default.date_dim (86)
+BroadcastExchange (98)
++- * ColumnarToRow (97)
+   +- CometProject (96)
+      +- CometFilter (95)
+         +- CometScan parquet spark_catalog.default.date_dim (94)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#22, d_date#189]
+Output [2]: [d_date_sk#22, d_date#168]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-08-18), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(87) CometFilter
-Input [2]: [d_date_sk#22, d_date#189]
-Condition : (((isnotnull(d_date#189) AND (d_date#189 >= 1998-08-04)) AND (d_date#189 <= 1998-08-18)) AND isnotnull(d_date_sk#22))
+(95) CometFilter
+Input [2]: [d_date_sk#22, d_date#168]
+Condition : (((isnotnull(d_date#168) AND (d_date#168 >= 1998-08-04)) AND (d_date#168 <= 1998-08-18)) AND isnotnull(d_date_sk#22))
 
-(88) CometProject
-Input [2]: [d_date_sk#22, d_date#189]
+(96) CometProject
+Input [2]: [d_date_sk#22, d_date#168]
 Arguments: [d_date_sk#22], [d_date_sk#22]
 
-(89) ColumnarToRow [codegen id : 1]
+(97) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#22]
 
-(90) BroadcastExchange
+(98) BroadcastExchange
 Input [1]: [d_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#15 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 21 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 23 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 24 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 26 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 45 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 45 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 49 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt
index 2eaeff8cd8..95096f9961 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt
@@ -1,24 +1,24 @@
-TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (55)
-    HashAggregate [channel,id,sales,returns,profit]
-      InputAdapter
-        Exchange [channel,id,sales,returns,profit] #1
-          WholeStageCodegen (54)
-            HashAggregate [channel,id,sales,returns,profit]
-              InputAdapter
-                Union
-                  WholeStageCodegen (17)
-                    HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [channel,id] #2
-                          WholeStageCodegen (16)
-                            HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (4)
-                                    HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
-                                      InputAdapter
-                                        Exchange [s_store_id] #3
+WholeStageCodegen (49)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
+        CometHashAggregate [channel,id,sales,returns,profit]
+          CometColumnarExchange [channel,id,sales,returns,profit] #1
+            CometHashAggregate [channel,id,sales,returns,profit]
+              CometUnion
+                CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [channel,id] #2
+                    RowToColumnar
+                      WholeStageCodegen (16)
+                        HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                          InputAdapter
+                            Union
+                              WholeStageCodegen (4)
+                                HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [s_store_id] #3
+                                        RowToColumnar
                                           WholeStageCodegen (3)
                                             HashAggregate [s_store_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                               Project [sales_price,profit,return_amt,net_loss,s_store_id]
@@ -52,10 +52,12 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                           InputAdapter
                                                             CometFilter [s_store_sk]
                                                               CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
-                                  WholeStageCodegen (8)
-                                    HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
-                                      InputAdapter
-                                        Exchange [cp_catalog_page_id] #6
+                              WholeStageCodegen (8)
+                                HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [cp_catalog_page_id] #6
+                                        RowToColumnar
                                           WholeStageCodegen (7)
                                             HashAggregate [cp_catalog_page_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                               Project [sales_price,profit,return_amt,net_loss,cp_catalog_page_id]
@@ -82,10 +84,12 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                           InputAdapter
                                                             CometFilter [cp_catalog_page_sk]
                                                               CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
-                                  WholeStageCodegen (15)
-                                    HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
-                                      InputAdapter
-                                        Exchange [web_site_id] #8
+                              WholeStageCodegen (15)
+                                HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [web_site_id] #8
+                                        RowToColumnar
                                           WholeStageCodegen (14)
                                             HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                               Project [sales_price,profit,return_amt,net_loss,web_site_id]
@@ -125,21 +129,13 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                           InputAdapter
                                                             CometFilter [web_site_sk]
                                                               CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
-                  WholeStageCodegen (35)
-                    HashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),id,sum(sales),sum(returns),sum(profit),sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [channel] #11
-                          WholeStageCodegen (34)
-                            HashAggregate [channel,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                InputAdapter
-                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
-                  WholeStageCodegen (53)
-                    HashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),channel,id,sum(sales),sum(returns),sum(profit),sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange #12
-                          WholeStageCodegen (52)
-                            HashAggregate [sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                InputAdapter
-                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                CometHashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [channel] #11
+                    CometHashAggregate [channel,sales,returns,profit]
+                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                CometHashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange #12
+                    CometHashAggregate [sales,returns,profit]
+                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt
index fcaa84890b..ffd243c6af 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt
@@ -1,43 +1,45 @@
 == Physical Plan ==
-TakeOrderedAndProject (39)
-+- * Filter (38)
-   +- * HashAggregate (37)
-      +- Exchange (36)
-         +- * HashAggregate (35)
-            +- * Project (34)
-               +- * BroadcastHashJoin Inner BuildRight (33)
-                  :- * Project (18)
-                  :  +- * BroadcastHashJoin Inner BuildRight (17)
-                  :     :- * Project (15)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :     :     :- * Project (9)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
-                  :     :     :     +- BroadcastExchange (7)
-                  :     :     :        +- * ColumnarToRow (6)
-                  :     :     :           +- CometFilter (5)
-                  :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                  :     :     +- BroadcastExchange (13)
-                  :     :        +- * ColumnarToRow (12)
-                  :     :           +- CometFilter (11)
-                  :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
-                  :     +- ReusedExchange (16)
-                  +- BroadcastExchange (32)
-                     +- * Project (31)
-                        +- * BroadcastHashJoin Inner BuildRight (30)
-                           :- * ColumnarToRow (21)
-                           :  +- CometFilter (20)
-                           :     +- CometScan parquet spark_catalog.default.item (19)
-                           +- BroadcastExchange (29)
-                              +- * ColumnarToRow (28)
-                                 +- CometFilter (27)
-                                    +- CometHashAggregate (26)
-                                       +- CometExchange (25)
-                                          +- CometHashAggregate (24)
-                                             +- CometFilter (23)
-                                                +- CometScan parquet spark_catalog.default.item (22)
+* ColumnarToRow (41)
++- CometTakeOrderedAndProject (40)
+   +- CometFilter (39)
+      +- CometHashAggregate (38)
+         +- CometColumnarExchange (37)
+            +- RowToColumnar (36)
+               +- * HashAggregate (35)
+                  +- * Project (34)
+                     +- * BroadcastHashJoin Inner BuildRight (33)
+                        :- * Project (18)
+                        :  +- * BroadcastHashJoin Inner BuildRight (17)
+                        :     :- * Project (15)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                        :     :     :- * Project (9)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                        :     :     :     :- * ColumnarToRow (3)
+                        :     :     :     :  +- CometFilter (2)
+                        :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
+                        :     :     :     +- BroadcastExchange (7)
+                        :     :     :        +- * ColumnarToRow (6)
+                        :     :     :           +- CometFilter (5)
+                        :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                        :     :     +- BroadcastExchange (13)
+                        :     :        +- * ColumnarToRow (12)
+                        :     :           +- CometFilter (11)
+                        :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
+                        :     +- ReusedExchange (16)
+                        +- BroadcastExchange (32)
+                           +- * Project (31)
+                              +- * BroadcastHashJoin Inner BuildRight (30)
+                                 :- * ColumnarToRow (21)
+                                 :  +- CometFilter (20)
+                                 :     +- CometScan parquet spark_catalog.default.item (19)
+                                 +- BroadcastExchange (29)
+                                    +- * ColumnarToRow (28)
+                                       +- CometFilter (27)
+                                          +- CometHashAggregate (26)
+                                             +- CometColumnarExchange (25)
+                                                +- CometHashAggregate (24)
+                                                   +- CometFilter (23)
+                                                      +- CometScan parquet spark_catalog.default.item (22)
 
 
 (unknown) Scan parquet spark_catalog.default.customer_address
@@ -111,7 +113,7 @@ Join condition: None
 Output [3]: [ca_state#2, ss_item_sk#5, ss_sold_date_sk#7]
 Input [5]: [ca_state#2, c_customer_sk#3, ss_item_sk#5, ss_customer_sk#6, ss_sold_date_sk#7]
 
-(16) ReusedExchange [Reuses operator id: 44]
+(16) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#9]
 
 (17) BroadcastHashJoin [codegen id : 6]
@@ -154,9 +156,9 @@ Input [2]: [i_current_price#13, i_category#14]
 Keys [1]: [i_category#14]
 Functions [1]: [partial_avg(UnscaledValue(i_current_price#13))]
 
-(25) CometExchange
+(25) CometColumnarExchange
 Input [3]: [i_category#14, sum#15, count#16]
-Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
 (26) CometHashAggregate
 Input [3]: [i_category#14, sum#15, count#16]
@@ -205,97 +207,101 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#18]
 Results [2]: [ca_state#2, count#19]
 
-(36) Exchange
+(36) RowToColumnar
 Input [2]: [ca_state#2, count#19]
-Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(37) HashAggregate [codegen id : 7]
+(37) CometColumnarExchange
+Input [2]: [ca_state#2, count#19]
+Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(38) CometHashAggregate
 Input [2]: [ca_state#2, count#19]
 Keys [1]: [ca_state#2]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#20]
-Results [3]: [ca_state#2 AS state#21, count(1)#20 AS cnt#22, ca_state#2]
 
-(38) Filter [codegen id : 7]
-Input [3]: [state#21, cnt#22, ca_state#2]
-Condition : (cnt#22 >= 10)
+(39) CometFilter
+Input [3]: [state#20, cnt#21, ca_state#2]
+Condition : (cnt#21 >= 10)
+
+(40) CometTakeOrderedAndProject
+Input [3]: [state#20, cnt#21, ca_state#2]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[cnt#21 ASC NULLS FIRST,ca_state#2 ASC NULLS FIRST], output=[state#20,cnt#21]), 100, [cnt#21 ASC NULLS FIRST, ca_state#2 ASC NULLS FIRST], [state#20, cnt#21]
 
-(39) TakeOrderedAndProject
-Input [3]: [state#21, cnt#22, ca_state#2]
-Arguments: 100, [cnt#22 ASC NULLS FIRST, ca_state#2 ASC NULLS FIRST], [state#21, cnt#22]
+(41) ColumnarToRow [codegen id : 7]
+Input [2]: [state#20, cnt#21]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 10 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (44)
-+- * ColumnarToRow (43)
-   +- CometProject (42)
-      +- CometFilter (41)
-         +- CometScan parquet spark_catalog.default.date_dim (40)
+BroadcastExchange (46)
++- * ColumnarToRow (45)
+   +- CometProject (44)
+      +- CometFilter (43)
+         +- CometScan parquet spark_catalog.default.date_dim (42)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#9, d_month_seq#23]
+Output [2]: [d_date_sk#9, d_month_seq#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(41) CometFilter
-Input [2]: [d_date_sk#9, d_month_seq#23]
-Condition : ((isnotnull(d_month_seq#23) AND (d_month_seq#23 = Subquery scalar-subquery#24, [id=#25])) AND isnotnull(d_date_sk#9))
+(43) CometFilter
+Input [2]: [d_date_sk#9, d_month_seq#22]
+Condition : ((isnotnull(d_month_seq#22) AND (d_month_seq#22 = Subquery scalar-subquery#23, [id=#24])) AND isnotnull(d_date_sk#9))
 
-(42) CometProject
-Input [2]: [d_date_sk#9, d_month_seq#23]
+(44) CometProject
+Input [2]: [d_date_sk#9, d_month_seq#22]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(43) ColumnarToRow [codegen id : 1]
+(45) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(44) BroadcastExchange
+(46) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 41 Hosting Expression = Subquery scalar-subquery#24, [id=#25]
-* ColumnarToRow (51)
-+- CometHashAggregate (50)
-   +- CometExchange (49)
-      +- CometHashAggregate (48)
-         +- CometProject (47)
-            +- CometFilter (46)
-               +- CometScan parquet spark_catalog.default.date_dim (45)
+Subquery:2 Hosting operator id = 43 Hosting Expression = Subquery scalar-subquery#23, [id=#24]
+* ColumnarToRow (53)
++- CometHashAggregate (52)
+   +- CometColumnarExchange (51)
+      +- CometHashAggregate (50)
+         +- CometProject (49)
+            +- CometFilter (48)
+               +- CometScan parquet spark_catalog.default.date_dim (47)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#26, d_year#27, d_moy#28]
+Output [3]: [d_month_seq#25, d_year#26, d_moy#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,1)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(46) CometFilter
-Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
-Condition : (((isnotnull(d_year#27) AND isnotnull(d_moy#28)) AND (d_year#27 = 2000)) AND (d_moy#28 = 1))
+(48) CometFilter
+Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
+Condition : (((isnotnull(d_year#26) AND isnotnull(d_moy#27)) AND (d_year#26 = 2000)) AND (d_moy#27 = 1))
 
-(47) CometProject
-Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
-Arguments: [d_month_seq#26], [d_month_seq#26]
+(49) CometProject
+Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
+Arguments: [d_month_seq#25], [d_month_seq#25]
 
-(48) CometHashAggregate
-Input [1]: [d_month_seq#26]
-Keys [1]: [d_month_seq#26]
+(50) CometHashAggregate
+Input [1]: [d_month_seq#25]
+Keys [1]: [d_month_seq#25]
 Functions: []
 
-(49) CometExchange
-Input [1]: [d_month_seq#26]
-Arguments: hashpartitioning(d_month_seq#26, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
+(51) CometColumnarExchange
+Input [1]: [d_month_seq#25]
+Arguments: hashpartitioning(d_month_seq#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(50) CometHashAggregate
-Input [1]: [d_month_seq#26]
-Keys [1]: [d_month_seq#26]
+(52) CometHashAggregate
+Input [1]: [d_month_seq#25]
+Keys [1]: [d_month_seq#25]
 Functions: []
 
-(51) ColumnarToRow [codegen id : 1]
-Input [1]: [d_month_seq#26]
+(53) ColumnarToRow [codegen id : 1]
+Input [1]: [d_month_seq#25]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt
index d2126126d5..2efd9c5510 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt
@@ -1,74 +1,76 @@
-TakeOrderedAndProject [cnt,ca_state,state]
-  WholeStageCodegen (7)
-    Filter [cnt]
-      HashAggregate [ca_state,count] [count(1),state,cnt,count]
-        InputAdapter
-          Exchange [ca_state] #1
-            WholeStageCodegen (6)
-              HashAggregate [ca_state] [count,count]
-                Project [ca_state]
-                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                    Project [ca_state,ss_item_sk]
-                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                        Project [ca_state,ss_item_sk,ss_sold_date_sk]
-                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                            Project [ca_state,c_customer_sk]
-                              BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+WholeStageCodegen (7)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [cnt,ca_state,state]
+        CometFilter [cnt]
+          CometHashAggregate [ca_state,count]
+            CometColumnarExchange [ca_state] #1
+              RowToColumnar
+                WholeStageCodegen (6)
+                  HashAggregate [ca_state] [count,count]
+                    Project [ca_state]
+                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                        Project [ca_state,ss_item_sk]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ca_state,ss_item_sk,ss_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                Project [ca_state,c_customer_sk]
+                                  BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                    InputAdapter
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_current_addr_sk,c_customer_sk]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                                 InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (1)
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (2)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [c_current_addr_sk,c_customer_sk]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                          CometFilter [ss_customer_sk,ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #4
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_month_seq,d_date_sk]
+                                                            Subquery #2
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometHashAggregate [d_month_seq]
+                                                                      CometColumnarExchange [d_month_seq] #5
+                                                                        CometHashAggregate [d_month_seq]
+                                                                          CometProject [d_month_seq]
+                                                                            CometFilter [d_year,d_moy]
+                                                                              CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
+                              ReusedExchange [d_date_sk] #4
+                        InputAdapter
+                          BroadcastExchange #6
+                            WholeStageCodegen (5)
+                              Project [i_item_sk]
+                                BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [ss_customer_sk,ss_item_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_month_seq,d_date_sk]
-                                                        Subquery #2
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometHashAggregate [d_month_seq]
-                                                                  CometExchange [d_month_seq] #5
-                                                                    CometHashAggregate [d_month_seq]
-                                                                      CometProject [d_month_seq]
-                                                                        CometFilter [d_year,d_moy]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                        InputAdapter
-                          ReusedExchange [d_date_sk] #4
-                    InputAdapter
-                      BroadcastExchange #6
-                        WholeStageCodegen (5)
-                          Project [i_item_sk]
-                            BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [i_current_price,i_category,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
-                              InputAdapter
-                                BroadcastExchange #7
-                                  WholeStageCodegen (4)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [avg(i_current_price)]
-                                          CometHashAggregate [i_category,sum,count]
-                                            CometExchange [i_category] #8
-                                              CometHashAggregate [i_category,i_current_price]
-                                                CometFilter [i_category]
-                                                  CometScan parquet spark_catalog.default.item [i_current_price,i_category]
+                                      CometFilter [i_current_price,i_category,i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
+                                  InputAdapter
+                                    BroadcastExchange #7
+                                      WholeStageCodegen (4)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [avg(i_current_price)]
+                                              CometHashAggregate [i_category,sum,count]
+                                                CometColumnarExchange [i_category] #8
+                                                  CometHashAggregate [i_category,i_current_price]
+                                                    CometFilter [i_category]
+                                                      CometScan parquet spark_catalog.default.item [i_current_price,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt
index 1e1b3ba45d..c94c2a6cc6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt
@@ -1,187 +1,195 @@
 == Physical Plan ==
-* Sort (183)
-+- Exchange (182)
-   +- * Project (181)
-      +- * SortMergeJoin Inner (180)
-         :- * Sort (110)
-         :  +- Exchange (109)
-         :     +- * HashAggregate (108)
-         :        +- * HashAggregate (107)
-         :           +- * Project (106)
-         :              +- * BroadcastHashJoin Inner BuildRight (105)
-         :                 :- * Project (99)
-         :                 :  +- * BroadcastHashJoin Inner BuildRight (98)
-         :                 :     :- * Project (96)
-         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (95)
-         :                 :     :     :- * Project (90)
-         :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (89)
-         :                 :     :     :     :- * Project (87)
-         :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
-         :                 :     :     :     :     :- * Project (81)
-         :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (80)
-         :                 :     :     :     :     :     :- * Project (78)
-         :                 :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (77)
-         :                 :     :     :     :     :     :     :- * Project (72)
-         :                 :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (71)
-         :                 :     :     :     :     :     :     :     :- * Project (66)
-         :                 :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (65)
-         :                 :     :     :     :     :     :     :     :     :- * Project (63)
-         :                 :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (62)
-         :                 :     :     :     :     :     :     :     :     :     :- * Project (57)
-         :                 :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-         :                 :     :     :     :     :     :     :     :     :     :     :- * Project (54)
-         :                 :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :- * Project (48)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (47)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (42)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (41)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (36)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (35)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (33)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (32)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (12)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (11)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (10)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (9)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (4)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (3)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (2)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (8)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (7)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (6)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (31)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (30)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (29)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (28)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (27)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometExchange (26)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (25)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (24)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (23)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (17)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometExchange (16)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (15)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (14)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (13)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (22)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometExchange (21)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (20)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (19)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (18)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (34)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (40)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (39)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (38)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (37)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (46)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (45)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (44)
-         :                 :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (43)
-         :                 :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (52)
-         :                 :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (51)
-         :                 :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (50)
-         :                 :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (49)
-         :                 :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (55)
-         :                 :     :     :     :     :     :     :     :     :     +- BroadcastExchange (61)
-         :                 :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (60)
-         :                 :     :     :     :     :     :     :     :     :           +- CometFilter (59)
-         :                 :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (58)
-         :                 :     :     :     :     :     :     :     :     +- ReusedExchange (64)
-         :                 :     :     :     :     :     :     :     +- BroadcastExchange (70)
-         :                 :     :     :     :     :     :     :        +- * ColumnarToRow (69)
-         :                 :     :     :     :     :     :     :           +- CometFilter (68)
-         :                 :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (67)
-         :                 :     :     :     :     :     :     +- BroadcastExchange (76)
-         :                 :     :     :     :     :     :        +- * ColumnarToRow (75)
-         :                 :     :     :     :     :     :           +- CometFilter (74)
-         :                 :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (73)
-         :                 :     :     :     :     :     +- ReusedExchange (79)
-         :                 :     :     :     :     +- BroadcastExchange (85)
-         :                 :     :     :     :        +- * ColumnarToRow (84)
-         :                 :     :     :     :           +- CometFilter (83)
-         :                 :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (82)
-         :                 :     :     :     +- ReusedExchange (88)
-         :                 :     :     +- BroadcastExchange (94)
-         :                 :     :        +- * ColumnarToRow (93)
-         :                 :     :           +- CometFilter (92)
-         :                 :     :              +- CometScan parquet spark_catalog.default.income_band (91)
-         :                 :     +- ReusedExchange (97)
-         :                 +- BroadcastExchange (104)
-         :                    +- * ColumnarToRow (103)
-         :                       +- CometProject (102)
-         :                          +- CometFilter (101)
-         :                             +- CometScan parquet spark_catalog.default.item (100)
-         +- * Sort (179)
-            +- Exchange (178)
-               +- * HashAggregate (177)
-                  +- * HashAggregate (176)
-                     +- * Project (175)
-                        +- * BroadcastHashJoin Inner BuildRight (174)
-                           :- * Project (172)
-                           :  +- * BroadcastHashJoin Inner BuildRight (171)
-                           :     :- * Project (169)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (168)
-                           :     :     :- * Project (166)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (165)
-                           :     :     :     :- * Project (163)
-                           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (162)
-                           :     :     :     :     :- * Project (160)
-                           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (159)
-                           :     :     :     :     :     :- * Project (157)
-                           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (156)
-                           :     :     :     :     :     :     :- * Project (154)
-                           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (153)
-                           :     :     :     :     :     :     :     :- * Project (151)
-                           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (150)
-                           :     :     :     :     :     :     :     :     :- * Project (148)
-                           :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (147)
-                           :     :     :     :     :     :     :     :     :     :- * Project (145)
-                           :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (144)
-                           :     :     :     :     :     :     :     :     :     :     :- * Project (142)
-                           :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (141)
-                           :     :     :     :     :     :     :     :     :     :     :     :- * Project (139)
-                           :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (138)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (136)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (135)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (133)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (132)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (130)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (129)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (122)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (121)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (120)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (119)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (114)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (113)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (112)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (111)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (118)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (117)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (116)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (115)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (128)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (127)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (126)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (125)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (124)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (123)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (131)
-                           :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (134)
-                           :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (137)
-                           :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (140)
-                           :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (143)
-                           :     :     :     :     :     :     :     :     :     +- ReusedExchange (146)
-                           :     :     :     :     :     :     :     :     +- ReusedExchange (149)
-                           :     :     :     :     :     :     :     +- ReusedExchange (152)
-                           :     :     :     :     :     :     +- ReusedExchange (155)
-                           :     :     :     :     :     +- ReusedExchange (158)
-                           :     :     :     :     +- ReusedExchange (161)
-                           :     :     :     +- ReusedExchange (164)
-                           :     :     +- ReusedExchange (167)
-                           :     +- ReusedExchange (170)
-                           +- ReusedExchange (173)
+* ColumnarToRow (191)
++- CometSort (190)
+   +- CometColumnarExchange (189)
+      +- RowToColumnar (188)
+         +- * Project (187)
+            +- * SortMergeJoin Inner (186)
+               :- * ColumnarToRow (113)
+               :  +- CometSort (112)
+               :     +- CometColumnarExchange (111)
+               :        +- RowToColumnar (110)
+               :           +- * HashAggregate (109)
+               :              +- * HashAggregate (108)
+               :                 +- * Project (107)
+               :                    +- * BroadcastHashJoin Inner BuildRight (106)
+               :                       :- * Project (100)
+               :                       :  +- * BroadcastHashJoin Inner BuildRight (99)
+               :                       :     :- * Project (97)
+               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (96)
+               :                       :     :     :- * Project (91)
+               :                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (90)
+               :                       :     :     :     :- * Project (88)
+               :                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (87)
+               :                       :     :     :     :     :- * Project (82)
+               :                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (81)
+               :                       :     :     :     :     :     :- * Project (79)
+               :                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (78)
+               :                       :     :     :     :     :     :     :- * Project (73)
+               :                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (72)
+               :                       :     :     :     :     :     :     :     :- * Project (67)
+               :                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (66)
+               :                       :     :     :     :     :     :     :     :     :- * Project (64)
+               :                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (63)
+               :                       :     :     :     :     :     :     :     :     :     :- * Project (58)
+               :                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
+               :                       :     :     :     :     :     :     :     :     :     :     :- * Project (55)
+               :                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (49)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (48)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (43)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (42)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (37)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (36)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (34)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (33)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (32)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (13)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (12)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (11)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (10)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (9)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (4)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (3)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (2)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (8)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (7)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (6)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (5)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (31)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (30)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (29)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (28)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometColumnarExchange (27)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (26)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (25)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (24)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (18)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometColumnarExchange (17)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (16)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (15)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (14)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (23)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometColumnarExchange (22)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (21)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (20)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (19)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (35)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (41)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (40)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (39)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (38)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (47)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (46)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (45)
+               :                       :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (44)
+               :                       :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (53)
+               :                       :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (52)
+               :                       :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (51)
+               :                       :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (50)
+               :                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (56)
+               :                       :     :     :     :     :     :     :     :     :     +- BroadcastExchange (62)
+               :                       :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (61)
+               :                       :     :     :     :     :     :     :     :     :           +- CometFilter (60)
+               :                       :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (59)
+               :                       :     :     :     :     :     :     :     :     +- ReusedExchange (65)
+               :                       :     :     :     :     :     :     :     +- BroadcastExchange (71)
+               :                       :     :     :     :     :     :     :        +- * ColumnarToRow (70)
+               :                       :     :     :     :     :     :     :           +- CometFilter (69)
+               :                       :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (68)
+               :                       :     :     :     :     :     :     +- BroadcastExchange (77)
+               :                       :     :     :     :     :     :        +- * ColumnarToRow (76)
+               :                       :     :     :     :     :     :           +- CometFilter (75)
+               :                       :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (74)
+               :                       :     :     :     :     :     +- ReusedExchange (80)
+               :                       :     :     :     :     +- BroadcastExchange (86)
+               :                       :     :     :     :        +- * ColumnarToRow (85)
+               :                       :     :     :     :           +- CometFilter (84)
+               :                       :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (83)
+               :                       :     :     :     +- ReusedExchange (89)
+               :                       :     :     +- BroadcastExchange (95)
+               :                       :     :        +- * ColumnarToRow (94)
+               :                       :     :           +- CometFilter (93)
+               :                       :     :              +- CometScan parquet spark_catalog.default.income_band (92)
+               :                       :     +- ReusedExchange (98)
+               :                       +- BroadcastExchange (105)
+               :                          +- * ColumnarToRow (104)
+               :                             +- CometProject (103)
+               :                                +- CometFilter (102)
+               :                                   +- CometScan parquet spark_catalog.default.item (101)
+               +- * ColumnarToRow (185)
+                  +- CometSort (184)
+                     +- CometColumnarExchange (183)
+                        +- RowToColumnar (182)
+                           +- * HashAggregate (181)
+                              +- * HashAggregate (180)
+                                 +- * Project (179)
+                                    +- * BroadcastHashJoin Inner BuildRight (178)
+                                       :- * Project (176)
+                                       :  +- * BroadcastHashJoin Inner BuildRight (175)
+                                       :     :- * Project (173)
+                                       :     :  +- * BroadcastHashJoin Inner BuildRight (172)
+                                       :     :     :- * Project (170)
+                                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (169)
+                                       :     :     :     :- * Project (167)
+                                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (166)
+                                       :     :     :     :     :- * Project (164)
+                                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (163)
+                                       :     :     :     :     :     :- * Project (161)
+                                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (160)
+                                       :     :     :     :     :     :     :- * Project (158)
+                                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (157)
+                                       :     :     :     :     :     :     :     :- * Project (155)
+                                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (154)
+                                       :     :     :     :     :     :     :     :     :- * Project (152)
+                                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (151)
+                                       :     :     :     :     :     :     :     :     :     :- * Project (149)
+                                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (148)
+                                       :     :     :     :     :     :     :     :     :     :     :- * Project (146)
+                                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (145)
+                                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (143)
+                                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (142)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (140)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (139)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (137)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (136)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (134)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (133)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (132)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (126)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (125)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (124)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (123)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (122)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (117)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (116)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (115)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (114)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (121)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (120)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (119)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (118)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (131)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (130)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (129)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (128)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (127)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (135)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (138)
+                                       :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (141)
+                                       :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (144)
+                                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (147)
+                                       :     :     :     :     :     :     :     :     :     +- ReusedExchange (150)
+                                       :     :     :     :     :     :     :     :     +- ReusedExchange (153)
+                                       :     :     :     :     :     :     :     +- ReusedExchange (156)
+                                       :     :     :     :     :     :     +- ReusedExchange (159)
+                                       :     :     :     :     :     +- ReusedExchange (162)
+                                       :     :     :     :     +- ReusedExchange (165)
+                                       :     :     :     +- ReusedExchange (168)
+                                       :     :     +- ReusedExchange (171)
+                                       :     +- ReusedExchange (174)
+                                       +- ReusedExchange (177)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -231,13 +239,16 @@ Join condition: None
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_ticket_number#8, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, sr_item_sk#14, sr_ticket_number#15]
 
-(11) Exchange
+(11) RowToColumnar
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(12) Sort [codegen id : 3]
+(12) CometColumnarExchange
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: [ss_item_sk#1 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(13) CometSort
+Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
@@ -246,19 +257,19 @@ Location [not included in comparison]/{warehouse_dir}/catalog_sales]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_order_number)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_ext_list_price:decimal(7,2)>
 
-(14) CometFilter
+(15) CometFilter
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Condition : (isnotnull(cs_item_sk#17) AND isnotnull(cs_order_number#18))
 
-(15) CometProject
+(16) CometProject
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 
-(16) CometExchange
+(17) CometColumnarExchange
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
-Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(17) CometSort
+(18) CometSort
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17 ASC NULLS FIRST, cs_order_number#18 ASC NULLS FIRST]
 
@@ -269,80 +280,79 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_refunded_cash:decimal(7,2),cr_reversed_charge:decimal(7,2),cr_store_credit:decimal(7,2)>
 
-(19) CometFilter
+(20) CometFilter
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Condition : (isnotnull(cr_item_sk#21) AND isnotnull(cr_order_number#22))
 
-(20) CometProject
+(21) CometProject
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(21) CometExchange
+(22) CometColumnarExchange
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
-Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
+Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(22) CometSort
+(23) CometSort
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21 ASC NULLS FIRST, cr_order_number#22 ASC NULLS FIRST]
 
-(23) CometSortMergeJoin
+(24) CometSortMergeJoin
 Left output [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Right output [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_order_number#18], [cr_item_sk#21, cr_order_number#22], Inner
 
-(24) CometProject
+(25) CometProject
 Input [8]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(25) CometHashAggregate
+(26) CometHashAggregate
 Input [5]: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [partial_sum(UnscaledValue(cs_ext_list_price#19)), partial_sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(26) CometExchange
+(27) CometColumnarExchange
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
-Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(27) CometHashAggregate
+(28) CometHashAggregate
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#19)), sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(28) CometFilter
+(29) CometFilter
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(29) CometProject
+(30) CometProject
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Arguments: [cs_item_sk#17], [cs_item_sk#17]
 
-(30) CometSort
+(31) CometSort
 Input [1]: [cs_item_sk#17]
 Arguments: [cs_item_sk#17], [cs_item_sk#17 ASC NULLS FIRST]
 
-(31) ColumnarToRow [codegen id : 4]
-Input [1]: [cs_item_sk#17]
-
-(32) SortMergeJoin [codegen id : 20]
-Left keys [1]: [ss_item_sk#1]
-Right keys [1]: [cs_item_sk#17]
-Join type: Inner
-Join condition: None
+(32) CometSortMergeJoin
+Left output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Right output [1]: [cs_item_sk#17]
+Arguments: [ss_item_sk#1], [cs_item_sk#17], Inner
 
-(33) Project [codegen id : 20]
-Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+(33) CometProject
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, cs_item_sk#17]
+Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
 
-(34) ReusedExchange [Reuses operator id: 187]
+(34) ColumnarToRow [codegen id : 18]
+Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+
+(35) ReusedExchange [Reuses operator id: 195]
 Output [2]: [d_date_sk#32, d_year#33]
 
-(35) BroadcastHashJoin [codegen id : 20]
+(36) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_sold_date_sk#12]
 Right keys [1]: [d_date_sk#32]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 20]
+(37) Project [codegen id : 18]
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33]
 Input [13]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, d_date_sk#32, d_year#33]
 
@@ -353,24 +363,24 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_name), IsNotNull(s_zip)]
 ReadSchema: struct<s_store_sk:int,s_store_name:string,s_zip:string>
 
-(38) CometFilter
+(39) CometFilter
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Condition : ((isnotnull(s_store_sk#34) AND isnotnull(s_store_name#35)) AND isnotnull(s_zip#36))
 
-(39) ColumnarToRow [codegen id : 6]
+(40) ColumnarToRow [codegen id : 4]
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 
-(40) BroadcastExchange
+(41) BroadcastExchange
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 20]
+(42) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_store_sk#6]
 Right keys [1]: [s_store_sk#34]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 20]
+(43) Project [codegen id : 18]
 Output [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_sk#34, s_store_name#35, s_zip#36]
 
@@ -381,24 +391,24 @@ Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_first_sales_date_sk), IsNotNull(c_first_shipto_date_sk), IsNotNull(c_current_cdemo_sk), IsNotNull(c_current_hdemo_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_cdemo_sk:int,c_current_hdemo_sk:int,c_current_addr_sk:int,c_first_shipto_date_sk:int,c_first_sales_date_sk:int>
 
-(44) CometFilter
+(45) CometFilter
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Condition : (((((isnotnull(c_customer_sk#37) AND isnotnull(c_first_sales_date_sk#42)) AND isnotnull(c_first_shipto_date_sk#41)) AND isnotnull(c_current_cdemo_sk#38)) AND isnotnull(c_current_hdemo_sk#39)) AND isnotnull(c_current_addr_sk#40))
 
-(45) ColumnarToRow [codegen id : 7]
+(46) ColumnarToRow [codegen id : 5]
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
-(46) BroadcastExchange
+(47) BroadcastExchange
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(47) BroadcastHashJoin [codegen id : 20]
+(48) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#37]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 20]
+(49) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Input [18]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
@@ -409,37 +419,37 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(50) CometFilter
+(51) CometFilter
 Input [2]: [d_date_sk#43, d_year#44]
 Condition : isnotnull(d_date_sk#43)
 
-(51) ColumnarToRow [codegen id : 8]
+(52) ColumnarToRow [codegen id : 6]
 Input [2]: [d_date_sk#43, d_year#44]
 
-(52) BroadcastExchange
+(53) BroadcastExchange
 Input [2]: [d_date_sk#43, d_year#44]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(53) BroadcastHashJoin [codegen id : 20]
+(54) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_first_sales_date_sk#42]
 Right keys [1]: [d_date_sk#43]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 20]
+(55) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42, d_date_sk#43, d_year#44]
 
-(55) ReusedExchange [Reuses operator id: 52]
+(56) ReusedExchange [Reuses operator id: 53]
 Output [2]: [d_date_sk#45, d_year#46]
 
-(56) BroadcastHashJoin [codegen id : 20]
+(57) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_first_shipto_date_sk#41]
 Right keys [1]: [d_date_sk#45]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 20]
+(58) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44, d_date_sk#45, d_year#46]
 
@@ -450,37 +460,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_demographics]
 PushedFilters: [IsNotNull(cd_demo_sk), IsNotNull(cd_marital_status)]
 ReadSchema: struct<cd_demo_sk:int,cd_marital_status:string>
 
-(59) CometFilter
+(60) CometFilter
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Condition : (isnotnull(cd_demo_sk#47) AND isnotnull(cd_marital_status#48))
 
-(60) ColumnarToRow [codegen id : 10]
+(61) ColumnarToRow [codegen id : 8]
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 
-(61) BroadcastExchange
+(62) BroadcastExchange
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(62) BroadcastHashJoin [codegen id : 20]
+(63) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_cdemo_sk#3]
 Right keys [1]: [cd_demo_sk#47]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 20]
+(64) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_demo_sk#47, cd_marital_status#48]
 
-(64) ReusedExchange [Reuses operator id: 61]
+(65) ReusedExchange [Reuses operator id: 62]
 Output [2]: [cd_demo_sk#49, cd_marital_status#50]
 
-(65) BroadcastHashJoin [codegen id : 20]
+(66) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_current_cdemo_sk#38]
 Right keys [1]: [cd_demo_sk#49]
 Join type: Inner
 Join condition: NOT (cd_marital_status#48 = cd_marital_status#50)
 
-(66) Project [codegen id : 20]
+(67) Project [codegen id : 18]
 Output [14]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48, cd_demo_sk#49, cd_marital_status#50]
 
@@ -491,24 +501,24 @@ Location [not included in comparison]/{warehouse_dir}/promotion]
 PushedFilters: [IsNotNull(p_promo_sk)]
 ReadSchema: struct<p_promo_sk:int>
 
-(68) CometFilter
+(69) CometFilter
 Input [1]: [p_promo_sk#51]
 Condition : isnotnull(p_promo_sk#51)
 
-(69) ColumnarToRow [codegen id : 12]
+(70) ColumnarToRow [codegen id : 10]
 Input [1]: [p_promo_sk#51]
 
-(70) BroadcastExchange
+(71) BroadcastExchange
 Input [1]: [p_promo_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-(71) BroadcastHashJoin [codegen id : 20]
+(72) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_promo_sk#7]
 Right keys [1]: [p_promo_sk#51]
 Join type: Inner
 Join condition: None
 
-(72) Project [codegen id : 20]
+(73) Project [codegen id : 18]
 Output [13]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, p_promo_sk#51]
 
@@ -519,37 +529,37 @@ Location [not included in comparison]/{warehouse_dir}/household_demographics]
 PushedFilters: [IsNotNull(hd_demo_sk), IsNotNull(hd_income_band_sk)]
 ReadSchema: struct<hd_demo_sk:int,hd_income_band_sk:int>
 
-(74) CometFilter
+(75) CometFilter
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Condition : (isnotnull(hd_demo_sk#52) AND isnotnull(hd_income_band_sk#53))
 
-(75) ColumnarToRow [codegen id : 13]
+(76) ColumnarToRow [codegen id : 11]
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 
-(76) BroadcastExchange
+(77) BroadcastExchange
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=11]
 
-(77) BroadcastHashJoin [codegen id : 20]
+(78) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_hdemo_sk#4]
 Right keys [1]: [hd_demo_sk#52]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 20]
+(79) Project [codegen id : 18]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_demo_sk#52, hd_income_band_sk#53]
 
-(79) ReusedExchange [Reuses operator id: 76]
+(80) ReusedExchange [Reuses operator id: 77]
 Output [2]: [hd_demo_sk#54, hd_income_band_sk#55]
 
-(80) BroadcastHashJoin [codegen id : 20]
+(81) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_current_hdemo_sk#39]
 Right keys [1]: [hd_demo_sk#54]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 20]
+(82) Project [codegen id : 18]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55]
 Input [15]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_demo_sk#54, hd_income_band_sk#55]
 
@@ -560,37 +570,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_street_number:string,ca_street_name:string,ca_city:string,ca_zip:string>
 
-(83) CometFilter
+(84) CometFilter
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Condition : isnotnull(ca_address_sk#56)
 
-(84) ColumnarToRow [codegen id : 15]
+(85) ColumnarToRow [codegen id : 13]
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(85) BroadcastExchange
+(86) BroadcastExchange
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-(86) BroadcastHashJoin [codegen id : 20]
+(87) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_addr_sk#5]
 Right keys [1]: [ca_address_sk#56]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 20]
+(88) Project [codegen id : 18]
 Output [16]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Input [18]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(88) ReusedExchange [Reuses operator id: 85]
+(89) ReusedExchange [Reuses operator id: 86]
 Output [5]: [ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
-(89) BroadcastHashJoin [codegen id : 20]
+(90) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [c_current_addr_sk#40]
 Right keys [1]: [ca_address_sk#61]
 Join type: Inner
 Join condition: None
 
-(90) Project [codegen id : 20]
+(91) Project [codegen id : 18]
 Output [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [21]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
@@ -601,37 +611,37 @@ Location [not included in comparison]/{warehouse_dir}/income_band]
 PushedFilters: [IsNotNull(ib_income_band_sk)]
 ReadSchema: struct<ib_income_band_sk:int>
 
-(92) CometFilter
+(93) CometFilter
 Input [1]: [ib_income_band_sk#66]
 Condition : isnotnull(ib_income_band_sk#66)
 
-(93) ColumnarToRow [codegen id : 17]
+(94) ColumnarToRow [codegen id : 15]
 Input [1]: [ib_income_band_sk#66]
 
-(94) BroadcastExchange
+(95) BroadcastExchange
 Input [1]: [ib_income_band_sk#66]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(95) BroadcastHashJoin [codegen id : 20]
+(96) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [hd_income_band_sk#53]
 Right keys [1]: [ib_income_band_sk#66]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 20]
+(97) Project [codegen id : 18]
 Output [18]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [20]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#66]
 
-(97) ReusedExchange [Reuses operator id: 94]
+(98) ReusedExchange [Reuses operator id: 95]
 Output [1]: [ib_income_band_sk#67]
 
-(98) BroadcastHashJoin [codegen id : 20]
+(99) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [hd_income_band_sk#55]
 Right keys [1]: [ib_income_band_sk#67]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 20]
+(100) Project [codegen id : 18]
 Output [17]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#67]
 
@@ -642,52 +652,58 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_current_price), In(i_color, [burlywood           ,floral              ,indian              ,medium              ,purple              ,spring              ]), GreaterThanOrEqual(i_current_price,64.00), LessThanOrEqual(i_current_price,74.00), GreaterThanOrEqual(i_current_price,65.00), LessThanOrEqual(i_current_price,79.00), IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_color:string,i_product_name:string>
 
-(101) CometFilter
+(102) CometFilter
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Condition : ((((((isnotnull(i_current_price#69) AND i_color#70 IN (purple              ,burlywood           ,indian              ,spring              ,floral              ,medium              )) AND (i_current_price#69 >= 64.00)) AND (i_current_price#69 <= 74.00)) AND (i_current_price#69 >= 65.00)) AND (i_current_price#69 <= 79.00)) AND isnotnull(i_item_sk#68))
 
-(102) CometProject
+(103) CometProject
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Arguments: [i_item_sk#68, i_product_name#71], [i_item_sk#68, i_product_name#71]
 
-(103) ColumnarToRow [codegen id : 19]
+(104) ColumnarToRow [codegen id : 17]
 Input [2]: [i_item_sk#68, i_product_name#71]
 
-(104) BroadcastExchange
+(105) BroadcastExchange
 Input [2]: [i_item_sk#68, i_product_name#71]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
-(105) BroadcastHashJoin [codegen id : 20]
+(106) BroadcastHashJoin [codegen id : 18]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#68]
 Join type: Inner
 Join condition: None
 
-(106) Project [codegen id : 20]
+(107) Project [codegen id : 18]
 Output [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 
-(107) HashAggregate [codegen id : 20]
+(108) HashAggregate [codegen id : 18]
 Input [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#9)), partial_sum(UnscaledValue(ss_list_price#10)), partial_sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count#72, sum#73, sum#74, sum#75]
 Results [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 
-(108) HashAggregate [codegen id : 20]
+(109) HashAggregate [codegen id : 18]
 Input [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#9)), sum(UnscaledValue(ss_list_price#10)), sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#9))#81, sum(UnscaledValue(ss_list_price#10))#82, sum(UnscaledValue(ss_coupon_amt#11))#83]
 Results [17]: [i_product_name#71 AS product_name#84, i_item_sk#68 AS item_sk#85, s_store_name#35 AS store_name#86, s_zip#36 AS store_zip#87, ca_street_number#57 AS b_street_number#88, ca_street_name#58 AS b_streen_name#89, ca_city#59 AS b_city#90, ca_zip#60 AS b_zip#91, ca_street_number#62 AS c_street_number#92, ca_street_name#63 AS c_street_name#93, ca_city#64 AS c_city#94, ca_zip#65 AS c_zip#95, d_year#33 AS syear#96, count(1)#80 AS cnt#97, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#9))#81,17,2) AS s1#98, MakeDecimal(sum(UnscaledValue(ss_list_price#10))#82,17,2) AS s2#99, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#11))#83,17,2) AS s3#100]
 
-(109) Exchange
+(110) RowToColumnar
+Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
+
+(111) CometColumnarExchange
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(110) Sort [codegen id : 21]
+(112) CometSort
+Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
+Arguments: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100], [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST]
+
+(113) ColumnarToRow [codegen id : 19]
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
@@ -697,14 +713,14 @@ PartitionFilters: [isnotnull(ss_sold_date_sk#112), dynamicpruningexpression(ss_s
 PushedFilters: [IsNotNull(ss_item_sk), IsNotNull(ss_ticket_number), IsNotNull(ss_store_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_cdemo_sk), IsNotNull(ss_promo_sk), IsNotNull(ss_hdemo_sk), IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_cdemo_sk:int,ss_hdemo_sk:int,ss_addr_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_number:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(112) CometFilter
+(115) CometFilter
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Condition : (((((((isnotnull(ss_item_sk#101) AND isnotnull(ss_ticket_number#108)) AND isnotnull(ss_store_sk#106)) AND isnotnull(ss_customer_sk#102)) AND isnotnull(ss_cdemo_sk#103)) AND isnotnull(ss_promo_sk#107)) AND isnotnull(ss_hdemo_sk#104)) AND isnotnull(ss_addr_sk#105))
 
-(113) ColumnarToRow [codegen id : 22]
+(116) ColumnarToRow [codegen id : 20]
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 
-(114) BroadcastExchange
+(117) BroadcastExchange
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, false] as bigint), 32) | (cast(input[7, int, false] as bigint) & 4294967295))),false), [plan_id=16]
 
@@ -715,310 +731,324 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_item_sk), IsNotNull(sr_ticket_number)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int>
 
-(116) CometFilter
+(119) CometFilter
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Condition : (isnotnull(sr_item_sk#114) AND isnotnull(sr_ticket_number#115))
 
-(117) CometProject
+(120) CometProject
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Arguments: [sr_item_sk#114, sr_ticket_number#115], [sr_item_sk#114, sr_ticket_number#115]
 
-(118) ColumnarToRow
+(121) ColumnarToRow
 Input [2]: [sr_item_sk#114, sr_ticket_number#115]
 
-(119) BroadcastHashJoin [codegen id : 23]
+(122) BroadcastHashJoin [codegen id : 21]
 Left keys [2]: [ss_item_sk#101, ss_ticket_number#108]
 Right keys [2]: [sr_item_sk#114, sr_ticket_number#115]
 Join type: Inner
 Join condition: None
 
-(120) Project [codegen id : 23]
+(123) Project [codegen id : 21]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, sr_item_sk#114, sr_ticket_number#115]
 
-(121) Exchange
+(124) RowToColumnar
+Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+
+(125) CometColumnarExchange
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, [plan_id=17]
+Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
 
-(122) Sort [codegen id : 24]
+(126) CometSort
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: [ss_item_sk#101 ASC NULLS FIRST], false, 0
+Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101 ASC NULLS FIRST]
 
-(123) ReusedExchange [Reuses operator id: 26]
+(127) ReusedExchange [Reuses operator id: 27]
 Output [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 
-(124) CometHashAggregate
+(128) CometHashAggregate
 Input [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 Keys [1]: [cs_item_sk#117]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#121)), sum(((cr_refunded_cash#122 + cr_reversed_charge#123) + cr_store_credit#124))]
 
-(125) CometFilter
+(129) CometFilter
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(126) CometProject
+(130) CometProject
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Arguments: [cs_item_sk#117], [cs_item_sk#117]
 
-(127) CometSort
+(131) CometSort
 Input [1]: [cs_item_sk#117]
 Arguments: [cs_item_sk#117], [cs_item_sk#117 ASC NULLS FIRST]
 
-(128) ColumnarToRow [codegen id : 25]
-Input [1]: [cs_item_sk#117]
-
-(129) SortMergeJoin [codegen id : 41]
-Left keys [1]: [ss_item_sk#101]
-Right keys [1]: [cs_item_sk#117]
-Join type: Inner
-Join condition: None
+(132) CometSortMergeJoin
+Left output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+Right output [1]: [cs_item_sk#117]
+Arguments: [ss_item_sk#101], [cs_item_sk#117], Inner
 
-(130) Project [codegen id : 41]
-Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+(133) CometProject
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, cs_item_sk#117]
+Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+
+(134) ColumnarToRow [codegen id : 37]
+Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 
-(131) ReusedExchange [Reuses operator id: 191]
+(135) ReusedExchange [Reuses operator id: 199]
 Output [2]: [d_date_sk#125, d_year#126]
 
-(132) BroadcastHashJoin [codegen id : 41]
+(136) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_sold_date_sk#112]
 Right keys [1]: [d_date_sk#125]
 Join type: Inner
 Join condition: None
 
-(133) Project [codegen id : 41]
+(137) Project [codegen id : 37]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126]
 Input [13]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, d_date_sk#125, d_year#126]
 
-(134) ReusedExchange [Reuses operator id: 40]
+(138) ReusedExchange [Reuses operator id: 41]
 Output [3]: [s_store_sk#127, s_store_name#128, s_zip#129]
 
-(135) BroadcastHashJoin [codegen id : 41]
+(139) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_store_sk#106]
 Right keys [1]: [s_store_sk#127]
 Join type: Inner
 Join condition: None
 
-(136) Project [codegen id : 41]
+(140) Project [codegen id : 37]
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_sk#127, s_store_name#128, s_zip#129]
 
-(137) ReusedExchange [Reuses operator id: 46]
+(141) ReusedExchange [Reuses operator id: 47]
 Output [6]: [c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(138) BroadcastHashJoin [codegen id : 41]
+(142) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_customer_sk#102]
 Right keys [1]: [c_customer_sk#130]
 Join type: Inner
 Join condition: None
 
-(139) Project [codegen id : 41]
+(143) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 Input [18]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(140) ReusedExchange [Reuses operator id: 52]
+(144) ReusedExchange [Reuses operator id: 53]
 Output [2]: [d_date_sk#136, d_year#137]
 
-(141) BroadcastHashJoin [codegen id : 41]
+(145) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_first_sales_date_sk#135]
 Right keys [1]: [d_date_sk#136]
 Join type: Inner
 Join condition: None
 
-(142) Project [codegen id : 41]
+(146) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135, d_date_sk#136, d_year#137]
 
-(143) ReusedExchange [Reuses operator id: 52]
+(147) ReusedExchange [Reuses operator id: 53]
 Output [2]: [d_date_sk#138, d_year#139]
 
-(144) BroadcastHashJoin [codegen id : 41]
+(148) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_first_shipto_date_sk#134]
 Right keys [1]: [d_date_sk#138]
 Join type: Inner
 Join condition: None
 
-(145) Project [codegen id : 41]
+(149) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137, d_date_sk#138, d_year#139]
 
-(146) ReusedExchange [Reuses operator id: 61]
+(150) ReusedExchange [Reuses operator id: 62]
 Output [2]: [cd_demo_sk#140, cd_marital_status#141]
 
-(147) BroadcastHashJoin [codegen id : 41]
+(151) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_cdemo_sk#103]
 Right keys [1]: [cd_demo_sk#140]
 Join type: Inner
 Join condition: None
 
-(148) Project [codegen id : 41]
+(152) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_demo_sk#140, cd_marital_status#141]
 
-(149) ReusedExchange [Reuses operator id: 61]
+(153) ReusedExchange [Reuses operator id: 62]
 Output [2]: [cd_demo_sk#142, cd_marital_status#143]
 
-(150) BroadcastHashJoin [codegen id : 41]
+(154) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_current_cdemo_sk#131]
 Right keys [1]: [cd_demo_sk#142]
 Join type: Inner
 Join condition: NOT (cd_marital_status#141 = cd_marital_status#143)
 
-(151) Project [codegen id : 41]
+(155) Project [codegen id : 37]
 Output [14]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141, cd_demo_sk#142, cd_marital_status#143]
 
-(152) ReusedExchange [Reuses operator id: 70]
+(156) ReusedExchange [Reuses operator id: 71]
 Output [1]: [p_promo_sk#144]
 
-(153) BroadcastHashJoin [codegen id : 41]
+(157) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_promo_sk#107]
 Right keys [1]: [p_promo_sk#144]
 Join type: Inner
 Join condition: None
 
-(154) Project [codegen id : 41]
+(158) Project [codegen id : 37]
 Output [13]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, p_promo_sk#144]
 
-(155) ReusedExchange [Reuses operator id: 76]
+(159) ReusedExchange [Reuses operator id: 77]
 Output [2]: [hd_demo_sk#145, hd_income_band_sk#146]
 
-(156) BroadcastHashJoin [codegen id : 41]
+(160) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_hdemo_sk#104]
 Right keys [1]: [hd_demo_sk#145]
 Join type: Inner
 Join condition: None
 
-(157) Project [codegen id : 41]
+(161) Project [codegen id : 37]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_demo_sk#145, hd_income_band_sk#146]
 
-(158) ReusedExchange [Reuses operator id: 76]
+(162) ReusedExchange [Reuses operator id: 77]
 Output [2]: [hd_demo_sk#147, hd_income_band_sk#148]
 
-(159) BroadcastHashJoin [codegen id : 41]
+(163) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_current_hdemo_sk#132]
 Right keys [1]: [hd_demo_sk#147]
 Join type: Inner
 Join condition: None
 
-(160) Project [codegen id : 41]
+(164) Project [codegen id : 37]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148]
 Input [15]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_demo_sk#147, hd_income_band_sk#148]
 
-(161) ReusedExchange [Reuses operator id: 85]
+(165) ReusedExchange [Reuses operator id: 86]
 Output [5]: [ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(162) BroadcastHashJoin [codegen id : 41]
+(166) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_addr_sk#105]
 Right keys [1]: [ca_address_sk#149]
 Join type: Inner
 Join condition: None
 
-(163) Project [codegen id : 41]
+(167) Project [codegen id : 37]
 Output [16]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 Input [18]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(164) ReusedExchange [Reuses operator id: 85]
+(168) ReusedExchange [Reuses operator id: 86]
 Output [5]: [ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(165) BroadcastHashJoin [codegen id : 41]
+(169) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [c_current_addr_sk#133]
 Right keys [1]: [ca_address_sk#154]
 Join type: Inner
 Join condition: None
 
-(166) Project [codegen id : 41]
+(170) Project [codegen id : 37]
 Output [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [21]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(167) ReusedExchange [Reuses operator id: 94]
+(171) ReusedExchange [Reuses operator id: 95]
 Output [1]: [ib_income_band_sk#159]
 
-(168) BroadcastHashJoin [codegen id : 41]
+(172) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [hd_income_band_sk#146]
 Right keys [1]: [ib_income_band_sk#159]
 Join type: Inner
 Join condition: None
 
-(169) Project [codegen id : 41]
+(173) Project [codegen id : 37]
 Output [18]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [20]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#159]
 
-(170) ReusedExchange [Reuses operator id: 94]
+(174) ReusedExchange [Reuses operator id: 95]
 Output [1]: [ib_income_band_sk#160]
 
-(171) BroadcastHashJoin [codegen id : 41]
+(175) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [hd_income_band_sk#148]
 Right keys [1]: [ib_income_band_sk#160]
 Join type: Inner
 Join condition: None
 
-(172) Project [codegen id : 41]
+(176) Project [codegen id : 37]
 Output [17]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#160]
 
-(173) ReusedExchange [Reuses operator id: 104]
+(177) ReusedExchange [Reuses operator id: 105]
 Output [2]: [i_item_sk#161, i_product_name#162]
 
-(174) BroadcastHashJoin [codegen id : 41]
+(178) BroadcastHashJoin [codegen id : 37]
 Left keys [1]: [ss_item_sk#101]
 Right keys [1]: [i_item_sk#161]
 Join type: Inner
 Join condition: None
 
-(175) Project [codegen id : 41]
+(179) Project [codegen id : 37]
 Output [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 
-(176) HashAggregate [codegen id : 41]
+(180) HashAggregate [codegen id : 37]
 Input [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#109)), partial_sum(UnscaledValue(ss_list_price#110)), partial_sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count#72, sum#163, sum#164, sum#165]
 Results [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 
-(177) HashAggregate [codegen id : 41]
+(181) HashAggregate [codegen id : 37]
 Input [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#109)), sum(UnscaledValue(ss_list_price#110)), sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#109))#81, sum(UnscaledValue(ss_list_price#110))#82, sum(UnscaledValue(ss_coupon_amt#111))#83]
 Results [8]: [i_item_sk#161 AS item_sk#169, s_store_name#128 AS store_name#170, s_zip#129 AS store_zip#171, d_year#126 AS syear#172, count(1)#80 AS cnt#173, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#109))#81,17,2) AS s1#174, MakeDecimal(sum(UnscaledValue(ss_list_price#110))#82,17,2) AS s2#175, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#111))#83,17,2) AS s3#176]
 
-(178) Exchange
+(182) RowToColumnar
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, [plan_id=18]
 
-(179) Sort [codegen id : 42]
+(183) CometColumnarExchange
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
 
-(180) SortMergeJoin [codegen id : 43]
+(184) CometSort
+Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
+Arguments: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176], [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST]
+
+(185) ColumnarToRow [codegen id : 38]
+Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
+
+(186) SortMergeJoin [codegen id : 39]
 Left keys [3]: [item_sk#85, store_name#86, store_zip#87]
 Right keys [3]: [item_sk#169, store_name#170, store_zip#171]
 Join type: Inner
 Join condition: (cnt#173 <= cnt#97)
 
-(181) Project [codegen id : 43]
+(187) Project [codegen id : 39]
 Output [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
 Input [25]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
 
-(182) Exchange
+(188) RowToColumnar
+Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
+
+(189) CometColumnarExchange
+Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
+Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=19]
+
+(190) CometSort
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=19]
+Arguments: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173], [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST]
 
-(183) Sort [codegen id : 44]
+(191) ColumnarToRow [codegen id : 40]
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (187)
-+- * ColumnarToRow (186)
-   +- CometFilter (185)
-      +- CometScan parquet spark_catalog.default.date_dim (184)
+BroadcastExchange (195)
++- * ColumnarToRow (194)
+   +- CometFilter (193)
+      +- CometScan parquet spark_catalog.default.date_dim (192)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1028,22 +1058,22 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(185) CometFilter
+(193) CometFilter
 Input [2]: [d_date_sk#32, d_year#33]
 Condition : ((isnotnull(d_year#33) AND (d_year#33 = 1999)) AND isnotnull(d_date_sk#32))
 
-(186) ColumnarToRow [codegen id : 1]
+(194) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#32, d_year#33]
 
-(187) BroadcastExchange
+(195) BroadcastExchange
 Input [2]: [d_date_sk#32, d_year#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=20]
 
-Subquery:2 Hosting operator id = 111 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
-BroadcastExchange (191)
-+- * ColumnarToRow (190)
-   +- CometFilter (189)
-      +- CometScan parquet spark_catalog.default.date_dim (188)
+Subquery:2 Hosting operator id = 114 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
+BroadcastExchange (199)
++- * ColumnarToRow (198)
+   +- CometFilter (197)
+      +- CometScan parquet spark_catalog.default.date_dim (196)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1053,14 +1083,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(189) CometFilter
+(197) CometFilter
 Input [2]: [d_date_sk#125, d_year#126]
 Condition : ((isnotnull(d_year#126) AND (d_year#126 = 2000)) AND isnotnull(d_date_sk#125))
 
-(190) ColumnarToRow [codegen id : 1]
+(198) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#125, d_year#126]
 
-(191) BroadcastExchange
+(199) BroadcastExchange
 Input [2]: [d_date_sk#125, d_year#126]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=21]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt
index 4aa8376d19..e4f0b78a77 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt
@@ -1,278 +1,276 @@
-WholeStageCodegen (44)
-  Sort [product_name,store_name,cnt,s1,s1]
+WholeStageCodegen (40)
+  ColumnarToRow
     InputAdapter
-      Exchange [product_name,store_name,cnt,s1,s1] #1
-        WholeStageCodegen (43)
-          Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
-            SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
-              InputAdapter
-                WholeStageCodegen (21)
-                  Sort [item_sk,store_name,store_zip]
-                    InputAdapter
-                      Exchange [item_sk,store_name,store_zip] #2
-                        WholeStageCodegen (20)
-                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                              InputAdapter
-                                                                                                WholeStageCodegen (3)
-                                                                                                  Sort [ss_item_sk]
+      CometSort [product_name,store_name,cnt,s1,s1]
+        CometColumnarExchange [product_name,store_name,cnt,s1,s1] #1
+          RowToColumnar
+            WholeStageCodegen (39)
+              Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
+                SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
+                  InputAdapter
+                    WholeStageCodegen (19)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [item_sk,store_name,store_zip]
+                            CometColumnarExchange [item_sk,store_name,store_zip] #2
+                              RowToColumnar
+                                WholeStageCodegen (18)
+                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                                  ColumnarToRow
                                                                                                     InputAdapter
-                                                                                                      Exchange [ss_item_sk] #3
-                                                                                                        WholeStageCodegen (2)
-                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                                                                                                              InputAdapter
-                                                                                                                BroadcastExchange #4
-                                                                                                                  WholeStageCodegen (1)
-                                                                                                                    ColumnarToRow
+                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                                          CometSort [ss_item_sk]
+                                                                                                            CometColumnarExchange [ss_item_sk] #3
+                                                                                                              RowToColumnar
+                                                                                                                WholeStageCodegen (2)
+                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
                                                                                                                       InputAdapter
-                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                            SubqueryBroadcast [d_date_sk] #1
-                                                                                                                              BroadcastExchange #5
-                                                                                                                                WholeStageCodegen (1)
-                                                                                                                                  ColumnarToRow
-                                                                                                                                    InputAdapter
-                                                                                                                                      CometFilter [d_year,d_date_sk]
-                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                              ColumnarToRow
-                                                                                                                InputAdapter
-                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                                        BroadcastExchange #4
+                                                                                                                          WholeStageCodegen (1)
+                                                                                                                            ColumnarToRow
+                                                                                                                              InputAdapter
+                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                                    SubqueryBroadcast [d_date_sk] #1
+                                                                                                                                      BroadcastExchange #5
+                                                                                                                                        WholeStageCodegen (1)
+                                                                                                                                          ColumnarToRow
+                                                                                                                                            InputAdapter
+                                                                                                                                              CometFilter [d_year,d_date_sk]
+                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                                      ColumnarToRow
+                                                                                                                        InputAdapter
+                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                          CometSort [cs_item_sk]
+                                                                                                            CometProject [cs_item_sk]
+                                                                                                              CometFilter [sale,refund]
+                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                                  CometColumnarExchange [cs_item_sk] #6
+                                                                                                                    CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                      CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                        CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                                                                                                                          CometSort [cs_item_sk,cs_order_number]
+                                                                                                                            CometColumnarExchange [cs_item_sk,cs_order_number] #7
+                                                                                                                              CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
+                                                                                                                                CometFilter [cs_item_sk,cs_order_number]
+                                                                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
+                                                                                                                          CometSort [cr_item_sk,cr_order_number]
+                                                                                                                            CometColumnarExchange [cr_item_sk,cr_order_number] #8
+                                                                                                                              CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                                CometFilter [cr_item_sk,cr_order_number]
+                                                                                                                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
+                                                                                                  InputAdapter
+                                                                                                    ReusedExchange [d_date_sk,d_year] #5
                                                                                               InputAdapter
-                                                                                                WholeStageCodegen (4)
-                                                                                                  ColumnarToRow
-                                                                                                    InputAdapter
-                                                                                                      CometSort [cs_item_sk]
-                                                                                                        CometProject [cs_item_sk]
-                                                                                                          CometFilter [sale,refund]
-                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                              CometExchange [cs_item_sk] #6
-                                                                                                                CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                  CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                    CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                                                                                                                      CometSort [cs_item_sk,cs_order_number]
-                                                                                                                        CometExchange [cs_item_sk,cs_order_number] #7
-                                                                                                                          CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
-                                                                                                                            CometFilter [cs_item_sk,cs_order_number]
-                                                                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
-                                                                                                                      CometSort [cr_item_sk,cr_order_number]
-                                                                                                                        CometExchange [cr_item_sk,cr_order_number] #8
-                                                                                                                          CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                            CometFilter [cr_item_sk,cr_order_number]
-                                                                                                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
+                                                                                                BroadcastExchange #9
+                                                                                                  WholeStageCodegen (4)
+                                                                                                    ColumnarToRow
+                                                                                                      InputAdapter
+                                                                                                        CometFilter [s_store_sk,s_store_name,s_zip]
+                                                                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
                                                                                           InputAdapter
-                                                                                            ReusedExchange [d_date_sk,d_year] #5
+                                                                                            BroadcastExchange #10
+                                                                                              WholeStageCodegen (5)
+                                                                                                ColumnarToRow
+                                                                                                  InputAdapter
+                                                                                                    CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
+                                                                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
                                                                                       InputAdapter
-                                                                                        BroadcastExchange #9
+                                                                                        BroadcastExchange #11
                                                                                           WholeStageCodegen (6)
                                                                                             ColumnarToRow
                                                                                               InputAdapter
-                                                                                                CometFilter [s_store_sk,s_store_name,s_zip]
-                                                                                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
+                                                                                                CometFilter [d_date_sk]
+                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                                   InputAdapter
-                                                                                    BroadcastExchange #10
-                                                                                      WholeStageCodegen (7)
-                                                                                        ColumnarToRow
-                                                                                          InputAdapter
-                                                                                            CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
-                                                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                    ReusedExchange [d_date_sk,d_year] #11
                                                                               InputAdapter
-                                                                                BroadcastExchange #11
+                                                                                BroadcastExchange #12
                                                                                   WholeStageCodegen (8)
                                                                                     ColumnarToRow
                                                                                       InputAdapter
-                                                                                        CometFilter [d_date_sk]
-                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                        CometFilter [cd_demo_sk,cd_marital_status]
+                                                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                                                           InputAdapter
-                                                                            ReusedExchange [d_date_sk,d_year] #11
+                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                       InputAdapter
-                                                                        BroadcastExchange #12
+                                                                        BroadcastExchange #13
                                                                           WholeStageCodegen (10)
                                                                             ColumnarToRow
                                                                               InputAdapter
-                                                                                CometFilter [cd_demo_sk,cd_marital_status]
-                                                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                                                CometFilter [p_promo_sk]
+                                                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk]
                                                                   InputAdapter
-                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                    BroadcastExchange #14
+                                                                      WholeStageCodegen (11)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [hd_demo_sk,hd_income_band_sk]
+                                                                              CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
                                                               InputAdapter
-                                                                BroadcastExchange #13
-                                                                  WholeStageCodegen (12)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometFilter [p_promo_sk]
-                                                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                           InputAdapter
-                                                            BroadcastExchange #14
+                                                            BroadcastExchange #15
                                                               WholeStageCodegen (13)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [hd_demo_sk,hd_income_band_sk]
-                                                                      CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
+                                                                    CometFilter [ca_address_sk]
+                                                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
                                                       InputAdapter
-                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                                   InputAdapter
-                                                    BroadcastExchange #15
+                                                    BroadcastExchange #16
                                                       WholeStageCodegen (15)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ca_address_sk]
-                                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                            CometFilter [ib_income_band_sk]
+                                                              CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
                                               InputAdapter
-                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                ReusedExchange [ib_income_band_sk] #16
                                           InputAdapter
-                                            BroadcastExchange #16
+                                            BroadcastExchange #17
                                               WholeStageCodegen (17)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [ib_income_band_sk]
-                                                      CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
-                                      InputAdapter
-                                        ReusedExchange [ib_income_band_sk] #16
-                                  InputAdapter
-                                    BroadcastExchange #17
-                                      WholeStageCodegen (19)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [i_item_sk,i_product_name]
-                                              CometFilter [i_current_price,i_color,i_item_sk]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
-              InputAdapter
-                WholeStageCodegen (42)
-                  Sort [item_sk,store_name,store_zip]
-                    InputAdapter
-                      Exchange [item_sk,store_name,store_zip] #18
-                        WholeStageCodegen (41)
-                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                              InputAdapter
-                                                                                                WholeStageCodegen (24)
-                                                                                                  Sort [ss_item_sk]
+                                                    CometProject [i_item_sk,i_product_name]
+                                                      CometFilter [i_current_price,i_color,i_item_sk]
+                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
+                  InputAdapter
+                    WholeStageCodegen (38)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [item_sk,store_name,store_zip]
+                            CometColumnarExchange [item_sk,store_name,store_zip] #18
+                              RowToColumnar
+                                WholeStageCodegen (37)
+                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                                  ColumnarToRow
                                                                                                     InputAdapter
-                                                                                                      Exchange [ss_item_sk] #19
-                                                                                                        WholeStageCodegen (23)
-                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                                                                                                              InputAdapter
-                                                                                                                BroadcastExchange #20
-                                                                                                                  WholeStageCodegen (22)
-                                                                                                                    ColumnarToRow
+                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                                          CometSort [ss_item_sk]
+                                                                                                            CometColumnarExchange [ss_item_sk] #19
+                                                                                                              RowToColumnar
+                                                                                                                WholeStageCodegen (21)
+                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
                                                                                                                       InputAdapter
-                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                            SubqueryBroadcast [d_date_sk] #2
-                                                                                                                              BroadcastExchange #21
-                                                                                                                                WholeStageCodegen (1)
-                                                                                                                                  ColumnarToRow
-                                                                                                                                    InputAdapter
-                                                                                                                                      CometFilter [d_year,d_date_sk]
-                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                              ColumnarToRow
-                                                                                                                InputAdapter
-                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                                        BroadcastExchange #20
+                                                                                                                          WholeStageCodegen (20)
+                                                                                                                            ColumnarToRow
+                                                                                                                              InputAdapter
+                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                                    SubqueryBroadcast [d_date_sk] #2
+                                                                                                                                      BroadcastExchange #21
+                                                                                                                                        WholeStageCodegen (1)
+                                                                                                                                          ColumnarToRow
+                                                                                                                                            InputAdapter
+                                                                                                                                              CometFilter [d_year,d_date_sk]
+                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                                      ColumnarToRow
+                                                                                                                        InputAdapter
+                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                                                                          CometSort [cs_item_sk]
+                                                                                                            CometProject [cs_item_sk]
+                                                                                                              CometFilter [sale,refund]
+                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                                  ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
+                                                                                                  InputAdapter
+                                                                                                    ReusedExchange [d_date_sk,d_year] #21
                                                                                               InputAdapter
-                                                                                                WholeStageCodegen (25)
-                                                                                                  ColumnarToRow
-                                                                                                    InputAdapter
-                                                                                                      CometSort [cs_item_sk]
-                                                                                                        CometProject [cs_item_sk]
-                                                                                                          CometFilter [sale,refund]
-                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                              ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
+                                                                                                ReusedExchange [s_store_sk,s_store_name,s_zip] #9
                                                                                           InputAdapter
-                                                                                            ReusedExchange [d_date_sk,d_year] #21
+                                                                                            ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
                                                                                       InputAdapter
-                                                                                        ReusedExchange [s_store_sk,s_store_name,s_zip] #9
+                                                                                        ReusedExchange [d_date_sk,d_year] #11
                                                                                   InputAdapter
-                                                                                    ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
+                                                                                    ReusedExchange [d_date_sk,d_year] #11
                                                                               InputAdapter
-                                                                                ReusedExchange [d_date_sk,d_year] #11
+                                                                                ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                           InputAdapter
-                                                                            ReusedExchange [d_date_sk,d_year] #11
+                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                       InputAdapter
-                                                                        ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                        ReusedExchange [p_promo_sk] #13
                                                                   InputAdapter
-                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                    ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                               InputAdapter
-                                                                ReusedExchange [p_promo_sk] #13
+                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                           InputAdapter
-                                                            ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                            ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                                       InputAdapter
-                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                                   InputAdapter
-                                                    ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                    ReusedExchange [ib_income_band_sk] #16
                                               InputAdapter
-                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                ReusedExchange [ib_income_band_sk] #16
                                           InputAdapter
-                                            ReusedExchange [ib_income_band_sk] #16
-                                      InputAdapter
-                                        ReusedExchange [ib_income_band_sk] #16
-                                  InputAdapter
-                                    ReusedExchange [i_item_sk,i_product_name] #17
+                                            ReusedExchange [i_item_sk,i_product_name] #17
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt
index 68be5c8723..5c22de6679 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt
@@ -1,71 +1,73 @@
 == Physical Plan ==
-TakeOrderedAndProject (67)
-+- * Filter (66)
-   +- Window (65)
-      +- * Sort (64)
-         +- Exchange (63)
-            +- Union (62)
-               :- * HashAggregate (21)
-               :  +- Exchange (20)
-               :     +- * HashAggregate (19)
-               :        +- * Project (18)
-               :           +- * BroadcastHashJoin Inner BuildRight (17)
-               :              :- * Project (12)
-               :              :  +- * BroadcastHashJoin Inner BuildRight (11)
-               :              :     :- * Project (6)
-               :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :              :     :     :- * ColumnarToRow (3)
-               :              :     :     :  +- CometFilter (2)
-               :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :              :     :     +- ReusedExchange (4)
-               :              :     +- BroadcastExchange (10)
-               :              :        +- * ColumnarToRow (9)
-               :              :           +- CometFilter (8)
-               :              :              +- CometScan parquet spark_catalog.default.store (7)
-               :              +- BroadcastExchange (16)
-               :                 +- * ColumnarToRow (15)
-               :                    +- CometFilter (14)
-               :                       +- CometScan parquet spark_catalog.default.item (13)
-               :- * HashAggregate (26)
-               :  +- Exchange (25)
-               :     +- * HashAggregate (24)
-               :        +- * HashAggregate (23)
-               :           +- ReusedExchange (22)
-               :- * HashAggregate (31)
-               :  +- Exchange (30)
-               :     +- * HashAggregate (29)
-               :        +- * HashAggregate (28)
-               :           +- ReusedExchange (27)
-               :- * HashAggregate (36)
-               :  +- Exchange (35)
-               :     +- * HashAggregate (34)
-               :        +- * HashAggregate (33)
-               :           +- ReusedExchange (32)
-               :- * HashAggregate (41)
-               :  +- Exchange (40)
-               :     +- * HashAggregate (39)
-               :        +- * HashAggregate (38)
-               :           +- ReusedExchange (37)
-               :- * HashAggregate (46)
-               :  +- Exchange (45)
-               :     +- * HashAggregate (44)
-               :        +- * HashAggregate (43)
-               :           +- ReusedExchange (42)
-               :- * HashAggregate (51)
-               :  +- Exchange (50)
-               :     +- * HashAggregate (49)
-               :        +- * HashAggregate (48)
-               :           +- ReusedExchange (47)
-               :- * HashAggregate (56)
-               :  +- Exchange (55)
-               :     +- * HashAggregate (54)
-               :        +- * HashAggregate (53)
-               :           +- ReusedExchange (52)
-               +- * HashAggregate (61)
-                  +- Exchange (60)
-                     +- * HashAggregate (59)
-                        +- * HashAggregate (58)
-                           +- ReusedExchange (57)
+TakeOrderedAndProject (69)
++- * Filter (68)
+   +- Window (67)
+      +- * ColumnarToRow (66)
+         +- CometSort (65)
+            +- CometColumnarExchange (64)
+               +- CometUnion (63)
+                  :- CometHashAggregate (22)
+                  :  +- CometColumnarExchange (21)
+                  :     +- RowToColumnar (20)
+                  :        +- * HashAggregate (19)
+                  :           +- * Project (18)
+                  :              +- * BroadcastHashJoin Inner BuildRight (17)
+                  :                 :- * Project (12)
+                  :                 :  +- * BroadcastHashJoin Inner BuildRight (11)
+                  :                 :     :- * Project (6)
+                  :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                  :                 :     :     :- * ColumnarToRow (3)
+                  :                 :     :     :  +- CometFilter (2)
+                  :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :                 :     :     +- ReusedExchange (4)
+                  :                 :     +- BroadcastExchange (10)
+                  :                 :        +- * ColumnarToRow (9)
+                  :                 :           +- CometFilter (8)
+                  :                 :              +- CometScan parquet spark_catalog.default.store (7)
+                  :                 +- BroadcastExchange (16)
+                  :                    +- * ColumnarToRow (15)
+                  :                       +- CometFilter (14)
+                  :                          +- CometScan parquet spark_catalog.default.item (13)
+                  :- CometHashAggregate (27)
+                  :  +- CometColumnarExchange (26)
+                  :     +- CometHashAggregate (25)
+                  :        +- CometHashAggregate (24)
+                  :           +- ReusedExchange (23)
+                  :- CometHashAggregate (32)
+                  :  +- CometColumnarExchange (31)
+                  :     +- CometHashAggregate (30)
+                  :        +- CometHashAggregate (29)
+                  :           +- ReusedExchange (28)
+                  :- CometHashAggregate (37)
+                  :  +- CometColumnarExchange (36)
+                  :     +- CometHashAggregate (35)
+                  :        +- CometHashAggregate (34)
+                  :           +- ReusedExchange (33)
+                  :- CometHashAggregate (42)
+                  :  +- CometColumnarExchange (41)
+                  :     +- CometHashAggregate (40)
+                  :        +- CometHashAggregate (39)
+                  :           +- ReusedExchange (38)
+                  :- CometHashAggregate (47)
+                  :  +- CometColumnarExchange (46)
+                  :     +- CometHashAggregate (45)
+                  :        +- CometHashAggregate (44)
+                  :           +- ReusedExchange (43)
+                  :- CometHashAggregate (52)
+                  :  +- CometColumnarExchange (51)
+                  :     +- CometHashAggregate (50)
+                  :        +- CometHashAggregate (49)
+                  :           +- ReusedExchange (48)
+                  :- CometHashAggregate (57)
+                  :  +- CometColumnarExchange (56)
+                  :     +- CometHashAggregate (55)
+                  :        +- CometHashAggregate (54)
+                  :           +- ReusedExchange (53)
+                  +- CometHashAggregate (62)
+                     +- CometColumnarExchange (61)
+                        +- CometHashAggregate (60)
+                           +- CometHashAggregate (59)
+                              +- ReusedExchange (58)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -83,7 +85,7 @@ Condition : (isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_quantity#3, ss_sales_price#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 72]
+(4) ReusedExchange [Reuses operator id: 74]
 Output [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -159,292 +161,257 @@ Functions [1]: [partial_sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as d
 Aggregate Attributes [2]: [sum#18, isEmpty#19]
 Results [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
 
-(20) Exchange
+(20) RowToColumnar
 Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) HashAggregate [codegen id : 5]
+(21) CometColumnarExchange
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(22) CometHashAggregate
 Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, cast(sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 as decimal(38,2)) AS sumsales#23]
 
-(22) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#24, isEmpty#25]
+(23) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#22, isEmpty#23]
 
-(23) HashAggregate [codegen id : 10]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#24, isEmpty#25]
+(24) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#22, isEmpty#23]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(24) HashAggregate [codegen id : 10]
-Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sumsales#26]
+(25) CometHashAggregate
+Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sumsales#24]
 Keys [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#27, isEmpty#28]
-Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#29, isEmpty#30]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(25) Exchange
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#29, isEmpty#30]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(26) CometColumnarExchange
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#25, isEmpty#26]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(26) HashAggregate [codegen id : 11]
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#29, isEmpty#30]
+(27) CometHashAggregate
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#25, isEmpty#26]
 Keys [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#31]
-Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, null AS s_store_id#32, sum(sumsales#26)#31 AS sumsales#33]
+Functions [1]: [sum(sumsales#24)]
 
-(27) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#34, isEmpty#35]
+(28) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#27, isEmpty#28]
 
-(28) HashAggregate [codegen id : 16]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#34, isEmpty#35]
+(29) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#27, isEmpty#28]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(29) HashAggregate [codegen id : 16]
-Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sumsales#26]
+(30) CometHashAggregate
+Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sumsales#24]
 Keys [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#36, isEmpty#37]
-Results [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#38, isEmpty#39]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(30) Exchange
-Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#38, isEmpty#39]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(31) CometColumnarExchange
+Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#29, isEmpty#30]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(31) HashAggregate [codegen id : 17]
-Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#38, isEmpty#39]
+(32) CometHashAggregate
+Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#29, isEmpty#30]
 Keys [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#40]
-Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, null AS d_moy#41, null AS s_store_id#42, sum(sumsales#26)#40 AS sumsales#43]
+Functions [1]: [sum(sumsales#24)]
 
-(32) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#44, isEmpty#45]
+(33) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#31, isEmpty#32]
 
-(33) HashAggregate [codegen id : 22]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#44, isEmpty#45]
+(34) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#31, isEmpty#32]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(34) HashAggregate [codegen id : 22]
-Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sumsales#26]
+(35) CometHashAggregate
+Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sumsales#24]
 Keys [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#46, isEmpty#47]
-Results [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#48, isEmpty#49]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(35) Exchange
-Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#48, isEmpty#49]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(36) CometColumnarExchange
+Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#33, isEmpty#34]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(36) HashAggregate [codegen id : 23]
-Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#48, isEmpty#49]
+(37) CometHashAggregate
+Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#33, isEmpty#34]
 Keys [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#50]
-Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, null AS d_qoy#51, null AS d_moy#52, null AS s_store_id#53, sum(sumsales#26)#50 AS sumsales#54]
+Functions [1]: [sum(sumsales#24)]
 
-(37) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#55, isEmpty#56]
+(38) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#35, isEmpty#36]
 
-(38) HashAggregate [codegen id : 28]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#55, isEmpty#56]
+(39) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#35, isEmpty#36]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(39) HashAggregate [codegen id : 28]
-Input [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sumsales#26]
+(40) CometHashAggregate
+Input [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sumsales#24]
 Keys [4]: [i_category#16, i_class#15, i_brand#14, i_product_name#17]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#57, isEmpty#58]
-Results [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#59, isEmpty#60]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(40) Exchange
-Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#59, isEmpty#60]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+(41) CometColumnarExchange
+Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#37, isEmpty#38]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(41) HashAggregate [codegen id : 29]
-Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#59, isEmpty#60]
+(42) CometHashAggregate
+Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#37, isEmpty#38]
 Keys [4]: [i_category#16, i_class#15, i_brand#14, i_product_name#17]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#61]
-Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, null AS d_year#62, null AS d_qoy#63, null AS d_moy#64, null AS s_store_id#65, sum(sumsales#26)#61 AS sumsales#66]
+Functions [1]: [sum(sumsales#24)]
 
-(42) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#67, isEmpty#68]
+(43) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#39, isEmpty#40]
 
-(43) HashAggregate [codegen id : 34]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#67, isEmpty#68]
+(44) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#39, isEmpty#40]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [4]: [i_category#16, i_class#15, i_brand#14, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(44) HashAggregate [codegen id : 34]
-Input [4]: [i_category#16, i_class#15, i_brand#14, sumsales#26]
+(45) CometHashAggregate
+Input [4]: [i_category#16, i_class#15, i_brand#14, sumsales#24]
 Keys [3]: [i_category#16, i_class#15, i_brand#14]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#69, isEmpty#70]
-Results [5]: [i_category#16, i_class#15, i_brand#14, sum#71, isEmpty#72]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(45) Exchange
-Input [5]: [i_category#16, i_class#15, i_brand#14, sum#71, isEmpty#72]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(46) CometColumnarExchange
+Input [5]: [i_category#16, i_class#15, i_brand#14, sum#41, isEmpty#42]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(46) HashAggregate [codegen id : 35]
-Input [5]: [i_category#16, i_class#15, i_brand#14, sum#71, isEmpty#72]
+(47) CometHashAggregate
+Input [5]: [i_category#16, i_class#15, i_brand#14, sum#41, isEmpty#42]
 Keys [3]: [i_category#16, i_class#15, i_brand#14]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#73]
-Results [9]: [i_category#16, i_class#15, i_brand#14, null AS i_product_name#74, null AS d_year#75, null AS d_qoy#76, null AS d_moy#77, null AS s_store_id#78, sum(sumsales#26)#73 AS sumsales#79]
+Functions [1]: [sum(sumsales#24)]
 
-(47) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#80, isEmpty#81]
+(48) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#43, isEmpty#44]
 
-(48) HashAggregate [codegen id : 40]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#80, isEmpty#81]
+(49) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#43, isEmpty#44]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [3]: [i_category#16, i_class#15, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(49) HashAggregate [codegen id : 40]
-Input [3]: [i_category#16, i_class#15, sumsales#26]
+(50) CometHashAggregate
+Input [3]: [i_category#16, i_class#15, sumsales#24]
 Keys [2]: [i_category#16, i_class#15]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#82, isEmpty#83]
-Results [4]: [i_category#16, i_class#15, sum#84, isEmpty#85]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(50) Exchange
-Input [4]: [i_category#16, i_class#15, sum#84, isEmpty#85]
-Arguments: hashpartitioning(i_category#16, i_class#15, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(51) CometColumnarExchange
+Input [4]: [i_category#16, i_class#15, sum#45, isEmpty#46]
+Arguments: hashpartitioning(i_category#16, i_class#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(51) HashAggregate [codegen id : 41]
-Input [4]: [i_category#16, i_class#15, sum#84, isEmpty#85]
+(52) CometHashAggregate
+Input [4]: [i_category#16, i_class#15, sum#45, isEmpty#46]
 Keys [2]: [i_category#16, i_class#15]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#86]
-Results [9]: [i_category#16, i_class#15, null AS i_brand#87, null AS i_product_name#88, null AS d_year#89, null AS d_qoy#90, null AS d_moy#91, null AS s_store_id#92, sum(sumsales#26)#86 AS sumsales#93]
+Functions [1]: [sum(sumsales#24)]
 
-(52) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#94, isEmpty#95]
+(53) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#47, isEmpty#48]
 
-(53) HashAggregate [codegen id : 46]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#94, isEmpty#95]
+(54) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#47, isEmpty#48]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [2]: [i_category#16, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(54) HashAggregate [codegen id : 46]
-Input [2]: [i_category#16, sumsales#26]
+(55) CometHashAggregate
+Input [2]: [i_category#16, sumsales#24]
 Keys [1]: [i_category#16]
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#96, isEmpty#97]
-Results [3]: [i_category#16, sum#98, isEmpty#99]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(55) Exchange
-Input [3]: [i_category#16, sum#98, isEmpty#99]
-Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(56) CometColumnarExchange
+Input [3]: [i_category#16, sum#49, isEmpty#50]
+Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(56) HashAggregate [codegen id : 47]
-Input [3]: [i_category#16, sum#98, isEmpty#99]
+(57) CometHashAggregate
+Input [3]: [i_category#16, sum#49, isEmpty#50]
 Keys [1]: [i_category#16]
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#100]
-Results [9]: [i_category#16, null AS i_class#101, null AS i_brand#102, null AS i_product_name#103, null AS d_year#104, null AS d_qoy#105, null AS d_moy#106, null AS s_store_id#107, sum(sumsales#26)#100 AS sumsales#108]
+Functions [1]: [sum(sumsales#24)]
 
-(57) ReusedExchange [Reuses operator id: 20]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#109, isEmpty#110]
+(58) ReusedExchange [Reuses operator id: 21]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#51, isEmpty#52]
 
-(58) HashAggregate [codegen id : 52]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#109, isEmpty#110]
+(59) CometHashAggregate
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#51, isEmpty#52]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
-Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
-Results [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(59) HashAggregate [codegen id : 52]
-Input [1]: [sumsales#26]
+(60) CometHashAggregate
+Input [1]: [sumsales#24]
 Keys: []
-Functions [1]: [partial_sum(sumsales#26)]
-Aggregate Attributes [2]: [sum#111, isEmpty#112]
-Results [2]: [sum#113, isEmpty#114]
+Functions [1]: [partial_sum(sumsales#24)]
 
-(60) Exchange
-Input [2]: [sum#113, isEmpty#114]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=11]
+(61) CometColumnarExchange
+Input [2]: [sum#53, isEmpty#54]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(61) HashAggregate [codegen id : 53]
-Input [2]: [sum#113, isEmpty#114]
+(62) CometHashAggregate
+Input [2]: [sum#53, isEmpty#54]
 Keys: []
-Functions [1]: [sum(sumsales#26)]
-Aggregate Attributes [1]: [sum(sumsales#26)#115]
-Results [9]: [null AS i_category#116, null AS i_class#117, null AS i_brand#118, null AS i_product_name#119, null AS d_year#120, null AS d_qoy#121, null AS d_moy#122, null AS s_store_id#123, sum(sumsales#26)#115 AS sumsales#124]
-
-(62) Union
-
-(63) Exchange
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23]
-Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, [plan_id=12]
-
-(64) Sort [codegen id : 54]
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23]
-Arguments: [i_category#16 ASC NULLS FIRST, sumsales#23 DESC NULLS LAST], false, 0
-
-(65) Window
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23]
-Arguments: [rank(sumsales#23) windowspecdefinition(i_category#16, sumsales#23 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#125], [i_category#16], [sumsales#23 DESC NULLS LAST]
-
-(66) Filter [codegen id : 55]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23, rk#125]
-Condition : (rk#125 <= 100)
-
-(67) TakeOrderedAndProject
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23, rk#125]
-Arguments: 100, [i_category#16 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_product_name#17 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#10 ASC NULLS FIRST, d_moy#9 ASC NULLS FIRST, s_store_id#12 ASC NULLS FIRST, sumsales#23 ASC NULLS FIRST, rk#125 ASC NULLS FIRST], [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23, rk#125]
+Functions [1]: [sum(sumsales#24)]
+
+(63) CometUnion
+Child 0 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
+Child 1 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#56, sumsales#57]
+Child 2 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#58, s_store_id#59, sumsales#60]
+Child 3 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#61, d_moy#62, s_store_id#63, sumsales#64]
+Child 4 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#65, d_qoy#66, d_moy#67, s_store_id#68, sumsales#69]
+Child 5 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#70, d_year#71, d_qoy#72, d_moy#73, s_store_id#74, sumsales#75]
+Child 6 Input [9]: [i_category#16, i_class#15, i_brand#76, i_product_name#77, d_year#78, d_qoy#79, d_moy#80, s_store_id#81, sumsales#82]
+Child 7 Input [9]: [i_category#16, i_class#83, i_brand#84, i_product_name#85, d_year#86, d_qoy#87, d_moy#88, s_store_id#89, sumsales#90]
+Child 8 Input [9]: [i_category#91, i_class#92, i_brand#93, i_product_name#94, d_year#95, d_qoy#96, d_moy#97, s_store_id#98, sumsales#99]
+
+(64) CometColumnarExchange
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
+Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+
+(65) CometSort
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
+Arguments: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55], [i_category#16 ASC NULLS FIRST, sumsales#55 DESC NULLS LAST]
+
+(66) ColumnarToRow [codegen id : 37]
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
+
+(67) Window
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
+Arguments: [rank(sumsales#55) windowspecdefinition(i_category#16, sumsales#55 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#100], [i_category#16], [sumsales#55 DESC NULLS LAST]
+
+(68) Filter [codegen id : 38]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55, rk#100]
+Condition : (rk#100 <= 100)
+
+(69) TakeOrderedAndProject
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55, rk#100]
+Arguments: 100, [i_category#16 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_product_name#17 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#10 ASC NULLS FIRST, d_moy#9 ASC NULLS FIRST, s_store_id#12 ASC NULLS FIRST, sumsales#55 ASC NULLS FIRST, rk#100 ASC NULLS FIRST], [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55, rk#100]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (72)
-+- * ColumnarToRow (71)
-   +- CometProject (70)
-      +- CometFilter (69)
-         +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (74)
++- * ColumnarToRow (73)
+   +- CometProject (72)
+      +- CometFilter (71)
+         +- CometScan parquet spark_catalog.default.date_dim (70)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [5]: [d_date_sk#7, d_month_seq#126, d_year#8, d_moy#9, d_qoy#10]
+Output [5]: [d_date_sk#7, d_month_seq#101, d_year#8, d_moy#9, d_qoy#10]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_year:int,d_moy:int,d_qoy:int>
 
-(69) CometFilter
-Input [5]: [d_date_sk#7, d_month_seq#126, d_year#8, d_moy#9, d_qoy#10]
-Condition : (((isnotnull(d_month_seq#126) AND (d_month_seq#126 >= 1212)) AND (d_month_seq#126 <= 1223)) AND isnotnull(d_date_sk#7))
+(71) CometFilter
+Input [5]: [d_date_sk#7, d_month_seq#101, d_year#8, d_moy#9, d_qoy#10]
+Condition : (((isnotnull(d_month_seq#101) AND (d_month_seq#101 >= 1212)) AND (d_month_seq#101 <= 1223)) AND isnotnull(d_date_sk#7))
 
-(70) CometProject
-Input [5]: [d_date_sk#7, d_month_seq#126, d_year#8, d_moy#9, d_qoy#10]
+(72) CometProject
+Input [5]: [d_date_sk#7, d_month_seq#101, d_year#8, d_moy#9, d_qoy#10]
 Arguments: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10], [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(71) ColumnarToRow [codegen id : 1]
+(73) ColumnarToRow [codegen id : 1]
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(72) BroadcastExchange
+(74) BroadcastExchange
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt
index cfac29f8a3..1949bc1306 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,rk]
-  WholeStageCodegen (55)
+  WholeStageCodegen (38)
     Filter [rk]
       InputAdapter
         Window [sumsales,i_category]
-          WholeStageCodegen (54)
-            Sort [i_category,sumsales]
+          WholeStageCodegen (37)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_category] #1
-                  Union
-                    WholeStageCodegen (5)
-                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id] #2
+                CometSort [i_category,sumsales]
+                  CometColumnarExchange [i_category] #1
+                    CometUnion
+                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id] #2
+                          RowToColumnar
                             WholeStageCodegen (4)
                               HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,ss_sales_price,ss_quantity] [sum,isEmpty,sum,isEmpty]
                                 Project [ss_quantity,ss_sales_price,d_year,d_moy,d_qoy,s_store_id,i_brand,i_class,i_category,i_product_name]
@@ -48,75 +48,43 @@ TakeOrderedAndProject [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_
                                             InputAdapter
                                               CometFilter [i_item_sk]
                                                 CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
-                    WholeStageCodegen (11)
-                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sum,isEmpty] [sum(sumsales),s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy] #6
-                            WholeStageCodegen (10)
-                              HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (17)
-                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sum,isEmpty] [sum(sumsales),d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy] #7
-                            WholeStageCodegen (16)
-                              HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (23)
-                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sum,isEmpty] [sum(sumsales),d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand,i_product_name,d_year] #8
-                            WholeStageCodegen (22)
-                              HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (29)
-                      HashAggregate [i_category,i_class,i_brand,i_product_name,sum,isEmpty] [sum(sumsales),d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand,i_product_name] #9
-                            WholeStageCodegen (28)
-                              HashAggregate [i_category,i_class,i_brand,i_product_name,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (35)
-                      HashAggregate [i_category,i_class,i_brand,sum,isEmpty] [sum(sumsales),i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class,i_brand] #10
-                            WholeStageCodegen (34)
-                              HashAggregate [i_category,i_class,i_brand,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (41)
-                      HashAggregate [i_category,i_class,sum,isEmpty] [sum(sumsales),i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category,i_class] #11
-                            WholeStageCodegen (40)
-                              HashAggregate [i_category,i_class,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (47)
-                      HashAggregate [i_category,sum,isEmpty] [sum(sumsales),i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange [i_category] #12
-                            WholeStageCodegen (46)
-                              HashAggregate [i_category,sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                    WholeStageCodegen (53)
-                      HashAggregate [sum,isEmpty] [sum(sumsales),i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
-                        InputAdapter
-                          Exchange #13
-                            WholeStageCodegen (52)
-                              HashAggregate [sumsales] [sum,isEmpty,sum,isEmpty]
-                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
-                                  InputAdapter
-                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy] #6
+                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy] #7
+                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year] #8
+                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name] #9
+                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,i_class,i_brand,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class,i_brand] #10
+                          CometHashAggregate [i_category,i_class,i_brand,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,i_class,sum,isEmpty]
+                        CometColumnarExchange [i_category,i_class] #11
+                          CometHashAggregate [i_category,i_class,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [i_category,sum,isEmpty]
+                        CometColumnarExchange [i_category] #12
+                          CometHashAggregate [i_category,sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                      CometHashAggregate [sum,isEmpty]
+                        CometColumnarExchange #13
+                          CometHashAggregate [sumsales]
+                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
+                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt
index 77dcb698fc..c3d9525d52 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt
@@ -1,59 +1,63 @@
 == Physical Plan ==
-TakeOrderedAndProject (55)
-+- * Project (54)
-   +- Window (53)
-      +- * Sort (52)
-         +- Exchange (51)
-            +- * HashAggregate (50)
-               +- Exchange (49)
-                  +- * HashAggregate (48)
-                     +- Union (47)
-                        :- * HashAggregate (36)
-                        :  +- Exchange (35)
-                        :     +- * HashAggregate (34)
-                        :        +- * Project (33)
-                        :           +- * BroadcastHashJoin Inner BuildRight (32)
-                        :              :- * Project (6)
-                        :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-                        :              :     :- * ColumnarToRow (3)
-                        :              :     :  +- CometFilter (2)
-                        :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                        :              :     +- ReusedExchange (4)
-                        :              +- BroadcastExchange (31)
-                        :                 +- * BroadcastHashJoin LeftSemi BuildRight (30)
-                        :                    :- * ColumnarToRow (9)
-                        :                    :  +- CometFilter (8)
-                        :                    :     +- CometScan parquet spark_catalog.default.store (7)
-                        :                    +- BroadcastExchange (29)
-                        :                       +- * Project (28)
-                        :                          +- * Filter (27)
-                        :                             +- Window (26)
-                        :                                +- * Sort (25)
-                        :                                   +- * HashAggregate (24)
-                        :                                      +- Exchange (23)
-                        :                                         +- * HashAggregate (22)
-                        :                                            +- * Project (21)
-                        :                                               +- * BroadcastHashJoin Inner BuildRight (20)
-                        :                                                  :- * Project (18)
-                        :                                                  :  +- * BroadcastHashJoin Inner BuildRight (17)
-                        :                                                  :     :- * ColumnarToRow (12)
-                        :                                                  :     :  +- CometFilter (11)
-                        :                                                  :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
-                        :                                                  :     +- BroadcastExchange (16)
-                        :                                                  :        +- * ColumnarToRow (15)
-                        :                                                  :           +- CometFilter (14)
-                        :                                                  :              +- CometScan parquet spark_catalog.default.store (13)
-                        :                                                  +- ReusedExchange (19)
-                        :- * HashAggregate (41)
-                        :  +- Exchange (40)
-                        :     +- * HashAggregate (39)
-                        :        +- * HashAggregate (38)
-                        :           +- ReusedExchange (37)
-                        +- * HashAggregate (46)
-                           +- Exchange (45)
-                              +- * HashAggregate (44)
-                                 +- * HashAggregate (43)
-                                    +- ReusedExchange (42)
+TakeOrderedAndProject (59)
++- * Project (58)
+   +- Window (57)
+      +- * ColumnarToRow (56)
+         +- CometSort (55)
+            +- CometColumnarExchange (54)
+               +- CometHashAggregate (53)
+                  +- CometColumnarExchange (52)
+                     +- CometHashAggregate (51)
+                        +- CometUnion (50)
+                           :- CometHashAggregate (39)
+                           :  +- CometColumnarExchange (38)
+                           :     +- RowToColumnar (37)
+                           :        +- * HashAggregate (36)
+                           :           +- * Project (35)
+                           :              +- * BroadcastHashJoin Inner BuildRight (34)
+                           :                 :- * Project (6)
+                           :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
+                           :                 :     :- * ColumnarToRow (3)
+                           :                 :     :  +- CometFilter (2)
+                           :                 :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                           :                 :     +- ReusedExchange (4)
+                           :                 +- BroadcastExchange (33)
+                           :                    +- * BroadcastHashJoin LeftSemi BuildRight (32)
+                           :                       :- * ColumnarToRow (9)
+                           :                       :  +- CometFilter (8)
+                           :                       :     +- CometScan parquet spark_catalog.default.store (7)
+                           :                       +- BroadcastExchange (31)
+                           :                          +- * Project (30)
+                           :                             +- * Filter (29)
+                           :                                +- Window (28)
+                           :                                   +- * ColumnarToRow (27)
+                           :                                      +- CometSort (26)
+                           :                                         +- CometHashAggregate (25)
+                           :                                            +- CometColumnarExchange (24)
+                           :                                               +- RowToColumnar (23)
+                           :                                                  +- * HashAggregate (22)
+                           :                                                     +- * Project (21)
+                           :                                                        +- * BroadcastHashJoin Inner BuildRight (20)
+                           :                                                           :- * Project (18)
+                           :                                                           :  +- * BroadcastHashJoin Inner BuildRight (17)
+                           :                                                           :     :- * ColumnarToRow (12)
+                           :                                                           :     :  +- CometFilter (11)
+                           :                                                           :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
+                           :                                                           :     +- BroadcastExchange (16)
+                           :                                                           :        +- * ColumnarToRow (15)
+                           :                                                           :           +- CometFilter (14)
+                           :                                                           :              +- CometScan parquet spark_catalog.default.store (13)
+                           :                                                           +- ReusedExchange (19)
+                           :- CometHashAggregate (44)
+                           :  +- CometColumnarExchange (43)
+                           :     +- CometHashAggregate (42)
+                           :        +- CometHashAggregate (41)
+                           :           +- ReusedExchange (40)
+                           +- CometHashAggregate (49)
+                              +- CometColumnarExchange (48)
+                                 +- CometHashAggregate (47)
+                                    +- CometHashAggregate (46)
+                                       +- ReusedExchange (45)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -71,7 +75,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 8]
 Input [3]: [ss_store_sk#1, ss_net_profit#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 60]
+(4) ReusedExchange [Reuses operator id: 64]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 8]
@@ -141,7 +145,7 @@ Join condition: None
 Output [3]: [ss_net_profit#10, ss_sold_date_sk#11, s_state#14]
 Input [5]: [ss_store_sk#9, ss_net_profit#10, ss_sold_date_sk#11, s_store_sk#13, s_state#14]
 
-(19) ReusedExchange [Reuses operator id: 60]
+(19) ReusedExchange [Reuses operator id: 64]
 Output [1]: [d_date_sk#15]
 
 (20) BroadcastHashJoin [codegen id : 4]
@@ -161,200 +165,195 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#10))]
 Aggregate Attributes [1]: [sum#16]
 Results [2]: [s_state#14, sum#17]
 
-(23) Exchange
+(23) RowToColumnar
 Input [2]: [s_state#14, sum#17]
-Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(24) HashAggregate [codegen id : 5]
+(24) CometColumnarExchange
+Input [2]: [s_state#14, sum#17]
+Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(25) CometHashAggregate
 Input [2]: [s_state#14, sum#17]
 Keys [1]: [s_state#14]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#10))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#10))#18]
-Results [3]: [s_state#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#10))#18,17,2) AS _w0#19, s_state#14]
 
-(25) Sort [codegen id : 5]
-Input [3]: [s_state#14, _w0#19, s_state#14]
-Arguments: [s_state#14 ASC NULLS FIRST, _w0#19 DESC NULLS LAST], false, 0
+(26) CometSort
+Input [3]: [s_state#14, _w0#18, s_state#14]
+Arguments: [s_state#14, _w0#18, s_state#14], [s_state#14 ASC NULLS FIRST, _w0#18 DESC NULLS LAST]
+
+(27) ColumnarToRow [codegen id : 5]
+Input [3]: [s_state#14, _w0#18, s_state#14]
 
-(26) Window
-Input [3]: [s_state#14, _w0#19, s_state#14]
-Arguments: [rank(_w0#19) windowspecdefinition(s_state#14, _w0#19 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#20], [s_state#14], [_w0#19 DESC NULLS LAST]
+(28) Window
+Input [3]: [s_state#14, _w0#18, s_state#14]
+Arguments: [rank(_w0#18) windowspecdefinition(s_state#14, _w0#18 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#19], [s_state#14], [_w0#18 DESC NULLS LAST]
 
-(27) Filter [codegen id : 6]
-Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
-Condition : (ranking#20 <= 5)
+(29) Filter [codegen id : 6]
+Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
+Condition : (ranking#19 <= 5)
 
-(28) Project [codegen id : 6]
+(30) Project [codegen id : 6]
 Output [1]: [s_state#14]
-Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
+Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
 
-(29) BroadcastExchange
+(31) BroadcastExchange
 Input [1]: [s_state#14]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=3]
 
-(30) BroadcastHashJoin [codegen id : 7]
+(32) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [s_state#8]
 Right keys [1]: [s_state#14]
 Join type: LeftSemi
 Join condition: None
 
-(31) BroadcastExchange
+(33) BroadcastExchange
 Input [3]: [s_store_sk#6, s_county#7, s_state#8]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(32) BroadcastHashJoin [codegen id : 8]
+(34) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_store_sk#1]
 Right keys [1]: [s_store_sk#6]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 8]
+(35) Project [codegen id : 8]
 Output [3]: [ss_net_profit#2, s_county#7, s_state#8]
 Input [5]: [ss_store_sk#1, ss_net_profit#2, s_store_sk#6, s_county#7, s_state#8]
 
-(34) HashAggregate [codegen id : 8]
+(36) HashAggregate [codegen id : 8]
 Input [3]: [ss_net_profit#2, s_county#7, s_state#8]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum#21]
-Results [3]: [s_state#8, s_county#7, sum#22]
+Aggregate Attributes [1]: [sum#20]
+Results [3]: [s_state#8, s_county#7, sum#21]
 
-(35) Exchange
-Input [3]: [s_state#8, s_county#7, sum#22]
-Arguments: hashpartitioning(s_state#8, s_county#7, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(37) RowToColumnar
+Input [3]: [s_state#8, s_county#7, sum#21]
 
-(36) HashAggregate [codegen id : 9]
-Input [3]: [s_state#8, s_county#7, sum#22]
+(38) CometColumnarExchange
+Input [3]: [s_state#8, s_county#7, sum#21]
+Arguments: hashpartitioning(s_state#8, s_county#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(39) CometHashAggregate
+Input [3]: [s_state#8, s_county#7, sum#21]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#23]
-Results [6]: [cast(MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#23,17,2) as decimal(27,2)) AS total_sum#24, s_state#8, s_county#7, 0 AS g_state#25, 0 AS g_county#26, 0 AS lochierarchy#27]
 
-(37) ReusedExchange [Reuses operator id: 35]
-Output [3]: [s_state#8, s_county#7, sum#28]
+(40) ReusedExchange [Reuses operator id: 38]
+Output [3]: [s_state#8, s_county#7, sum#22]
 
-(38) HashAggregate [codegen id : 18]
-Input [3]: [s_state#8, s_county#7, sum#28]
+(41) CometHashAggregate
+Input [3]: [s_state#8, s_county#7, sum#22]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#23]
-Results [2]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#23,17,2) AS total_sum#29, s_state#8]
 
-(39) HashAggregate [codegen id : 18]
-Input [2]: [total_sum#29, s_state#8]
+(42) CometHashAggregate
+Input [2]: [total_sum#23, s_state#8]
 Keys [1]: [s_state#8]
-Functions [1]: [partial_sum(total_sum#29)]
-Aggregate Attributes [2]: [sum#30, isEmpty#31]
-Results [3]: [s_state#8, sum#32, isEmpty#33]
+Functions [1]: [partial_sum(total_sum#23)]
 
-(40) Exchange
-Input [3]: [s_state#8, sum#32, isEmpty#33]
-Arguments: hashpartitioning(s_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(43) CometColumnarExchange
+Input [3]: [s_state#8, sum#24, isEmpty#25]
+Arguments: hashpartitioning(s_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
 
-(41) HashAggregate [codegen id : 19]
-Input [3]: [s_state#8, sum#32, isEmpty#33]
+(44) CometHashAggregate
+Input [3]: [s_state#8, sum#24, isEmpty#25]
 Keys [1]: [s_state#8]
-Functions [1]: [sum(total_sum#29)]
-Aggregate Attributes [1]: [sum(total_sum#29)#34]
-Results [6]: [sum(total_sum#29)#34 AS total_sum#35, s_state#8, null AS s_county#36, 0 AS g_state#37, 1 AS g_county#38, 1 AS lochierarchy#39]
+Functions [1]: [sum(total_sum#23)]
 
-(42) ReusedExchange [Reuses operator id: 35]
-Output [3]: [s_state#8, s_county#7, sum#40]
+(45) ReusedExchange [Reuses operator id: 38]
+Output [3]: [s_state#8, s_county#7, sum#26]
 
-(43) HashAggregate [codegen id : 28]
-Input [3]: [s_state#8, s_county#7, sum#40]
+(46) CometHashAggregate
+Input [3]: [s_state#8, s_county#7, sum#26]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#23]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#23,17,2) AS total_sum#29]
 
-(44) HashAggregate [codegen id : 28]
-Input [1]: [total_sum#29]
+(47) CometHashAggregate
+Input [1]: [total_sum#23]
 Keys: []
-Functions [1]: [partial_sum(total_sum#29)]
-Aggregate Attributes [2]: [sum#41, isEmpty#42]
-Results [2]: [sum#43, isEmpty#44]
+Functions [1]: [partial_sum(total_sum#23)]
 
-(45) Exchange
-Input [2]: [sum#43, isEmpty#44]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
+(48) CometColumnarExchange
+Input [2]: [sum#27, isEmpty#28]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(46) HashAggregate [codegen id : 29]
-Input [2]: [sum#43, isEmpty#44]
+(49) CometHashAggregate
+Input [2]: [sum#27, isEmpty#28]
 Keys: []
-Functions [1]: [sum(total_sum#29)]
-Aggregate Attributes [1]: [sum(total_sum#29)#45]
-Results [6]: [sum(total_sum#29)#45 AS total_sum#46, null AS s_state#47, null AS s_county#48, 1 AS g_state#49, 1 AS g_county#50, 2 AS lochierarchy#51]
+Functions [1]: [sum(total_sum#23)]
 
-(47) Union
+(50) CometUnion
+Child 0 Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
+Child 1 Input [6]: [total_sum#33, s_state#8, s_county#34, g_state#35, g_county#36, lochierarchy#37]
+Child 2 Input [6]: [total_sum#38, s_state#39, s_county#40, g_state#41, g_county#42, lochierarchy#43]
 
-(48) HashAggregate [codegen id : 30]
-Input [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
-Keys [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
+(51) CometHashAggregate
+Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
+Keys [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
 Functions: []
-Aggregate Attributes: []
-Results [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
 
-(49) Exchange
-Input [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
-Arguments: hashpartitioning(total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+(52) CometColumnarExchange
+Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
+Arguments: hashpartitioning(total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(50) HashAggregate [codegen id : 31]
-Input [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
-Keys [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
+(53) CometHashAggregate
+Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
+Keys [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, CASE WHEN (g_county#26 = 0) THEN s_state#8 END AS _w0#52]
 
-(51) Exchange
-Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52]
-Arguments: hashpartitioning(lochierarchy#27, _w0#52, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(54) CometColumnarExchange
+Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
+Arguments: hashpartitioning(lochierarchy#32, _w0#44, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(55) CometSort
+Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
+Arguments: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44], [lochierarchy#32 ASC NULLS FIRST, _w0#44 ASC NULLS FIRST, total_sum#29 DESC NULLS LAST]
 
-(52) Sort [codegen id : 32]
-Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52]
-Arguments: [lochierarchy#27 ASC NULLS FIRST, _w0#52 ASC NULLS FIRST, total_sum#24 DESC NULLS LAST], false, 0
+(56) ColumnarToRow [codegen id : 25]
+Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
 
-(53) Window
-Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52]
-Arguments: [rank(total_sum#24) windowspecdefinition(lochierarchy#27, _w0#52, total_sum#24 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#53], [lochierarchy#27, _w0#52], [total_sum#24 DESC NULLS LAST]
+(57) Window
+Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
+Arguments: [rank(total_sum#29) windowspecdefinition(lochierarchy#32, _w0#44, total_sum#29 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#45], [lochierarchy#32, _w0#44], [total_sum#29 DESC NULLS LAST]
 
-(54) Project [codegen id : 33]
-Output [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, rank_within_parent#53]
-Input [6]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52, rank_within_parent#53]
+(58) Project [codegen id : 26]
+Output [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, rank_within_parent#45]
+Input [6]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44, rank_within_parent#45]
 
-(55) TakeOrderedAndProject
-Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, rank_within_parent#53]
-Arguments: 100, [lochierarchy#27 DESC NULLS LAST, CASE WHEN (lochierarchy#27 = 0) THEN s_state#8 END ASC NULLS FIRST, rank_within_parent#53 ASC NULLS FIRST], [total_sum#24, s_state#8, s_county#7, lochierarchy#27, rank_within_parent#53]
+(59) TakeOrderedAndProject
+Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, rank_within_parent#45]
+Arguments: 100, [lochierarchy#32 DESC NULLS LAST, CASE WHEN (lochierarchy#32 = 0) THEN s_state#8 END ASC NULLS FIRST, rank_within_parent#45 ASC NULLS FIRST], [total_sum#29, s_state#8, s_county#7, lochierarchy#32, rank_within_parent#45]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (60)
-+- * ColumnarToRow (59)
-   +- CometProject (58)
-      +- CometFilter (57)
-         +- CometScan parquet spark_catalog.default.date_dim (56)
+BroadcastExchange (64)
++- * ColumnarToRow (63)
+   +- CometProject (62)
+      +- CometFilter (61)
+         +- CometScan parquet spark_catalog.default.date_dim (60)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#54]
+Output [2]: [d_date_sk#5, d_month_seq#46]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(57) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#54]
-Condition : (((isnotnull(d_month_seq#54) AND (d_month_seq#54 >= 1212)) AND (d_month_seq#54 <= 1223)) AND isnotnull(d_date_sk#5))
+(61) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#46]
+Condition : (((isnotnull(d_month_seq#46) AND (d_month_seq#46 >= 1212)) AND (d_month_seq#46 <= 1223)) AND isnotnull(d_date_sk#5))
 
-(58) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#54]
+(62) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#46]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(59) ColumnarToRow [codegen id : 1]
+(63) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(60) BroadcastExchange
+(64) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=10]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt
index 663f828f46..4719e8ea07 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt
@@ -1,99 +1,89 @@
 TakeOrderedAndProject [lochierarchy,s_state,rank_within_parent,total_sum,s_county]
-  WholeStageCodegen (33)
+  WholeStageCodegen (26)
     Project [total_sum,s_state,s_county,lochierarchy,rank_within_parent]
       InputAdapter
         Window [total_sum,lochierarchy,_w0]
-          WholeStageCodegen (32)
-            Sort [lochierarchy,_w0,total_sum]
+          WholeStageCodegen (25)
+            ColumnarToRow
               InputAdapter
-                Exchange [lochierarchy,_w0] #1
-                  WholeStageCodegen (31)
-                    HashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy] [_w0]
-                      InputAdapter
-                        Exchange [total_sum,s_state,s_county,g_state,g_county,lochierarchy] #2
-                          WholeStageCodegen (30)
-                            HashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (9)
-                                    HashAggregate [s_state,s_county,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,g_state,g_county,lochierarchy,sum]
-                                      InputAdapter
-                                        Exchange [s_state,s_county] #3
-                                          WholeStageCodegen (8)
-                                            HashAggregate [s_state,s_county,ss_net_profit] [sum,sum]
-                                              Project [ss_net_profit,s_county,s_state]
-                                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                  Project [ss_store_sk,ss_net_profit]
-                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [ss_store_sk]
-                                                            CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                                              SubqueryBroadcast [d_date_sk] #1
-                                                                BroadcastExchange #4
-                                                                  WholeStageCodegen (1)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [d_date_sk]
-                                                                          CometFilter [d_month_seq,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                                      InputAdapter
-                                                        ReusedExchange [d_date_sk] #4
+                CometSort [lochierarchy,_w0,total_sum]
+                  CometColumnarExchange [lochierarchy,_w0] #1
+                    CometHashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy]
+                      CometColumnarExchange [total_sum,s_state,s_county,g_state,g_county,lochierarchy] #2
+                        CometHashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy]
+                          CometUnion
+                            CometHashAggregate [s_state,s_county,sum]
+                              CometColumnarExchange [s_state,s_county] #3
+                                RowToColumnar
+                                  WholeStageCodegen (8)
+                                    HashAggregate [s_state,s_county,ss_net_profit] [sum,sum]
+                                      Project [ss_net_profit,s_county,s_state]
+                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                          Project [ss_store_sk,ss_net_profit]
+                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_store_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #4
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_month_seq,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #4
+                                          InputAdapter
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (7)
+                                                BroadcastHashJoin [s_state,s_state]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county,s_state]
                                                   InputAdapter
-                                                    BroadcastExchange #5
-                                                      WholeStageCodegen (7)
-                                                        BroadcastHashJoin [s_state,s_state]
-                                                          ColumnarToRow
+                                                    BroadcastExchange #6
+                                                      WholeStageCodegen (6)
+                                                        Project [s_state]
+                                                          Filter [ranking]
                                                             InputAdapter
-                                                              CometFilter [s_store_sk]
-                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county,s_state]
-                                                          InputAdapter
-                                                            BroadcastExchange #6
-                                                              WholeStageCodegen (6)
-                                                                Project [s_state]
-                                                                  Filter [ranking]
+                                                              Window [_w0,s_state]
+                                                                WholeStageCodegen (5)
+                                                                  ColumnarToRow
                                                                     InputAdapter
-                                                                      Window [_w0,s_state]
-                                                                        WholeStageCodegen (5)
-                                                                          Sort [s_state,_w0]
-                                                                            HashAggregate [sum] [sum(UnscaledValue(ss_net_profit)),_w0,s_state,sum]
-                                                                              InputAdapter
-                                                                                Exchange [s_state] #7
-                                                                                  WholeStageCodegen (4)
-                                                                                    HashAggregate [s_state,ss_net_profit] [sum,sum]
-                                                                                      Project [ss_net_profit,s_state]
-                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                          Project [ss_net_profit,ss_sold_date_sk,s_state]
-                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                              ColumnarToRow
-                                                                                                InputAdapter
-                                                                                                  CometFilter [ss_store_sk]
-                                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                                                                                      ReusedSubquery [d_date_sk] #1
-                                                                                              InputAdapter
-                                                                                                BroadcastExchange #8
-                                                                                                  WholeStageCodegen (2)
-                                                                                                    ColumnarToRow
-                                                                                                      InputAdapter
-                                                                                                        CometFilter [s_store_sk]
-                                                                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                                                                      CometSort [s_state,_w0]
+                                                                        CometHashAggregate [s_state,sum]
+                                                                          CometColumnarExchange [s_state] #7
+                                                                            RowToColumnar
+                                                                              WholeStageCodegen (4)
+                                                                                HashAggregate [s_state,ss_net_profit] [sum,sum]
+                                                                                  Project [ss_net_profit,s_state]
+                                                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                      Project [ss_net_profit,ss_sold_date_sk,s_state]
+                                                                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometFilter [ss_store_sk]
+                                                                                                CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                                                                                  ReusedSubquery [d_date_sk] #1
                                                                                           InputAdapter
-                                                                                            ReusedExchange [d_date_sk] #4
-                                  WholeStageCodegen (19)
-                                    HashAggregate [s_state,sum,isEmpty] [sum(total_sum),total_sum,s_county,g_state,g_county,lochierarchy,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [s_state] #9
-                                          WholeStageCodegen (18)
-                                            HashAggregate [s_state,total_sum] [sum,isEmpty,sum,isEmpty]
-                                              HashAggregate [s_state,s_county,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,sum]
-                                                InputAdapter
-                                                  ReusedExchange [s_state,s_county,sum] #3
-                                  WholeStageCodegen (29)
-                                    HashAggregate [sum,isEmpty] [sum(total_sum),total_sum,s_state,s_county,g_state,g_county,lochierarchy,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange #10
-                                          WholeStageCodegen (28)
-                                            HashAggregate [total_sum] [sum,isEmpty,sum,isEmpty]
-                                              HashAggregate [s_state,s_county,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,sum]
-                                                InputAdapter
-                                                  ReusedExchange [s_state,s_county,sum] #3
+                                                                                            BroadcastExchange #8
+                                                                                              WholeStageCodegen (2)
+                                                                                                ColumnarToRow
+                                                                                                  InputAdapter
+                                                                                                    CometFilter [s_store_sk]
+                                                                                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                                                                                      InputAdapter
+                                                                                        ReusedExchange [d_date_sk] #4
+                            CometHashAggregate [s_state,sum,isEmpty]
+                              CometColumnarExchange [s_state] #9
+                                CometHashAggregate [s_state,total_sum]
+                                  CometHashAggregate [s_state,s_county,sum]
+                                    ReusedExchange [s_state,s_county,sum] #3
+                            CometHashAggregate [sum,isEmpty]
+                              CometColumnarExchange #10
+                                CometHashAggregate [total_sum]
+                                  CometHashAggregate [s_state,s_county,sum]
+                                    ReusedExchange [s_state,s_county,sum] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt
index 46b9e51d5e..9fe23081f5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt
@@ -1,74 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (70)
-+- * HashAggregate (69)
-   +- Exchange (68)
-      +- * HashAggregate (67)
-         +- * Project (66)
-            +- * SortMergeJoin LeftOuter (65)
-               :- * Sort (58)
-               :  +- Exchange (57)
-               :     +- * Project (56)
-               :        +- * BroadcastHashJoin LeftOuter BuildRight (55)
-               :           :- * Project (50)
-               :           :  +- * BroadcastHashJoin Inner BuildRight (49)
-               :           :     :- * Project (44)
-               :           :     :  +- * BroadcastHashJoin Inner BuildRight (43)
-               :           :     :     :- * Project (38)
-               :           :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-               :           :     :     :     :- * Project (35)
-               :           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-               :           :     :     :     :     :- * Project (28)
-               :           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
-               :           :     :     :     :     :     :- * Project (21)
-               :           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :           :     :     :     :     :     :     :- * Project (15)
-               :           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :           :     :     :     :     :     :     :     :- * Project (9)
-               :           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :           :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
-               :           :     :     :     :     :     :     :     :     :  +- CometFilter (2)
-               :           :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :           :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
-               :           :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
-               :           :     :     :     :     :     :     :     :           +- CometFilter (5)
-               :           :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
-               :           :     :     :     :     :     :     :     +- BroadcastExchange (13)
-               :           :     :     :     :     :     :     :        +- * ColumnarToRow (12)
-               :           :     :     :     :     :     :     :           +- CometFilter (11)
-               :           :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
-               :           :     :     :     :     :     :     +- BroadcastExchange (19)
-               :           :     :     :     :     :     :        +- * ColumnarToRow (18)
-               :           :     :     :     :     :     :           +- CometFilter (17)
-               :           :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
-               :           :     :     :     :     :     +- BroadcastExchange (26)
-               :           :     :     :     :     :        +- * ColumnarToRow (25)
-               :           :     :     :     :     :           +- CometProject (24)
-               :           :     :     :     :     :              +- CometFilter (23)
-               :           :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
-               :           :     :     :     :     +- BroadcastExchange (33)
-               :           :     :     :     :        +- * ColumnarToRow (32)
-               :           :     :     :     :           +- CometProject (31)
-               :           :     :     :     :              +- CometFilter (30)
-               :           :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
-               :           :     :     :     +- ReusedExchange (36)
-               :           :     :     +- BroadcastExchange (42)
-               :           :     :        +- * ColumnarToRow (41)
-               :           :     :           +- CometFilter (40)
-               :           :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
-               :           :     +- BroadcastExchange (48)
-               :           :        +- * ColumnarToRow (47)
-               :           :           +- CometFilter (46)
-               :           :              +- CometScan parquet spark_catalog.default.date_dim (45)
-               :           +- BroadcastExchange (54)
-               :              +- * ColumnarToRow (53)
-               :                 +- CometFilter (52)
-               :                    +- CometScan parquet spark_catalog.default.promotion (51)
-               +- * ColumnarToRow (64)
-                  +- CometSort (63)
-                     +- CometExchange (62)
-                        +- CometProject (61)
-                           +- CometFilter (60)
-                              +- CometScan parquet spark_catalog.default.catalog_returns (59)
+* ColumnarToRow (71)
++- CometTakeOrderedAndProject (70)
+   +- CometHashAggregate (69)
+      +- CometColumnarExchange (68)
+         +- CometHashAggregate (67)
+            +- CometProject (66)
+               +- CometSortMergeJoin (65)
+                  :- CometSort (59)
+                  :  +- CometColumnarExchange (58)
+                  :     +- RowToColumnar (57)
+                  :        +- * Project (56)
+                  :           +- * BroadcastHashJoin LeftOuter BuildRight (55)
+                  :              :- * Project (50)
+                  :              :  +- * BroadcastHashJoin Inner BuildRight (49)
+                  :              :     :- * Project (44)
+                  :              :     :  +- * BroadcastHashJoin Inner BuildRight (43)
+                  :              :     :     :- * Project (38)
+                  :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+                  :              :     :     :     :- * Project (35)
+                  :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+                  :              :     :     :     :     :- * Project (28)
+                  :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
+                  :              :     :     :     :     :     :- * Project (21)
+                  :              :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+                  :              :     :     :     :     :     :     :- * Project (15)
+                  :              :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :              :     :     :     :     :     :     :     :- * Project (9)
+                  :              :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :              :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
+                  :              :     :     :     :     :     :     :     :     :  +- CometFilter (2)
+                  :              :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                  :              :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
+                  :              :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
+                  :              :     :     :     :     :     :     :     :           +- CometFilter (5)
+                  :              :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
+                  :              :     :     :     :     :     :     :     +- BroadcastExchange (13)
+                  :              :     :     :     :     :     :     :        +- * ColumnarToRow (12)
+                  :              :     :     :     :     :     :     :           +- CometFilter (11)
+                  :              :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
+                  :              :     :     :     :     :     :     +- BroadcastExchange (19)
+                  :              :     :     :     :     :     :        +- * ColumnarToRow (18)
+                  :              :     :     :     :     :     :           +- CometFilter (17)
+                  :              :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
+                  :              :     :     :     :     :     +- BroadcastExchange (26)
+                  :              :     :     :     :     :        +- * ColumnarToRow (25)
+                  :              :     :     :     :     :           +- CometProject (24)
+                  :              :     :     :     :     :              +- CometFilter (23)
+                  :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
+                  :              :     :     :     :     +- BroadcastExchange (33)
+                  :              :     :     :     :        +- * ColumnarToRow (32)
+                  :              :     :     :     :           +- CometProject (31)
+                  :              :     :     :     :              +- CometFilter (30)
+                  :              :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
+                  :              :     :     :     +- ReusedExchange (36)
+                  :              :     :     +- BroadcastExchange (42)
+                  :              :     :        +- * ColumnarToRow (41)
+                  :              :     :           +- CometFilter (40)
+                  :              :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
+                  :              :     +- BroadcastExchange (48)
+                  :              :        +- * ColumnarToRow (47)
+                  :              :           +- CometFilter (46)
+                  :              :              +- CometScan parquet spark_catalog.default.date_dim (45)
+                  :              +- BroadcastExchange (54)
+                  :                 +- * ColumnarToRow (53)
+                  :                    +- CometFilter (52)
+                  :                       +- CometScan parquet spark_catalog.default.promotion (51)
+                  +- CometSort (64)
+                     +- CometColumnarExchange (63)
+                        +- CometProject (62)
+                           +- CometFilter (61)
+                              +- CometScan parquet spark_catalog.default.catalog_returns (60)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -235,7 +236,7 @@ Join condition: None
 Output [8]: [cs_ship_date_sk#1, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17]
 Input [10]: [cs_ship_date_sk#1, cs_bill_hdemo_sk#3, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17, hd_demo_sk#20]
 
-(36) ReusedExchange [Reuses operator id: 75]
+(36) ReusedExchange [Reuses operator id: 76]
 Output [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
 (37) BroadcastHashJoin [codegen id : 10]
@@ -332,13 +333,16 @@ Join condition: None
 Output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Input [7]: [cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, p_promo_sk#29]
 
-(57) Exchange
+(57) RowToColumnar
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(58) Sort [codegen id : 11]
+(58) CometColumnarExchange
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(59) CometSort
+Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+Arguments: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
@@ -347,86 +351,81 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(60) CometFilter
+(61) CometFilter
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Condition : (isnotnull(cr_item_sk#30) AND isnotnull(cr_order_number#31))
 
-(61) CometProject
+(62) CometProject
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30, cr_order_number#31]
 
-(62) CometExchange
+(63) CometColumnarExchange
 Input [2]: [cr_item_sk#30, cr_order_number#31]
-Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=10]
+Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(63) CometSort
+(64) CometSort
 Input [2]: [cr_item_sk#30, cr_order_number#31]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30 ASC NULLS FIRST, cr_order_number#31 ASC NULLS FIRST]
 
-(64) ColumnarToRow [codegen id : 12]
-Input [2]: [cr_item_sk#30, cr_order_number#31]
+(65) CometSortMergeJoin
+Left output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+Right output [2]: [cr_item_sk#30, cr_order_number#31]
+Arguments: [cs_item_sk#4, cs_order_number#6], [cr_item_sk#30, cr_order_number#31], LeftOuter
 
-(65) SortMergeJoin [codegen id : 13]
-Left keys [2]: [cs_item_sk#4, cs_order_number#6]
-Right keys [2]: [cr_item_sk#30, cr_order_number#31]
-Join type: LeftOuter
-Join condition: None
-
-(66) Project [codegen id : 13]
-Output [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+(66) CometProject
 Input [7]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, cr_item_sk#30, cr_order_number#31]
+Arguments: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 
-(67) HashAggregate [codegen id : 13]
+(67) CometHashAggregate
 Input [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#33]
-Results [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
 
-(68) Exchange
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
-Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(68) CometColumnarExchange
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
+Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(69) HashAggregate [codegen id : 14]
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
+(69) CometHashAggregate
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [count(1)]
-Aggregate Attributes [1]: [count(1)#35]
-Results [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count(1)#35 AS no_promo#36, count(1)#35 AS promo#37, count(1)#35 AS total_cnt#38]
 
-(70) TakeOrderedAndProject
-Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
-Arguments: 100, [total_cnt#38 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
+(70) CometTakeOrderedAndProject
+Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_cnt#36 DESC NULLS LAST,i_item_desc#17 ASC NULLS FIRST,w_warehouse_name#15 ASC NULLS FIRST,d_week_seq#24 ASC NULLS FIRST], output=[i_item_desc#17,w_warehouse_name#15,d_week_seq#24,no_promo#34,promo#35,total_cnt#36]), 100, [total_cnt#36 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
+
+(71) ColumnarToRow [codegen id : 11]
+Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometProject (73)
-      +- CometFilter (72)
-         +- CometScan parquet spark_catalog.default.date_dim (71)
+BroadcastExchange (76)
++- * ColumnarToRow (75)
+   +- CometProject (74)
+      +- CometFilter (73)
+         +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
+Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk), IsNotNull(d_week_seq), IsNotNull(d_date)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_week_seq:int,d_year:int>
 
-(72) CometFilter
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
-Condition : ((((isnotnull(d_year#39) AND (d_year#39 = 2001)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
+(73) CometFilter
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
+Condition : ((((isnotnull(d_year#37) AND (d_year#37 = 2001)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
 
-(73) CometProject
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
+(74) CometProject
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
 Arguments: [d_date_sk#22, d_date#23, d_week_seq#24], [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(74) ColumnarToRow [codegen id : 1]
+(75) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(75) BroadcastExchange
+(76) BroadcastExchange
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt
index 5eb8ea5275..5bf7ab343a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt
@@ -1,114 +1,108 @@
-TakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
-  WholeStageCodegen (14)
-    HashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count] [count(1),no_promo,promo,total_cnt,count]
-      InputAdapter
-        Exchange [i_item_desc,w_warehouse_name,d_week_seq] #1
-          WholeStageCodegen (13)
-            HashAggregate [i_item_desc,w_warehouse_name,d_week_seq] [count,count]
-              Project [w_warehouse_name,i_item_desc,d_week_seq]
-                SortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                  InputAdapter
-                    WholeStageCodegen (11)
-                      Sort [cs_item_sk,cs_order_number]
-                        InputAdapter
-                          Exchange [cs_item_sk,cs_order_number] #2
-                            WholeStageCodegen (10)
-                              Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                                BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                                  Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                                    BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
-                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                        BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
-                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                              Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
-                                                  Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                    BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                        BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
-                                                            BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                                              Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
-                                                                BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
-                                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
-                                                                          SubqueryBroadcast [d_date_sk] #1
-                                                                            BroadcastExchange #3
-                                                                              WholeStageCodegen (1)
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometProject [d_date_sk,d_date,d_week_seq]
-                                                                                      CometFilter [d_year,d_date_sk,d_week_seq,d_date]
-                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
-                                                                  InputAdapter
-                                                                    BroadcastExchange #4
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
-                                                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+WholeStageCodegen (11)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
+        CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count]
+          CometColumnarExchange [i_item_desc,w_warehouse_name,d_week_seq] #1
+            CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq]
+              CometProject [w_warehouse_name,i_item_desc,d_week_seq]
+                CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                  CometSort [cs_item_sk,cs_order_number]
+                    CometColumnarExchange [cs_item_sk,cs_order_number] #2
+                      RowToColumnar
+                        WholeStageCodegen (10)
+                          Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                            BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                              Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                                BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
+                                  Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                    BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
+                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                            BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
+                                              Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                                  Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
+                                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
+                                                            BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
+                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
+                                                                      SubqueryBroadcast [d_date_sk] #1
+                                                                        BroadcastExchange #3
+                                                                          WholeStageCodegen (1)
+                                                                            ColumnarToRow
+                                                                              InputAdapter
+                                                                                CometProject [d_date_sk,d_date,d_week_seq]
+                                                                                  CometFilter [d_year,d_date_sk,d_week_seq,d_date]
+                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
                                                               InputAdapter
-                                                                BroadcastExchange #5
-                                                                  WholeStageCodegen (2)
+                                                                BroadcastExchange #4
+                                                                  WholeStageCodegen (1)
                                                                     ColumnarToRow
                                                                       InputAdapter
-                                                                        CometFilter [w_warehouse_sk]
-                                                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                                                        CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
+                                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
                                                           InputAdapter
-                                                            BroadcastExchange #6
-                                                              WholeStageCodegen (3)
+                                                            BroadcastExchange #5
+                                                              WholeStageCodegen (2)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [i_item_sk]
-                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                                                                    CometFilter [w_warehouse_sk]
+                                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                                                       InputAdapter
-                                                        BroadcastExchange #7
-                                                          WholeStageCodegen (4)
+                                                        BroadcastExchange #6
+                                                          WholeStageCodegen (3)
                                                             ColumnarToRow
                                                               InputAdapter
-                                                                CometProject [cd_demo_sk]
-                                                                  CometFilter [cd_marital_status,cd_demo_sk]
-                                                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                                CometFilter [i_item_sk]
+                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
                                                   InputAdapter
-                                                    BroadcastExchange #8
-                                                      WholeStageCodegen (5)
+                                                    BroadcastExchange #7
+                                                      WholeStageCodegen (4)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometProject [hd_demo_sk]
-                                                              CometFilter [hd_buy_potential,hd_demo_sk]
-                                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
+                                                            CometProject [cd_demo_sk]
+                                                              CometFilter [cd_marital_status,cd_demo_sk]
+                                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                               InputAdapter
-                                                ReusedExchange [d_date_sk,d_date,d_week_seq] #3
+                                                BroadcastExchange #8
+                                                  WholeStageCodegen (5)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [hd_demo_sk]
+                                                          CometFilter [hd_buy_potential,hd_demo_sk]
+                                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
                                           InputAdapter
-                                            BroadcastExchange #9
-                                              WholeStageCodegen (7)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [d_week_seq,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                            ReusedExchange [d_date_sk,d_date,d_week_seq] #3
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (8)
+                                        BroadcastExchange #9
+                                          WholeStageCodegen (7)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometFilter [d_date,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                CometFilter [d_week_seq,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
                                   InputAdapter
-                                    BroadcastExchange #11
-                                      WholeStageCodegen (9)
+                                    BroadcastExchange #10
+                                      WholeStageCodegen (8)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometFilter [p_promo_sk]
-                                              CometScan parquet spark_catalog.default.promotion [p_promo_sk]
-                  InputAdapter
-                    WholeStageCodegen (12)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [cr_item_sk,cr_order_number]
-                            CometExchange [cr_item_sk,cr_order_number] #12
-                              CometProject [cr_item_sk,cr_order_number]
-                                CometFilter [cr_item_sk,cr_order_number]
-                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                              InputAdapter
+                                BroadcastExchange #11
+                                  WholeStageCodegen (9)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [p_promo_sk]
+                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                  CometSort [cr_item_sk,cr_order_number]
+                    CometColumnarExchange [cr_item_sk,cr_order_number] #12
+                      CometProject [cr_item_sk,cr_order_number]
+                        CometFilter [cr_item_sk,cr_order_number]
+                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt
index 776fad0078..46315a3c4f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt
@@ -1,75 +1,83 @@
 == Physical Plan ==
-TakeOrderedAndProject (71)
-+- * Project (70)
-   +- * BroadcastHashJoin Inner BuildRight (69)
-      :- * Project (52)
-      :  +- * BroadcastHashJoin Inner BuildRight (51)
-      :     :- * BroadcastHashJoin Inner BuildRight (33)
-      :     :  :- * Filter (16)
-      :     :  :  +- * HashAggregate (15)
-      :     :  :     +- Exchange (14)
-      :     :  :        +- * HashAggregate (13)
-      :     :  :           +- * Project (12)
-      :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :  :                 :- * Project (9)
-      :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :  :                 :     :- * ColumnarToRow (3)
-      :     :  :                 :     :  +- CometFilter (2)
-      :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :  :                 :     +- BroadcastExchange (7)
-      :     :  :                 :        +- * ColumnarToRow (6)
-      :     :  :                 :           +- CometFilter (5)
-      :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :  :                 +- ReusedExchange (10)
-      :     :  +- BroadcastExchange (32)
-      :     :     +- * HashAggregate (31)
-      :     :        +- Exchange (30)
-      :     :           +- * HashAggregate (29)
-      :     :              +- * Project (28)
-      :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
-      :     :                    :- * Project (25)
-      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
-      :     :                    :     :- * ColumnarToRow (19)
-      :     :                    :     :  +- CometFilter (18)
-      :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
-      :     :                    :     +- BroadcastExchange (23)
-      :     :                    :        +- * ColumnarToRow (22)
-      :     :                    :           +- CometFilter (21)
-      :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
-      :     :                    +- ReusedExchange (26)
-      :     +- BroadcastExchange (50)
-      :        +- * Filter (49)
-      :           +- * HashAggregate (48)
-      :              +- Exchange (47)
-      :                 +- * HashAggregate (46)
-      :                    +- * Project (45)
-      :                       +- * BroadcastHashJoin Inner BuildRight (44)
-      :                          :- * Project (42)
-      :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
-      :                          :     :- * ColumnarToRow (36)
-      :                          :     :  +- CometFilter (35)
-      :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
-      :                          :     +- BroadcastExchange (40)
-      :                          :        +- * ColumnarToRow (39)
-      :                          :           +- CometFilter (38)
-      :                          :              +- CometScan parquet spark_catalog.default.web_sales (37)
-      :                          +- ReusedExchange (43)
-      +- BroadcastExchange (68)
-         +- * HashAggregate (67)
-            +- Exchange (66)
-               +- * HashAggregate (65)
-                  +- * Project (64)
-                     +- * BroadcastHashJoin Inner BuildRight (63)
-                        :- * Project (61)
-                        :  +- * BroadcastHashJoin Inner BuildRight (60)
-                        :     :- * ColumnarToRow (55)
-                        :     :  +- CometFilter (54)
-                        :     :     +- CometScan parquet spark_catalog.default.customer (53)
-                        :     +- BroadcastExchange (59)
-                        :        +- * ColumnarToRow (58)
-                        :           +- CometFilter (57)
-                        :              +- CometScan parquet spark_catalog.default.web_sales (56)
-                        +- ReusedExchange (62)
+TakeOrderedAndProject (79)
++- * Project (78)
+   +- * BroadcastHashJoin Inner BuildRight (77)
+      :- * Project (58)
+      :  +- * BroadcastHashJoin Inner BuildRight (57)
+      :     :- * BroadcastHashJoin Inner BuildRight (37)
+      :     :  :- * ColumnarToRow (18)
+      :     :  :  +- CometFilter (17)
+      :     :  :     +- CometHashAggregate (16)
+      :     :  :        +- CometColumnarExchange (15)
+      :     :  :           +- RowToColumnar (14)
+      :     :  :              +- * HashAggregate (13)
+      :     :  :                 +- * Project (12)
+      :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :  :                       :- * Project (9)
+      :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :  :                       :     :- * ColumnarToRow (3)
+      :     :  :                       :     :  +- CometFilter (2)
+      :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :  :                       :     +- BroadcastExchange (7)
+      :     :  :                       :        +- * ColumnarToRow (6)
+      :     :  :                       :           +- CometFilter (5)
+      :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :  :                       +- ReusedExchange (10)
+      :     :  +- BroadcastExchange (36)
+      :     :     +- * ColumnarToRow (35)
+      :     :        +- CometHashAggregate (34)
+      :     :           +- CometColumnarExchange (33)
+      :     :              +- RowToColumnar (32)
+      :     :                 +- * HashAggregate (31)
+      :     :                    +- * Project (30)
+      :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :                          :- * Project (27)
+      :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
+      :     :                          :     :- * ColumnarToRow (21)
+      :     :                          :     :  +- CometFilter (20)
+      :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
+      :     :                          :     +- BroadcastExchange (25)
+      :     :                          :        +- * ColumnarToRow (24)
+      :     :                          :           +- CometFilter (23)
+      :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
+      :     :                          +- ReusedExchange (28)
+      :     +- BroadcastExchange (56)
+      :        +- * ColumnarToRow (55)
+      :           +- CometFilter (54)
+      :              +- CometHashAggregate (53)
+      :                 +- CometColumnarExchange (52)
+      :                    +- RowToColumnar (51)
+      :                       +- * HashAggregate (50)
+      :                          +- * Project (49)
+      :                             +- * BroadcastHashJoin Inner BuildRight (48)
+      :                                :- * Project (46)
+      :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
+      :                                :     :- * ColumnarToRow (40)
+      :                                :     :  +- CometFilter (39)
+      :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
+      :                                :     +- BroadcastExchange (44)
+      :                                :        +- * ColumnarToRow (43)
+      :                                :           +- CometFilter (42)
+      :                                :              +- CometScan parquet spark_catalog.default.web_sales (41)
+      :                                +- ReusedExchange (47)
+      +- BroadcastExchange (76)
+         +- * ColumnarToRow (75)
+            +- CometHashAggregate (74)
+               +- CometColumnarExchange (73)
+                  +- RowToColumnar (72)
+                     +- * HashAggregate (71)
+                        +- * Project (70)
+                           +- * BroadcastHashJoin Inner BuildRight (69)
+                              :- * Project (67)
+                              :  +- * BroadcastHashJoin Inner BuildRight (66)
+                              :     :- * ColumnarToRow (61)
+                              :     :  +- CometFilter (60)
+                              :     :     +- CometScan parquet spark_catalog.default.customer (59)
+                              :     +- BroadcastExchange (65)
+                              :        +- * ColumnarToRow (64)
+                              :           +- CometFilter (63)
+                              :              +- CometScan parquet spark_catalog.default.web_sales (62)
+                              +- ReusedExchange (68)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -115,7 +123,7 @@ Join condition: None
 Output [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, ss_net_paid#6, ss_sold_date_sk#7]
 Input [7]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, ss_customer_sk#5, ss_net_paid#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 75]
+(10) ReusedExchange [Reuses operator id: 83]
 Output [2]: [d_date_sk#9, d_year#10]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -135,296 +143,312 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#6))]
 Aggregate Attributes [1]: [sum#11]
 Results [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 
-(14) Exchange
+(14) RowToColumnar
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 16]
+(15) CometColumnarExchange
+Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 Keys [4]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#6))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#6))#13]
-Results [2]: [c_customer_id#2 AS customer_id#14, MakeDecimal(sum(UnscaledValue(ss_net_paid#6))#13,17,2) AS year_total#15]
 
-(16) Filter [codegen id : 16]
-Input [2]: [customer_id#14, year_total#15]
-Condition : (isnotnull(year_total#15) AND (year_total#15 > 0.00))
+(17) CometFilter
+Input [2]: [customer_id#13, year_total#14]
+Condition : (isnotnull(year_total#14) AND (year_total#14 > 0.00))
+
+(18) ColumnarToRow [codegen id : 16]
+Input [2]: [customer_id#13, year_total#14]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
+Output [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(18) CometFilter
-Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
-Condition : (isnotnull(c_customer_sk#16) AND isnotnull(c_customer_id#17))
+(20) CometFilter
+Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
+Condition : (isnotnull(c_customer_sk#15) AND isnotnull(c_customer_id#16))
 
-(19) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
+(21) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+Output [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#22), dynamicpruningexpression(ss_sold_date_sk#22 IN dynamicpruning#23)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#21), dynamicpruningexpression(ss_sold_date_sk#21 IN dynamicpruning#22)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_net_paid:decimal(7,2)>
 
-(21) CometFilter
-Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
-Condition : isnotnull(ss_customer_sk#20)
+(23) CometFilter
+Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+Condition : isnotnull(ss_customer_sk#19)
 
-(22) ColumnarToRow [codegen id : 4]
-Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+(24) ColumnarToRow [codegen id : 4]
+Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 
-(23) BroadcastExchange
-Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+(25) BroadcastExchange
+Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#16]
-Right keys [1]: [ss_customer_sk#20]
+(26) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#15]
+Right keys [1]: [ss_customer_sk#19]
 Join type: Inner
 Join condition: None
 
-(25) Project [codegen id : 6]
-Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22]
-Input [7]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19, ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+(27) Project [codegen id : 6]
+Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21]
+Input [7]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18, ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
 
-(26) ReusedExchange [Reuses operator id: 79]
-Output [2]: [d_date_sk#24, d_year#25]
+(28) ReusedExchange [Reuses operator id: 87]
+Output [2]: [d_date_sk#23, d_year#24]
 
-(27) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#22]
-Right keys [1]: [d_date_sk#24]
+(29) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#21]
+Right keys [1]: [d_date_sk#23]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
-Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
-Input [7]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22, d_date_sk#24, d_year#25]
-
-(29) HashAggregate [codegen id : 6]
-Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
-Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
-Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#21))]
-Aggregate Attributes [1]: [sum#26]
-Results [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
-
-(30) Exchange
-Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
-Arguments: hashpartitioning(c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, 5), ENSURE_REQUIREMENTS, [plan_id=4]
-
-(31) HashAggregate [codegen id : 7]
-Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
-Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
-Functions [1]: [sum(UnscaledValue(ss_net_paid#21))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#21))#13]
-Results [4]: [c_customer_id#17 AS customer_id#28, c_first_name#18 AS customer_first_name#29, c_last_name#19 AS customer_last_name#30, MakeDecimal(sum(UnscaledValue(ss_net_paid#21))#13,17,2) AS year_total#31]
-
-(32) BroadcastExchange
-Input [4]: [customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31]
+(30) Project [codegen id : 6]
+Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
+Input [7]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21, d_date_sk#23, d_year#24]
+
+(31) HashAggregate [codegen id : 6]
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
+Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
+Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#20))]
+Aggregate Attributes [1]: [sum#25]
+Results [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+
+(32) RowToColumnar
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+
+(33) CometColumnarExchange
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+Arguments: hashpartitioning(c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+
+(34) CometHashAggregate
+Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
+Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
+Functions [1]: [sum(UnscaledValue(ss_net_paid#20))]
+
+(35) ColumnarToRow [codegen id : 7]
+Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
+
+(36) BroadcastExchange
+Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(33) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#14]
-Right keys [1]: [customer_id#28]
+(37) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#13]
+Right keys [1]: [customer_id#27]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
+Output [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(35) CometFilter
-Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
-Condition : (isnotnull(c_customer_sk#32) AND isnotnull(c_customer_id#33))
+(39) CometFilter
+Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
+Condition : (isnotnull(c_customer_sk#31) AND isnotnull(c_customer_id#32))
 
-(36) ColumnarToRow [codegen id : 10]
-Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
+(40) ColumnarToRow [codegen id : 10]
+Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+Output [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#38), dynamicpruningexpression(ws_sold_date_sk#38 IN dynamicpruning#39)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#37), dynamicpruningexpression(ws_sold_date_sk#37 IN dynamicpruning#38)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(38) CometFilter
-Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
-Condition : isnotnull(ws_bill_customer_sk#36)
+(42) CometFilter
+Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+Condition : isnotnull(ws_bill_customer_sk#35)
 
-(39) ColumnarToRow [codegen id : 8]
-Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+(43) ColumnarToRow [codegen id : 8]
+Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 
-(40) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+(44) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#32]
-Right keys [1]: [ws_bill_customer_sk#36]
+(45) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#31]
+Right keys [1]: [ws_bill_customer_sk#35]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
-Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38]
-Input [7]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35, ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+(46) Project [codegen id : 10]
+Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37]
+Input [7]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34, ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
 
-(43) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#40, d_year#41]
+(47) ReusedExchange [Reuses operator id: 83]
+Output [2]: [d_date_sk#39, d_year#40]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#38]
-Right keys [1]: [d_date_sk#40]
+(48) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#37]
+Right keys [1]: [d_date_sk#39]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
-Input [7]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38, d_date_sk#40, d_year#41]
-
-(46) HashAggregate [codegen id : 10]
-Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
-Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#37))]
-Aggregate Attributes [1]: [sum#42]
-Results [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
-
-(47) Exchange
-Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
-Arguments: hashpartitioning(c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, 5), ENSURE_REQUIREMENTS, [plan_id=7]
-
-(48) HashAggregate [codegen id : 11]
-Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
-Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#37))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#37))#44]
-Results [2]: [c_customer_id#33 AS customer_id#45, MakeDecimal(sum(UnscaledValue(ws_net_paid#37))#44,17,2) AS year_total#46]
-
-(49) Filter [codegen id : 11]
-Input [2]: [customer_id#45, year_total#46]
-Condition : (isnotnull(year_total#46) AND (year_total#46 > 0.00))
-
-(50) BroadcastExchange
-Input [2]: [customer_id#45, year_total#46]
+(49) Project [codegen id : 10]
+Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
+Input [7]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37, d_date_sk#39, d_year#40]
+
+(50) HashAggregate [codegen id : 10]
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
+Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#36))]
+Aggregate Attributes [1]: [sum#41]
+Results [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+
+(51) RowToColumnar
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+
+(52) CometColumnarExchange
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+Arguments: hashpartitioning(c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(53) CometHashAggregate
+Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
+Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#36))]
+
+(54) CometFilter
+Input [2]: [customer_id#43, year_total#44]
+Condition : (isnotnull(year_total#44) AND (year_total#44 > 0.00))
+
+(55) ColumnarToRow [codegen id : 11]
+Input [2]: [customer_id#43, year_total#44]
+
+(56) BroadcastExchange
+Input [2]: [customer_id#43, year_total#44]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(51) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#14]
-Right keys [1]: [customer_id#45]
+(57) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#13]
+Right keys [1]: [customer_id#43]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 16]
-Output [7]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46]
-Input [8]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, customer_id#45, year_total#46]
+(58) Project [codegen id : 16]
+Output [7]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44]
+Input [8]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, customer_id#43, year_total#44]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
+Output [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(54) CometFilter
-Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
-Condition : (isnotnull(c_customer_sk#47) AND isnotnull(c_customer_id#48))
+(60) CometFilter
+Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
+Condition : (isnotnull(c_customer_sk#45) AND isnotnull(c_customer_id#46))
 
-(55) ColumnarToRow [codegen id : 14]
-Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
+(61) ColumnarToRow [codegen id : 14]
+Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+Output [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(57) CometFilter
-Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
-Condition : isnotnull(ws_bill_customer_sk#51)
+(63) CometFilter
+Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+Condition : isnotnull(ws_bill_customer_sk#49)
 
-(58) ColumnarToRow [codegen id : 12]
-Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+(64) ColumnarToRow [codegen id : 12]
+Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 
-(59) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+(65) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#47]
-Right keys [1]: [ws_bill_customer_sk#51]
+(66) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#45]
+Right keys [1]: [ws_bill_customer_sk#49]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 14]
-Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53]
-Input [7]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50, ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+(67) Project [codegen id : 14]
+Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51]
+Input [7]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48, ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
 
-(62) ReusedExchange [Reuses operator id: 79]
-Output [2]: [d_date_sk#55, d_year#56]
+(68) ReusedExchange [Reuses operator id: 87]
+Output [2]: [d_date_sk#53, d_year#54]
 
-(63) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#53]
-Right keys [1]: [d_date_sk#55]
+(69) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#51]
+Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 14]
-Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
-Input [7]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56]
-
-(65) HashAggregate [codegen id : 14]
-Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
-Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#52))]
-Aggregate Attributes [1]: [sum#57]
-Results [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
-
-(66) Exchange
-Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
-Arguments: hashpartitioning(c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(67) HashAggregate [codegen id : 15]
-Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
-Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#52))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#52))#44]
-Results [2]: [c_customer_id#48 AS customer_id#59, MakeDecimal(sum(UnscaledValue(ws_net_paid#52))#44,17,2) AS year_total#60]
-
-(68) BroadcastExchange
-Input [2]: [customer_id#59, year_total#60]
+(70) Project [codegen id : 14]
+Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
+Input [7]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54]
+
+(71) HashAggregate [codegen id : 14]
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
+Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#50))]
+Aggregate Attributes [1]: [sum#55]
+Results [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+
+(72) RowToColumnar
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+
+(73) CometColumnarExchange
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+Arguments: hashpartitioning(c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(74) CometHashAggregate
+Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
+Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#50))]
+
+(75) ColumnarToRow [codegen id : 15]
+Input [2]: [customer_id#57, year_total#58]
+
+(76) BroadcastExchange
+Input [2]: [customer_id#57, year_total#58]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(69) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#14]
-Right keys [1]: [customer_id#59]
+(77) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#13]
+Right keys [1]: [customer_id#57]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#46 > 0.00) THEN (year_total#60 / year_total#46) END > CASE WHEN (year_total#15 > 0.00) THEN (year_total#31 / year_total#15) END)
+Join condition: (CASE WHEN (year_total#44 > 0.00) THEN (year_total#58 / year_total#44) END > CASE WHEN (year_total#14 > 0.00) THEN (year_total#30 / year_total#14) END)
 
-(70) Project [codegen id : 16]
-Output [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
-Input [9]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46, customer_id#59, year_total#60]
+(78) Project [codegen id : 16]
+Output [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
+Input [9]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44, customer_id#57, year_total#58]
 
-(71) TakeOrderedAndProject
-Input [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
-Arguments: 100, [customer_first_name#29 ASC NULLS FIRST, customer_id#28 ASC NULLS FIRST, customer_last_name#30 ASC NULLS FIRST], [customer_id#28, customer_first_name#29, customer_last_name#30]
+(79) TakeOrderedAndProject
+Input [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
+Arguments: 100, [customer_first_name#28 ASC NULLS FIRST, customer_id#27 ASC NULLS FIRST, customer_last_name#29 ASC NULLS FIRST], [customer_id#27, customer_first_name#28, customer_last_name#29]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometFilter (73)
-      +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (83)
++- * ColumnarToRow (82)
+   +- CometFilter (81)
+      +- CometScan parquet spark_catalog.default.date_dim (80)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -434,44 +458,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(73) CometFilter
+(81) CometFilter
 Input [2]: [d_date_sk#9, d_year#10]
 Condition : (((isnotnull(d_year#10) AND (d_year#10 = 2001)) AND d_year#10 IN (2001,2002)) AND isnotnull(d_date_sk#9))
 
-(74) ColumnarToRow [codegen id : 1]
+(82) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_year#10]
 
-(75) BroadcastExchange
+(83) BroadcastExchange
 Input [2]: [d_date_sk#9, d_year#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
-BroadcastExchange (79)
-+- * ColumnarToRow (78)
-   +- CometFilter (77)
-      +- CometScan parquet spark_catalog.default.date_dim (76)
+Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#21 IN dynamicpruning#22
+BroadcastExchange (87)
++- * ColumnarToRow (86)
+   +- CometFilter (85)
+      +- CometScan parquet spark_catalog.default.date_dim (84)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#24, d_year#25]
+Output [2]: [d_date_sk#23, d_year#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(77) CometFilter
-Input [2]: [d_date_sk#24, d_year#25]
-Condition : (((isnotnull(d_year#25) AND (d_year#25 = 2002)) AND d_year#25 IN (2001,2002)) AND isnotnull(d_date_sk#24))
+(85) CometFilter
+Input [2]: [d_date_sk#23, d_year#24]
+Condition : (((isnotnull(d_year#24) AND (d_year#24 = 2002)) AND d_year#24 IN (2001,2002)) AND isnotnull(d_date_sk#23))
 
-(78) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#24, d_year#25]
+(86) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#23, d_year#24]
 
-(79) BroadcastExchange
-Input [2]: [d_date_sk#24, d_year#25]
+(87) BroadcastExchange
+Input [2]: [d_date_sk#23, d_year#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#38 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#37 IN dynamicpruning#8
 
-Subquery:4 Hosting operator id = 56 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#23
+Subquery:4 Hosting operator id = 62 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#22
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt
index 26989b0c00..e8b5c93db2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt
@@ -5,43 +5,13 @@ TakeOrderedAndProject [customer_first_name,customer_id,customer_last_name]
         Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,year_total,year_total]
           BroadcastHashJoin [customer_id,customer_id]
             BroadcastHashJoin [customer_id,customer_id]
-              Filter [year_total]
-                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,year_total,sum]
-                  InputAdapter
-                    Exchange [c_customer_id,c_first_name,c_last_name,d_year] #1
-                      WholeStageCodegen (3)
-                        HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
-                          Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
-                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [c_customer_sk,c_customer_id]
-                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ss_customer_sk]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [d_year,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                              InputAdapter
-                                ReusedExchange [d_date_sk,d_year] #3
-              InputAdapter
-                BroadcastExchange #4
-                  WholeStageCodegen (7)
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,customer_first_name,customer_last_name,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #5
-                          WholeStageCodegen (6)
+              ColumnarToRow
+                InputAdapter
+                  CometFilter [year_total]
+                    CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                      CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #1
+                        RowToColumnar
+                          WholeStageCodegen (3)
                             HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
                               Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
                                 BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -52,71 +22,109 @@ TakeOrderedAndProject [customer_first_name,customer_id,customer_last_name]
                                           CometFilter [c_customer_sk,c_customer_id]
                                             CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                       InputAdapter
-                                        BroadcastExchange #6
-                                          WholeStageCodegen (4)
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometFilter [ss_customer_sk]
                                                   CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #2
-                                                      BroadcastExchange #7
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
                                                         WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
                                                               CometFilter [d_year,d_date_sk]
                                                                 CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #7
+                                    ReusedExchange [d_date_sk,d_year] #3
+              InputAdapter
+                BroadcastExchange #4
+                  WholeStageCodegen (7)
+                    ColumnarToRow
+                      InputAdapter
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #5
+                            RowToColumnar
+                              WholeStageCodegen (6)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (4)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ss_customer_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #2
+                                                          BroadcastExchange #7
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  Filter [year_total]
-                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
-                      InputAdapter
-                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #9
-                          WholeStageCodegen (10)
-                            HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                              Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk,c_customer_id]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                  ColumnarToRow
+                    InputAdapter
+                      CometFilter [year_total]
+                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #9
+                            RowToColumnar
+                              WholeStageCodegen (10)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                          InputAdapter
+                                            BroadcastExchange #10
+                                              WholeStageCodegen (8)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
                                       InputAdapter
-                                        BroadcastExchange #10
-                                          WholeStageCodegen (8)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
+                                        ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
+              ColumnarToRow
                 InputAdapter
-                  Exchange [c_customer_id,c_first_name,c_last_name,d_year] #12
-                    WholeStageCodegen (14)
-                      HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                        Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_customer_sk,c_customer_id]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
+                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #12
+                      RowToColumnar
+                        WholeStageCodegen (14)
+                          HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_customer_id]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                    InputAdapter
+                                      BroadcastExchange #13
+                                        WholeStageCodegen (12)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #13
-                                    WholeStageCodegen (12)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_customer_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #2
-                            InputAdapter
-                              ReusedExchange [d_date_sk,d_year] #7
+                                  ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt
index 3922f7efe6..98da31a346 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt
@@ -1,136 +1,138 @@
 == Physical Plan ==
-TakeOrderedAndProject (132)
-+- * Project (131)
-   +- * SortMergeJoin Inner (130)
-      :- * Sort (71)
-      :  +- Exchange (70)
-      :     +- * Filter (69)
-      :        +- * HashAggregate (68)
-      :           +- Exchange (67)
-      :              +- * HashAggregate (66)
-      :                 +- * HashAggregate (65)
-      :                    +- Exchange (64)
-      :                       +- * HashAggregate (63)
-      :                          +- Union (62)
-      :                             :- * Project (23)
-      :                             :  +- * SortMergeJoin LeftOuter (22)
-      :                             :     :- * Sort (15)
-      :                             :     :  +- Exchange (14)
-      :                             :     :     +- * Project (13)
-      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (12)
-      :                             :     :           :- * Project (10)
-      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (9)
-      :                             :     :           :     :- * ColumnarToRow (3)
-      :                             :     :           :     :  +- CometFilter (2)
-      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-      :                             :     :           :     +- BroadcastExchange (8)
-      :                             :     :           :        +- * ColumnarToRow (7)
-      :                             :     :           :           +- CometProject (6)
-      :                             :     :           :              +- CometFilter (5)
-      :                             :     :           :                 +- CometScan parquet spark_catalog.default.item (4)
-      :                             :     :           +- ReusedExchange (11)
-      :                             :     +- * ColumnarToRow (21)
-      :                             :        +- CometSort (20)
-      :                             :           +- CometExchange (19)
-      :                             :              +- CometProject (18)
-      :                             :                 +- CometFilter (17)
-      :                             :                    +- CometScan parquet spark_catalog.default.catalog_returns (16)
-      :                             :- * Project (42)
-      :                             :  +- * SortMergeJoin LeftOuter (41)
-      :                             :     :- * Sort (34)
-      :                             :     :  +- Exchange (33)
-      :                             :     :     +- * Project (32)
-      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (31)
-      :                             :     :           :- * Project (29)
-      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (28)
-      :                             :     :           :     :- * ColumnarToRow (26)
-      :                             :     :           :     :  +- CometFilter (25)
-      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
-      :                             :     :           :     +- ReusedExchange (27)
-      :                             :     :           +- ReusedExchange (30)
-      :                             :     +- * ColumnarToRow (40)
-      :                             :        +- CometSort (39)
-      :                             :           +- CometExchange (38)
-      :                             :              +- CometProject (37)
-      :                             :                 +- CometFilter (36)
-      :                             :                    +- CometScan parquet spark_catalog.default.store_returns (35)
-      :                             +- * Project (61)
-      :                                +- * SortMergeJoin LeftOuter (60)
-      :                                   :- * Sort (53)
-      :                                   :  +- Exchange (52)
-      :                                   :     +- * Project (51)
-      :                                   :        +- * BroadcastHashJoin Inner BuildRight (50)
-      :                                   :           :- * Project (48)
-      :                                   :           :  +- * BroadcastHashJoin Inner BuildRight (47)
-      :                                   :           :     :- * ColumnarToRow (45)
-      :                                   :           :     :  +- CometFilter (44)
-      :                                   :           :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
-      :                                   :           :     +- ReusedExchange (46)
-      :                                   :           +- ReusedExchange (49)
-      :                                   +- * ColumnarToRow (59)
-      :                                      +- CometSort (58)
-      :                                         +- CometExchange (57)
-      :                                            +- CometProject (56)
-      :                                               +- CometFilter (55)
-      :                                                  +- CometScan parquet spark_catalog.default.web_returns (54)
-      +- * Sort (129)
-         +- Exchange (128)
-            +- * Filter (127)
-               +- * HashAggregate (126)
-                  +- Exchange (125)
-                     +- * HashAggregate (124)
-                        +- * HashAggregate (123)
-                           +- Exchange (122)
-                              +- * HashAggregate (121)
-                                 +- Union (120)
-                                    :- * Project (87)
-                                    :  +- * SortMergeJoin LeftOuter (86)
-                                    :     :- * Sort (82)
-                                    :     :  +- Exchange (81)
-                                    :     :     +- * Project (80)
-                                    :     :        +- * BroadcastHashJoin Inner BuildRight (79)
-                                    :     :           :- * Project (77)
-                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (76)
-                                    :     :           :     :- * ColumnarToRow (74)
-                                    :     :           :     :  +- CometFilter (73)
-                                    :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (72)
-                                    :     :           :     +- ReusedExchange (75)
-                                    :     :           +- ReusedExchange (78)
-                                    :     +- * ColumnarToRow (85)
-                                    :        +- CometSort (84)
-                                    :           +- ReusedExchange (83)
-                                    :- * Project (103)
-                                    :  +- * SortMergeJoin LeftOuter (102)
-                                    :     :- * Sort (98)
-                                    :     :  +- Exchange (97)
-                                    :     :     +- * Project (96)
-                                    :     :        +- * BroadcastHashJoin Inner BuildRight (95)
-                                    :     :           :- * Project (93)
-                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (92)
-                                    :     :           :     :- * ColumnarToRow (90)
-                                    :     :           :     :  +- CometFilter (89)
-                                    :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (88)
-                                    :     :           :     +- ReusedExchange (91)
-                                    :     :           +- ReusedExchange (94)
-                                    :     +- * ColumnarToRow (101)
-                                    :        +- CometSort (100)
-                                    :           +- ReusedExchange (99)
-                                    +- * Project (119)
-                                       +- * SortMergeJoin LeftOuter (118)
-                                          :- * Sort (114)
-                                          :  +- Exchange (113)
-                                          :     +- * Project (112)
-                                          :        +- * BroadcastHashJoin Inner BuildRight (111)
-                                          :           :- * Project (109)
-                                          :           :  +- * BroadcastHashJoin Inner BuildRight (108)
-                                          :           :     :- * ColumnarToRow (106)
-                                          :           :     :  +- CometFilter (105)
-                                          :           :     :     +- CometScan parquet spark_catalog.default.web_sales (104)
-                                          :           :     +- ReusedExchange (107)
-                                          :           +- ReusedExchange (110)
-                                          +- * ColumnarToRow (117)
-                                             +- CometSort (116)
-                                                +- ReusedExchange (115)
+TakeOrderedAndProject (134)
++- * Project (133)
+   +- * SortMergeJoin Inner (132)
+      :- * ColumnarToRow (72)
+      :  +- CometSort (71)
+      :     +- CometColumnarExchange (70)
+      :        +- CometFilter (69)
+      :           +- CometHashAggregate (68)
+      :              +- CometColumnarExchange (67)
+      :                 +- CometHashAggregate (66)
+      :                    +- CometHashAggregate (65)
+      :                       +- CometColumnarExchange (64)
+      :                          +- CometHashAggregate (63)
+      :                             +- CometUnion (62)
+      :                                :- CometProject (23)
+      :                                :  +- CometSortMergeJoin (22)
+      :                                :     :- CometSort (16)
+      :                                :     :  +- CometColumnarExchange (15)
+      :                                :     :     +- RowToColumnar (14)
+      :                                :     :        +- * Project (13)
+      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (12)
+      :                                :     :              :- * Project (10)
+      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (9)
+      :                                :     :              :     :- * ColumnarToRow (3)
+      :                                :     :              :     :  +- CometFilter (2)
+      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+      :                                :     :              :     +- BroadcastExchange (8)
+      :                                :     :              :        +- * ColumnarToRow (7)
+      :                                :     :              :           +- CometProject (6)
+      :                                :     :              :              +- CometFilter (5)
+      :                                :     :              :                 +- CometScan parquet spark_catalog.default.item (4)
+      :                                :     :              +- ReusedExchange (11)
+      :                                :     +- CometSort (21)
+      :                                :        +- CometColumnarExchange (20)
+      :                                :           +- CometProject (19)
+      :                                :              +- CometFilter (18)
+      :                                :                 +- CometScan parquet spark_catalog.default.catalog_returns (17)
+      :                                :- CometProject (42)
+      :                                :  +- CometSortMergeJoin (41)
+      :                                :     :- CometSort (35)
+      :                                :     :  +- CometColumnarExchange (34)
+      :                                :     :     +- RowToColumnar (33)
+      :                                :     :        +- * Project (32)
+      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (31)
+      :                                :     :              :- * Project (29)
+      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (28)
+      :                                :     :              :     :- * ColumnarToRow (26)
+      :                                :     :              :     :  +- CometFilter (25)
+      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
+      :                                :     :              :     +- ReusedExchange (27)
+      :                                :     :              +- ReusedExchange (30)
+      :                                :     +- CometSort (40)
+      :                                :        +- CometColumnarExchange (39)
+      :                                :           +- CometProject (38)
+      :                                :              +- CometFilter (37)
+      :                                :                 +- CometScan parquet spark_catalog.default.store_returns (36)
+      :                                +- CometProject (61)
+      :                                   +- CometSortMergeJoin (60)
+      :                                      :- CometSort (54)
+      :                                      :  +- CometColumnarExchange (53)
+      :                                      :     +- RowToColumnar (52)
+      :                                      :        +- * Project (51)
+      :                                      :           +- * BroadcastHashJoin Inner BuildRight (50)
+      :                                      :              :- * Project (48)
+      :                                      :              :  +- * BroadcastHashJoin Inner BuildRight (47)
+      :                                      :              :     :- * ColumnarToRow (45)
+      :                                      :              :     :  +- CometFilter (44)
+      :                                      :              :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
+      :                                      :              :     +- ReusedExchange (46)
+      :                                      :              +- ReusedExchange (49)
+      :                                      +- CometSort (59)
+      :                                         +- CometColumnarExchange (58)
+      :                                            +- CometProject (57)
+      :                                               +- CometFilter (56)
+      :                                                  +- CometScan parquet spark_catalog.default.web_returns (55)
+      +- * ColumnarToRow (131)
+         +- CometSort (130)
+            +- CometColumnarExchange (129)
+               +- CometFilter (128)
+                  +- CometHashAggregate (127)
+                     +- CometColumnarExchange (126)
+                        +- CometHashAggregate (125)
+                           +- CometHashAggregate (124)
+                              +- CometColumnarExchange (123)
+                                 +- CometHashAggregate (122)
+                                    +- CometUnion (121)
+                                       :- CometProject (88)
+                                       :  +- CometSortMergeJoin (87)
+                                       :     :- CometSort (84)
+                                       :     :  +- CometColumnarExchange (83)
+                                       :     :     +- RowToColumnar (82)
+                                       :     :        +- * Project (81)
+                                       :     :           +- * BroadcastHashJoin Inner BuildRight (80)
+                                       :     :              :- * Project (78)
+                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (77)
+                                       :     :              :     :- * ColumnarToRow (75)
+                                       :     :              :     :  +- CometFilter (74)
+                                       :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (73)
+                                       :     :              :     +- ReusedExchange (76)
+                                       :     :              +- ReusedExchange (79)
+                                       :     +- CometSort (86)
+                                       :        +- ReusedExchange (85)
+                                       :- CometProject (104)
+                                       :  +- CometSortMergeJoin (103)
+                                       :     :- CometSort (100)
+                                       :     :  +- CometColumnarExchange (99)
+                                       :     :     +- RowToColumnar (98)
+                                       :     :        +- * Project (97)
+                                       :     :           +- * BroadcastHashJoin Inner BuildRight (96)
+                                       :     :              :- * Project (94)
+                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (93)
+                                       :     :              :     :- * ColumnarToRow (91)
+                                       :     :              :     :  +- CometFilter (90)
+                                       :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (89)
+                                       :     :              :     +- ReusedExchange (92)
+                                       :     :              +- ReusedExchange (95)
+                                       :     +- CometSort (102)
+                                       :        +- ReusedExchange (101)
+                                       +- CometProject (120)
+                                          +- CometSortMergeJoin (119)
+                                             :- CometSort (116)
+                                             :  +- CometColumnarExchange (115)
+                                             :     +- RowToColumnar (114)
+                                             :        +- * Project (113)
+                                             :           +- * BroadcastHashJoin Inner BuildRight (112)
+                                             :              :- * Project (110)
+                                             :              :  +- * BroadcastHashJoin Inner BuildRight (109)
+                                             :              :     :- * ColumnarToRow (107)
+                                             :              :     :  +- CometFilter (106)
+                                             :              :     :     +- CometScan parquet spark_catalog.default.web_sales (105)
+                                             :              :     +- ReusedExchange (108)
+                                             :              +- ReusedExchange (111)
+                                             +- CometSort (118)
+                                                +- ReusedExchange (117)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -180,7 +182,7 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Input [10]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_item_sk#7, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 
-(11) ReusedExchange [Reuses operator id: 136]
+(11) ReusedExchange [Reuses operator id: 138]
 Output [2]: [d_date_sk#13, d_year#14]
 
 (12) BroadcastHashJoin [codegen id : 3]
@@ -193,13 +195,16 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
 Input [11]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_date_sk#13, d_year#14]
 
-(14) Exchange
+(14) RowToColumnar
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) Sort [codegen id : 4]
+(15) CometColumnarExchange
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometSort
+Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
+Arguments: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14], [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
@@ -208,34 +213,30 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(17) CometFilter
+(18) CometFilter
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Condition : (isnotnull(cr_order_number#16) AND isnotnull(cr_item_sk#15))
 
-(18) CometProject
+(19) CometProject
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 
-(19) CometExchange
+(20) CometColumnarExchange
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
+Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(20) CometSort
+(21) CometSort
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_order_number#16 ASC NULLS FIRST, cr_item_sk#15 ASC NULLS FIRST]
 
-(21) ColumnarToRow [codegen id : 5]
-Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
+(22) CometSortMergeJoin
+Left output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
+Right output [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
+Arguments: [cs_order_number#2, cs_item_sk#1], [cr_order_number#16, cr_item_sk#15], LeftOuter
 
-(22) SortMergeJoin [codegen id : 6]
-Left keys [2]: [cs_order_number#2, cs_item_sk#1]
-Right keys [2]: [cr_order_number#16, cr_item_sk#15]
-Join type: LeftOuter
-Join condition: None
-
-(23) Project [codegen id : 6]
-Output [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
+(23) CometProject
 Input [13]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14, cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
+Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21], [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
@@ -249,42 +250,45 @@ ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sa
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 Condition : isnotnull(ss_item_sk#22)
 
-(26) ColumnarToRow [codegen id : 9]
+(26) ColumnarToRow [codegen id : 6]
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 
 (27) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(28) BroadcastHashJoin [codegen id : 9]
+(28) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_item_sk#22]
 Right keys [1]: [i_item_sk#28]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 9]
+(29) Project [codegen id : 6]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 Input [10]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(30) ReusedExchange [Reuses operator id: 136]
+(30) ReusedExchange [Reuses operator id: 138]
 Output [2]: [d_date_sk#33, d_year#34]
 
-(31) BroadcastHashJoin [codegen id : 9]
+(31) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_sold_date_sk#26]
 Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 9]
+(32) Project [codegen id : 6]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
 Input [11]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_date_sk#33, d_year#34]
 
-(33) Exchange
+(33) RowToColumnar
+Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
+
+(34) CometColumnarExchange
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(34) Sort [codegen id : 10]
+(35) CometSort
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST], false, 0
+Arguments: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34], [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
 Output [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
@@ -293,34 +297,30 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(36) CometFilter
+(37) CometFilter
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Condition : (isnotnull(sr_ticket_number#36) AND isnotnull(sr_item_sk#35))
 
-(37) CometProject
+(38) CometProject
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 
-(38) CometExchange
+(39) CometColumnarExchange
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(39) CometSort
+(40) CometSort
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_ticket_number#36 ASC NULLS FIRST, sr_item_sk#35 ASC NULLS FIRST]
 
-(40) ColumnarToRow [codegen id : 11]
-Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-
-(41) SortMergeJoin [codegen id : 12]
-Left keys [2]: [ss_ticket_number#23, ss_item_sk#22]
-Right keys [2]: [sr_ticket_number#36, sr_item_sk#35]
-Join type: LeftOuter
-Join condition: None
+(41) CometSortMergeJoin
+Left output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
+Right output [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
+Arguments: [ss_ticket_number#23, ss_item_sk#22], [sr_ticket_number#36, sr_item_sk#35], LeftOuter
 
-(42) Project [codegen id : 12]
-Output [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
+(42) CometProject
 Input [13]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34, sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
+Arguments: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41], [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
@@ -334,42 +334,45 @@ ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sal
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 Condition : isnotnull(ws_item_sk#42)
 
-(45) ColumnarToRow [codegen id : 15]
+(45) ColumnarToRow [codegen id : 9]
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 
 (46) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(47) BroadcastHashJoin [codegen id : 15]
+(47) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#42]
 Right keys [1]: [i_item_sk#48]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 15]
+(48) Project [codegen id : 9]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 Input [10]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(49) ReusedExchange [Reuses operator id: 136]
+(49) ReusedExchange [Reuses operator id: 138]
 Output [2]: [d_date_sk#53, d_year#54]
 
-(50) BroadcastHashJoin [codegen id : 15]
+(50) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#46]
 Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 15]
+(51) Project [codegen id : 9]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
 Input [11]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_date_sk#53, d_year#54]
 
-(52) Exchange
+(52) RowToColumnar
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(53) Sort [codegen id : 16]
+(53) CometColumnarExchange
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST], false, 0
+Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(54) CometSort
+Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
+Arguments: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54], [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
 Output [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
@@ -378,363 +381,352 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_quantity:int,wr_return_amt:decimal(7,2)>
 
-(55) CometFilter
+(56) CometFilter
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Condition : (isnotnull(wr_order_number#56) AND isnotnull(wr_item_sk#55))
 
-(56) CometProject
+(57) CometProject
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 
-(57) CometExchange
+(58) CometColumnarExchange
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(58) CometSort
+(59) CometSort
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_order_number#56 ASC NULLS FIRST, wr_item_sk#55 ASC NULLS FIRST]
 
-(59) ColumnarToRow [codegen id : 17]
-Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-
-(60) SortMergeJoin [codegen id : 18]
-Left keys [2]: [ws_order_number#43, ws_item_sk#42]
-Right keys [2]: [wr_order_number#56, wr_item_sk#55]
-Join type: LeftOuter
-Join condition: None
+(60) CometSortMergeJoin
+Left output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
+Right output [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
+Arguments: [ws_order_number#43, ws_item_sk#42], [wr_order_number#56, wr_item_sk#55], LeftOuter
 
-(61) Project [codegen id : 18]
-Output [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
+(61) CometProject
 Input [13]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54, wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
+Arguments: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61], [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
 
-(62) Union
+(62) CometUnion
+Child 0 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
+Child 1 Input [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41]
+Child 2 Input [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61]
 
-(63) HashAggregate [codegen id : 19]
+(63) CometHashAggregate
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(64) Exchange
+(64) CometColumnarExchange
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(65) HashAggregate [codegen id : 20]
+(65) CometHashAggregate
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(66) HashAggregate [codegen id : 20]
+(66) CometHashAggregate
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum#62, sum#63]
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
 
-(67) Exchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(67) CometColumnarExchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(68) HashAggregate [codegen id : 21]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
+(68) CometHashAggregate
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
-Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum(sales_cnt#20)#66 AS sales_cnt#68, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#69]
 
-(69) Filter [codegen id : 21]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
-Condition : isnotnull(sales_cnt#68)
+(69) CometFilter
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+Condition : isnotnull(sales_cnt#64)
 
-(70) Exchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
-Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+(70) CometColumnarExchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
 
-(71) Sort [codegen id : 22]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
-Arguments: [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST], false, 0
+(71) CometSort
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65], [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST]
+
+(72) ColumnarToRow [codegen id : 10]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
+Output [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#74), dynamicpruningexpression(cs_sold_date_sk#74 IN dynamicpruning#75)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#70), dynamicpruningexpression(cs_sold_date_sk#70 IN dynamicpruning#71)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_ext_sales_price:decimal(7,2)>
 
-(73) CometFilter
-Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
-Condition : isnotnull(cs_item_sk#70)
+(74) CometFilter
+Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
+Condition : isnotnull(cs_item_sk#66)
 
-(74) ColumnarToRow [codegen id : 25]
-Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
+(75) ColumnarToRow [codegen id : 13]
+Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
 
-(75) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(76) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 
-(76) BroadcastHashJoin [codegen id : 25]
-Left keys [1]: [cs_item_sk#70]
-Right keys [1]: [i_item_sk#76]
+(77) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cs_item_sk#66]
+Right keys [1]: [i_item_sk#72]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 25]
-Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
-Input [10]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(78) Project [codegen id : 13]
+Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+Input [10]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 
-(78) ReusedExchange [Reuses operator id: 140]
-Output [2]: [d_date_sk#81, d_year#82]
+(79) ReusedExchange [Reuses operator id: 142]
+Output [2]: [d_date_sk#77, d_year#78]
 
-(79) BroadcastHashJoin [codegen id : 25]
-Left keys [1]: [cs_sold_date_sk#74]
-Right keys [1]: [d_date_sk#81]
+(80) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cs_sold_date_sk#70]
+Right keys [1]: [d_date_sk#77]
 Join type: Inner
 Join condition: None
 
-(80) Project [codegen id : 25]
-Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
-Input [11]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_date_sk#81, d_year#82]
-
-(81) Exchange
-Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
-Arguments: hashpartitioning(cs_order_number#71, cs_item_sk#70, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+(81) Project [codegen id : 13]
+Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Input [11]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_date_sk#77, d_year#78]
 
-(82) Sort [codegen id : 26]
-Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
-Arguments: [cs_order_number#71 ASC NULLS FIRST, cs_item_sk#70 ASC NULLS FIRST], false, 0
+(82) RowToColumnar
+Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
 
-(83) ReusedExchange [Reuses operator id: 19]
-Output [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+(83) CometColumnarExchange
+Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Arguments: hashpartitioning(cs_order_number#67, cs_item_sk#66, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
 (84) CometSort
-Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
-Arguments: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86], [cr_order_number#84 ASC NULLS FIRST, cr_item_sk#83 ASC NULLS FIRST]
+Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Arguments: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78], [cs_order_number#67 ASC NULLS FIRST, cs_item_sk#66 ASC NULLS FIRST]
 
-(85) ColumnarToRow [codegen id : 27]
-Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+(85) ReusedExchange [Reuses operator id: 20]
+Output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
 
-(86) SortMergeJoin [codegen id : 28]
-Left keys [2]: [cs_order_number#71, cs_item_sk#70]
-Right keys [2]: [cr_order_number#84, cr_item_sk#83]
-Join type: LeftOuter
-Join condition: None
+(86) CometSort
+Input [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+Arguments: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82], [cr_order_number#80 ASC NULLS FIRST, cr_item_sk#79 ASC NULLS FIRST]
+
+(87) CometSortMergeJoin
+Left output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+Right output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+Arguments: [cs_order_number#67, cs_item_sk#66], [cr_order_number#80, cr_item_sk#79], LeftOuter
 
-(87) Project [codegen id : 28]
-Output [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, (cs_quantity#72 - coalesce(cr_return_quantity#85, 0)) AS sales_cnt#20, (cs_ext_sales_price#73 - coalesce(cr_return_amount#86, 0.00)) AS sales_amt#21]
-Input [13]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82, cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+(88) CometProject
+Input [13]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78, cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21], [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, (cs_quantity#68 - coalesce(cr_return_quantity#81, 0)) AS sales_cnt#20, (cs_ext_sales_price#69 - coalesce(cr_return_amount#82, 0.00)) AS sales_amt#21]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
+Output [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#91), dynamicpruningexpression(ss_sold_date_sk#91 IN dynamicpruning#92)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#87), dynamicpruningexpression(ss_sold_date_sk#87 IN dynamicpruning#88)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sales_price:decimal(7,2)>
 
-(89) CometFilter
-Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
-Condition : isnotnull(ss_item_sk#87)
+(90) CometFilter
+Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
+Condition : isnotnull(ss_item_sk#83)
 
-(90) ColumnarToRow [codegen id : 31]
-Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
+(91) ColumnarToRow [codegen id : 16]
+Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
 
-(91) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
+(92) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
 
-(92) BroadcastHashJoin [codegen id : 31]
-Left keys [1]: [ss_item_sk#87]
-Right keys [1]: [i_item_sk#93]
+(93) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [ss_item_sk#83]
+Right keys [1]: [i_item_sk#89]
 Join type: Inner
 Join condition: None
 
-(93) Project [codegen id : 31]
-Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
-Input [10]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
+(94) Project [codegen id : 16]
+Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
+Input [10]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
 
-(94) ReusedExchange [Reuses operator id: 140]
-Output [2]: [d_date_sk#98, d_year#99]
+(95) ReusedExchange [Reuses operator id: 142]
+Output [2]: [d_date_sk#94, d_year#95]
 
-(95) BroadcastHashJoin [codegen id : 31]
-Left keys [1]: [ss_sold_date_sk#91]
-Right keys [1]: [d_date_sk#98]
+(96) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [ss_sold_date_sk#87]
+Right keys [1]: [d_date_sk#94]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 31]
-Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
-Input [11]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_date_sk#98, d_year#99]
-
-(97) Exchange
-Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
-Arguments: hashpartitioning(ss_ticket_number#88, ss_item_sk#87, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+(97) Project [codegen id : 16]
+Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Input [11]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_date_sk#94, d_year#95]
 
-(98) Sort [codegen id : 32]
-Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
-Arguments: [ss_ticket_number#88 ASC NULLS FIRST, ss_item_sk#87 ASC NULLS FIRST], false, 0
+(98) RowToColumnar
+Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
 
-(99) ReusedExchange [Reuses operator id: 38]
-Output [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+(99) CometColumnarExchange
+Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Arguments: hashpartitioning(ss_ticket_number#84, ss_item_sk#83, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
 (100) CometSort
-Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
-Arguments: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103], [sr_ticket_number#101 ASC NULLS FIRST, sr_item_sk#100 ASC NULLS FIRST]
+Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Arguments: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95], [ss_ticket_number#84 ASC NULLS FIRST, ss_item_sk#83 ASC NULLS FIRST]
 
-(101) ColumnarToRow [codegen id : 33]
-Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+(101) ReusedExchange [Reuses operator id: 39]
+Output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
 
-(102) SortMergeJoin [codegen id : 34]
-Left keys [2]: [ss_ticket_number#88, ss_item_sk#87]
-Right keys [2]: [sr_ticket_number#101, sr_item_sk#100]
-Join type: LeftOuter
-Join condition: None
+(102) CometSort
+Input [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+Arguments: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99], [sr_ticket_number#97 ASC NULLS FIRST, sr_item_sk#96 ASC NULLS FIRST]
+
+(103) CometSortMergeJoin
+Left output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+Right output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+Arguments: [ss_ticket_number#84, ss_item_sk#83], [sr_ticket_number#97, sr_item_sk#96], LeftOuter
 
-(103) Project [codegen id : 34]
-Output [7]: [d_year#99, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, (ss_quantity#89 - coalesce(sr_return_quantity#102, 0)) AS sales_cnt#40, (ss_ext_sales_price#90 - coalesce(sr_return_amt#103, 0.00)) AS sales_amt#41]
-Input [13]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99, sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+(104) CometProject
+Input [13]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95, sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+Arguments: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41], [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, (ss_quantity#85 - coalesce(sr_return_quantity#98, 0)) AS sales_cnt#40, (ss_ext_sales_price#86 - coalesce(sr_return_amt#99, 0.00)) AS sales_amt#41]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
+Output [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#108), dynamicpruningexpression(ws_sold_date_sk#108 IN dynamicpruning#109)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#104), dynamicpruningexpression(ws_sold_date_sk#104 IN dynamicpruning#105)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sales_price:decimal(7,2)>
 
-(105) CometFilter
-Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
-Condition : isnotnull(ws_item_sk#104)
+(106) CometFilter
+Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
+Condition : isnotnull(ws_item_sk#100)
 
-(106) ColumnarToRow [codegen id : 37]
-Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
+(107) ColumnarToRow [codegen id : 19]
+Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
 
-(107) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
+(108) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
 
-(108) BroadcastHashJoin [codegen id : 37]
-Left keys [1]: [ws_item_sk#104]
-Right keys [1]: [i_item_sk#110]
+(109) BroadcastHashJoin [codegen id : 19]
+Left keys [1]: [ws_item_sk#100]
+Right keys [1]: [i_item_sk#106]
 Join type: Inner
 Join condition: None
 
-(109) Project [codegen id : 37]
-Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
-Input [10]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
+(110) Project [codegen id : 19]
+Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
+Input [10]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
 
-(110) ReusedExchange [Reuses operator id: 140]
-Output [2]: [d_date_sk#115, d_year#116]
+(111) ReusedExchange [Reuses operator id: 142]
+Output [2]: [d_date_sk#111, d_year#112]
 
-(111) BroadcastHashJoin [codegen id : 37]
-Left keys [1]: [ws_sold_date_sk#108]
-Right keys [1]: [d_date_sk#115]
+(112) BroadcastHashJoin [codegen id : 19]
+Left keys [1]: [ws_sold_date_sk#104]
+Right keys [1]: [d_date_sk#111]
 Join type: Inner
 Join condition: None
 
-(112) Project [codegen id : 37]
-Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
-Input [11]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_date_sk#115, d_year#116]
-
-(113) Exchange
-Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
-Arguments: hashpartitioning(ws_order_number#105, ws_item_sk#104, 5), ENSURE_REQUIREMENTS, [plan_id=13]
+(113) Project [codegen id : 19]
+Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Input [11]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_date_sk#111, d_year#112]
 
-(114) Sort [codegen id : 38]
-Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
-Arguments: [ws_order_number#105 ASC NULLS FIRST, ws_item_sk#104 ASC NULLS FIRST], false, 0
+(114) RowToColumnar
+Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
 
-(115) ReusedExchange [Reuses operator id: 57]
-Output [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+(115) CometColumnarExchange
+Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Arguments: hashpartitioning(ws_order_number#101, ws_item_sk#100, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
 
 (116) CometSort
-Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
-Arguments: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120], [wr_order_number#118 ASC NULLS FIRST, wr_item_sk#117 ASC NULLS FIRST]
+Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Arguments: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112], [ws_order_number#101 ASC NULLS FIRST, ws_item_sk#100 ASC NULLS FIRST]
 
-(117) ColumnarToRow [codegen id : 39]
-Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+(117) ReusedExchange [Reuses operator id: 58]
+Output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
 
-(118) SortMergeJoin [codegen id : 40]
-Left keys [2]: [ws_order_number#105, ws_item_sk#104]
-Right keys [2]: [wr_order_number#118, wr_item_sk#117]
-Join type: LeftOuter
-Join condition: None
+(118) CometSort
+Input [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+Arguments: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116], [wr_order_number#114 ASC NULLS FIRST, wr_item_sk#113 ASC NULLS FIRST]
+
+(119) CometSortMergeJoin
+Left output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+Right output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+Arguments: [ws_order_number#101, ws_item_sk#100], [wr_order_number#114, wr_item_sk#113], LeftOuter
 
-(119) Project [codegen id : 40]
-Output [7]: [d_year#116, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, (ws_quantity#106 - coalesce(wr_return_quantity#119, 0)) AS sales_cnt#60, (ws_ext_sales_price#107 - coalesce(wr_return_amt#120, 0.00)) AS sales_amt#61]
-Input [13]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116, wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+(120) CometProject
+Input [13]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112, wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+Arguments: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61], [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, (ws_quantity#102 - coalesce(wr_return_quantity#115, 0)) AS sales_cnt#60, (ws_ext_sales_price#103 - coalesce(wr_return_amt#116, 0.00)) AS sales_amt#61]
 
-(120) Union
+(121) CometUnion
+Child 0 Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Child 1 Input [7]: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41]
+Child 2 Input [7]: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61]
 
-(121) HashAggregate [codegen id : 41]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+(122) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(122) Exchange
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=14]
+(123) CometColumnarExchange
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
 
-(123) HashAggregate [codegen id : 42]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+(124) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
 Functions: []
-Aggregate Attributes: []
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(124) HashAggregate [codegen id : 42]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
-Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(125) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum#62, sum#121]
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
 
-(125) Exchange
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
-Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+(126) CometColumnarExchange
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
+Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(126) HashAggregate [codegen id : 43]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
-Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+(127) CometHashAggregate
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
+Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
-Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
-Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum(sales_cnt#20)#66 AS sales_cnt#123, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#124]
 
-(127) Filter [codegen id : 43]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
-Condition : isnotnull(sales_cnt#123)
+(128) CometFilter
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+Condition : isnotnull(sales_cnt#118)
+
+(129) CometColumnarExchange
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+Arguments: hashpartitioning(i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
 
-(128) Exchange
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
-Arguments: hashpartitioning(i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=16]
+(130) CometSort
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119], [i_brand_id#73 ASC NULLS FIRST, i_class_id#74 ASC NULLS FIRST, i_category_id#75 ASC NULLS FIRST, i_manufact_id#76 ASC NULLS FIRST]
 
-(129) Sort [codegen id : 44]
-Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
-Arguments: [i_brand_id#77 ASC NULLS FIRST, i_class_id#78 ASC NULLS FIRST, i_category_id#79 ASC NULLS FIRST, i_manufact_id#80 ASC NULLS FIRST], false, 0
+(131) ColumnarToRow [codegen id : 20]
+Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
 
-(130) SortMergeJoin [codegen id : 45]
+(132) SortMergeJoin [codegen id : 21]
 Left keys [4]: [i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
-Right keys [4]: [i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+Right keys [4]: [i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
 Join type: Inner
-Join condition: ((cast(sales_cnt#68 as decimal(17,2)) / cast(sales_cnt#123 as decimal(17,2))) < 0.90000000000000000000)
+Join condition: ((cast(sales_cnt#64 as decimal(17,2)) / cast(sales_cnt#118 as decimal(17,2))) < 0.90000000000000000000)
 
-(131) Project [codegen id : 45]
-Output [10]: [d_year#82 AS prev_year#125, d_year#14 AS year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#123 AS prev_yr_cnt#127, sales_cnt#68 AS curr_yr_cnt#128, (sales_cnt#68 - sales_cnt#123) AS sales_cnt_diff#129, (sales_amt#69 - sales_amt#124) AS sales_amt_diff#130]
-Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69, d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+(133) Project [codegen id : 21]
+Output [10]: [d_year#78 AS prev_year#120, d_year#14 AS year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#118 AS prev_yr_cnt#122, sales_cnt#64 AS curr_yr_cnt#123, (sales_cnt#64 - sales_cnt#118) AS sales_cnt_diff#124, (sales_amt#65 - sales_amt#119) AS sales_amt_diff#125]
+Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65, d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
 
-(132) TakeOrderedAndProject
-Input [10]: [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
-Arguments: 100, [sales_cnt_diff#129 ASC NULLS FIRST, sales_amt_diff#130 ASC NULLS FIRST], [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
+(134) TakeOrderedAndProject
+Input [10]: [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
+Arguments: 100, [sales_cnt_diff#124 ASC NULLS FIRST, sales_amt_diff#125 ASC NULLS FIRST], [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (136)
-+- * ColumnarToRow (135)
-   +- CometFilter (134)
-      +- CometScan parquet spark_catalog.default.date_dim (133)
+BroadcastExchange (138)
++- * ColumnarToRow (137)
+   +- CometFilter (136)
+      +- CometScan parquet spark_catalog.default.date_dim (135)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -744,14 +736,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(134) CometFilter
+(136) CometFilter
 Input [2]: [d_date_sk#13, d_year#14]
 Condition : ((isnotnull(d_year#14) AND (d_year#14 = 2002)) AND isnotnull(d_date_sk#13))
 
-(135) ColumnarToRow [codegen id : 1]
+(137) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#13, d_year#14]
 
-(136) BroadcastExchange
+(138) BroadcastExchange
 Input [2]: [d_date_sk#13, d_year#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=17]
 
@@ -759,33 +751,33 @@ Subquery:2 Hosting operator id = 24 Hosting Expression = ss_sold_date_sk#26 IN d
 
 Subquery:3 Hosting operator id = 43 Hosting Expression = ws_sold_date_sk#46 IN dynamicpruning#6
 
-Subquery:4 Hosting operator id = 72 Hosting Expression = cs_sold_date_sk#74 IN dynamicpruning#75
-BroadcastExchange (140)
-+- * ColumnarToRow (139)
-   +- CometFilter (138)
-      +- CometScan parquet spark_catalog.default.date_dim (137)
+Subquery:4 Hosting operator id = 73 Hosting Expression = cs_sold_date_sk#70 IN dynamicpruning#71
+BroadcastExchange (142)
++- * ColumnarToRow (141)
+   +- CometFilter (140)
+      +- CometScan parquet spark_catalog.default.date_dim (139)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#81, d_year#82]
+Output [2]: [d_date_sk#77, d_year#78]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(138) CometFilter
-Input [2]: [d_date_sk#81, d_year#82]
-Condition : ((isnotnull(d_year#82) AND (d_year#82 = 2001)) AND isnotnull(d_date_sk#81))
+(140) CometFilter
+Input [2]: [d_date_sk#77, d_year#78]
+Condition : ((isnotnull(d_year#78) AND (d_year#78 = 2001)) AND isnotnull(d_date_sk#77))
 
-(139) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#81, d_year#82]
+(141) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#77, d_year#78]
 
-(140) BroadcastExchange
-Input [2]: [d_date_sk#81, d_year#82]
+(142) BroadcastExchange
+Input [2]: [d_date_sk#77, d_year#78]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=18]
 
-Subquery:5 Hosting operator id = 88 Hosting Expression = ss_sold_date_sk#91 IN dynamicpruning#75
+Subquery:5 Hosting operator id = 89 Hosting Expression = ss_sold_date_sk#87 IN dynamicpruning#71
 
-Subquery:6 Hosting operator id = 104 Hosting Expression = ws_sold_date_sk#108 IN dynamicpruning#75
+Subquery:6 Hosting operator id = 105 Hosting Expression = ws_sold_date_sk#104 IN dynamicpruning#71
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt
index 25dd0f9468..a0e22e72fb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt
@@ -1,237 +1,185 @@
 TakeOrderedAndProject [sales_cnt_diff,sales_amt_diff,prev_year,year,i_brand_id,i_class_id,i_category_id,i_manufact_id,prev_yr_cnt,curr_yr_cnt]
-  WholeStageCodegen (45)
+  WholeStageCodegen (21)
     Project [d_year,d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt,sales_amt,sales_amt]
       SortMergeJoin [i_brand_id,i_class_id,i_category_id,i_manufact_id,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt]
         InputAdapter
-          WholeStageCodegen (22)
-            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+          WholeStageCodegen (10)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
-                  WholeStageCodegen (21)
-                    Filter [sales_cnt]
-                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
-                        InputAdapter
-                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
-                            WholeStageCodegen (20)
-                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
-                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  InputAdapter
-                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
-                                      WholeStageCodegen (19)
-                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                          InputAdapter
-                                            Union
-                                              WholeStageCodegen (6)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
-                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (4)
-                                                        Sort [cs_order_number,cs_item_sk]
-                                                          InputAdapter
-                                                            Exchange [cs_order_number,cs_item_sk] #4
-                                                              WholeStageCodegen (3)
-                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [cs_item_sk]
-                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                                  BroadcastExchange #5
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #6
-                                                                            WholeStageCodegen (1)
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #5
-                                                    InputAdapter
-                                                      WholeStageCodegen (5)
+                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
+                    CometFilter [sales_cnt]
+                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
+                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
+                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
+                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  CometUnion
+                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                        CometSort [cs_order_number,cs_item_sk]
+                                          CometColumnarExchange [cs_order_number,cs_item_sk] #4
+                                            RowToColumnar
+                                              WholeStageCodegen (3)
+                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [cr_order_number,cr_item_sk]
-                                                              CometExchange [cr_order_number,cr_item_sk] #7
-                                                                CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                                                  CometFilter [cr_order_number,cr_item_sk]
-                                                                    CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
-                                              WholeStageCodegen (12)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
-                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (10)
-                                                        Sort [ss_ticket_number,ss_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ss_ticket_number,ss_item_sk] #8
-                                                              WholeStageCodegen (9)
-                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
+                                                            CometFilter [cs_item_sk]
+                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                  BroadcastExchange #5
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
                                                                         InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                                          CometFilter [d_year,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                        InputAdapter
+                                                          BroadcastExchange #6
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
                                                     InputAdapter
-                                                      WholeStageCodegen (11)
+                                                      ReusedExchange [d_date_sk,d_year] #5
+                                        CometSort [cr_order_number,cr_item_sk]
+                                          CometColumnarExchange [cr_order_number,cr_item_sk] #7
+                                            CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                              CometFilter [cr_order_number,cr_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                        CometSort [ss_ticket_number,ss_item_sk]
+                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #8
+                                            RowToColumnar
+                                              WholeStageCodegen (6)
+                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [sr_ticket_number,sr_item_sk]
-                                                              CometExchange [sr_ticket_number,sr_item_sk] #9
-                                                                CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                                                  CometFilter [sr_ticket_number,sr_item_sk]
-                                                                    CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
-                                              WholeStageCodegen (18)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
-                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (16)
-                                                        Sort [ws_order_number,ws_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ws_order_number,ws_item_sk] #10
-                                                              WholeStageCodegen (15)
-                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ws_item_sk]
-                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #1
-                                                                        InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                            CometFilter [ss_item_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
                                                     InputAdapter
-                                                      WholeStageCodegen (17)
+                                                      ReusedExchange [d_date_sk,d_year] #5
+                                        CometSort [sr_ticket_number,sr_item_sk]
+                                          CometColumnarExchange [sr_ticket_number,sr_item_sk] #9
+                                            CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                              CometFilter [sr_ticket_number,sr_item_sk]
+                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                        CometSort [ws_order_number,ws_item_sk]
+                                          CometColumnarExchange [ws_order_number,ws_item_sk] #10
+                                            RowToColumnar
+                                              WholeStageCodegen (9)
+                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [wr_order_number,wr_item_sk]
-                                                              CometExchange [wr_order_number,wr_item_sk] #11
-                                                                CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                                                  CometFilter [wr_order_number,wr_item_sk]
-                                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+                                                            CometFilter [ws_item_sk]
+                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk,d_year] #5
+                                        CometSort [wr_order_number,wr_item_sk]
+                                          CometColumnarExchange [wr_order_number,wr_item_sk] #11
+                                            CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                              CometFilter [wr_order_number,wr_item_sk]
+                                                CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
         InputAdapter
-          WholeStageCodegen (44)
-            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+          WholeStageCodegen (20)
+            ColumnarToRow
               InputAdapter
-                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
-                  WholeStageCodegen (43)
-                    Filter [sales_cnt]
-                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
-                        InputAdapter
-                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
-                            WholeStageCodegen (42)
-                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
-                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  InputAdapter
-                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
-                                      WholeStageCodegen (41)
-                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                          InputAdapter
-                                            Union
-                                              WholeStageCodegen (28)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
-                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (26)
-                                                        Sort [cs_order_number,cs_item_sk]
-                                                          InputAdapter
-                                                            Exchange [cs_order_number,cs_item_sk] #15
-                                                              WholeStageCodegen (25)
-                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [cs_item_sk]
-                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #2
-                                                                                  BroadcastExchange #16
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #16
-                                                    InputAdapter
-                                                      WholeStageCodegen (27)
+                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
+                    CometFilter [sales_cnt]
+                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
+                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
+                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
+                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  CometUnion
+                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                        CometSort [cs_order_number,cs_item_sk]
+                                          CometColumnarExchange [cs_order_number,cs_item_sk] #15
+                                            RowToColumnar
+                                              WholeStageCodegen (13)
+                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [cr_order_number,cr_item_sk]
-                                                              ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
-                                              WholeStageCodegen (34)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
-                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    InputAdapter
-                                                      WholeStageCodegen (32)
-                                                        Sort [ss_ticket_number,ss_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ss_ticket_number,ss_item_sk] #17
-                                                              WholeStageCodegen (31)
-                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #2
+                                                            CometFilter [cs_item_sk]
+                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #2
+                                                                  BroadcastExchange #16
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
                                                                         InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #16
+                                                                          CometFilter [d_year,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
                                                     InputAdapter
-                                                      WholeStageCodegen (33)
+                                                      ReusedExchange [d_date_sk,d_year] #16
+                                        CometSort [cr_order_number,cr_item_sk]
+                                          ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
+                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                        CometSort [ss_ticket_number,ss_item_sk]
+                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #17
+                                            RowToColumnar
+                                              WholeStageCodegen (16)
+                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [sr_ticket_number,sr_item_sk]
-                                                              ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
-                                              WholeStageCodegen (40)
-                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
-                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                                            CometFilter [ss_item_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #2
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
                                                     InputAdapter
-                                                      WholeStageCodegen (38)
-                                                        Sort [ws_order_number,ws_item_sk]
-                                                          InputAdapter
-                                                            Exchange [ws_order_number,ws_item_sk] #18
-                                                              WholeStageCodegen (37)
-                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ws_item_sk]
-                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                                ReusedSubquery [d_date_sk] #2
-                                                                        InputAdapter
-                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk,d_year] #16
-                                                    InputAdapter
-                                                      WholeStageCodegen (39)
+                                                      ReusedExchange [d_date_sk,d_year] #16
+                                        CometSort [sr_ticket_number,sr_item_sk]
+                                          ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
+                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                        CometSort [ws_order_number,ws_item_sk]
+                                          CometColumnarExchange [ws_order_number,ws_item_sk] #18
+                                            RowToColumnar
+                                              WholeStageCodegen (19)
+                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometSort [wr_order_number,wr_item_sk]
-                                                              ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
+                                                            CometFilter [ws_item_sk]
+                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #2
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk,d_year] #16
+                                        CometSort [wr_order_number,wr_item_sk]
+                                          ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt
index 82c7d9b244..688a02fb0e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt
@@ -1,102 +1,116 @@
 == Physical Plan ==
-TakeOrderedAndProject (98)
-+- * HashAggregate (97)
-   +- Exchange (96)
-      +- * HashAggregate (95)
-         +- Union (94)
-            :- * HashAggregate (83)
-            :  +- Exchange (82)
-            :     +- * HashAggregate (81)
-            :        +- Union (80)
-            :           :- * Project (30)
-            :           :  +- * BroadcastHashJoin LeftOuter BuildRight (29)
-            :           :     :- * HashAggregate (15)
-            :           :     :  +- Exchange (14)
-            :           :     :     +- * HashAggregate (13)
-            :           :     :        +- * Project (12)
-            :           :     :           +- * BroadcastHashJoin Inner BuildRight (11)
-            :           :     :              :- * Project (6)
-            :           :     :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-            :           :     :              :     :- * ColumnarToRow (3)
-            :           :     :              :     :  +- CometFilter (2)
-            :           :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-            :           :     :              :     +- ReusedExchange (4)
-            :           :     :              +- BroadcastExchange (10)
-            :           :     :                 +- * ColumnarToRow (9)
-            :           :     :                    +- CometFilter (8)
-            :           :     :                       +- CometScan parquet spark_catalog.default.store (7)
-            :           :     +- BroadcastExchange (28)
-            :           :        +- * HashAggregate (27)
-            :           :           +- Exchange (26)
-            :           :              +- * HashAggregate (25)
-            :           :                 +- * Project (24)
-            :           :                    +- * BroadcastHashJoin Inner BuildRight (23)
-            :           :                       :- * Project (21)
-            :           :                       :  +- * BroadcastHashJoin Inner BuildRight (20)
-            :           :                       :     :- * ColumnarToRow (18)
-            :           :                       :     :  +- CometFilter (17)
-            :           :                       :     :     +- CometScan parquet spark_catalog.default.store_returns (16)
-            :           :                       :     +- ReusedExchange (19)
-            :           :                       +- ReusedExchange (22)
-            :           :- * Project (49)
-            :           :  +- * BroadcastNestedLoopJoin Inner BuildLeft (48)
-            :           :     :- BroadcastExchange (39)
-            :           :     :  +- * HashAggregate (38)
-            :           :     :     +- Exchange (37)
-            :           :     :        +- * HashAggregate (36)
-            :           :     :           +- * Project (35)
-            :           :     :              +- * BroadcastHashJoin Inner BuildRight (34)
-            :           :     :                 :- * ColumnarToRow (32)
-            :           :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (31)
-            :           :     :                 +- ReusedExchange (33)
-            :           :     +- * HashAggregate (47)
-            :           :        +- Exchange (46)
-            :           :           +- * HashAggregate (45)
-            :           :              +- * Project (44)
-            :           :                 +- * BroadcastHashJoin Inner BuildRight (43)
-            :           :                    :- * ColumnarToRow (41)
-            :           :                    :  +- CometScan parquet spark_catalog.default.catalog_returns (40)
-            :           :                    +- ReusedExchange (42)
-            :           +- * Project (79)
-            :              +- * BroadcastHashJoin LeftOuter BuildRight (78)
-            :                 :- * HashAggregate (64)
-            :                 :  +- Exchange (63)
-            :                 :     +- * HashAggregate (62)
-            :                 :        +- * Project (61)
-            :                 :           +- * BroadcastHashJoin Inner BuildRight (60)
-            :                 :              :- * Project (55)
-            :                 :              :  +- * BroadcastHashJoin Inner BuildRight (54)
-            :                 :              :     :- * ColumnarToRow (52)
-            :                 :              :     :  +- CometFilter (51)
-            :                 :              :     :     +- CometScan parquet spark_catalog.default.web_sales (50)
-            :                 :              :     +- ReusedExchange (53)
-            :                 :              +- BroadcastExchange (59)
-            :                 :                 +- * ColumnarToRow (58)
-            :                 :                    +- CometFilter (57)
-            :                 :                       +- CometScan parquet spark_catalog.default.web_page (56)
-            :                 +- BroadcastExchange (77)
-            :                    +- * HashAggregate (76)
-            :                       +- Exchange (75)
-            :                          +- * HashAggregate (74)
-            :                             +- * Project (73)
-            :                                +- * BroadcastHashJoin Inner BuildRight (72)
-            :                                   :- * Project (70)
-            :                                   :  +- * BroadcastHashJoin Inner BuildRight (69)
-            :                                   :     :- * ColumnarToRow (67)
-            :                                   :     :  +- CometFilter (66)
-            :                                   :     :     +- CometScan parquet spark_catalog.default.web_returns (65)
-            :                                   :     +- ReusedExchange (68)
-            :                                   +- ReusedExchange (71)
-            :- * HashAggregate (88)
-            :  +- Exchange (87)
-            :     +- * HashAggregate (86)
-            :        +- * HashAggregate (85)
-            :           +- ReusedExchange (84)
-            +- * HashAggregate (93)
-               +- Exchange (92)
-                  +- * HashAggregate (91)
-                     +- * HashAggregate (90)
-                        +- ReusedExchange (89)
+* ColumnarToRow (112)
++- CometTakeOrderedAndProject (111)
+   +- CometHashAggregate (110)
+      +- CometColumnarExchange (109)
+         +- CometHashAggregate (108)
+            +- CometUnion (107)
+               :- CometHashAggregate (96)
+               :  +- CometColumnarExchange (95)
+               :     +- RowToColumnar (94)
+               :        +- * HashAggregate (93)
+               :           +- Union (92)
+               :              :- * Project (34)
+               :              :  +- * BroadcastHashJoin LeftOuter BuildRight (33)
+               :              :     :- * ColumnarToRow (17)
+               :              :     :  +- CometHashAggregate (16)
+               :              :     :     +- CometColumnarExchange (15)
+               :              :     :        +- RowToColumnar (14)
+               :              :     :           +- * HashAggregate (13)
+               :              :     :              +- * Project (12)
+               :              :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
+               :              :     :                    :- * Project (6)
+               :              :     :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :              :     :                    :     :- * ColumnarToRow (3)
+               :              :     :                    :     :  +- CometFilter (2)
+               :              :     :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :              :     :                    :     +- ReusedExchange (4)
+               :              :     :                    +- BroadcastExchange (10)
+               :              :     :                       +- * ColumnarToRow (9)
+               :              :     :                          +- CometFilter (8)
+               :              :     :                             +- CometScan parquet spark_catalog.default.store (7)
+               :              :     +- BroadcastExchange (32)
+               :              :        +- * ColumnarToRow (31)
+               :              :           +- CometHashAggregate (30)
+               :              :              +- CometColumnarExchange (29)
+               :              :                 +- RowToColumnar (28)
+               :              :                    +- * HashAggregate (27)
+               :              :                       +- * Project (26)
+               :              :                          +- * BroadcastHashJoin Inner BuildRight (25)
+               :              :                             :- * Project (23)
+               :              :                             :  +- * BroadcastHashJoin Inner BuildRight (22)
+               :              :                             :     :- * ColumnarToRow (20)
+               :              :                             :     :  +- CometFilter (19)
+               :              :                             :     :     +- CometScan parquet spark_catalog.default.store_returns (18)
+               :              :                             :     +- ReusedExchange (21)
+               :              :                             +- ReusedExchange (24)
+               :              :- * Project (57)
+               :              :  +- * BroadcastNestedLoopJoin Inner BuildLeft (56)
+               :              :     :- BroadcastExchange (45)
+               :              :     :  +- * ColumnarToRow (44)
+               :              :     :     +- CometHashAggregate (43)
+               :              :     :        +- CometColumnarExchange (42)
+               :              :     :           +- RowToColumnar (41)
+               :              :     :              +- * HashAggregate (40)
+               :              :     :                 +- * Project (39)
+               :              :     :                    +- * BroadcastHashJoin Inner BuildRight (38)
+               :              :     :                       :- * ColumnarToRow (36)
+               :              :     :                       :  +- CometScan parquet spark_catalog.default.catalog_sales (35)
+               :              :     :                       +- ReusedExchange (37)
+               :              :     +- * ColumnarToRow (55)
+               :              :        +- CometHashAggregate (54)
+               :              :           +- CometColumnarExchange (53)
+               :              :              +- RowToColumnar (52)
+               :              :                 +- * HashAggregate (51)
+               :              :                    +- * Project (50)
+               :              :                       +- * BroadcastHashJoin Inner BuildRight (49)
+               :              :                          :- * ColumnarToRow (47)
+               :              :                          :  +- CometScan parquet spark_catalog.default.catalog_returns (46)
+               :              :                          +- ReusedExchange (48)
+               :              +- * Project (91)
+               :                 +- * BroadcastHashJoin LeftOuter BuildRight (90)
+               :                    :- * ColumnarToRow (74)
+               :                    :  +- CometHashAggregate (73)
+               :                    :     +- CometColumnarExchange (72)
+               :                    :        +- RowToColumnar (71)
+               :                    :           +- * HashAggregate (70)
+               :                    :              +- * Project (69)
+               :                    :                 +- * BroadcastHashJoin Inner BuildRight (68)
+               :                    :                    :- * Project (63)
+               :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (62)
+               :                    :                    :     :- * ColumnarToRow (60)
+               :                    :                    :     :  +- CometFilter (59)
+               :                    :                    :     :     +- CometScan parquet spark_catalog.default.web_sales (58)
+               :                    :                    :     +- ReusedExchange (61)
+               :                    :                    +- BroadcastExchange (67)
+               :                    :                       +- * ColumnarToRow (66)
+               :                    :                          +- CometFilter (65)
+               :                    :                             +- CometScan parquet spark_catalog.default.web_page (64)
+               :                    +- BroadcastExchange (89)
+               :                       +- * ColumnarToRow (88)
+               :                          +- CometHashAggregate (87)
+               :                             +- CometColumnarExchange (86)
+               :                                +- RowToColumnar (85)
+               :                                   +- * HashAggregate (84)
+               :                                      +- * Project (83)
+               :                                         +- * BroadcastHashJoin Inner BuildRight (82)
+               :                                            :- * Project (80)
+               :                                            :  +- * BroadcastHashJoin Inner BuildRight (79)
+               :                                            :     :- * ColumnarToRow (77)
+               :                                            :     :  +- CometFilter (76)
+               :                                            :     :     +- CometScan parquet spark_catalog.default.web_returns (75)
+               :                                            :     +- ReusedExchange (78)
+               :                                            +- ReusedExchange (81)
+               :- CometHashAggregate (101)
+               :  +- CometColumnarExchange (100)
+               :     +- CometHashAggregate (99)
+               :        +- CometHashAggregate (98)
+               :           +- ReusedExchange (97)
+               +- CometHashAggregate (106)
+                  +- CometColumnarExchange (105)
+                     +- CometHashAggregate (104)
+                        +- CometHashAggregate (103)
+                           +- ReusedExchange (102)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -114,7 +128,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [ss_store_sk#1, ss_ext_sales_price#2, ss_net_profit#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 103]
+(4) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -162,471 +176,486 @@ Functions [2]: [partial_sum(UnscaledValue(ss_ext_sales_price#2)), partial_sum(Un
 Aggregate Attributes [2]: [sum#8, sum#9]
 Results [3]: [s_store_sk#7, sum#10, sum#11]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [s_store_sk#7, sum#10, sum#11]
-Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 8]
+(15) CometColumnarExchange
+Input [3]: [s_store_sk#7, sum#10, sum#11]
+Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [s_store_sk#7, sum#10, sum#11]
 Keys [1]: [s_store_sk#7]
 Functions [2]: [sum(UnscaledValue(ss_ext_sales_price#2)), sum(UnscaledValue(ss_net_profit#3))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ss_ext_sales_price#2))#12, sum(UnscaledValue(ss_net_profit#3))#13]
-Results [3]: [s_store_sk#7, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#12,17,2) AS sales#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#3))#13,17,2) AS profit#15]
+
+(17) ColumnarToRow [codegen id : 8]
+Input [3]: [s_store_sk#7, sales#12, profit#13]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
+Output [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(sr_returned_date_sk#19), dynamicpruningexpression(sr_returned_date_sk#19 IN dynamicpruning#20)]
+PartitionFilters: [isnotnull(sr_returned_date_sk#17), dynamicpruningexpression(sr_returned_date_sk#17 IN dynamicpruning#18)]
 PushedFilters: [IsNotNull(sr_store_sk)]
 ReadSchema: struct<sr_store_sk:int,sr_return_amt:decimal(7,2),sr_net_loss:decimal(7,2)>
 
-(17) CometFilter
-Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
-Condition : isnotnull(sr_store_sk#16)
+(19) CometFilter
+Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
+Condition : isnotnull(sr_store_sk#14)
 
-(18) ColumnarToRow [codegen id : 6]
-Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
+(20) ColumnarToRow [codegen id : 6]
+Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
 
-(19) ReusedExchange [Reuses operator id: 103]
-Output [1]: [d_date_sk#21]
+(21) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#19]
 
-(20) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_returned_date_sk#19]
-Right keys [1]: [d_date_sk#21]
+(22) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_returned_date_sk#17]
+Right keys [1]: [d_date_sk#19]
 Join type: Inner
 Join condition: None
 
-(21) Project [codegen id : 6]
-Output [3]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18]
-Input [5]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19, d_date_sk#21]
+(23) Project [codegen id : 6]
+Output [3]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16]
+Input [5]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17, d_date_sk#19]
 
-(22) ReusedExchange [Reuses operator id: 10]
-Output [1]: [s_store_sk#22]
+(24) ReusedExchange [Reuses operator id: 10]
+Output [1]: [s_store_sk#20]
 
-(23) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_store_sk#16]
-Right keys [1]: [s_store_sk#22]
+(25) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_store_sk#14]
+Right keys [1]: [s_store_sk#20]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
-Output [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
-Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
-
-(25) HashAggregate [codegen id : 6]
-Input [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
-Keys [1]: [s_store_sk#22]
-Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#17)), partial_sum(UnscaledValue(sr_net_loss#18))]
-Aggregate Attributes [2]: [sum#23, sum#24]
-Results [3]: [s_store_sk#22, sum#25, sum#26]
-
-(26) Exchange
-Input [3]: [s_store_sk#22, sum#25, sum#26]
-Arguments: hashpartitioning(s_store_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=3]
-
-(27) HashAggregate [codegen id : 7]
-Input [3]: [s_store_sk#22, sum#25, sum#26]
-Keys [1]: [s_store_sk#22]
-Functions [2]: [sum(UnscaledValue(sr_return_amt#17)), sum(UnscaledValue(sr_net_loss#18))]
-Aggregate Attributes [2]: [sum(UnscaledValue(sr_return_amt#17))#27, sum(UnscaledValue(sr_net_loss#18))#28]
-Results [3]: [s_store_sk#22, MakeDecimal(sum(UnscaledValue(sr_return_amt#17))#27,17,2) AS returns#29, MakeDecimal(sum(UnscaledValue(sr_net_loss#18))#28,17,2) AS profit_loss#30]
-
-(28) BroadcastExchange
-Input [3]: [s_store_sk#22, returns#29, profit_loss#30]
+(26) Project [codegen id : 6]
+Output [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
+Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
+
+(27) HashAggregate [codegen id : 6]
+Input [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
+Keys [1]: [s_store_sk#20]
+Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#15)), partial_sum(UnscaledValue(sr_net_loss#16))]
+Aggregate Attributes [2]: [sum#21, sum#22]
+Results [3]: [s_store_sk#20, sum#23, sum#24]
+
+(28) RowToColumnar
+Input [3]: [s_store_sk#20, sum#23, sum#24]
+
+(29) CometColumnarExchange
+Input [3]: [s_store_sk#20, sum#23, sum#24]
+Arguments: hashpartitioning(s_store_sk#20, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(30) CometHashAggregate
+Input [3]: [s_store_sk#20, sum#23, sum#24]
+Keys [1]: [s_store_sk#20]
+Functions [2]: [sum(UnscaledValue(sr_return_amt#15)), sum(UnscaledValue(sr_net_loss#16))]
+
+(31) ColumnarToRow [codegen id : 7]
+Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
+
+(32) BroadcastExchange
+Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 8]
+(33) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [s_store_sk#7]
-Right keys [1]: [s_store_sk#22]
+Right keys [1]: [s_store_sk#20]
 Join type: LeftOuter
 Join condition: None
 
-(30) Project [codegen id : 8]
-Output [5]: [store channel AS channel#31, s_store_sk#7 AS id#32, sales#14, coalesce(returns#29, 0.00) AS returns#33, (profit#15 - coalesce(profit_loss#30, 0.00)) AS profit#34]
-Input [6]: [s_store_sk#7, sales#14, profit#15, s_store_sk#22, returns#29, profit_loss#30]
+(34) Project [codegen id : 8]
+Output [5]: [store channel AS channel#27, s_store_sk#7 AS id#28, sales#12, coalesce(returns#25, 0.00) AS returns#29, (profit#13 - coalesce(profit_loss#26, 0.00)) AS profit#30]
+Input [6]: [s_store_sk#7, sales#12, profit#13, s_store_sk#20, returns#25, profit_loss#26]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
+Output [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#38), dynamicpruningexpression(cs_sold_date_sk#38 IN dynamicpruning#39)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#34), dynamicpruningexpression(cs_sold_date_sk#34 IN dynamicpruning#35)]
 ReadSchema: struct<cs_call_center_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(32) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
+(36) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
 
-(33) ReusedExchange [Reuses operator id: 103]
-Output [1]: [d_date_sk#40]
+(37) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#36]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#38]
-Right keys [1]: [d_date_sk#40]
+(38) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#34]
+Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
-Input [5]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38, d_date_sk#40]
-
-(36) HashAggregate [codegen id : 10]
-Input [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
-Keys [1]: [cs_call_center_sk#35]
-Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#36)), partial_sum(UnscaledValue(cs_net_profit#37))]
-Aggregate Attributes [2]: [sum#41, sum#42]
-Results [3]: [cs_call_center_sk#35, sum#43, sum#44]
-
-(37) Exchange
-Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
-Arguments: hashpartitioning(cs_call_center_sk#35, 5), ENSURE_REQUIREMENTS, [plan_id=5]
-
-(38) HashAggregate [codegen id : 11]
-Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
-Keys [1]: [cs_call_center_sk#35]
-Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#36)), sum(UnscaledValue(cs_net_profit#37))]
-Aggregate Attributes [2]: [sum(UnscaledValue(cs_ext_sales_price#36))#45, sum(UnscaledValue(cs_net_profit#37))#46]
-Results [3]: [cs_call_center_sk#35, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#36))#45,17,2) AS sales#47, MakeDecimal(sum(UnscaledValue(cs_net_profit#37))#46,17,2) AS profit#48]
-
-(39) BroadcastExchange
-Input [3]: [cs_call_center_sk#35, sales#47, profit#48]
+(39) Project [codegen id : 10]
+Output [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
+Input [5]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34, d_date_sk#36]
+
+(40) HashAggregate [codegen id : 10]
+Input [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
+Keys [1]: [cs_call_center_sk#31]
+Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#32)), partial_sum(UnscaledValue(cs_net_profit#33))]
+Aggregate Attributes [2]: [sum#37, sum#38]
+Results [3]: [cs_call_center_sk#31, sum#39, sum#40]
+
+(41) RowToColumnar
+Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
+
+(42) CometColumnarExchange
+Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
+Arguments: hashpartitioning(cs_call_center_sk#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+
+(43) CometHashAggregate
+Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
+Keys [1]: [cs_call_center_sk#31]
+Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#32)), sum(UnscaledValue(cs_net_profit#33))]
+
+(44) ColumnarToRow [codegen id : 11]
+Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
+
+(45) BroadcastExchange
+Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
 Arguments: IdentityBroadcastMode, [plan_id=6]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
+Output [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#51), dynamicpruningexpression(cr_returned_date_sk#51 IN dynamicpruning#52)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#45), dynamicpruningexpression(cr_returned_date_sk#45 IN dynamicpruning#46)]
 ReadSchema: struct<cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(41) ColumnarToRow [codegen id : 13]
-Input [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
+(47) ColumnarToRow [codegen id : 13]
+Input [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
 
-(42) ReusedExchange [Reuses operator id: 103]
-Output [1]: [d_date_sk#53]
+(48) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#47]
 
-(43) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cr_returned_date_sk#51]
-Right keys [1]: [d_date_sk#53]
+(49) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cr_returned_date_sk#45]
+Right keys [1]: [d_date_sk#47]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 13]
-Output [2]: [cr_return_amount#49, cr_net_loss#50]
-Input [4]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51, d_date_sk#53]
+(50) Project [codegen id : 13]
+Output [2]: [cr_return_amount#43, cr_net_loss#44]
+Input [4]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45, d_date_sk#47]
 
-(45) HashAggregate [codegen id : 13]
-Input [2]: [cr_return_amount#49, cr_net_loss#50]
+(51) HashAggregate [codegen id : 13]
+Input [2]: [cr_return_amount#43, cr_net_loss#44]
 Keys: []
-Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#49)), partial_sum(UnscaledValue(cr_net_loss#50))]
-Aggregate Attributes [2]: [sum#54, sum#55]
-Results [2]: [sum#56, sum#57]
+Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#43)), partial_sum(UnscaledValue(cr_net_loss#44))]
+Aggregate Attributes [2]: [sum#48, sum#49]
+Results [2]: [sum#50, sum#51]
 
-(46) Exchange
-Input [2]: [sum#56, sum#57]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
+(52) RowToColumnar
+Input [2]: [sum#50, sum#51]
 
-(47) HashAggregate
-Input [2]: [sum#56, sum#57]
+(53) CometColumnarExchange
+Input [2]: [sum#50, sum#51]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+
+(54) CometHashAggregate
+Input [2]: [sum#50, sum#51]
 Keys: []
-Functions [2]: [sum(UnscaledValue(cr_return_amount#49)), sum(UnscaledValue(cr_net_loss#50))]
-Aggregate Attributes [2]: [sum(UnscaledValue(cr_return_amount#49))#58, sum(UnscaledValue(cr_net_loss#50))#59]
-Results [2]: [MakeDecimal(sum(UnscaledValue(cr_return_amount#49))#58,17,2) AS returns#60, MakeDecimal(sum(UnscaledValue(cr_net_loss#50))#59,17,2) AS profit_loss#61]
+Functions [2]: [sum(UnscaledValue(cr_return_amount#43)), sum(UnscaledValue(cr_net_loss#44))]
+
+(55) ColumnarToRow
+Input [2]: [returns#52, profit_loss#53]
 
-(48) BroadcastNestedLoopJoin [codegen id : 14]
+(56) BroadcastNestedLoopJoin [codegen id : 14]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 14]
-Output [5]: [catalog channel AS channel#62, cs_call_center_sk#35 AS id#63, sales#47, returns#60, (profit#48 - profit_loss#61) AS profit#64]
-Input [5]: [cs_call_center_sk#35, sales#47, profit#48, returns#60, profit_loss#61]
+(57) Project [codegen id : 14]
+Output [5]: [catalog channel AS channel#54, cs_call_center_sk#31 AS id#55, sales#41, returns#52, (profit#42 - profit_loss#53) AS profit#56]
+Input [5]: [cs_call_center_sk#31, sales#41, profit#42, returns#52, profit_loss#53]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
+Output [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#68), dynamicpruningexpression(ws_sold_date_sk#68 IN dynamicpruning#69)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#60), dynamicpruningexpression(ws_sold_date_sk#60 IN dynamicpruning#61)]
 PushedFilters: [IsNotNull(ws_web_page_sk)]
 ReadSchema: struct<ws_web_page_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(51) CometFilter
-Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
-Condition : isnotnull(ws_web_page_sk#65)
+(59) CometFilter
+Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
+Condition : isnotnull(ws_web_page_sk#57)
 
-(52) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
+(60) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
 
-(53) ReusedExchange [Reuses operator id: 103]
-Output [1]: [d_date_sk#70]
+(61) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#62]
 
-(54) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#68]
-Right keys [1]: [d_date_sk#70]
+(62) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#60]
+Right keys [1]: [d_date_sk#62]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 17]
-Output [3]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67]
-Input [5]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68, d_date_sk#70]
+(63) Project [codegen id : 17]
+Output [3]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59]
+Input [5]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60, d_date_sk#62]
 
 (unknown) Scan parquet spark_catalog.default.web_page
-Output [1]: [wp_web_page_sk#71]
+Output [1]: [wp_web_page_sk#63]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_page]
 PushedFilters: [IsNotNull(wp_web_page_sk)]
 ReadSchema: struct<wp_web_page_sk:int>
 
-(57) CometFilter
-Input [1]: [wp_web_page_sk#71]
-Condition : isnotnull(wp_web_page_sk#71)
+(65) CometFilter
+Input [1]: [wp_web_page_sk#63]
+Condition : isnotnull(wp_web_page_sk#63)
 
-(58) ColumnarToRow [codegen id : 16]
-Input [1]: [wp_web_page_sk#71]
+(66) ColumnarToRow [codegen id : 16]
+Input [1]: [wp_web_page_sk#63]
 
-(59) BroadcastExchange
-Input [1]: [wp_web_page_sk#71]
+(67) BroadcastExchange
+Input [1]: [wp_web_page_sk#63]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_web_page_sk#65]
-Right keys [1]: [wp_web_page_sk#71]
+(68) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_web_page_sk#57]
+Right keys [1]: [wp_web_page_sk#63]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 17]
-Output [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
-Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
+(69) Project [codegen id : 17]
+Output [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
+Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
+
+(70) HashAggregate [codegen id : 17]
+Input [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
+Keys [1]: [wp_web_page_sk#63]
+Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#58)), partial_sum(UnscaledValue(ws_net_profit#59))]
+Aggregate Attributes [2]: [sum#64, sum#65]
+Results [3]: [wp_web_page_sk#63, sum#66, sum#67]
 
-(62) HashAggregate [codegen id : 17]
-Input [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
-Keys [1]: [wp_web_page_sk#71]
-Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#66)), partial_sum(UnscaledValue(ws_net_profit#67))]
-Aggregate Attributes [2]: [sum#72, sum#73]
-Results [3]: [wp_web_page_sk#71, sum#74, sum#75]
+(71) RowToColumnar
+Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
 
-(63) Exchange
-Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
-Arguments: hashpartitioning(wp_web_page_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+(72) CometColumnarExchange
+Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
+Arguments: hashpartitioning(wp_web_page_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
 
-(64) HashAggregate [codegen id : 22]
-Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
-Keys [1]: [wp_web_page_sk#71]
-Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#66)), sum(UnscaledValue(ws_net_profit#67))]
-Aggregate Attributes [2]: [sum(UnscaledValue(ws_ext_sales_price#66))#76, sum(UnscaledValue(ws_net_profit#67))#77]
-Results [3]: [wp_web_page_sk#71, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#66))#76,17,2) AS sales#78, MakeDecimal(sum(UnscaledValue(ws_net_profit#67))#77,17,2) AS profit#79]
+(73) CometHashAggregate
+Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
+Keys [1]: [wp_web_page_sk#63]
+Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#58)), sum(UnscaledValue(ws_net_profit#59))]
+
+(74) ColumnarToRow [codegen id : 22]
+Input [3]: [wp_web_page_sk#63, sales#68, profit#69]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
+Output [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#83), dynamicpruningexpression(wr_returned_date_sk#83 IN dynamicpruning#84)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#73), dynamicpruningexpression(wr_returned_date_sk#73 IN dynamicpruning#74)]
 PushedFilters: [IsNotNull(wr_web_page_sk)]
 ReadSchema: struct<wr_web_page_sk:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(66) CometFilter
-Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
-Condition : isnotnull(wr_web_page_sk#80)
+(76) CometFilter
+Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
+Condition : isnotnull(wr_web_page_sk#70)
 
-(67) ColumnarToRow [codegen id : 20]
-Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
+(77) ColumnarToRow [codegen id : 20]
+Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
 
-(68) ReusedExchange [Reuses operator id: 103]
-Output [1]: [d_date_sk#85]
+(78) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#75]
 
-(69) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_returned_date_sk#83]
-Right keys [1]: [d_date_sk#85]
+(79) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_returned_date_sk#73]
+Right keys [1]: [d_date_sk#75]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 20]
-Output [3]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82]
-Input [5]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83, d_date_sk#85]
+(80) Project [codegen id : 20]
+Output [3]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72]
+Input [5]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73, d_date_sk#75]
 
-(71) ReusedExchange [Reuses operator id: 59]
-Output [1]: [wp_web_page_sk#86]
+(81) ReusedExchange [Reuses operator id: 67]
+Output [1]: [wp_web_page_sk#76]
 
-(72) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_web_page_sk#80]
-Right keys [1]: [wp_web_page_sk#86]
+(82) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_web_page_sk#70]
+Right keys [1]: [wp_web_page_sk#76]
 Join type: Inner
 Join condition: None
 
-(73) Project [codegen id : 20]
-Output [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
-Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
-
-(74) HashAggregate [codegen id : 20]
-Input [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
-Keys [1]: [wp_web_page_sk#86]
-Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#81)), partial_sum(UnscaledValue(wr_net_loss#82))]
-Aggregate Attributes [2]: [sum#87, sum#88]
-Results [3]: [wp_web_page_sk#86, sum#89, sum#90]
-
-(75) Exchange
-Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
-Arguments: hashpartitioning(wp_web_page_sk#86, 5), ENSURE_REQUIREMENTS, [plan_id=10]
-
-(76) HashAggregate [codegen id : 21]
-Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
-Keys [1]: [wp_web_page_sk#86]
-Functions [2]: [sum(UnscaledValue(wr_return_amt#81)), sum(UnscaledValue(wr_net_loss#82))]
-Aggregate Attributes [2]: [sum(UnscaledValue(wr_return_amt#81))#91, sum(UnscaledValue(wr_net_loss#82))#92]
-Results [3]: [wp_web_page_sk#86, MakeDecimal(sum(UnscaledValue(wr_return_amt#81))#91,17,2) AS returns#93, MakeDecimal(sum(UnscaledValue(wr_net_loss#82))#92,17,2) AS profit_loss#94]
-
-(77) BroadcastExchange
-Input [3]: [wp_web_page_sk#86, returns#93, profit_loss#94]
+(83) Project [codegen id : 20]
+Output [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
+Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
+
+(84) HashAggregate [codegen id : 20]
+Input [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
+Keys [1]: [wp_web_page_sk#76]
+Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#71)), partial_sum(UnscaledValue(wr_net_loss#72))]
+Aggregate Attributes [2]: [sum#77, sum#78]
+Results [3]: [wp_web_page_sk#76, sum#79, sum#80]
+
+(85) RowToColumnar
+Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
+
+(86) CometColumnarExchange
+Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
+Arguments: hashpartitioning(wp_web_page_sk#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(87) CometHashAggregate
+Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
+Keys [1]: [wp_web_page_sk#76]
+Functions [2]: [sum(UnscaledValue(wr_return_amt#71)), sum(UnscaledValue(wr_net_loss#72))]
+
+(88) ColumnarToRow [codegen id : 21]
+Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
+
+(89) BroadcastExchange
+Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(78) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [wp_web_page_sk#71]
-Right keys [1]: [wp_web_page_sk#86]
+(90) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [wp_web_page_sk#63]
+Right keys [1]: [wp_web_page_sk#76]
 Join type: LeftOuter
 Join condition: None
 
-(79) Project [codegen id : 22]
-Output [5]: [web channel AS channel#95, wp_web_page_sk#71 AS id#96, sales#78, coalesce(returns#93, 0.00) AS returns#97, (profit#79 - coalesce(profit_loss#94, 0.00)) AS profit#98]
-Input [6]: [wp_web_page_sk#71, sales#78, profit#79, wp_web_page_sk#86, returns#93, profit_loss#94]
-
-(80) Union
-
-(81) HashAggregate [codegen id : 23]
-Input [5]: [channel#31, id#32, sales#14, returns#33, profit#34]
-Keys [2]: [channel#31, id#32]
-Functions [3]: [partial_sum(sales#14), partial_sum(returns#33), partial_sum(profit#34)]
-Aggregate Attributes [6]: [sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104]
-Results [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-
-(82) Exchange
-Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-Arguments: hashpartitioning(channel#31, id#32, 5), ENSURE_REQUIREMENTS, [plan_id=12]
-
-(83) HashAggregate [codegen id : 24]
-Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-Keys [2]: [channel#31, id#32]
-Functions [3]: [sum(sales#14), sum(returns#33), sum(profit#34)]
-Aggregate Attributes [3]: [sum(sales#14)#111, sum(returns#33)#112, sum(profit#34)#113]
-Results [5]: [channel#31, id#32, cast(sum(sales#14)#111 as decimal(37,2)) AS sales#114, cast(sum(returns#33)#112 as decimal(37,2)) AS returns#115, cast(sum(profit#34)#113 as decimal(38,2)) AS profit#116]
-
-(84) ReusedExchange [Reuses operator id: 82]
-Output [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-
-(85) HashAggregate [codegen id : 48]
-Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-Keys [2]: [channel#31, id#32]
-Functions [3]: [sum(sales#14), sum(returns#33), sum(profit#34)]
-Aggregate Attributes [3]: [sum(sales#14)#111, sum(returns#33)#112, sum(profit#34)#113]
-Results [4]: [channel#31, sum(sales#14)#111 AS sales#117, sum(returns#33)#112 AS returns#118, sum(profit#34)#113 AS profit#119]
-
-(86) HashAggregate [codegen id : 48]
-Input [4]: [channel#31, sales#117, returns#118, profit#119]
-Keys [1]: [channel#31]
-Functions [3]: [partial_sum(sales#117), partial_sum(returns#118), partial_sum(profit#119)]
-Aggregate Attributes [6]: [sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
-Results [7]: [channel#31, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
-
-(87) Exchange
-Input [7]: [channel#31, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
-Arguments: hashpartitioning(channel#31, 5), ENSURE_REQUIREMENTS, [plan_id=13]
-
-(88) HashAggregate [codegen id : 49]
-Input [7]: [channel#31, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
-Keys [1]: [channel#31]
-Functions [3]: [sum(sales#117), sum(returns#118), sum(profit#119)]
-Aggregate Attributes [3]: [sum(sales#117)#132, sum(returns#118)#133, sum(profit#119)#134]
-Results [5]: [channel#31, null AS id#135, sum(sales#117)#132 AS sales#136, sum(returns#118)#133 AS returns#137, sum(profit#119)#134 AS profit#138]
-
-(89) ReusedExchange [Reuses operator id: 82]
-Output [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-
-(90) HashAggregate [codegen id : 73]
-Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
-Keys [2]: [channel#31, id#32]
-Functions [3]: [sum(sales#14), sum(returns#33), sum(profit#34)]
-Aggregate Attributes [3]: [sum(sales#14)#111, sum(returns#33)#112, sum(profit#34)#113]
-Results [3]: [sum(sales#14)#111 AS sales#117, sum(returns#33)#112 AS returns#118, sum(profit#34)#113 AS profit#119]
-
-(91) HashAggregate [codegen id : 73]
-Input [3]: [sales#117, returns#118, profit#119]
+(91) Project [codegen id : 22]
+Output [5]: [web channel AS channel#83, wp_web_page_sk#63 AS id#84, sales#68, coalesce(returns#81, 0.00) AS returns#85, (profit#69 - coalesce(profit_loss#82, 0.00)) AS profit#86]
+Input [6]: [wp_web_page_sk#63, sales#68, profit#69, wp_web_page_sk#76, returns#81, profit_loss#82]
+
+(92) Union
+
+(93) HashAggregate [codegen id : 23]
+Input [5]: [channel#27, id#28, sales#12, returns#29, profit#30]
+Keys [2]: [channel#27, id#28]
+Functions [3]: [partial_sum(sales#12), partial_sum(returns#29), partial_sum(profit#30)]
+Aggregate Attributes [6]: [sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92]
+Results [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+
+(94) RowToColumnar
+Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+
+(95) CometColumnarExchange
+Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+Arguments: hashpartitioning(channel#27, id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+
+(96) CometHashAggregate
+Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+Keys [2]: [channel#27, id#28]
+Functions [3]: [sum(sales#12), sum(returns#29), sum(profit#30)]
+
+(97) ReusedExchange [Reuses operator id: 95]
+Output [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+
+(98) CometHashAggregate
+Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+Keys [2]: [channel#27, id#28]
+Functions [3]: [sum(sales#12), sum(returns#29), sum(profit#30)]
+
+(99) CometHashAggregate
+Input [4]: [channel#27, sales#99, returns#100, profit#101]
+Keys [1]: [channel#27]
+Functions [3]: [partial_sum(sales#99), partial_sum(returns#100), partial_sum(profit#101)]
+
+(100) CometColumnarExchange
+Input [7]: [channel#27, sum#102, isEmpty#103, sum#104, isEmpty#105, sum#106, isEmpty#107]
+Arguments: hashpartitioning(channel#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+
+(101) CometHashAggregate
+Input [7]: [channel#27, sum#102, isEmpty#103, sum#104, isEmpty#105, sum#106, isEmpty#107]
+Keys [1]: [channel#27]
+Functions [3]: [sum(sales#99), sum(returns#100), sum(profit#101)]
+
+(102) ReusedExchange [Reuses operator id: 95]
+Output [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+
+(103) CometHashAggregate
+Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
+Keys [2]: [channel#27, id#28]
+Functions [3]: [sum(sales#12), sum(returns#29), sum(profit#30)]
+
+(104) CometHashAggregate
+Input [3]: [sales#99, returns#100, profit#101]
 Keys: []
-Functions [3]: [partial_sum(sales#117), partial_sum(returns#118), partial_sum(profit#119)]
-Aggregate Attributes [6]: [sum#139, isEmpty#140, sum#141, isEmpty#142, sum#143, isEmpty#144]
-Results [6]: [sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150]
+Functions [3]: [partial_sum(sales#99), partial_sum(returns#100), partial_sum(profit#101)]
 
-(92) Exchange
-Input [6]: [sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=14]
+(105) CometColumnarExchange
+Input [6]: [sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
 
-(93) HashAggregate [codegen id : 74]
-Input [6]: [sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150]
+(106) CometHashAggregate
+Input [6]: [sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
 Keys: []
-Functions [3]: [sum(sales#117), sum(returns#118), sum(profit#119)]
-Aggregate Attributes [3]: [sum(sales#117)#151, sum(returns#118)#152, sum(profit#119)#153]
-Results [5]: [null AS channel#154, null AS id#155, sum(sales#117)#151 AS sales#156, sum(returns#118)#152 AS returns#157, sum(profit#119)#153 AS profit#158]
+Functions [3]: [sum(sales#99), sum(returns#100), sum(profit#101)]
 
-(94) Union
+(107) CometUnion
+Child 0 Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+Child 1 Input [5]: [channel#27, id#117, sales#118, returns#119, profit#120]
+Child 2 Input [5]: [channel#121, id#122, sales#123, returns#124, profit#125]
 
-(95) HashAggregate [codegen id : 75]
-Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
-Keys [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
+(108) CometHashAggregate
+Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+Keys [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
 
-(96) Exchange
-Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
-Arguments: hashpartitioning(channel#31, id#32, sales#114, returns#115, profit#116, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+(109) CometColumnarExchange
+Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+Arguments: hashpartitioning(channel#27, id#28, sales#114, returns#115, profit#116, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(97) HashAggregate [codegen id : 76]
-Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
-Keys [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
+(110) CometHashAggregate
+Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+Keys [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
 
-(98) TakeOrderedAndProject
-Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
-Arguments: 100, [channel#31 ASC NULLS FIRST, id#32 ASC NULLS FIRST], [channel#31, id#32, sales#114, returns#115, profit#116]
+(111) CometTakeOrderedAndProject
+Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#27 ASC NULLS FIRST,id#28 ASC NULLS FIRST], output=[channel#27,id#28,sales#114,returns#115,profit#116]), 100, [channel#27 ASC NULLS FIRST, id#28 ASC NULLS FIRST], [channel#27, id#28, sales#114, returns#115, profit#116]
+
+(112) ColumnarToRow [codegen id : 70]
+Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (103)
-+- * ColumnarToRow (102)
-   +- CometProject (101)
-      +- CometFilter (100)
-         +- CometScan parquet spark_catalog.default.date_dim (99)
+BroadcastExchange (117)
++- * ColumnarToRow (116)
+   +- CometProject (115)
+      +- CometFilter (114)
+         +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_date#159]
+Output [2]: [d_date_sk#6, d_date#126]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-09-03), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(100) CometFilter
-Input [2]: [d_date_sk#6, d_date#159]
-Condition : (((isnotnull(d_date#159) AND (d_date#159 >= 1998-08-04)) AND (d_date#159 <= 1998-09-03)) AND isnotnull(d_date_sk#6))
+(114) CometFilter
+Input [2]: [d_date_sk#6, d_date#126]
+Condition : (((isnotnull(d_date#126) AND (d_date#126 >= 1998-08-04)) AND (d_date#126 <= 1998-09-03)) AND isnotnull(d_date_sk#6))
 
-(101) CometProject
-Input [2]: [d_date_sk#6, d_date#159]
+(115) CometProject
+Input [2]: [d_date_sk#6, d_date#126]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(102) ColumnarToRow [codegen id : 1]
+(116) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(103) BroadcastExchange
+(117) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=16]
 
-Subquery:2 Hosting operator id = 16 Hosting Expression = sr_returned_date_sk#19 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 18 Hosting Expression = sr_returned_date_sk#17 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 31 Hosting Expression = cs_sold_date_sk#38 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 35 Hosting Expression = cs_sold_date_sk#34 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 40 Hosting Expression = cr_returned_date_sk#51 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 46 Hosting Expression = cr_returned_date_sk#45 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 50 Hosting Expression = ws_sold_date_sk#68 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 58 Hosting Expression = ws_sold_date_sk#60 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 65 Hosting Expression = wr_returned_date_sk#83 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 75 Hosting Expression = wr_returned_date_sk#73 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt
index 670a7e6c3e..1fc58ce481 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt
@@ -1,26 +1,26 @@
-TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (76)
-    HashAggregate [channel,id,sales,returns,profit]
-      InputAdapter
-        Exchange [channel,id,sales,returns,profit] #1
-          WholeStageCodegen (75)
-            HashAggregate [channel,id,sales,returns,profit]
-              InputAdapter
-                Union
-                  WholeStageCodegen (24)
-                    HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [channel,id] #2
-                          WholeStageCodegen (23)
-                            HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (8)
-                                    Project [s_store_sk,sales,returns,profit,profit_loss]
-                                      BroadcastHashJoin [s_store_sk,s_store_sk]
-                                        HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(UnscaledValue(ss_net_profit)),sales,profit,sum,sum]
-                                          InputAdapter
-                                            Exchange [s_store_sk] #3
+WholeStageCodegen (70)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
+        CometHashAggregate [channel,id,sales,returns,profit]
+          CometColumnarExchange [channel,id,sales,returns,profit] #1
+            CometHashAggregate [channel,id,sales,returns,profit]
+              CometUnion
+                CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [channel,id] #2
+                    RowToColumnar
+                      WholeStageCodegen (23)
+                        HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                          InputAdapter
+                            Union
+                              WholeStageCodegen (8)
+                                Project [s_store_sk,sales,returns,profit,profit_loss]
+                                  BroadcastHashJoin [s_store_sk,s_store_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [s_store_sk,sum,sum]
+                                          CometColumnarExchange [s_store_sk] #3
+                                            RowToColumnar
                                               WholeStageCodegen (3)
                                                 HashAggregate [s_store_sk,ss_ext_sales_price,ss_net_profit] [sum,sum,sum,sum]
                                                   Project [ss_ext_sales_price,ss_net_profit,s_store_sk]
@@ -48,12 +48,14 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                               InputAdapter
                                                                 CometFilter [s_store_sk]
                                                                   CometScan parquet spark_catalog.default.store [s_store_sk]
-                                        InputAdapter
-                                          BroadcastExchange #6
-                                            WholeStageCodegen (7)
-                                              HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(sr_return_amt)),sum(UnscaledValue(sr_net_loss)),returns,profit_loss,sum,sum]
-                                                InputAdapter
-                                                  Exchange [s_store_sk] #7
+                                    InputAdapter
+                                      BroadcastExchange #6
+                                        WholeStageCodegen (7)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometHashAggregate [s_store_sk,sum,sum]
+                                                CometColumnarExchange [s_store_sk] #7
+                                                  RowToColumnar
                                                     WholeStageCodegen (6)
                                                       HashAggregate [s_store_sk,sr_return_amt,sr_net_loss] [sum,sum,sum,sum]
                                                         Project [sr_return_amt,sr_net_loss,s_store_sk]
@@ -69,15 +71,17 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                   ReusedExchange [d_date_sk] #4
                                                             InputAdapter
                                                               ReusedExchange [s_store_sk] #5
-                                  WholeStageCodegen (14)
-                                    Project [cs_call_center_sk,sales,returns,profit,profit_loss]
-                                      BroadcastNestedLoopJoin
-                                        InputAdapter
-                                          BroadcastExchange #8
-                                            WholeStageCodegen (11)
-                                              HashAggregate [cs_call_center_sk,sum,sum] [sum(UnscaledValue(cs_ext_sales_price)),sum(UnscaledValue(cs_net_profit)),sales,profit,sum,sum]
-                                                InputAdapter
-                                                  Exchange [cs_call_center_sk] #9
+                              WholeStageCodegen (14)
+                                Project [cs_call_center_sk,sales,returns,profit,profit_loss]
+                                  BroadcastNestedLoopJoin
+                                    InputAdapter
+                                      BroadcastExchange #8
+                                        WholeStageCodegen (11)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometHashAggregate [cs_call_center_sk,sum,sum]
+                                                CometColumnarExchange [cs_call_center_sk] #9
+                                                  RowToColumnar
                                                     WholeStageCodegen (10)
                                                       HashAggregate [cs_call_center_sk,cs_ext_sales_price,cs_net_profit] [sum,sum,sum,sum]
                                                         Project [cs_call_center_sk,cs_ext_sales_price,cs_net_profit]
@@ -88,9 +92,11 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                   ReusedSubquery [d_date_sk] #1
                                                             InputAdapter
                                                               ReusedExchange [d_date_sk] #4
-                                        HashAggregate [sum,sum] [sum(UnscaledValue(cr_return_amount)),sum(UnscaledValue(cr_net_loss)),returns,profit_loss,sum,sum]
-                                          InputAdapter
-                                            Exchange #10
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [sum,sum]
+                                          CometColumnarExchange #10
+                                            RowToColumnar
                                               WholeStageCodegen (13)
                                                 HashAggregate [cr_return_amount,cr_net_loss] [sum,sum,sum,sum]
                                                   Project [cr_return_amount,cr_net_loss]
@@ -101,12 +107,14 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                             ReusedSubquery [d_date_sk] #1
                                                       InputAdapter
                                                         ReusedExchange [d_date_sk] #4
-                                  WholeStageCodegen (22)
-                                    Project [wp_web_page_sk,sales,returns,profit,profit_loss]
-                                      BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
-                                        HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(ws_ext_sales_price)),sum(UnscaledValue(ws_net_profit)),sales,profit,sum,sum]
-                                          InputAdapter
-                                            Exchange [wp_web_page_sk] #11
+                              WholeStageCodegen (22)
+                                Project [wp_web_page_sk,sales,returns,profit,profit_loss]
+                                  BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometHashAggregate [wp_web_page_sk,sum,sum]
+                                          CometColumnarExchange [wp_web_page_sk] #11
+                                            RowToColumnar
                                               WholeStageCodegen (17)
                                                 HashAggregate [wp_web_page_sk,ws_ext_sales_price,ws_net_profit] [sum,sum,sum,sum]
                                                   Project [ws_ext_sales_price,ws_net_profit,wp_web_page_sk]
@@ -127,12 +135,14 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                               InputAdapter
                                                                 CometFilter [wp_web_page_sk]
                                                                   CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
-                                        InputAdapter
-                                          BroadcastExchange #13
-                                            WholeStageCodegen (21)
-                                              HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(wr_return_amt)),sum(UnscaledValue(wr_net_loss)),returns,profit_loss,sum,sum]
-                                                InputAdapter
-                                                  Exchange [wp_web_page_sk] #14
+                                    InputAdapter
+                                      BroadcastExchange #13
+                                        WholeStageCodegen (21)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometHashAggregate [wp_web_page_sk,sum,sum]
+                                                CometColumnarExchange [wp_web_page_sk] #14
+                                                  RowToColumnar
                                                     WholeStageCodegen (20)
                                                       HashAggregate [wp_web_page_sk,wr_return_amt,wr_net_loss] [sum,sum,sum,sum]
                                                         Project [wr_return_amt,wr_net_loss,wp_web_page_sk]
@@ -148,21 +158,13 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                   ReusedExchange [d_date_sk] #4
                                                             InputAdapter
                                                               ReusedExchange [wp_web_page_sk] #12
-                  WholeStageCodegen (49)
-                    HashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [channel] #15
-                          WholeStageCodegen (48)
-                            HashAggregate [channel,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                InputAdapter
-                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
-                  WholeStageCodegen (74)
-                    HashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),channel,id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange #16
-                          WholeStageCodegen (73)
-                            HashAggregate [sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                InputAdapter
-                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                CometHashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [channel] #15
+                    CometHashAggregate [channel,sales,returns,profit]
+                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                CometHashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange #16
+                    CometHashAggregate [sales,returns,profit]
+                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt
index cfb9ed7d0e..f411b80b79 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt
@@ -1,71 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (67)
-+- * Project (66)
-   +- * SortMergeJoin Inner (65)
-      :- * Project (43)
-      :  +- * SortMergeJoin Inner (42)
-      :     :- * Sort (20)
-      :     :  +- * HashAggregate (19)
-      :     :     +- Exchange (18)
-      :     :        +- * HashAggregate (17)
-      :     :           +- * Project (16)
-      :     :              +- * BroadcastHashJoin Inner BuildRight (15)
-      :     :                 :- * ColumnarToRow (13)
-      :     :                 :  +- CometProject (12)
-      :     :                 :     +- CometFilter (11)
-      :     :                 :        +- CometSortMergeJoin (10)
-      :     :                 :           :- CometSort (4)
-      :     :                 :           :  +- CometExchange (3)
-      :     :                 :           :     +- CometFilter (2)
-      :     :                 :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :                 :           +- CometSort (9)
-      :     :                 :              +- CometExchange (8)
-      :     :                 :                 +- CometProject (7)
-      :     :                 :                    +- CometFilter (6)
-      :     :                 :                       +- CometScan parquet spark_catalog.default.store_returns (5)
-      :     :                 +- ReusedExchange (14)
-      :     +- * Sort (41)
-      :        +- * Filter (40)
-      :           +- * HashAggregate (39)
-      :              +- Exchange (38)
-      :                 +- * HashAggregate (37)
-      :                    +- * Project (36)
-      :                       +- * BroadcastHashJoin Inner BuildRight (35)
-      :                          :- * ColumnarToRow (33)
-      :                          :  +- CometProject (32)
-      :                          :     +- CometFilter (31)
-      :                          :        +- CometSortMergeJoin (30)
-      :                          :           :- CometSort (24)
-      :                          :           :  +- CometExchange (23)
-      :                          :           :     +- CometFilter (22)
-      :                          :           :        +- CometScan parquet spark_catalog.default.web_sales (21)
-      :                          :           +- CometSort (29)
-      :                          :              +- CometExchange (28)
-      :                          :                 +- CometProject (27)
-      :                          :                    +- CometFilter (26)
-      :                          :                       +- CometScan parquet spark_catalog.default.web_returns (25)
-      :                          +- ReusedExchange (34)
-      +- * Sort (64)
-         +- * Filter (63)
-            +- * HashAggregate (62)
-               +- Exchange (61)
-                  +- * HashAggregate (60)
-                     +- * Project (59)
-                        +- * BroadcastHashJoin Inner BuildRight (58)
-                           :- * ColumnarToRow (56)
-                           :  +- CometProject (55)
-                           :     +- CometFilter (54)
-                           :        +- CometSortMergeJoin (53)
-                           :           :- CometSort (47)
-                           :           :  +- CometExchange (46)
-                           :           :     +- CometFilter (45)
-                           :           :        +- CometScan parquet spark_catalog.default.catalog_sales (44)
-                           :           +- CometSort (52)
-                           :              +- CometExchange (51)
-                           :                 +- CometProject (50)
-                           :                    +- CometFilter (49)
-                           :                       +- CometScan parquet spark_catalog.default.catalog_returns (48)
-                           +- ReusedExchange (57)
+TakeOrderedAndProject (71)
++- * Project (70)
+   +- * ColumnarToRow (69)
+      +- CometSortMergeJoin (68)
+         :- CometProject (45)
+         :  +- CometSortMergeJoin (44)
+         :     :- CometSort (21)
+         :     :  +- CometHashAggregate (20)
+         :     :     +- CometColumnarExchange (19)
+         :     :        +- RowToColumnar (18)
+         :     :           +- * HashAggregate (17)
+         :     :              +- * Project (16)
+         :     :                 +- * BroadcastHashJoin Inner BuildRight (15)
+         :     :                    :- * ColumnarToRow (13)
+         :     :                    :  +- CometProject (12)
+         :     :                    :     +- CometFilter (11)
+         :     :                    :        +- CometSortMergeJoin (10)
+         :     :                    :           :- CometSort (4)
+         :     :                    :           :  +- CometColumnarExchange (3)
+         :     :                    :           :     +- CometFilter (2)
+         :     :                    :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
+         :     :                    :           +- CometSort (9)
+         :     :                    :              +- CometColumnarExchange (8)
+         :     :                    :                 +- CometProject (7)
+         :     :                    :                    +- CometFilter (6)
+         :     :                    :                       +- CometScan parquet spark_catalog.default.store_returns (5)
+         :     :                    +- ReusedExchange (14)
+         :     +- CometSort (43)
+         :        +- CometFilter (42)
+         :           +- CometHashAggregate (41)
+         :              +- CometColumnarExchange (40)
+         :                 +- RowToColumnar (39)
+         :                    +- * HashAggregate (38)
+         :                       +- * Project (37)
+         :                          +- * BroadcastHashJoin Inner BuildRight (36)
+         :                             :- * ColumnarToRow (34)
+         :                             :  +- CometProject (33)
+         :                             :     +- CometFilter (32)
+         :                             :        +- CometSortMergeJoin (31)
+         :                             :           :- CometSort (25)
+         :                             :           :  +- CometColumnarExchange (24)
+         :                             :           :     +- CometFilter (23)
+         :                             :           :        +- CometScan parquet spark_catalog.default.web_sales (22)
+         :                             :           +- CometSort (30)
+         :                             :              +- CometColumnarExchange (29)
+         :                             :                 +- CometProject (28)
+         :                             :                    +- CometFilter (27)
+         :                             :                       +- CometScan parquet spark_catalog.default.web_returns (26)
+         :                             +- ReusedExchange (35)
+         +- CometSort (67)
+            +- CometFilter (66)
+               +- CometHashAggregate (65)
+                  +- CometColumnarExchange (64)
+                     +- RowToColumnar (63)
+                        +- * HashAggregate (62)
+                           +- * Project (61)
+                              +- * BroadcastHashJoin Inner BuildRight (60)
+                                 :- * ColumnarToRow (58)
+                                 :  +- CometProject (57)
+                                 :     +- CometFilter (56)
+                                 :        +- CometSortMergeJoin (55)
+                                 :           :- CometSort (49)
+                                 :           :  +- CometColumnarExchange (48)
+                                 :           :     +- CometFilter (47)
+                                 :           :        +- CometScan parquet spark_catalog.default.catalog_sales (46)
+                                 :           +- CometSort (54)
+                                 :              +- CometColumnarExchange (53)
+                                 :                 +- CometProject (52)
+                                 :                    +- CometFilter (51)
+                                 :                       +- CometScan parquet spark_catalog.default.catalog_returns (50)
+                                 +- ReusedExchange (59)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -80,9 +84,9 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_ticket_number:int,ss_qua
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_customer_sk#2))
 
-(3) CometExchange
+(3) CometColumnarExchange
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
@@ -103,9 +107,9 @@ Condition : (isnotnull(sr_ticket_number#10) AND isnotnull(sr_item_sk#9))
 Input [3]: [sr_item_sk#9, sr_ticket_number#10, sr_returned_date_sk#11]
 Arguments: [sr_item_sk#9, sr_ticket_number#10], [sr_item_sk#9, sr_ticket_number#10]
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
-Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
@@ -127,7 +131,7 @@ Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5,
 (13) ColumnarToRow [codegen id : 2]
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(14) ReusedExchange [Reuses operator id: 71]
+(14) ReusedExchange [Reuses operator id: 75]
 Output [2]: [d_date_sk#12, d_year#13]
 
 (15) BroadcastHashJoin [codegen id : 2]
@@ -147,248 +151,252 @@ Functions [3]: [partial_sum(ss_quantity#4), partial_sum(UnscaledValue(ss_wholesa
 Aggregate Attributes [3]: [sum#14, sum#15, sum#16]
 Results [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 
-(18) Exchange
+(18) RowToColumnar
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
-Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) HashAggregate [codegen id : 3]
+(19) CometColumnarExchange
+Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
+Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(20) CometHashAggregate
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 Keys [3]: [d_year#13, ss_item_sk#1, ss_customer_sk#2]
 Functions [3]: [sum(ss_quantity#4), sum(UnscaledValue(ss_wholesale_cost#5)), sum(UnscaledValue(ss_sales_price#6))]
-Aggregate Attributes [3]: [sum(ss_quantity#4)#20, sum(UnscaledValue(ss_wholesale_cost#5))#21, sum(UnscaledValue(ss_sales_price#6))#22]
-Results [6]: [d_year#13 AS ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, sum(ss_quantity#4)#20 AS ss_qty#24, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#5))#21,17,2) AS ss_wc#25, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#22,17,2) AS ss_sp#26]
 
-(20) Sort [codegen id : 3]
-Input [6]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
-Arguments: [ss_sold_year#23 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], false, 0
+(21) CometSort
+Input [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23], [ss_sold_year#20 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_sold_date_sk#30 IN dynamicpruning#31)]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_order_number:int,ws_quantity:int,ws_wholesale_cost:decimal(7,2),ws_sales_price:decimal(7,2)>
 
-(22) CometFilter
-Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Condition : (isnotnull(ws_item_sk#27) AND isnotnull(ws_bill_customer_sk#28))
+(23) CometFilter
+Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Condition : (isnotnull(ws_item_sk#24) AND isnotnull(ws_bill_customer_sk#25))
 
-(23) CometExchange
-Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Arguments: hashpartitioning(ws_order_number#29, ws_item_sk#27, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
+(24) CometColumnarExchange
+Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Arguments: hashpartitioning(ws_order_number#26, ws_item_sk#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(24) CometSort
-Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_order_number#29 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST]
+(25) CometSort
+Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_order_number#26 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
+Output [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int>
 
-(26) CometFilter
-Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
-Condition : (isnotnull(wr_order_number#36) AND isnotnull(wr_item_sk#35))
+(27) CometFilter
+Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
+Condition : (isnotnull(wr_order_number#33) AND isnotnull(wr_item_sk#32))
 
-(27) CometProject
-Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
-Arguments: [wr_item_sk#35, wr_order_number#36], [wr_item_sk#35, wr_order_number#36]
+(28) CometProject
+Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
+Arguments: [wr_item_sk#32, wr_order_number#33], [wr_item_sk#32, wr_order_number#33]
 
-(28) CometExchange
-Input [2]: [wr_item_sk#35, wr_order_number#36]
-Arguments: hashpartitioning(wr_order_number#36, wr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
+(29) CometColumnarExchange
+Input [2]: [wr_item_sk#32, wr_order_number#33]
+Arguments: hashpartitioning(wr_order_number#33, wr_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(29) CometSort
-Input [2]: [wr_item_sk#35, wr_order_number#36]
-Arguments: [wr_item_sk#35, wr_order_number#36], [wr_order_number#36 ASC NULLS FIRST, wr_item_sk#35 ASC NULLS FIRST]
+(30) CometSort
+Input [2]: [wr_item_sk#32, wr_order_number#33]
+Arguments: [wr_item_sk#32, wr_order_number#33], [wr_order_number#33 ASC NULLS FIRST, wr_item_sk#32 ASC NULLS FIRST]
 
-(30) CometSortMergeJoin
-Left output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
-Right output [2]: [wr_item_sk#35, wr_order_number#36]
-Arguments: [ws_order_number#29, ws_item_sk#27], [wr_order_number#36, wr_item_sk#35], LeftOuter
+(31) CometSortMergeJoin
+Left output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Right output [2]: [wr_item_sk#32, wr_order_number#33]
+Arguments: [ws_order_number#26, ws_item_sk#24], [wr_order_number#33, wr_item_sk#32], LeftOuter
 
-(31) CometFilter
-Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
-Condition : isnull(wr_order_number#36)
+(32) CometFilter
+Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
+Condition : isnull(wr_order_number#33)
 
-(32) CometProject
-Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
-Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+(33) CometProject
+Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
+Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
 
-(33) ColumnarToRow [codegen id : 5]
-Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+(34) ColumnarToRow [codegen id : 4]
+Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
 
-(34) ReusedExchange [Reuses operator id: 71]
-Output [2]: [d_date_sk#38, d_year#39]
+(35) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#35, d_year#36]
 
-(35) BroadcastHashJoin [codegen id : 5]
-Left keys [1]: [ws_sold_date_sk#33]
-Right keys [1]: [d_date_sk#38]
+(36) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [ws_sold_date_sk#30]
+Right keys [1]: [d_date_sk#35]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 5]
-Output [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
-Input [8]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, d_date_sk#38, d_year#39]
-
-(37) HashAggregate [codegen id : 5]
-Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
-Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
-Functions [3]: [partial_sum(ws_quantity#30), partial_sum(UnscaledValue(ws_wholesale_cost#31)), partial_sum(UnscaledValue(ws_sales_price#32))]
-Aggregate Attributes [3]: [sum#40, sum#41, sum#42]
-Results [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
-
-(38) Exchange
-Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
-Arguments: hashpartitioning(d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, 5), ENSURE_REQUIREMENTS, [plan_id=6]
-
-(39) HashAggregate [codegen id : 6]
-Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
-Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
-Functions [3]: [sum(ws_quantity#30), sum(UnscaledValue(ws_wholesale_cost#31)), sum(UnscaledValue(ws_sales_price#32))]
-Aggregate Attributes [3]: [sum(ws_quantity#30)#46, sum(UnscaledValue(ws_wholesale_cost#31))#47, sum(UnscaledValue(ws_sales_price#32))#48]
-Results [6]: [d_year#39 AS ws_sold_year#49, ws_item_sk#27, ws_bill_customer_sk#28 AS ws_customer_sk#50, sum(ws_quantity#30)#46 AS ws_qty#51, MakeDecimal(sum(UnscaledValue(ws_wholesale_cost#31))#47,17,2) AS ws_wc#52, MakeDecimal(sum(UnscaledValue(ws_sales_price#32))#48,17,2) AS ws_sp#53]
-
-(40) Filter [codegen id : 6]
-Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
-Condition : (coalesce(ws_qty#51, 0) > 0)
-
-(41) Sort [codegen id : 6]
-Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
-Arguments: [ws_sold_year#49 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST, ws_customer_sk#50 ASC NULLS FIRST], false, 0
-
-(42) SortMergeJoin [codegen id : 7]
-Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
-Right keys [3]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50]
-Join type: Inner
-Join condition: None
+(37) Project [codegen id : 4]
+Output [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
+Input [8]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, d_date_sk#35, d_year#36]
+
+(38) HashAggregate [codegen id : 4]
+Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
+Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
+Functions [3]: [partial_sum(ws_quantity#27), partial_sum(UnscaledValue(ws_wholesale_cost#28)), partial_sum(UnscaledValue(ws_sales_price#29))]
+Aggregate Attributes [3]: [sum#37, sum#38, sum#39]
+Results [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+
+(39) RowToColumnar
+Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+
+(40) CometColumnarExchange
+Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+Arguments: hashpartitioning(d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(41) CometHashAggregate
+Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
+Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
+Functions [3]: [sum(ws_quantity#27), sum(UnscaledValue(ws_wholesale_cost#28)), sum(UnscaledValue(ws_sales_price#29))]
+
+(42) CometFilter
+Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Condition : (coalesce(ws_qty#45, 0) > 0)
+
+(43) CometSort
+Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Arguments: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47], [ws_sold_year#43 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST, ws_customer_sk#44 ASC NULLS FIRST]
+
+(44) CometSortMergeJoin
+Left output [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
+Right output [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44], Inner
 
-(43) Project [codegen id : 7]
-Output [9]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53]
-Input [12]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
+(45) CometProject
+Input [12]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47], [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#60), dynamicpruningexpression(cs_sold_date_sk#60 IN dynamicpruning#61)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#54), dynamicpruningexpression(cs_sold_date_sk#54 IN dynamicpruning#55)]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_wholesale_cost:decimal(7,2),cs_sales_price:decimal(7,2)>
 
-(45) CometFilter
-Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Condition : (isnotnull(cs_item_sk#55) AND isnotnull(cs_bill_customer_sk#54))
+(47) CometFilter
+Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Condition : (isnotnull(cs_item_sk#49) AND isnotnull(cs_bill_customer_sk#48))
 
-(46) CometExchange
-Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Arguments: hashpartitioning(cs_order_number#56, cs_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+(48) CometColumnarExchange
+Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Arguments: hashpartitioning(cs_order_number#50, cs_item_sk#49, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(47) CometSort
-Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_order_number#56 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST]
+(49) CometSort
+Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_order_number#50 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
+Output [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(49) CometFilter
-Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
-Condition : (isnotnull(cr_order_number#63) AND isnotnull(cr_item_sk#62))
+(51) CometFilter
+Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
+Condition : (isnotnull(cr_order_number#57) AND isnotnull(cr_item_sk#56))
 
-(50) CometProject
-Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
-Arguments: [cr_item_sk#62, cr_order_number#63], [cr_item_sk#62, cr_order_number#63]
+(52) CometProject
+Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
+Arguments: [cr_item_sk#56, cr_order_number#57], [cr_item_sk#56, cr_order_number#57]
 
-(51) CometExchange
-Input [2]: [cr_item_sk#62, cr_order_number#63]
-Arguments: hashpartitioning(cr_order_number#63, cr_item_sk#62, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
+(53) CometColumnarExchange
+Input [2]: [cr_item_sk#56, cr_order_number#57]
+Arguments: hashpartitioning(cr_order_number#57, cr_item_sk#56, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(52) CometSort
-Input [2]: [cr_item_sk#62, cr_order_number#63]
-Arguments: [cr_item_sk#62, cr_order_number#63], [cr_order_number#63 ASC NULLS FIRST, cr_item_sk#62 ASC NULLS FIRST]
+(54) CometSort
+Input [2]: [cr_item_sk#56, cr_order_number#57]
+Arguments: [cr_item_sk#56, cr_order_number#57], [cr_order_number#57 ASC NULLS FIRST, cr_item_sk#56 ASC NULLS FIRST]
 
-(53) CometSortMergeJoin
-Left output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
-Right output [2]: [cr_item_sk#62, cr_order_number#63]
-Arguments: [cs_order_number#56, cs_item_sk#55], [cr_order_number#63, cr_item_sk#62], LeftOuter
+(55) CometSortMergeJoin
+Left output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Right output [2]: [cr_item_sk#56, cr_order_number#57]
+Arguments: [cs_order_number#50, cs_item_sk#49], [cr_order_number#57, cr_item_sk#56], LeftOuter
 
-(54) CometFilter
-Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
-Condition : isnull(cr_order_number#63)
+(56) CometFilter
+Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
+Condition : isnull(cr_order_number#57)
 
-(55) CometProject
-Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
-Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+(57) CometProject
+Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
+Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
 
-(56) ColumnarToRow [codegen id : 9]
-Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+(58) ColumnarToRow [codegen id : 6]
+Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
 
-(57) ReusedExchange [Reuses operator id: 71]
-Output [2]: [d_date_sk#65, d_year#66]
+(59) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#59, d_year#60]
 
-(58) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [cs_sold_date_sk#60]
-Right keys [1]: [d_date_sk#65]
+(60) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [cs_sold_date_sk#54]
+Right keys [1]: [d_date_sk#59]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 9]
-Output [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
-Input [8]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, d_date_sk#65, d_year#66]
-
-(60) HashAggregate [codegen id : 9]
-Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
-Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
-Functions [3]: [partial_sum(cs_quantity#57), partial_sum(UnscaledValue(cs_wholesale_cost#58)), partial_sum(UnscaledValue(cs_sales_price#59))]
-Aggregate Attributes [3]: [sum#67, sum#68, sum#69]
-Results [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
-
-(61) Exchange
-Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
-Arguments: hashpartitioning(d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, 5), ENSURE_REQUIREMENTS, [plan_id=9]
-
-(62) HashAggregate [codegen id : 10]
-Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
-Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
-Functions [3]: [sum(cs_quantity#57), sum(UnscaledValue(cs_wholesale_cost#58)), sum(UnscaledValue(cs_sales_price#59))]
-Aggregate Attributes [3]: [sum(cs_quantity#57)#73, sum(UnscaledValue(cs_wholesale_cost#58))#74, sum(UnscaledValue(cs_sales_price#59))#75]
-Results [6]: [d_year#66 AS cs_sold_year#76, cs_item_sk#55, cs_bill_customer_sk#54 AS cs_customer_sk#77, sum(cs_quantity#57)#73 AS cs_qty#78, MakeDecimal(sum(UnscaledValue(cs_wholesale_cost#58))#74,17,2) AS cs_wc#79, MakeDecimal(sum(UnscaledValue(cs_sales_price#59))#75,17,2) AS cs_sp#80]
-
-(63) Filter [codegen id : 10]
-Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
-Condition : (coalesce(cs_qty#78, 0) > 0)
-
-(64) Sort [codegen id : 10]
-Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
-Arguments: [cs_sold_year#76 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST, cs_customer_sk#77 ASC NULLS FIRST], false, 0
-
-(65) SortMergeJoin [codegen id : 11]
-Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
-Right keys [3]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77]
-Join type: Inner
-Join condition: None
+(61) Project [codegen id : 6]
+Output [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
+Input [8]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, d_date_sk#59, d_year#60]
+
+(62) HashAggregate [codegen id : 6]
+Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
+Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
+Functions [3]: [partial_sum(cs_quantity#51), partial_sum(UnscaledValue(cs_wholesale_cost#52)), partial_sum(UnscaledValue(cs_sales_price#53))]
+Aggregate Attributes [3]: [sum#61, sum#62, sum#63]
+Results [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+
+(63) RowToColumnar
+Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+
+(64) CometColumnarExchange
+Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+Arguments: hashpartitioning(d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+
+(65) CometHashAggregate
+Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
+Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
+Functions [3]: [sum(cs_quantity#51), sum(UnscaledValue(cs_wholesale_cost#52)), sum(UnscaledValue(cs_sales_price#53))]
+
+(66) CometFilter
+Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+Condition : (coalesce(cs_qty#69, 0) > 0)
+
+(67) CometSort
+Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+Arguments: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71], [cs_sold_year#67 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST, cs_customer_sk#68 ASC NULLS FIRST]
+
+(68) CometSortMergeJoin
+Left output [9]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
+Right output [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68], Inner
+
+(69) ColumnarToRow [codegen id : 7]
+Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
 
-(66) Project [codegen id : 11]
-Output [13]: [round((cast(ss_qty#24 as double) / cast(coalesce((ws_qty#51 + cs_qty#78), 1) as double)), 2) AS ratio#81, ss_qty#24 AS store_qty#82, ss_wc#25 AS store_wholesale_cost#83, ss_sp#26 AS store_sales_price#84, (coalesce(ws_qty#51, 0) + coalesce(cs_qty#78, 0)) AS other_chan_qty#85, (coalesce(ws_wc#52, 0.00) + coalesce(cs_wc#79, 0.00)) AS other_chan_wholesale_cost#86, (coalesce(ws_sp#53, 0.00) + coalesce(cs_sp#80, 0.00)) AS other_chan_sales_price#87, ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
-Input [15]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53, cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
+(70) Project [codegen id : 7]
+Output [13]: [round((cast(ss_qty#21 as double) / cast(coalesce((ws_qty#45 + cs_qty#69), 1) as double)), 2) AS ratio#72, ss_qty#21 AS store_qty#73, ss_wc#22 AS store_wholesale_cost#74, ss_sp#23 AS store_sales_price#75, (coalesce(ws_qty#45, 0) + coalesce(cs_qty#69, 0)) AS other_chan_qty#76, (coalesce(ws_wc#46, 0.00) + coalesce(cs_wc#70, 0.00)) AS other_chan_wholesale_cost#77, (coalesce(ws_sp#47, 0.00) + coalesce(cs_sp#71, 0.00)) AS other_chan_sales_price#78, ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
+Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
 
-(67) TakeOrderedAndProject
-Input [13]: [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87, ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
-Arguments: 100, [ss_sold_year#23 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST, ss_qty#24 DESC NULLS LAST, ss_wc#25 DESC NULLS LAST, ss_sp#26 DESC NULLS LAST, other_chan_qty#85 ASC NULLS FIRST, other_chan_wholesale_cost#86 ASC NULLS FIRST, other_chan_sales_price#87 ASC NULLS FIRST, ratio#81 ASC NULLS FIRST], [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87]
+(71) TakeOrderedAndProject
+Input [13]: [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78, ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
+Arguments: 100, [ss_sold_year#20 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST, ss_qty#21 DESC NULLS LAST, ss_wc#22 DESC NULLS LAST, ss_sp#23 DESC NULLS LAST, other_chan_qty#76 ASC NULLS FIRST, other_chan_wholesale_cost#77 ASC NULLS FIRST, other_chan_sales_price#78 ASC NULLS FIRST, ratio#72 ASC NULLS FIRST], [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (71)
-+- * ColumnarToRow (70)
-   +- CometFilter (69)
-      +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometFilter (73)
+      +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -398,19 +406,19 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(69) CometFilter
+(73) CometFilter
 Input [2]: [d_date_sk#12, d_year#13]
 Condition : ((isnotnull(d_year#13) AND (d_year#13 = 2000)) AND isnotnull(d_date_sk#12))
 
-(70) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#12, d_year#13]
 
-(71) BroadcastExchange
+(75) BroadcastExchange
 Input [2]: [d_date_sk#12, d_year#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-Subquery:2 Hosting operator id = 21 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 22 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 44 Hosting Expression = cs_sold_date_sk#60 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 46 Hosting Expression = cs_sold_date_sk#54 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt
index ea1de2fd73..1b83b3157b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt
@@ -1,80 +1,74 @@
 TakeOrderedAndProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,other_chan_qty,other_chan_wholesale_cost,other_chan_sales_price,ratio,store_qty,store_wholesale_cost,store_sales_price]
-  WholeStageCodegen (11)
+  WholeStageCodegen (7)
     Project [ss_qty,ws_qty,cs_qty,ss_wc,ss_sp,ws_wc,cs_wc,ws_sp,cs_sp,ss_sold_year,ss_item_sk,ss_customer_sk]
-      SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
+      ColumnarToRow
         InputAdapter
-          WholeStageCodegen (7)
-            Project [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
-              SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
-                InputAdapter
-                  WholeStageCodegen (3)
-                    Sort [ss_sold_year,ss_item_sk,ss_customer_sk]
-                      HashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum] [sum(ss_quantity),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_sales_price)),ss_sold_year,ss_qty,ss_wc,ss_sp,sum,sum,sum]
-                        InputAdapter
-                          Exchange [d_year,ss_item_sk,ss_customer_sk] #1
-                            WholeStageCodegen (2)
-                              HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
-                                Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                          CometFilter [sr_ticket_number]
-                                            CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                              CometSort [ss_ticket_number,ss_item_sk]
-                                                CometExchange [ss_ticket_number,ss_item_sk] #2
-                                                  CometFilter [ss_item_sk,ss_customer_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [d_year,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                              CometSort [sr_ticket_number,sr_item_sk]
-                                                CometExchange [sr_ticket_number,sr_item_sk] #4
-                                                  CometProject [sr_item_sk,sr_ticket_number]
-                                                    CometFilter [sr_ticket_number,sr_item_sk]
-                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+          CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
+            CometProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
+              CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
+                CometSort [ss_sold_year,ss_item_sk,ss_customer_sk]
+                  CometHashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum]
+                    CometColumnarExchange [d_year,ss_item_sk,ss_customer_sk] #1
+                      RowToColumnar
+                        WholeStageCodegen (2)
+                          HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
+                            Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                      CometFilter [sr_ticket_number]
+                                        CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                          CometSort [ss_ticket_number,ss_item_sk]
+                                            CometColumnarExchange [ss_ticket_number,ss_item_sk] #2
+                                              CometFilter [ss_item_sk,ss_customer_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                          CometSort [sr_ticket_number,sr_item_sk]
+                                            CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
+                                              CometProject [sr_item_sk,sr_ticket_number]
+                                                CometFilter [sr_ticket_number,sr_item_sk]
+                                                  CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk,d_year] #3
+                CometSort [ws_sold_year,ws_item_sk,ws_customer_sk]
+                  CometFilter [ws_qty]
+                    CometHashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum]
+                      CometColumnarExchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
+                        RowToColumnar
+                          WholeStageCodegen (4)
+                            HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
+                              Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  ColumnarToRow
                                     InputAdapter
-                                      ReusedExchange [d_date_sk,d_year] #3
-                InputAdapter
-                  WholeStageCodegen (6)
-                    Sort [ws_sold_year,ws_item_sk,ws_customer_sk]
-                      Filter [ws_qty]
-                        HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum] [sum(ws_quantity),sum(UnscaledValue(ws_wholesale_cost)),sum(UnscaledValue(ws_sales_price)),ws_sold_year,ws_customer_sk,ws_qty,ws_wc,ws_sp,sum,sum,sum]
-                          InputAdapter
-                            Exchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
-                              WholeStageCodegen (5)
-                                HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
-                                  Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                            CometFilter [wr_order_number]
-                                              CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                                CometSort [ws_order_number,ws_item_sk]
-                                                  CometExchange [ws_order_number,ws_item_sk] #6
-                                                    CometFilter [ws_item_sk,ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
-                                                CometSort [wr_order_number,wr_item_sk]
-                                                  CometExchange [wr_order_number,wr_item_sk] #7
-                                                    CometProject [wr_item_sk,wr_order_number]
-                                                      CometFilter [wr_order_number,wr_item_sk]
-                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
-        InputAdapter
-          WholeStageCodegen (10)
-            Sort [cs_sold_year,cs_item_sk,cs_customer_sk]
-              Filter [cs_qty]
-                HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum] [sum(cs_quantity),sum(UnscaledValue(cs_wholesale_cost)),sum(UnscaledValue(cs_sales_price)),cs_sold_year,cs_customer_sk,cs_qty,cs_wc,cs_sp,sum,sum,sum]
-                  InputAdapter
-                    Exchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
-                      WholeStageCodegen (9)
+                                      CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                        CometFilter [wr_order_number]
+                                          CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                            CometSort [ws_order_number,ws_item_sk]
+                                              CometColumnarExchange [ws_order_number,ws_item_sk] #6
+                                                CometFilter [ws_item_sk,ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            CometSort [wr_order_number,wr_item_sk]
+                                              CometColumnarExchange [wr_order_number,wr_item_sk] #7
+                                                CometProject [wr_item_sk,wr_order_number]
+                                                  CometFilter [wr_order_number,wr_item_sk]
+                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
+            CometSort [cs_sold_year,cs_item_sk,cs_customer_sk]
+              CometFilter [cs_qty]
+                CometHashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum]
+                  CometColumnarExchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
+                    RowToColumnar
+                      WholeStageCodegen (6)
                         HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,cs_quantity,cs_wholesale_cost,cs_sales_price] [sum,sum,sum,sum,sum,sum]
                           Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_wholesale_cost,cs_sales_price,d_year]
                             BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
@@ -84,12 +78,12 @@ TakeOrderedAndProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp
                                     CometFilter [cr_order_number]
                                       CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
                                         CometSort [cs_order_number,cs_item_sk]
-                                          CometExchange [cs_order_number,cs_item_sk] #9
+                                          CometColumnarExchange [cs_order_number,cs_item_sk] #9
                                             CometFilter [cs_item_sk,cs_bill_customer_sk]
                                               CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_order_number,cs_quantity,cs_wholesale_cost,cs_sales_price,cs_sold_date_sk]
                                                 ReusedSubquery [d_date_sk] #1
                                         CometSort [cr_order_number,cr_item_sk]
-                                          CometExchange [cr_order_number,cr_item_sk] #10
+                                          CometColumnarExchange [cr_order_number,cr_item_sk] #10
                                             CometProject [cr_item_sk,cr_order_number]
                                               CometFilter [cr_order_number,cr_item_sk]
                                                 CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt
index dfd081b442..71122484d8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt
@@ -1,121 +1,129 @@
 == Physical Plan ==
-TakeOrderedAndProject (117)
-+- * HashAggregate (116)
-   +- Exchange (115)
-      +- * HashAggregate (114)
-         +- Union (113)
-            :- * HashAggregate (102)
-            :  +- Exchange (101)
-            :     +- * HashAggregate (100)
-            :        +- Union (99)
-            :           :- * HashAggregate (38)
-            :           :  +- Exchange (37)
-            :           :     +- * HashAggregate (36)
-            :           :        +- * Project (35)
-            :           :           +- * BroadcastHashJoin Inner BuildRight (34)
-            :           :              :- * Project (28)
-            :           :              :  +- * BroadcastHashJoin Inner BuildRight (27)
-            :           :              :     :- * Project (21)
-            :           :              :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-            :           :              :     :     :- * Project (15)
-            :           :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-            :           :              :     :     :     :- * ColumnarToRow (12)
-            :           :              :     :     :     :  +- CometProject (11)
-            :           :              :     :     :     :     +- CometSortMergeJoin (10)
-            :           :              :     :     :     :        :- CometSort (4)
-            :           :              :     :     :     :        :  +- CometExchange (3)
-            :           :              :     :     :     :        :     +- CometFilter (2)
-            :           :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
-            :           :              :     :     :     :        +- CometSort (9)
-            :           :              :     :     :     :           +- CometExchange (8)
-            :           :              :     :     :     :              +- CometProject (7)
-            :           :              :     :     :     :                 +- CometFilter (6)
-            :           :              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-            :           :              :     :     :     +- ReusedExchange (13)
-            :           :              :     :     +- BroadcastExchange (19)
-            :           :              :     :        +- * ColumnarToRow (18)
-            :           :              :     :           +- CometFilter (17)
-            :           :              :     :              +- CometScan parquet spark_catalog.default.store (16)
-            :           :              :     +- BroadcastExchange (26)
-            :           :              :        +- * ColumnarToRow (25)
-            :           :              :           +- CometProject (24)
-            :           :              :              +- CometFilter (23)
-            :           :              :                 +- CometScan parquet spark_catalog.default.item (22)
-            :           :              +- BroadcastExchange (33)
-            :           :                 +- * ColumnarToRow (32)
-            :           :                    +- CometProject (31)
-            :           :                       +- CometFilter (30)
-            :           :                          +- CometScan parquet spark_catalog.default.promotion (29)
-            :           :- * HashAggregate (68)
-            :           :  +- Exchange (67)
-            :           :     +- * HashAggregate (66)
-            :           :        +- * Project (65)
-            :           :           +- * BroadcastHashJoin Inner BuildRight (64)
-            :           :              :- * Project (62)
-            :           :              :  +- * BroadcastHashJoin Inner BuildRight (61)
-            :           :              :     :- * Project (59)
-            :           :              :     :  +- * BroadcastHashJoin Inner BuildRight (58)
-            :           :              :     :     :- * Project (53)
-            :           :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (52)
-            :           :              :     :     :     :- * ColumnarToRow (50)
-            :           :              :     :     :     :  +- CometProject (49)
-            :           :              :     :     :     :     +- CometSortMergeJoin (48)
-            :           :              :     :     :     :        :- CometSort (42)
-            :           :              :     :     :     :        :  +- CometExchange (41)
-            :           :              :     :     :     :        :     +- CometFilter (40)
-            :           :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (39)
-            :           :              :     :     :     :        +- CometSort (47)
-            :           :              :     :     :     :           +- CometExchange (46)
-            :           :              :     :     :     :              +- CometProject (45)
-            :           :              :     :     :     :                 +- CometFilter (44)
-            :           :              :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (43)
-            :           :              :     :     :     +- ReusedExchange (51)
-            :           :              :     :     +- BroadcastExchange (57)
-            :           :              :     :        +- * ColumnarToRow (56)
-            :           :              :     :           +- CometFilter (55)
-            :           :              :     :              +- CometScan parquet spark_catalog.default.catalog_page (54)
-            :           :              :     +- ReusedExchange (60)
-            :           :              +- ReusedExchange (63)
-            :           +- * HashAggregate (98)
-            :              +- Exchange (97)
-            :                 +- * HashAggregate (96)
-            :                    +- * Project (95)
-            :                       +- * BroadcastHashJoin Inner BuildRight (94)
-            :                          :- * Project (92)
-            :                          :  +- * BroadcastHashJoin Inner BuildRight (91)
-            :                          :     :- * Project (89)
-            :                          :     :  +- * BroadcastHashJoin Inner BuildRight (88)
-            :                          :     :     :- * Project (83)
-            :                          :     :     :  +- * BroadcastHashJoin Inner BuildRight (82)
-            :                          :     :     :     :- * ColumnarToRow (80)
-            :                          :     :     :     :  +- CometProject (79)
-            :                          :     :     :     :     +- CometSortMergeJoin (78)
-            :                          :     :     :     :        :- CometSort (72)
-            :                          :     :     :     :        :  +- CometExchange (71)
-            :                          :     :     :     :        :     +- CometFilter (70)
-            :                          :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (69)
-            :                          :     :     :     :        +- CometSort (77)
-            :                          :     :     :     :           +- CometExchange (76)
-            :                          :     :     :     :              +- CometProject (75)
-            :                          :     :     :     :                 +- CometFilter (74)
-            :                          :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (73)
-            :                          :     :     :     +- ReusedExchange (81)
-            :                          :     :     +- BroadcastExchange (87)
-            :                          :     :        +- * ColumnarToRow (86)
-            :                          :     :           +- CometFilter (85)
-            :                          :     :              +- CometScan parquet spark_catalog.default.web_site (84)
-            :                          :     +- ReusedExchange (90)
-            :                          +- ReusedExchange (93)
-            :- * HashAggregate (107)
-            :  +- Exchange (106)
-            :     +- * HashAggregate (105)
-            :        +- * HashAggregate (104)
-            :           +- ReusedExchange (103)
-            +- * HashAggregate (112)
-               +- Exchange (111)
-                  +- * HashAggregate (110)
-                     +- * HashAggregate (109)
-                        +- ReusedExchange (108)
+* ColumnarToRow (125)
++- CometTakeOrderedAndProject (124)
+   +- CometHashAggregate (123)
+      +- CometColumnarExchange (122)
+         +- CometHashAggregate (121)
+            +- CometUnion (120)
+               :- CometHashAggregate (109)
+               :  +- CometColumnarExchange (108)
+               :     +- RowToColumnar (107)
+               :        +- * HashAggregate (106)
+               :           +- Union (105)
+               :              :- * HashAggregate (40)
+               :              :  +- * ColumnarToRow (39)
+               :              :     +- CometColumnarExchange (38)
+               :              :        +- RowToColumnar (37)
+               :              :           +- * HashAggregate (36)
+               :              :              +- * Project (35)
+               :              :                 +- * BroadcastHashJoin Inner BuildRight (34)
+               :              :                    :- * Project (28)
+               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (27)
+               :              :                    :     :- * Project (21)
+               :              :                    :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :              :                    :     :     :- * Project (15)
+               :              :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :              :                    :     :     :     :- * ColumnarToRow (12)
+               :              :                    :     :     :     :  +- CometProject (11)
+               :              :                    :     :     :     :     +- CometSortMergeJoin (10)
+               :              :                    :     :     :     :        :- CometSort (4)
+               :              :                    :     :     :     :        :  +- CometColumnarExchange (3)
+               :              :                    :     :     :     :        :     +- CometFilter (2)
+               :              :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
+               :              :                    :     :     :     :        +- CometSort (9)
+               :              :                    :     :     :     :           +- CometColumnarExchange (8)
+               :              :                    :     :     :     :              +- CometProject (7)
+               :              :                    :     :     :     :                 +- CometFilter (6)
+               :              :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+               :              :                    :     :     :     +- ReusedExchange (13)
+               :              :                    :     :     +- BroadcastExchange (19)
+               :              :                    :     :        +- * ColumnarToRow (18)
+               :              :                    :     :           +- CometFilter (17)
+               :              :                    :     :              +- CometScan parquet spark_catalog.default.store (16)
+               :              :                    :     +- BroadcastExchange (26)
+               :              :                    :        +- * ColumnarToRow (25)
+               :              :                    :           +- CometProject (24)
+               :              :                    :              +- CometFilter (23)
+               :              :                    :                 +- CometScan parquet spark_catalog.default.item (22)
+               :              :                    +- BroadcastExchange (33)
+               :              :                       +- * ColumnarToRow (32)
+               :              :                          +- CometProject (31)
+               :              :                             +- CometFilter (30)
+               :              :                                +- CometScan parquet spark_catalog.default.promotion (29)
+               :              :- * HashAggregate (72)
+               :              :  +- * ColumnarToRow (71)
+               :              :     +- CometColumnarExchange (70)
+               :              :        +- RowToColumnar (69)
+               :              :           +- * HashAggregate (68)
+               :              :              +- * Project (67)
+               :              :                 +- * BroadcastHashJoin Inner BuildRight (66)
+               :              :                    :- * Project (64)
+               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (63)
+               :              :                    :     :- * Project (61)
+               :              :                    :     :  +- * BroadcastHashJoin Inner BuildRight (60)
+               :              :                    :     :     :- * Project (55)
+               :              :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+               :              :                    :     :     :     :- * ColumnarToRow (52)
+               :              :                    :     :     :     :  +- CometProject (51)
+               :              :                    :     :     :     :     +- CometSortMergeJoin (50)
+               :              :                    :     :     :     :        :- CometSort (44)
+               :              :                    :     :     :     :        :  +- CometColumnarExchange (43)
+               :              :                    :     :     :     :        :     +- CometFilter (42)
+               :              :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (41)
+               :              :                    :     :     :     :        +- CometSort (49)
+               :              :                    :     :     :     :           +- CometColumnarExchange (48)
+               :              :                    :     :     :     :              +- CometProject (47)
+               :              :                    :     :     :     :                 +- CometFilter (46)
+               :              :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (45)
+               :              :                    :     :     :     +- ReusedExchange (53)
+               :              :                    :     :     +- BroadcastExchange (59)
+               :              :                    :     :        +- * ColumnarToRow (58)
+               :              :                    :     :           +- CometFilter (57)
+               :              :                    :     :              +- CometScan parquet spark_catalog.default.catalog_page (56)
+               :              :                    :     +- ReusedExchange (62)
+               :              :                    +- ReusedExchange (65)
+               :              +- * HashAggregate (104)
+               :                 +- * ColumnarToRow (103)
+               :                    +- CometColumnarExchange (102)
+               :                       +- RowToColumnar (101)
+               :                          +- * HashAggregate (100)
+               :                             +- * Project (99)
+               :                                +- * BroadcastHashJoin Inner BuildRight (98)
+               :                                   :- * Project (96)
+               :                                   :  +- * BroadcastHashJoin Inner BuildRight (95)
+               :                                   :     :- * Project (93)
+               :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (92)
+               :                                   :     :     :- * Project (87)
+               :                                   :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
+               :                                   :     :     :     :- * ColumnarToRow (84)
+               :                                   :     :     :     :  +- CometProject (83)
+               :                                   :     :     :     :     +- CometSortMergeJoin (82)
+               :                                   :     :     :     :        :- CometSort (76)
+               :                                   :     :     :     :        :  +- CometColumnarExchange (75)
+               :                                   :     :     :     :        :     +- CometFilter (74)
+               :                                   :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (73)
+               :                                   :     :     :     :        +- CometSort (81)
+               :                                   :     :     :     :           +- CometColumnarExchange (80)
+               :                                   :     :     :     :              +- CometProject (79)
+               :                                   :     :     :     :                 +- CometFilter (78)
+               :                                   :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (77)
+               :                                   :     :     :     +- ReusedExchange (85)
+               :                                   :     :     +- BroadcastExchange (91)
+               :                                   :     :        +- * ColumnarToRow (90)
+               :                                   :     :           +- CometFilter (89)
+               :                                   :     :              +- CometScan parquet spark_catalog.default.web_site (88)
+               :                                   :     +- ReusedExchange (94)
+               :                                   +- ReusedExchange (97)
+               :- CometHashAggregate (114)
+               :  +- CometColumnarExchange (113)
+               :     +- CometHashAggregate (112)
+               :        +- CometHashAggregate (111)
+               :           +- ReusedExchange (110)
+               +- CometHashAggregate (119)
+                  +- CometColumnarExchange (118)
+                     +- CometHashAggregate (117)
+                        +- CometHashAggregate (116)
+                           +- ReusedExchange (115)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -130,9 +138,9 @@ ReadSchema: struct<ss_item_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_numb
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
 Condition : ((isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1)) AND isnotnull(ss_promo_sk#3))
 
-(3) CometExchange
+(3) CometColumnarExchange
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
@@ -153,9 +161,9 @@ Condition : (isnotnull(sr_item_sk#9) AND isnotnull(sr_ticket_number#10))
 Input [5]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12, sr_returned_date_sk#13]
 Arguments: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12], [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
 
-(8) CometExchange
+(8) CometColumnarExchange
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
-Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
 
 (9) CometSort
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
@@ -173,7 +181,7 @@ Arguments: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss
 (12) ColumnarToRow [codegen id : 5]
 Input [8]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7, sr_return_amt#11, sr_net_loss#12]
 
-(13) ReusedExchange [Reuses operator id: 122]
+(13) ReusedExchange [Reuses operator id: 130]
 Output [1]: [d_date_sk#14]
 
 (14) BroadcastHashJoin [codegen id : 5]
@@ -285,11 +293,17 @@ Functions [3]: [partial_sum(UnscaledValue(ss_ext_sales_price#5)), partial_sum(co
 Aggregate Attributes [5]: [sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Results [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 
-(37) Exchange
+(37) RowToColumnar
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
-Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(38) HashAggregate [codegen id : 6]
+(38) CometColumnarExchange
+Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
+Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(39) ColumnarToRow [codegen id : 6]
+Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
+
+(40) HashAggregate [codegen id : 6]
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 Keys [1]: [s_store_id#16]
 Functions [3]: [sum(UnscaledValue(ss_ext_sales_price#5)), sum(coalesce(cast(sr_return_amt#11 as decimal(12,2)), 0.00)), sum((ss_net_profit#6 - coalesce(cast(sr_net_loss#12 as decimal(12,2)), 0.00)))]
@@ -304,15 +318,15 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk), IsNotNull(cs_item_sk), IsNotNull(cs_promo_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_item_sk:int,cs_promo_sk:int,cs_order_number:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(40) CometFilter
+(42) CometFilter
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : ((isnotnull(cs_catalog_page_sk#39) AND isnotnull(cs_item_sk#40)) AND isnotnull(cs_promo_sk#41))
 
-(41) CometExchange
+(43) CometColumnarExchange
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
-Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
+Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
 
-(42) CometSort
+(44) CometSort
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45], [cs_item_sk#40 ASC NULLS FIRST, cs_order_number#42 ASC NULLS FIRST]
 
@@ -323,44 +337,44 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(44) CometFilter
+(46) CometFilter
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Condition : (isnotnull(cr_item_sk#47) AND isnotnull(cr_order_number#48))
 
-(45) CometProject
+(47) CometProject
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 
-(46) CometExchange
+(48) CometColumnarExchange
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
-Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
+Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
 
-(47) CometSort
+(49) CometSort
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47 ASC NULLS FIRST, cr_order_number#48 ASC NULLS FIRST]
 
-(48) CometSortMergeJoin
+(50) CometSortMergeJoin
 Left output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Right output [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_item_sk#40, cs_order_number#42], [cr_item_sk#47, cr_order_number#48], LeftOuter
 
-(49) CometProject
+(51) CometProject
 Input [11]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50], [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(50) ColumnarToRow [codegen id : 11]
+(52) ColumnarToRow [codegen id : 11]
 Input [8]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(51) ReusedExchange [Reuses operator id: 122]
+(53) ReusedExchange [Reuses operator id: 130]
 Output [1]: [d_date_sk#52]
 
-(52) BroadcastHashJoin [codegen id : 11]
+(54) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_sold_date_sk#45]
 Right keys [1]: [d_date_sk#52]
 Join type: Inner
 Join condition: None
 
-(53) Project [codegen id : 11]
+(55) Project [codegen id : 11]
 Output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50, d_date_sk#52]
 
@@ -371,65 +385,71 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(55) CometFilter
+(57) CometFilter
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Condition : isnotnull(cp_catalog_page_sk#53)
 
-(56) ColumnarToRow [codegen id : 8]
+(58) ColumnarToRow [codegen id : 8]
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(57) BroadcastExchange
+(59) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(58) BroadcastHashJoin [codegen id : 11]
+(60) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_catalog_page_sk#39]
 Right keys [1]: [cp_catalog_page_sk#53]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 11]
+(61) Project [codegen id : 11]
 Output [7]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(60) ReusedExchange [Reuses operator id: 26]
+(62) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#55]
 
-(61) BroadcastHashJoin [codegen id : 11]
+(63) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_item_sk#40]
 Right keys [1]: [i_item_sk#55]
 Join type: Inner
 Join condition: None
 
-(62) Project [codegen id : 11]
+(64) Project [codegen id : 11]
 Output [6]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [8]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, i_item_sk#55]
 
-(63) ReusedExchange [Reuses operator id: 33]
+(65) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#56]
 
-(64) BroadcastHashJoin [codegen id : 11]
+(66) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_promo_sk#41]
 Right keys [1]: [p_promo_sk#56]
 Join type: Inner
 Join condition: None
 
-(65) Project [codegen id : 11]
+(67) Project [codegen id : 11]
 Output [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [7]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, p_promo_sk#56]
 
-(66) HashAggregate [codegen id : 11]
+(68) HashAggregate [codegen id : 11]
 Input [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [partial_sum(UnscaledValue(cs_ext_sales_price#43)), partial_sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), partial_sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#57, sum#58, isEmpty#59, sum#60, isEmpty#61]
 Results [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 
-(67) Exchange
+(69) RowToColumnar
+Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
+
+(70) CometColumnarExchange
+Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
+Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+
+(71) ColumnarToRow [codegen id : 12]
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
-Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(68) HashAggregate [codegen id : 12]
+(72) HashAggregate [codegen id : 12]
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [sum(UnscaledValue(cs_ext_sales_price#43)), sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
@@ -444,15 +464,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#81), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk), IsNotNull(ws_item_sk), IsNotNull(ws_promo_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_promo_sk:int,ws_order_number:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(70) CometFilter
+(74) CometFilter
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Condition : ((isnotnull(ws_web_site_sk#76) AND isnotnull(ws_item_sk#75)) AND isnotnull(ws_promo_sk#77))
 
-(71) CometExchange
+(75) CometColumnarExchange
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
-Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=11]
+Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
 
-(72) CometSort
+(76) CometSort
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81], [ws_item_sk#75 ASC NULLS FIRST, ws_order_number#78 ASC NULLS FIRST]
 
@@ -463,44 +483,44 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_item_sk), IsNotNull(wr_order_number)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(74) CometFilter
+(78) CometFilter
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Condition : (isnotnull(wr_item_sk#83) AND isnotnull(wr_order_number#84))
 
-(75) CometProject
+(79) CometProject
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 
-(76) CometExchange
+(80) CometColumnarExchange
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
-Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
+Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
 
-(77) CometSort
+(81) CometSort
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83 ASC NULLS FIRST, wr_order_number#84 ASC NULLS FIRST]
 
-(78) CometSortMergeJoin
+(82) CometSortMergeJoin
 Left output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Right output [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_order_number#78], [wr_item_sk#83, wr_order_number#84], LeftOuter
 
-(79) CometProject
+(83) CometProject
 Input [11]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86], [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(80) ColumnarToRow [codegen id : 17]
+(84) ColumnarToRow [codegen id : 17]
 Input [8]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(81) ReusedExchange [Reuses operator id: 122]
+(85) ReusedExchange [Reuses operator id: 130]
 Output [1]: [d_date_sk#88]
 
-(82) BroadcastHashJoin [codegen id : 17]
+(86) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_sold_date_sk#81]
 Right keys [1]: [d_date_sk#88]
 Join type: Inner
 Join condition: None
 
-(83) Project [codegen id : 17]
+(87) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86, d_date_sk#88]
 
@@ -511,205 +531,202 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(85) CometFilter
+(89) CometFilter
 Input [2]: [web_site_sk#89, web_site_id#90]
 Condition : isnotnull(web_site_sk#89)
 
-(86) ColumnarToRow [codegen id : 14]
+(90) ColumnarToRow [codegen id : 14]
 Input [2]: [web_site_sk#89, web_site_id#90]
 
-(87) BroadcastExchange
+(91) BroadcastExchange
 Input [2]: [web_site_sk#89, web_site_id#90]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(88) BroadcastHashJoin [codegen id : 17]
+(92) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_web_site_sk#76]
 Right keys [1]: [web_site_sk#89]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 17]
+(93) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_sk#89, web_site_id#90]
 
-(90) ReusedExchange [Reuses operator id: 26]
+(94) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#91]
 
-(91) BroadcastHashJoin [codegen id : 17]
+(95) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_item_sk#75]
 Right keys [1]: [i_item_sk#91]
 Join type: Inner
 Join condition: None
 
-(92) Project [codegen id : 17]
+(96) Project [codegen id : 17]
 Output [6]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [8]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, i_item_sk#91]
 
-(93) ReusedExchange [Reuses operator id: 33]
+(97) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#92]
 
-(94) BroadcastHashJoin [codegen id : 17]
+(98) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_promo_sk#77]
 Right keys [1]: [p_promo_sk#92]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 17]
+(99) Project [codegen id : 17]
 Output [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [7]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, p_promo_sk#92]
 
-(96) HashAggregate [codegen id : 17]
+(100) HashAggregate [codegen id : 17]
 Input [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Keys [1]: [web_site_id#90]
 Functions [3]: [partial_sum(UnscaledValue(ws_ext_sales_price#79)), partial_sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), partial_sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#93, sum#94, isEmpty#95, sum#96, isEmpty#97]
 Results [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 
-(97) Exchange
+(101) RowToColumnar
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
-Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, [plan_id=14]
 
-(98) HashAggregate [codegen id : 18]
+(102) CometColumnarExchange
+Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
+Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+
+(103) ColumnarToRow [codegen id : 18]
+Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
+
+(104) HashAggregate [codegen id : 18]
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 Keys [1]: [web_site_id#90]
 Functions [3]: [sum(UnscaledValue(ws_ext_sales_price#79)), sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_sales_price#79))#103, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105]
 Results [5]: [web channel AS channel#106, concat(web_site, web_site_id#90) AS id#107, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#79))#103,17,2) AS sales#108, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104 AS returns#109, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105 AS profit#110]
 
-(99) Union
+(105) Union
 
-(100) HashAggregate [codegen id : 19]
+(106) HashAggregate [codegen id : 19]
 Input [5]: [channel#34, id#35, sales#36, returns#37, profit#38]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [partial_sum(sales#36), partial_sum(returns#37), partial_sum(profit#38)]
 Aggregate Attributes [6]: [sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116]
 Results [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 
-(101) Exchange
+(107) RowToColumnar
+Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
+
+(108) CometColumnarExchange
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
-Arguments: hashpartitioning(channel#34, id#35, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+Arguments: hashpartitioning(channel#34, id#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
 
-(102) HashAggregate [codegen id : 20]
+(109) CometHashAggregate
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [sum(sales#36), sum(returns#37), sum(profit#38)]
-Aggregate Attributes [3]: [sum(sales#36)#123, sum(returns#37)#124, sum(profit#38)#125]
-Results [5]: [channel#34, id#35, cast(sum(sales#36)#123 as decimal(37,2)) AS sales#126, cast(sum(returns#37)#124 as decimal(38,2)) AS returns#127, cast(sum(profit#38)#125 as decimal(38,2)) AS profit#128]
 
-(103) ReusedExchange [Reuses operator id: 101]
+(110) ReusedExchange [Reuses operator id: 108]
 Output [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 
-(104) HashAggregate [codegen id : 40]
+(111) CometHashAggregate
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [sum(sales#36), sum(returns#37), sum(profit#38)]
-Aggregate Attributes [3]: [sum(sales#36)#123, sum(returns#37)#124, sum(profit#38)#125]
-Results [4]: [channel#34, sum(sales#36)#123 AS sales#129, sum(returns#37)#124 AS returns#130, sum(profit#38)#125 AS profit#131]
 
-(105) HashAggregate [codegen id : 40]
-Input [4]: [channel#34, sales#129, returns#130, profit#131]
+(112) CometHashAggregate
+Input [4]: [channel#34, sales#123, returns#124, profit#125]
 Keys [1]: [channel#34]
-Functions [3]: [partial_sum(sales#129), partial_sum(returns#130), partial_sum(profit#131)]
-Aggregate Attributes [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
-Results [7]: [channel#34, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
+Functions [3]: [partial_sum(sales#123), partial_sum(returns#124), partial_sum(profit#125)]
 
-(106) Exchange
-Input [7]: [channel#34, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
-Arguments: hashpartitioning(channel#34, 5), ENSURE_REQUIREMENTS, [plan_id=16]
+(113) CometColumnarExchange
+Input [7]: [channel#34, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
+Arguments: hashpartitioning(channel#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
 
-(107) HashAggregate [codegen id : 41]
-Input [7]: [channel#34, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
+(114) CometHashAggregate
+Input [7]: [channel#34, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
 Keys [1]: [channel#34]
-Functions [3]: [sum(sales#129), sum(returns#130), sum(profit#131)]
-Aggregate Attributes [3]: [sum(sales#129)#144, sum(returns#130)#145, sum(profit#131)#146]
-Results [5]: [channel#34, null AS id#147, sum(sales#129)#144 AS sales#148, sum(returns#130)#145 AS returns#149, sum(profit#131)#146 AS profit#150]
+Functions [3]: [sum(sales#123), sum(returns#124), sum(profit#125)]
 
-(108) ReusedExchange [Reuses operator id: 101]
+(115) ReusedExchange [Reuses operator id: 108]
 Output [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 
-(109) HashAggregate [codegen id : 61]
+(116) CometHashAggregate
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [sum(sales#36), sum(returns#37), sum(profit#38)]
-Aggregate Attributes [3]: [sum(sales#36)#123, sum(returns#37)#124, sum(profit#38)#125]
-Results [3]: [sum(sales#36)#123 AS sales#129, sum(returns#37)#124 AS returns#130, sum(profit#38)#125 AS profit#131]
 
-(110) HashAggregate [codegen id : 61]
-Input [3]: [sales#129, returns#130, profit#131]
+(117) CometHashAggregate
+Input [3]: [sales#123, returns#124, profit#125]
 Keys: []
-Functions [3]: [partial_sum(sales#129), partial_sum(returns#130), partial_sum(profit#131)]
-Aggregate Attributes [6]: [sum#151, isEmpty#152, sum#153, isEmpty#154, sum#155, isEmpty#156]
-Results [6]: [sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162]
+Functions [3]: [partial_sum(sales#123), partial_sum(returns#124), partial_sum(profit#125)]
 
-(111) Exchange
-Input [6]: [sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=17]
+(118) CometColumnarExchange
+Input [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
 
-(112) HashAggregate [codegen id : 62]
-Input [6]: [sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162]
+(119) CometHashAggregate
+Input [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
 Keys: []
-Functions [3]: [sum(sales#129), sum(returns#130), sum(profit#131)]
-Aggregate Attributes [3]: [sum(sales#129)#163, sum(returns#130)#164, sum(profit#131)#165]
-Results [5]: [null AS channel#166, null AS id#167, sum(sales#129)#163 AS sales#168, sum(returns#130)#164 AS returns#169, sum(profit#131)#165 AS profit#170]
+Functions [3]: [sum(sales#123), sum(returns#124), sum(profit#125)]
 
-(113) Union
+(120) CometUnion
+Child 0 Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+Child 1 Input [5]: [channel#34, id#141, sales#142, returns#143, profit#144]
+Child 2 Input [5]: [channel#145, id#146, sales#147, returns#148, profit#149]
 
-(114) HashAggregate [codegen id : 63]
-Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
-Keys [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
+(121) CometHashAggregate
+Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+Keys [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
 
-(115) Exchange
-Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
-Arguments: hashpartitioning(channel#34, id#35, sales#126, returns#127, profit#128, 5), ENSURE_REQUIREMENTS, [plan_id=18]
+(122) CometColumnarExchange
+Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+Arguments: hashpartitioning(channel#34, id#35, sales#138, returns#139, profit#140, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
 
-(116) HashAggregate [codegen id : 64]
-Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
-Keys [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
+(123) CometHashAggregate
+Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+Keys [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
 
-(117) TakeOrderedAndProject
-Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
-Arguments: 100, [channel#34 ASC NULLS FIRST, id#35 ASC NULLS FIRST], [channel#34, id#35, sales#126, returns#127, profit#128]
+(124) CometTakeOrderedAndProject
+Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#34 ASC NULLS FIRST,id#35 ASC NULLS FIRST], output=[channel#34,id#35,sales#138,returns#139,profit#140]), 100, [channel#34 ASC NULLS FIRST, id#35 ASC NULLS FIRST], [channel#34, id#35, sales#138, returns#139, profit#140]
+
+(125) ColumnarToRow [codegen id : 58]
+Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (122)
-+- * ColumnarToRow (121)
-   +- CometProject (120)
-      +- CometFilter (119)
-         +- CometScan parquet spark_catalog.default.date_dim (118)
+BroadcastExchange (130)
++- * ColumnarToRow (129)
+   +- CometProject (128)
+      +- CometFilter (127)
+         +- CometScan parquet spark_catalog.default.date_dim (126)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_date#171]
+Output [2]: [d_date_sk#14, d_date#150]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-09-03), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(119) CometFilter
-Input [2]: [d_date_sk#14, d_date#171]
-Condition : (((isnotnull(d_date#171) AND (d_date#171 >= 1998-08-04)) AND (d_date#171 <= 1998-09-03)) AND isnotnull(d_date_sk#14))
+(127) CometFilter
+Input [2]: [d_date_sk#14, d_date#150]
+Condition : (((isnotnull(d_date#150) AND (d_date#150 >= 1998-08-04)) AND (d_date#150 <= 1998-09-03)) AND isnotnull(d_date_sk#14))
 
-(120) CometProject
-Input [2]: [d_date_sk#14, d_date#171]
+(128) CometProject
+Input [2]: [d_date_sk#14, d_date#150]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(121) ColumnarToRow [codegen id : 1]
+(129) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(122) BroadcastExchange
+(130) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=19]
 
-Subquery:2 Hosting operator id = 39 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 41 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 69 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 73 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt
index f6a37c6372..f694eedfaf 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt
@@ -1,24 +1,24 @@
-TakeOrderedAndProject [channel,id,sales,returns,profit]
-  WholeStageCodegen (64)
-    HashAggregate [channel,id,sales,returns,profit]
-      InputAdapter
-        Exchange [channel,id,sales,returns,profit] #1
-          WholeStageCodegen (63)
-            HashAggregate [channel,id,sales,returns,profit]
-              InputAdapter
-                Union
-                  WholeStageCodegen (20)
-                    HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [channel,id] #2
-                          WholeStageCodegen (19)
-                            HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (6)
-                                    HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [s_store_id] #3
+WholeStageCodegen (58)
+  ColumnarToRow
+    InputAdapter
+      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
+        CometHashAggregate [channel,id,sales,returns,profit]
+          CometColumnarExchange [channel,id,sales,returns,profit] #1
+            CometHashAggregate [channel,id,sales,returns,profit]
+              CometUnion
+                CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [channel,id] #2
+                    RowToColumnar
+                      WholeStageCodegen (19)
+                        HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                          InputAdapter
+                            Union
+                              WholeStageCodegen (6)
+                                HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [s_store_id] #3
+                                        RowToColumnar
                                           WholeStageCodegen (5)
                                             HashAggregate [s_store_id,ss_ext_sales_price,sr_return_amt,ss_net_profit,sr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
                                               Project [ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
@@ -34,7 +34,7 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                   CometProject [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk,sr_return_amt,sr_net_loss]
                                                                     CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
                                                                       CometSort [ss_item_sk,ss_ticket_number]
-                                                                        CometExchange [ss_item_sk,ss_ticket_number] #4
+                                                                        CometColumnarExchange [ss_item_sk,ss_ticket_number] #4
                                                                           CometFilter [ss_store_sk,ss_item_sk,ss_promo_sk]
                                                                             CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
                                                                               SubqueryBroadcast [d_date_sk] #1
@@ -46,7 +46,7 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                                           CometFilter [d_date,d_date_sk]
                                                                                             CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                                                       CometSort [sr_item_sk,sr_ticket_number]
-                                                                        CometExchange [sr_item_sk,sr_ticket_number] #6
+                                                                        CometColumnarExchange [sr_item_sk,sr_ticket_number] #6
                                                                           CometProject [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss]
                                                                             CometFilter [sr_item_sk,sr_ticket_number]
                                                                               CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss,sr_returned_date_sk]
@@ -75,10 +75,12 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                             CometProject [p_promo_sk]
                                                               CometFilter [p_channel_tv,p_promo_sk]
                                                                 CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_tv]
-                                  WholeStageCodegen (12)
-                                    HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [cp_catalog_page_id] #10
+                              WholeStageCodegen (12)
+                                HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [cp_catalog_page_id] #10
+                                        RowToColumnar
                                           WholeStageCodegen (11)
                                             HashAggregate [cp_catalog_page_id,cs_ext_sales_price,cr_return_amount,cs_net_profit,cr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
                                               Project [cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
@@ -94,12 +96,12 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                   CometProject [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk,cr_return_amount,cr_net_loss]
                                                                     CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
                                                                       CometSort [cs_item_sk,cs_order_number]
-                                                                        CometExchange [cs_item_sk,cs_order_number] #11
+                                                                        CometColumnarExchange [cs_item_sk,cs_order_number] #11
                                                                           CometFilter [cs_catalog_page_sk,cs_item_sk,cs_promo_sk]
                                                                             CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
                                                                               ReusedSubquery [d_date_sk] #1
                                                                       CometSort [cr_item_sk,cr_order_number]
-                                                                        CometExchange [cr_item_sk,cr_order_number] #12
+                                                                        CometColumnarExchange [cr_item_sk,cr_order_number] #12
                                                                           CometProject [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss]
                                                                             CometFilter [cr_item_sk,cr_order_number]
                                                                               CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss,cr_returned_date_sk]
@@ -116,10 +118,12 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                         ReusedExchange [i_item_sk] #8
                                                   InputAdapter
                                                     ReusedExchange [p_promo_sk] #9
-                                  WholeStageCodegen (18)
-                                    HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [web_site_id] #14
+                              WholeStageCodegen (18)
+                                HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometColumnarExchange [web_site_id] #14
+                                        RowToColumnar
                                           WholeStageCodegen (17)
                                             HashAggregate [web_site_id,ws_ext_sales_price,wr_return_amt,ws_net_profit,wr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
                                               Project [ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
@@ -135,12 +139,12 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                                   CometProject [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk,wr_return_amt,wr_net_loss]
                                                                     CometSortMergeJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
                                                                       CometSort [ws_item_sk,ws_order_number]
-                                                                        CometExchange [ws_item_sk,ws_order_number] #15
+                                                                        CometColumnarExchange [ws_item_sk,ws_order_number] #15
                                                                           CometFilter [ws_web_site_sk,ws_item_sk,ws_promo_sk]
                                                                             CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_order_number,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
                                                                               ReusedSubquery [d_date_sk] #1
                                                                       CometSort [wr_item_sk,wr_order_number]
-                                                                        CometExchange [wr_item_sk,wr_order_number] #16
+                                                                        CometColumnarExchange [wr_item_sk,wr_order_number] #16
                                                                           CometProject [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss]
                                                                             CometFilter [wr_item_sk,wr_order_number]
                                                                               CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
@@ -157,21 +161,13 @@ TakeOrderedAndProject [channel,id,sales,returns,profit]
                                                         ReusedExchange [i_item_sk] #8
                                                   InputAdapter
                                                     ReusedExchange [p_promo_sk] #9
-                  WholeStageCodegen (41)
-                    HashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange [channel] #18
-                          WholeStageCodegen (40)
-                            HashAggregate [channel,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                InputAdapter
-                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
-                  WholeStageCodegen (62)
-                    HashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),channel,id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                      InputAdapter
-                        Exchange #19
-                          WholeStageCodegen (61)
-                            HashAggregate [sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                                InputAdapter
-                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                CometHashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange [channel] #18
+                    CometHashAggregate [channel,sales,returns,profit]
+                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                CometHashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                  CometColumnarExchange #19
+                    CometHashAggregate [sales,returns,profit]
+                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt
index 610ae89672..2c60857ef7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt
@@ -1,38 +1,40 @@
 == Physical Plan ==
-TakeOrderedAndProject (34)
-+- * Project (33)
-   +- Window (32)
-      +- * Sort (31)
-         +- Exchange (30)
-            +- * HashAggregate (29)
-               +- Exchange (28)
-                  +- * HashAggregate (27)
-                     +- Union (26)
-                        :- * HashAggregate (15)
-                        :  +- Exchange (14)
-                        :     +- * HashAggregate (13)
-                        :        +- * Project (12)
-                        :           +- * BroadcastHashJoin Inner BuildRight (11)
-                        :              :- * Project (6)
-                        :              :  +- * BroadcastHashJoin Inner BuildRight (5)
-                        :              :     :- * ColumnarToRow (3)
-                        :              :     :  +- CometFilter (2)
-                        :              :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                        :              :     +- ReusedExchange (4)
-                        :              +- BroadcastExchange (10)
-                        :                 +- * ColumnarToRow (9)
-                        :                    +- CometFilter (8)
-                        :                       +- CometScan parquet spark_catalog.default.item (7)
-                        :- * HashAggregate (20)
-                        :  +- Exchange (19)
-                        :     +- * HashAggregate (18)
-                        :        +- * HashAggregate (17)
-                        :           +- ReusedExchange (16)
-                        +- * HashAggregate (25)
-                           +- Exchange (24)
-                              +- * HashAggregate (23)
-                                 +- * HashAggregate (22)
-                                    +- ReusedExchange (21)
+TakeOrderedAndProject (36)
++- * Project (35)
+   +- Window (34)
+      +- * ColumnarToRow (33)
+         +- CometSort (32)
+            +- CometColumnarExchange (31)
+               +- CometHashAggregate (30)
+                  +- CometColumnarExchange (29)
+                     +- CometHashAggregate (28)
+                        +- CometUnion (27)
+                           :- CometHashAggregate (16)
+                           :  +- CometColumnarExchange (15)
+                           :     +- RowToColumnar (14)
+                           :        +- * HashAggregate (13)
+                           :           +- * Project (12)
+                           :              +- * BroadcastHashJoin Inner BuildRight (11)
+                           :                 :- * Project (6)
+                           :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
+                           :                 :     :- * ColumnarToRow (3)
+                           :                 :     :  +- CometFilter (2)
+                           :                 :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                           :                 :     +- ReusedExchange (4)
+                           :                 +- BroadcastExchange (10)
+                           :                    +- * ColumnarToRow (9)
+                           :                       +- CometFilter (8)
+                           :                          +- CometScan parquet spark_catalog.default.item (7)
+                           :- CometHashAggregate (21)
+                           :  +- CometColumnarExchange (20)
+                           :     +- CometHashAggregate (19)
+                           :        +- CometHashAggregate (18)
+                           :           +- ReusedExchange (17)
+                           +- CometHashAggregate (26)
+                              +- CometColumnarExchange (25)
+                                 +- CometHashAggregate (24)
+                                    +- CometHashAggregate (23)
+                                       +- ReusedExchange (22)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -50,7 +52,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [3]: [ws_item_sk#1, ws_net_paid#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 39]
+(4) ReusedExchange [Reuses operator id: 41]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -98,142 +100,133 @@ Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#2))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [i_category#8, i_class#7, sum#10]
 
-(14) Exchange
+(14) RowToColumnar
 Input [3]: [i_category#8, i_class#7, sum#10]
-Arguments: hashpartitioning(i_category#8, i_class#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [3]: [i_category#8, i_class#7, sum#10]
+Arguments: hashpartitioning(i_category#8, i_class#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [3]: [i_category#8, i_class#7, sum#10]
 Keys [2]: [i_category#8, i_class#7]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#11]
-Results [6]: [cast(MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#11,17,2) as decimal(27,2)) AS total_sum#12, i_category#8, i_class#7, 0 AS g_category#13, 0 AS g_class#14, 0 AS lochierarchy#15]
 
-(16) ReusedExchange [Reuses operator id: 14]
-Output [3]: [i_category#8, i_class#7, sum#16]
+(17) ReusedExchange [Reuses operator id: 15]
+Output [3]: [i_category#8, i_class#7, sum#11]
 
-(17) HashAggregate [codegen id : 8]
-Input [3]: [i_category#8, i_class#7, sum#16]
+(18) CometHashAggregate
+Input [3]: [i_category#8, i_class#7, sum#11]
 Keys [2]: [i_category#8, i_class#7]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#11]
-Results [2]: [MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#11,17,2) AS total_sum#17, i_category#8]
 
-(18) HashAggregate [codegen id : 8]
-Input [2]: [total_sum#17, i_category#8]
+(19) CometHashAggregate
+Input [2]: [total_sum#12, i_category#8]
 Keys [1]: [i_category#8]
-Functions [1]: [partial_sum(total_sum#17)]
-Aggregate Attributes [2]: [sum#18, isEmpty#19]
-Results [3]: [i_category#8, sum#20, isEmpty#21]
+Functions [1]: [partial_sum(total_sum#12)]
 
-(19) Exchange
-Input [3]: [i_category#8, sum#20, isEmpty#21]
-Arguments: hashpartitioning(i_category#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(20) CometColumnarExchange
+Input [3]: [i_category#8, sum#13, isEmpty#14]
+Arguments: hashpartitioning(i_category#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
 
-(20) HashAggregate [codegen id : 9]
-Input [3]: [i_category#8, sum#20, isEmpty#21]
+(21) CometHashAggregate
+Input [3]: [i_category#8, sum#13, isEmpty#14]
 Keys [1]: [i_category#8]
-Functions [1]: [sum(total_sum#17)]
-Aggregate Attributes [1]: [sum(total_sum#17)#22]
-Results [6]: [sum(total_sum#17)#22 AS total_sum#23, i_category#8, null AS i_class#24, 0 AS g_category#25, 1 AS g_class#26, 1 AS lochierarchy#27]
+Functions [1]: [sum(total_sum#12)]
 
-(21) ReusedExchange [Reuses operator id: 14]
-Output [3]: [i_category#8, i_class#7, sum#28]
+(22) ReusedExchange [Reuses operator id: 15]
+Output [3]: [i_category#8, i_class#7, sum#15]
 
-(22) HashAggregate [codegen id : 13]
-Input [3]: [i_category#8, i_class#7, sum#28]
+(23) CometHashAggregate
+Input [3]: [i_category#8, i_class#7, sum#15]
 Keys [2]: [i_category#8, i_class#7]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#11]
-Results [1]: [MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#11,17,2) AS total_sum#17]
 
-(23) HashAggregate [codegen id : 13]
-Input [1]: [total_sum#17]
+(24) CometHashAggregate
+Input [1]: [total_sum#12]
 Keys: []
-Functions [1]: [partial_sum(total_sum#17)]
-Aggregate Attributes [2]: [sum#29, isEmpty#30]
-Results [2]: [sum#31, isEmpty#32]
+Functions [1]: [partial_sum(total_sum#12)]
 
-(24) Exchange
-Input [2]: [sum#31, isEmpty#32]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
+(25) CometColumnarExchange
+Input [2]: [sum#16, isEmpty#17]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(25) HashAggregate [codegen id : 14]
-Input [2]: [sum#31, isEmpty#32]
+(26) CometHashAggregate
+Input [2]: [sum#16, isEmpty#17]
 Keys: []
-Functions [1]: [sum(total_sum#17)]
-Aggregate Attributes [1]: [sum(total_sum#17)#33]
-Results [6]: [sum(total_sum#17)#33 AS total_sum#34, null AS i_category#35, null AS i_class#36, 1 AS g_category#37, 1 AS g_class#38, 2 AS lochierarchy#39]
+Functions [1]: [sum(total_sum#12)]
 
-(26) Union
+(27) CometUnion
+Child 0 Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
+Child 1 Input [6]: [total_sum#22, i_category#8, i_class#23, g_category#24, g_class#25, lochierarchy#26]
+Child 2 Input [6]: [total_sum#27, i_category#28, i_class#29, g_category#30, g_class#31, lochierarchy#32]
 
-(27) HashAggregate [codegen id : 15]
-Input [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
-Keys [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
+(28) CometHashAggregate
+Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
+Keys [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
 Functions: []
-Aggregate Attributes: []
-Results [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
 
-(28) Exchange
-Input [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
-Arguments: hashpartitioning(total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+(29) CometColumnarExchange
+Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
+Arguments: hashpartitioning(total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
 
-(29) HashAggregate [codegen id : 16]
-Input [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
-Keys [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
+(30) CometHashAggregate
+Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
+Keys [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
 Functions: []
-Aggregate Attributes: []
-Results [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, CASE WHEN (g_class#14 = 0) THEN i_category#8 END AS _w0#40]
 
-(30) Exchange
-Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40]
-Arguments: hashpartitioning(lochierarchy#15, _w0#40, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+(31) CometColumnarExchange
+Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
+Arguments: hashpartitioning(lochierarchy#21, _w0#33, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+
+(32) CometSort
+Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
+Arguments: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33], [lochierarchy#21 ASC NULLS FIRST, _w0#33 ASC NULLS FIRST, total_sum#18 DESC NULLS LAST]
 
-(31) Sort [codegen id : 17]
-Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40]
-Arguments: [lochierarchy#15 ASC NULLS FIRST, _w0#40 ASC NULLS FIRST, total_sum#12 DESC NULLS LAST], false, 0
+(33) ColumnarToRow [codegen id : 10]
+Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
 
-(32) Window
-Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40]
-Arguments: [rank(total_sum#12) windowspecdefinition(lochierarchy#15, _w0#40, total_sum#12 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#41], [lochierarchy#15, _w0#40], [total_sum#12 DESC NULLS LAST]
+(34) Window
+Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
+Arguments: [rank(total_sum#18) windowspecdefinition(lochierarchy#21, _w0#33, total_sum#18 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#34], [lochierarchy#21, _w0#33], [total_sum#18 DESC NULLS LAST]
 
-(33) Project [codegen id : 18]
-Output [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, rank_within_parent#41]
-Input [6]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40, rank_within_parent#41]
+(35) Project [codegen id : 11]
+Output [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, rank_within_parent#34]
+Input [6]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33, rank_within_parent#34]
 
-(34) TakeOrderedAndProject
-Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, rank_within_parent#41]
-Arguments: 100, [lochierarchy#15 DESC NULLS LAST, CASE WHEN (lochierarchy#15 = 0) THEN i_category#8 END ASC NULLS FIRST, rank_within_parent#41 ASC NULLS FIRST], [total_sum#12, i_category#8, i_class#7, lochierarchy#15, rank_within_parent#41]
+(36) TakeOrderedAndProject
+Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, rank_within_parent#34]
+Arguments: 100, [lochierarchy#21 DESC NULLS LAST, CASE WHEN (lochierarchy#21 = 0) THEN i_category#8 END ASC NULLS FIRST, rank_within_parent#34 ASC NULLS FIRST], [total_sum#18, i_category#8, i_class#7, lochierarchy#21, rank_within_parent#34]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (39)
-+- * ColumnarToRow (38)
-   +- CometProject (37)
-      +- CometFilter (36)
-         +- CometScan parquet spark_catalog.default.date_dim (35)
+BroadcastExchange (41)
++- * ColumnarToRow (40)
+   +- CometProject (39)
+      +- CometFilter (38)
+         +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#42]
+Output [2]: [d_date_sk#5, d_month_seq#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(36) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#42]
-Condition : (((isnotnull(d_month_seq#42) AND (d_month_seq#42 >= 1212)) AND (d_month_seq#42 <= 1223)) AND isnotnull(d_date_sk#5))
+(38) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#35]
+Condition : (((isnotnull(d_month_seq#35) AND (d_month_seq#35 >= 1212)) AND (d_month_seq#35 <= 1223)) AND isnotnull(d_date_sk#5))
 
-(37) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#42]
+(39) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#35]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(38) ColumnarToRow [codegen id : 1]
+(40) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(39) BroadcastExchange
+(41) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt
index 5c5e088857..ef041fca19 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt
@@ -1,66 +1,54 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,total_sum,i_class]
-  WholeStageCodegen (18)
+  WholeStageCodegen (11)
     Project [total_sum,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [total_sum,lochierarchy,_w0]
-          WholeStageCodegen (17)
-            Sort [lochierarchy,_w0,total_sum]
+          WholeStageCodegen (10)
+            ColumnarToRow
               InputAdapter
-                Exchange [lochierarchy,_w0] #1
-                  WholeStageCodegen (16)
-                    HashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy] [_w0]
-                      InputAdapter
-                        Exchange [total_sum,i_category,i_class,g_category,g_class,lochierarchy] #2
-                          WholeStageCodegen (15)
-                            HashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (4)
-                                    HashAggregate [i_category,i_class,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,g_category,g_class,lochierarchy,sum]
-                                      InputAdapter
-                                        Exchange [i_category,i_class] #3
-                                          WholeStageCodegen (3)
-                                            HashAggregate [i_category,i_class,ws_net_paid] [sum,sum]
-                                              Project [ws_net_paid,i_class,i_category]
-                                                BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                  Project [ws_item_sk,ws_net_paid]
-                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [ws_item_sk]
-                                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_net_paid,ws_sold_date_sk]
-                                                              SubqueryBroadcast [d_date_sk] #1
-                                                                BroadcastExchange #4
-                                                                  WholeStageCodegen (1)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [d_date_sk]
-                                                                          CometFilter [d_month_seq,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                                      InputAdapter
-                                                        ReusedExchange [d_date_sk] #4
-                                                  InputAdapter
-                                                    BroadcastExchange #5
-                                                      WholeStageCodegen (2)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [i_item_sk]
-                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
-                                  WholeStageCodegen (9)
-                                    HashAggregate [i_category,sum,isEmpty] [sum(total_sum),total_sum,i_class,g_category,g_class,lochierarchy,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange [i_category] #6
-                                          WholeStageCodegen (8)
-                                            HashAggregate [i_category,total_sum] [sum,isEmpty,sum,isEmpty]
-                                              HashAggregate [i_category,i_class,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,sum]
-                                                InputAdapter
-                                                  ReusedExchange [i_category,i_class,sum] #3
-                                  WholeStageCodegen (14)
-                                    HashAggregate [sum,isEmpty] [sum(total_sum),total_sum,i_category,i_class,g_category,g_class,lochierarchy,sum,isEmpty]
-                                      InputAdapter
-                                        Exchange #7
-                                          WholeStageCodegen (13)
-                                            HashAggregate [total_sum] [sum,isEmpty,sum,isEmpty]
-                                              HashAggregate [i_category,i_class,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,sum]
+                CometSort [lochierarchy,_w0,total_sum]
+                  CometColumnarExchange [lochierarchy,_w0] #1
+                    CometHashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy]
+                      CometColumnarExchange [total_sum,i_category,i_class,g_category,g_class,lochierarchy] #2
+                        CometHashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy]
+                          CometUnion
+                            CometHashAggregate [i_category,i_class,sum]
+                              CometColumnarExchange [i_category,i_class] #3
+                                RowToColumnar
+                                  WholeStageCodegen (3)
+                                    HashAggregate [i_category,i_class,ws_net_paid] [sum,sum]
+                                      Project [ws_net_paid,i_class,i_category]
+                                        BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                          Project [ws_item_sk,ws_net_paid]
+                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
                                                 InputAdapter
-                                                  ReusedExchange [i_category,i_class,sum] #3
+                                                  CometFilter [ws_item_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_net_paid,ws_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #4
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_month_seq,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #4
+                                          InputAdapter
+                                            BroadcastExchange #5
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [i_item_sk]
+                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
+                            CometHashAggregate [i_category,sum,isEmpty]
+                              CometColumnarExchange [i_category] #6
+                                CometHashAggregate [i_category,total_sum]
+                                  CometHashAggregate [i_category,i_class,sum]
+                                    ReusedExchange [i_category,i_class,sum] #3
+                            CometHashAggregate [sum,isEmpty]
+                              CometColumnarExchange #7
+                                CometHashAggregate [total_sum]
+                                  CometHashAggregate [i_category,i_class,sum]
+                                    ReusedExchange [i_category,i_class,sum] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt
index 7fa138d5e9..080613d65b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt
@@ -1,25 +1,29 @@
 == Physical Plan ==
-* Sort (21)
-+- Exchange (20)
-   +- * Project (19)
-      +- Window (18)
-         +- * Sort (17)
-            +- Exchange (16)
-               +- * HashAggregate (15)
-                  +- Exchange (14)
-                     +- * HashAggregate (13)
-                        +- * Project (12)
-                           +- * BroadcastHashJoin Inner BuildRight (11)
-                              :- * Project (9)
-                              :  +- * BroadcastHashJoin Inner BuildRight (8)
-                              :     :- * ColumnarToRow (3)
-                              :     :  +- CometFilter (2)
-                              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     +- BroadcastExchange (7)
-                              :        +- * ColumnarToRow (6)
-                              :           +- CometFilter (5)
-                              :              +- CometScan parquet spark_catalog.default.item (4)
-                              +- ReusedExchange (10)
+* ColumnarToRow (25)
++- CometSort (24)
+   +- CometColumnarExchange (23)
+      +- RowToColumnar (22)
+         +- * Project (21)
+            +- Window (20)
+               +- * ColumnarToRow (19)
+                  +- CometSort (18)
+                     +- CometColumnarExchange (17)
+                        +- CometHashAggregate (16)
+                           +- CometColumnarExchange (15)
+                              +- RowToColumnar (14)
+                                 +- * HashAggregate (13)
+                                    +- * Project (12)
+                                       +- * BroadcastHashJoin Inner BuildRight (11)
+                                          :- * Project (9)
+                                          :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                          :     :- * ColumnarToRow (3)
+                                          :     :  +- CometFilter (2)
+                                          :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                                          :     +- BroadcastExchange (7)
+                                          :        +- * ColumnarToRow (6)
+                                          :           +- CometFilter (5)
+                                          :              +- CometScan parquet spark_catalog.default.item (4)
+                                          +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -65,7 +69,7 @@ Join condition: None
 Output [7]: [ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 26]
+(10) ReusedExchange [Reuses operator id: 30]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -85,70 +89,80 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) Exchange
+(14) RowToColumnar
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) HashAggregate [codegen id : 4]
+(15) CometColumnarExchange
+Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+
+(16) CometHashAggregate
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
-Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#14]
-Results [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS _w0#16]
 
-(16) Exchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+(17) CometColumnarExchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+
+(18) CometSort
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15], [i_class#9 ASC NULLS FIRST]
+
+(19) ColumnarToRow [codegen id : 4]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+
+(20) Window
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
 
-(17) Sort [codegen id : 5]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: [i_class#9 ASC NULLS FIRST], false, 0
+(21) Project [codegen id : 5]
+Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17]
+Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, _we0#16]
 
-(18) Window
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
-Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
+(22) RowToColumnar
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
-(19) Project [codegen id : 6]
-Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18]
-Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, _we0#17]
+(23) CometColumnarExchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
 
-(20) Exchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
-Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+(24) CometSort
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17], [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST]
 
-(21) Sort [codegen id : 7]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
-Arguments: [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], true, 0
+(25) ColumnarToRow [codegen id : 6]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (26)
-+- * ColumnarToRow (25)
-   +- CometProject (24)
-      +- CometFilter (23)
-         +- CometScan parquet spark_catalog.default.date_dim (22)
+BroadcastExchange (30)
++- * ColumnarToRow (29)
+   +- CometProject (28)
+      +- CometFilter (27)
+         +- CometScan parquet spark_catalog.default.date_dim (26)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#19]
+Output [2]: [d_date_sk#11, d_date#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(23) CometFilter
-Input [2]: [d_date_sk#11, d_date#19]
-Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(27) CometFilter
+Input [2]: [d_date_sk#11, d_date#18]
+Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(24) CometProject
-Input [2]: [d_date_sk#11, d_date#19]
+(28) CometProject
+Input [2]: [d_date_sk#11, d_date#18]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(25) ColumnarToRow [codegen id : 1]
+(29) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(26) BroadcastExchange
+(30) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt
index b7489a0aff..b59521b6c2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt
@@ -1,43 +1,45 @@
-WholeStageCodegen (7)
-  Sort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
+WholeStageCodegen (6)
+  ColumnarToRow
     InputAdapter
-      Exchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
-        WholeStageCodegen (6)
-          Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
-            InputAdapter
-              Window [_w0,i_class]
-                WholeStageCodegen (5)
-                  Sort [i_class]
-                    InputAdapter
-                      Exchange [i_class] #2
-                        WholeStageCodegen (4)
-                          HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ss_ext_sales_price)),itemrevenue,_w0,sum]
-                            InputAdapter
-                              Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
-                                WholeStageCodegen (3)
-                                  HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
-                                    Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                        Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_item_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #4
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_date,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+      CometSort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
+        CometColumnarExchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
+          RowToColumnar
+            WholeStageCodegen (5)
+              Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
+                InputAdapter
+                  Window [_w0,i_class]
+                    WholeStageCodegen (4)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [i_class]
+                            CometColumnarExchange [i_class] #2
+                              CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
+                                CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
+                                  RowToColumnar
+                                    WholeStageCodegen (3)
+                                      HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
+                                        Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                            Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ss_item_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #1
+                                                          BroadcastExchange #4
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometProject [d_date_sk]
+                                                                    CometFilter [d_date,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                InputAdapter
+                                                  BroadcastExchange #5
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [i_category,i_item_sk]
+                                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
                                             InputAdapter
-                                              BroadcastExchange #5
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [i_category,i_item_sk]
-                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #4
+                                              ReusedExchange [d_date_sk] #4

From 8dbf9ef3e585974106e01efb9e8038a092691ad9 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Sun, 31 Mar 2024 19:49:12 -0700
Subject: [PATCH 4/6] Update

---
 core/Cargo.lock | 50 ++++++++++++++++++++++++-------------------------
 core/Cargo.toml | 20 ++++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 7ec96b32eb..e209e4a8d3 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -115,7 +115,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 [[package]]
 name = "arrow"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -135,7 +135,7 @@ dependencies = [
 [[package]]
 name = "arrow-arith"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -149,7 +149,7 @@ dependencies = [
 [[package]]
 name = "arrow-array"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "ahash",
  "arrow-buffer",
@@ -165,7 +165,7 @@ dependencies = [
 [[package]]
 name = "arrow-buffer"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "bytes",
  "half 2.1.0",
@@ -175,7 +175,7 @@ dependencies = [
 [[package]]
 name = "arrow-cast"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -195,7 +195,7 @@ dependencies = [
 [[package]]
 name = "arrow-csv"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -213,7 +213,7 @@ dependencies = [
 [[package]]
 name = "arrow-data"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-buffer",
  "arrow-schema",
@@ -224,7 +224,7 @@ dependencies = [
 [[package]]
 name = "arrow-ipc"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -238,7 +238,7 @@ dependencies = [
 [[package]]
 name = "arrow-json"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -257,7 +257,7 @@ dependencies = [
 [[package]]
 name = "arrow-ord"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -271,7 +271,7 @@ dependencies = [
 [[package]]
 name = "arrow-row"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -285,7 +285,7 @@ dependencies = [
 [[package]]
 name = "arrow-schema"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "bitflags 2.5.0",
 ]
@@ -293,7 +293,7 @@ dependencies = [
 [[package]]
 name = "arrow-select"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -306,7 +306,7 @@ dependencies = [
 [[package]]
 name = "arrow-string"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -825,7 +825,7 @@ dependencies = [
 [[package]]
 name = "datafusion"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "ahash",
  "arrow",
@@ -867,7 +867,7 @@ dependencies = [
 [[package]]
 name = "datafusion-common"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "ahash",
  "arrow",
@@ -886,7 +886,7 @@ dependencies = [
 [[package]]
 name = "datafusion-common-runtime"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "tokio",
 ]
@@ -894,7 +894,7 @@ dependencies = [
 [[package]]
 name = "datafusion-execution"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "arrow",
  "chrono",
@@ -914,7 +914,7 @@ dependencies = [
 [[package]]
 name = "datafusion-expr"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "ahash",
  "arrow",
@@ -930,7 +930,7 @@ dependencies = [
 [[package]]
 name = "datafusion-functions"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "arrow",
  "base64",
@@ -954,7 +954,7 @@ dependencies = [
 [[package]]
 name = "datafusion-optimizer"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "arrow",
  "async-trait",
@@ -971,7 +971,7 @@ dependencies = [
 [[package]]
 name = "datafusion-physical-expr"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "ahash",
  "arrow",
@@ -1005,7 +1005,7 @@ dependencies = [
 [[package]]
 name = "datafusion-physical-plan"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "ahash",
  "arrow",
@@ -1035,7 +1035,7 @@ dependencies = [
 [[package]]
 name = "datafusion-sql"
 version = "36.0.0"
-source = "git+https://github.com/viirya/arrow-datafusion.git?rev=71aa052#71aa052f4664ccef49df84ae96cc6b6b3a30fee8"
+source = "git+https://github.com/viirya/arrow-datafusion.git?rev=111a940#111a940b297aa83839e4e2273f0e1a38e108b370"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1974,7 +1974,7 @@ dependencies = [
 [[package]]
 name = "parquet"
 version = "51.0.0"
-source = "git+https://github.com/viirya/arrow-rs.git?rev=c9fb7df#c9fb7dffcf417471c1343f8bf536f7bf928efce9"
+source = "git+https://github.com/viirya/arrow-rs.git?rev=3f1ae0c#3f1ae0c836b0769c88220d2180ef008b7a59158c"
 dependencies = [
  "ahash",
  "bytes",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 87f8eb542b..880d18d195 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -29,12 +29,12 @@ include = [
 
 [dependencies]
 parquet-format = "4.0.0" # This must be kept in sync with that from parquet crate
-arrow = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df", features = ["prettyprint", "ffi", "chrono-tz"] }
-arrow-array = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
-arrow-data = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
-arrow-schema = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
-arrow-string = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df" }
-parquet = { git = "https://github.com/viirya/arrow-rs.git", rev = "c9fb7df", default-features = false, features = ["experimental"] }
+arrow = { git = "https://github.com/viirya/arrow-rs.git", rev = "3f1ae0c", features = ["prettyprint", "ffi", "chrono-tz"] }
+arrow-array = { git = "https://github.com/viirya/arrow-rs.git", rev = "3f1ae0c" }
+arrow-data = { git = "https://github.com/viirya/arrow-rs.git", rev = "3f1ae0c" }
+arrow-schema = { git = "https://github.com/viirya/arrow-rs.git", rev = "3f1ae0c" }
+arrow-string = { git = "https://github.com/viirya/arrow-rs.git", rev = "3f1ae0c" }
+parquet = { git = "https://github.com/viirya/arrow-rs.git", rev = "3f1ae0c", default-features = false, features = ["experimental"] }
 half = { version = "~2.1", default-features = false }
 futures = "0.3.28"
 mimalloc = { version = "*", default-features = false, optional = true }
@@ -66,10 +66,10 @@ itertools = "0.11.0"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 chrono-tz = { version = "0.8" }
 paste = "1.0.14"
-datafusion-common = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052" }
-datafusion = { default-features = false, git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052", features = ["unicode_expressions"] }
-datafusion-functions = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052" }
-datafusion-physical-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "71aa052", default-features = false, features = ["unicode_expressions"] }
+datafusion-common = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "111a940" }
+datafusion = { default-features = false, git = "https://github.com/viirya/arrow-datafusion.git", rev = "111a940", features = ["unicode_expressions"] }
+datafusion-functions = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "111a940" }
+datafusion-physical-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "111a940", default-features = false, features = ["unicode_expressions"] }
 unicode-segmentation = "^1.10.1"
 once_cell = "1.18.0"
 regex = "1.9.6"

From 3a760f299453cd8eced3af84b5ae2c82700071cd Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Mon, 1 Apr 2024 00:01:25 -0700
Subject: [PATCH 5/6] Restore config

---
 .../main/scala/org/apache/comet/CometConf.scala  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/src/main/scala/org/apache/comet/CometConf.scala b/common/src/main/scala/org/apache/comet/CometConf.scala
index eb42457533..de49fdfb0b 100644
--- a/common/src/main/scala/org/apache/comet/CometConf.scala
+++ b/common/src/main/scala/org/apache/comet/CometConf.scala
@@ -130,14 +130,14 @@ object CometConf {
       .booleanConf
       .createWithDefault(false)
 
-  val COMET_COLUMNAR_SHUFFLE_ENABLED: ConfigEntry[Boolean] =
-    conf("spark.comet.columnar.shuffle.enabled")
-      .doc(
-        "Whether to enable Arrow-based columnar shuffle for Comet and Spark regular operators. " +
-          "If this is enabled, Comet prefers columnar shuffle than native shuffle. " +
-          "By default, this config is true.")
-      .booleanConf
-      .createWithDefault(true)
+  val COMET_COLUMNAR_SHUFFLE_ENABLED: ConfigEntry[Boolean] = conf(
+    "spark.comet.columnar.shuffle.enabled")
+    .doc(
+      "Force Comet to only use columnar shuffle for CometScan and Spark regular operators. " +
+        "If this is enabled, Comet native shuffle will not be enabled but only Arrow shuffle. " +
+        "By default, this config is false.")
+    .booleanConf
+    .createWithDefault(false)
 
   val COMET_EXEC_BROADCAST_ENABLED: ConfigEntry[Boolean] =
     conf(s"$COMET_EXEC_CONFIG_PREFIX.broadcast.enabled")

From 6161601d6de899bbd947ddba1e1aeed5ba7c1843 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@gmail.com>
Date: Mon, 1 Apr 2024 00:05:25 -0700
Subject: [PATCH 6/6] Restore plan stability

---
 .../approved-plans-v1_4/q1/explain.txt        |  298 ++---
 .../approved-plans-v1_4/q1/simplified.txt     |   72 +-
 .../approved-plans-v1_4/q10/explain.txt       |  140 +-
 .../approved-plans-v1_4/q10/simplified.txt    |  134 +-
 .../approved-plans-v1_4/q11/explain.txt       |  582 ++++----
 .../approved-plans-v1_4/q11/simplified.txt    |  180 ++-
 .../approved-plans-v1_4/q12/explain.txt       |  114 +-
 .../approved-plans-v1_4/q12/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q13/explain.txt       |  112 +-
 .../approved-plans-v1_4/q13/simplified.txt    |  100 +-
 .../approved-plans-v1_4/q14a/explain.txt      |  781 ++++++-----
 .../approved-plans-v1_4/q14a/simplified.txt   |  250 ++--
 .../approved-plans-v1_4/q14b/explain.txt      |  678 +++++-----
 .../approved-plans-v1_4/q14b/simplified.txt   |  370 +++---
 .../approved-plans-v1_4/q15/explain.txt       |   94 +-
 .../approved-plans-v1_4/q15/simplified.txt    |   76 +-
 .../approved-plans-v1_4/q16/explain.txt       |  118 +-
 .../approved-plans-v1_4/q16/simplified.txt    |  122 +-
 .../approved-plans-v1_4/q17/explain.txt       |  138 +-
 .../approved-plans-v1_4/q17/simplified.txt    |  126 +-
 .../approved-plans-v1_4/q18/explain.txt       |  136 +-
 .../approved-plans-v1_4/q18/simplified.txt    |  122 +-
 .../approved-plans-v1_4/q19/explain.txt       |  100 +-
 .../approved-plans-v1_4/q19/simplified.txt    |   94 +-
 .../approved-plans-v1_4/q2/explain.txt        |  202 ++-
 .../approved-plans-v1_4/q2/simplified.txt     |  105 +-
 .../approved-plans-v1_4/q20/explain.txt       |  114 +-
 .../approved-plans-v1_4/q20/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q21/explain.txt       |   92 +-
 .../approved-plans-v1_4/q21/simplified.txt    |   78 +-
 .../approved-plans-v1_4/q22/explain.txt       |   96 +-
 .../approved-plans-v1_4/q22/simplified.txt    |   78 +-
 .../approved-plans-v1_4/q23a/explain.txt      |  706 +++++-----
 .../approved-plans-v1_4/q23a/simplified.txt   |  295 +++--
 .../approved-plans-v1_4/q23b/explain.txt      |  881 ++++++------
 .../approved-plans-v1_4/q23b/simplified.txt   |  349 ++---
 .../approved-plans-v1_4/q24a/explain.txt      |  294 ++--
 .../approved-plans-v1_4/q24a/simplified.txt   |  100 +-
 .../approved-plans-v1_4/q24b/explain.txt      |  294 ++--
 .../approved-plans-v1_4/q24b/simplified.txt   |  100 +-
 .../approved-plans-v1_4/q25/explain.txt       |  160 ++-
 .../approved-plans-v1_4/q25/simplified.txt    |  132 +-
 .../approved-plans-v1_4/q26/explain.txt       |  110 +-
 .../approved-plans-v1_4/q26/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q27/explain.txt       |  110 +-
 .../approved-plans-v1_4/q27/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q28/explain.txt       |  340 +++--
 .../approved-plans-v1_4/q28/simplified.txt    |  140 +-
 .../approved-plans-v1_4/q29/explain.txt       |  186 ++-
 .../approved-plans-v1_4/q29/simplified.txt    |  140 +-
 .../approved-plans-v1_4/q3/explain.txt        |   64 +-
 .../approved-plans-v1_4/q3/simplified.txt     |   58 +-
 .../approved-plans-v1_4/q30/explain.txt       |  322 +++--
 .../approved-plans-v1_4/q30/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q31/explain.txt       |  808 ++++++-----
 .../approved-plans-v1_4/q31/simplified.txt    |  300 ++---
 .../approved-plans-v1_4/q32/explain.txt       |  164 ++-
 .../approved-plans-v1_4/q32/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q33/explain.txt       |  395 +++---
 .../approved-plans-v1_4/q33/simplified.txt    |  190 +--
 .../approved-plans-v1_4/q34/explain.txt       |  160 +--
 .../approved-plans-v1_4/q34/simplified.txt    |  108 +-
 .../approved-plans-v1_4/q35/explain.txt       |  138 +-
 .../approved-plans-v1_4/q35/simplified.txt    |  132 +-
 .../approved-plans-v1_4/q36/explain.txt       |  130 +-
 .../approved-plans-v1_4/q36/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q37/explain.txt       |   90 +-
 .../approved-plans-v1_4/q37/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q38/explain.txt       |  238 ++--
 .../approved-plans-v1_4/q38/simplified.txt    |  160 ++-
 .../approved-plans-v1_4/q39a/explain.txt      |  208 ++-
 .../approved-plans-v1_4/q39a/simplified.txt   |  152 +--
 .../approved-plans-v1_4/q39b/explain.txt      |  208 ++-
 .../approved-plans-v1_4/q39b/simplified.txt   |  152 +--
 .../approved-plans-v1_4/q4/explain.txt        |  898 ++++++-------
 .../approved-plans-v1_4/q4/simplified.txt     |  272 ++--
 .../approved-plans-v1_4/q40/explain.txt       |  110 +-
 .../approved-plans-v1_4/q40/simplified.txt    |   94 +-
 .../approved-plans-v1_4/q41/explain.txt       |   64 +-
 .../approved-plans-v1_4/q41/simplified.txt    |   56 +-
 .../approved-plans-v1_4/q42/explain.txt       |   64 +-
 .../approved-plans-v1_4/q42/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q43/explain.txt       |   64 +-
 .../approved-plans-v1_4/q43/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q44/explain.txt       |   18 +-
 .../approved-plans-v1_4/q44/simplified.txt    |    6 +-
 .../approved-plans-v1_4/q45/explain.txt       |  122 +-
 .../approved-plans-v1_4/q45/simplified.txt    |  108 +-
 .../approved-plans-v1_4/q46/explain.txt       |  172 ++-
 .../approved-plans-v1_4/q46/simplified.txt    |   86 +-
 .../approved-plans-v1_4/q47/explain.txt       |  283 ++--
 .../approved-plans-v1_4/q47/simplified.txt    |   42 +-
 .../approved-plans-v1_4/q48/explain.txt       |  100 +-
 .../approved-plans-v1_4/q48/simplified.txt    |   84 +-
 .../approved-plans-v1_4/q49/explain.txt       |  602 ++++-----
 .../approved-plans-v1_4/q49/simplified.txt    |  262 ++--
 .../approved-plans-v1_4/q5/explain.txt        |  320 ++---
 .../approved-plans-v1_4/q5/simplified.txt     |  236 ++--
 .../approved-plans-v1_4/q50/explain.txt       |  106 +-
 .../approved-plans-v1_4/q50/simplified.txt    |   84 +-
 .../approved-plans-v1_4/q51/explain.txt       |  335 +++--
 .../approved-plans-v1_4/q51/simplified.txt    |  136 +-
 .../approved-plans-v1_4/q52/explain.txt       |   64 +-
 .../approved-plans-v1_4/q52/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q53/explain.txt       |  136 +-
 .../approved-plans-v1_4/q53/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q54/explain.txt       |  368 +++--
 .../approved-plans-v1_4/q54/simplified.txt    |  112 +-
 .../approved-plans-v1_4/q55/explain.txt       |   64 +-
 .../approved-plans-v1_4/q55/simplified.txt    |   58 +-
 .../approved-plans-v1_4/q56/explain.txt       |  395 +++---
 .../approved-plans-v1_4/q56/simplified.txt    |  190 +--
 .../approved-plans-v1_4/q57/explain.txt       |  283 ++--
 .../approved-plans-v1_4/q57/simplified.txt    |   42 +-
 .../approved-plans-v1_4/q58/explain.txt       |  458 +++----
 .../approved-plans-v1_4/q58/simplified.txt    |  166 ++-
 .../approved-plans-v1_4/q59/explain.txt       |  256 ++--
 .../approved-plans-v1_4/q59/simplified.txt    |   41 +-
 .../approved-plans-v1_4/q6/explain.txt        |  190 ++-
 .../approved-plans-v1_4/q6/simplified.txt     |  138 +-
 .../approved-plans-v1_4/q60/explain.txt       |  395 +++---
 .../approved-plans-v1_4/q60/simplified.txt    |  190 +--
 .../approved-plans-v1_4/q61/explain.txt       |  318 +++--
 .../approved-plans-v1_4/q61/simplified.txt    |  170 ++-
 .../approved-plans-v1_4/q62/explain.txt       |   86 +-
 .../approved-plans-v1_4/q62/simplified.txt    |   80 +-
 .../approved-plans-v1_4/q63/explain.txt       |  136 +-
 .../approved-plans-v1_4/q63/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q64/explain.txt       |  800 ++++++-----
 .../approved-plans-v1_4/q64/simplified.txt    |  452 +++----
 .../approved-plans-v1_4/q65/explain.txt       |  300 ++---
 .../approved-plans-v1_4/q65/simplified.txt    |   68 +-
 .../approved-plans-v1_4/q66/explain.txt       |  300 ++---
 .../approved-plans-v1_4/q66/simplified.txt    |  153 +--
 .../approved-plans-v1_4/q67/explain.txt       |  128 +-
 .../approved-plans-v1_4/q67/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q68/explain.txt       |  172 ++-
 .../approved-plans-v1_4/q68/simplified.txt    |   86 +-
 .../approved-plans-v1_4/q69/explain.txt       |  138 +-
 .../approved-plans-v1_4/q69/simplified.txt    |  130 +-
 .../approved-plans-v1_4/q7/explain.txt        |  110 +-
 .../approved-plans-v1_4/q7/simplified.txt     |   96 +-
 .../approved-plans-v1_4/q70/explain.txt       |  228 ++--
 .../approved-plans-v1_4/q70/simplified.txt    |   64 +-
 .../approved-plans-v1_4/q71/explain.txt       |  136 +-
 .../approved-plans-v1_4/q71/simplified.txt    |   14 +-
 .../approved-plans-v1_4/q72/explain.txt       |  231 ++--
 .../approved-plans-v1_4/q72/simplified.txt    |  182 +--
 .../approved-plans-v1_4/q73/explain.txt       |  160 +--
 .../approved-plans-v1_4/q73/simplified.txt    |  108 +-
 .../approved-plans-v1_4/q74/explain.txt       |  574 ++++----
 .../approved-plans-v1_4/q74/simplified.txt    |  180 ++-
 .../approved-plans-v1_4/q75/explain.txt       |  850 ++++++------
 .../approved-plans-v1_4/q75/simplified.txt    |  372 +++---
 .../approved-plans-v1_4/q76/explain.txt       |   98 +-
 .../approved-plans-v1_4/q76/simplified.txt    |  106 +-
 .../approved-plans-v1_4/q77/explain.txt       |  714 +++++-----
 .../approved-plans-v1_4/q77/simplified.txt    |  290 ++--
 .../approved-plans-v1_4/q78/explain.txt       |  508 ++++---
 .../approved-plans-v1_4/q78/simplified.txt    |  144 +-
 .../approved-plans-v1_4/q79/explain.txt       |  136 +-
 .../approved-plans-v1_4/q79/simplified.txt    |   74 +-
 .../approved-plans-v1_4/q8/explain.txt        |  206 ++-
 .../approved-plans-v1_4/q8/simplified.txt     |  142 +-
 .../approved-plans-v1_4/q80/explain.txt       |  426 +++---
 .../approved-plans-v1_4/q80/simplified.txt    |  294 ++--
 .../approved-plans-v1_4/q81/explain.txt       |  314 +++--
 .../approved-plans-v1_4/q81/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q82/explain.txt       |   90 +-
 .../approved-plans-v1_4/q82/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q83/explain.txt       |  430 +++---
 .../approved-plans-v1_4/q83/simplified.txt    |  158 ++-
 .../approved-plans-v1_4/q85/explain.txt       |  146 +-
 .../approved-plans-v1_4/q85/simplified.txt    |  128 +-
 .../approved-plans-v1_4/q86/explain.txt       |  116 +-
 .../approved-plans-v1_4/q86/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q87/explain.txt       |  238 ++--
 .../approved-plans-v1_4/q87/simplified.txt    |  160 ++-
 .../approved-plans-v1_4/q88/explain.txt       | 1178 ++++++++---------
 .../approved-plans-v1_4/q88/simplified.txt    |  288 ++--
 .../approved-plans-v1_4/q89/explain.txt       |  134 +-
 .../approved-plans-v1_4/q89/simplified.txt    |   16 +-
 .../approved-plans-v1_4/q9/explain.txt        |   30 +-
 .../approved-plans-v1_4/q9/simplified.txt     |   10 +-
 .../approved-plans-v1_4/q90/explain.txt       |  238 ++--
 .../approved-plans-v1_4/q90/simplified.txt    |  120 +-
 .../approved-plans-v1_4/q91/explain.txt       |  142 +-
 .../approved-plans-v1_4/q91/simplified.txt    |   14 +-
 .../approved-plans-v1_4/q92/explain.txt       |  164 ++-
 .../approved-plans-v1_4/q92/simplified.txt    |   96 +-
 .../approved-plans-v1_4/q93/explain.txt       |   76 +-
 .../approved-plans-v1_4/q93/simplified.txt    |   62 +-
 .../approved-plans-v1_4/q94/explain.txt       |  118 +-
 .../approved-plans-v1_4/q94/simplified.txt    |  122 +-
 .../approved-plans-v1_4/q95/explain.txt       |  150 +--
 .../approved-plans-v1_4/q95/simplified.txt    |  178 ++-
 .../approved-plans-v1_4/q96/explain.txt       |   72 +-
 .../approved-plans-v1_4/q96/simplified.txt    |   68 +-
 .../approved-plans-v1_4/q97/explain.txt       |  151 ++-
 .../approved-plans-v1_4/q97/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q98/explain.txt       |  138 +-
 .../approved-plans-v1_4/q98/simplified.txt    |   88 +-
 .../approved-plans-v1_4/q99/explain.txt       |   86 +-
 .../approved-plans-v1_4/q99/simplified.txt    |   80 +-
 .../approved-plans-v2_7/q10a/explain.txt      |  136 +-
 .../approved-plans-v2_7/q10a/simplified.txt   |  136 +-
 .../approved-plans-v2_7/q11/explain.txt       |  574 ++++----
 .../approved-plans-v2_7/q11/simplified.txt    |  180 ++-
 .../approved-plans-v2_7/q12/explain.txt       |  114 +-
 .../approved-plans-v2_7/q12/simplified.txt    |   16 +-
 .../approved-plans-v2_7/q14/explain.txt       |  678 +++++-----
 .../approved-plans-v2_7/q14/simplified.txt    |  370 +++---
 .../approved-plans-v2_7/q14a/explain.txt      | 1048 +++++++--------
 .../approved-plans-v2_7/q14a/simplified.txt   |  476 +++----
 .../approved-plans-v2_7/q18a/explain.txt      |  647 +++++----
 .../approved-plans-v2_7/q18a/simplified.txt   |  402 +++---
 .../approved-plans-v2_7/q20/explain.txt       |  114 +-
 .../approved-plans-v2_7/q20/simplified.txt    |   16 +-
 .../approved-plans-v2_7/q22/explain.txt       |   94 +-
 .../approved-plans-v2_7/q22/simplified.txt    |   76 +-
 .../approved-plans-v2_7/q22a/explain.txt      |  275 ++--
 .../approved-plans-v2_7/q22a/simplified.txt   |  138 +-
 .../approved-plans-v2_7/q24/explain.txt       |  310 +++--
 .../approved-plans-v2_7/q24/simplified.txt    |  128 +-
 .../approved-plans-v2_7/q27a/explain.txt      |  319 +++--
 .../approved-plans-v2_7/q27a/simplified.txt   |  212 +--
 .../approved-plans-v2_7/q34/explain.txt       |  160 +--
 .../approved-plans-v2_7/q34/simplified.txt    |  108 +-
 .../approved-plans-v2_7/q35/explain.txt       |  138 +-
 .../approved-plans-v2_7/q35/simplified.txt    |  132 +-
 .../approved-plans-v2_7/q35a/explain.txt      |  134 +-
 .../approved-plans-v2_7/q35a/simplified.txt   |  134 +-
 .../approved-plans-v2_7/q36a/explain.txt      |  247 ++--
 .../approved-plans-v2_7/q36a/simplified.txt   |  126 +-
 .../approved-plans-v2_7/q47/explain.txt       |  283 ++--
 .../approved-plans-v2_7/q47/simplified.txt    |   42 +-
 .../approved-plans-v2_7/q49/explain.txt       |  602 ++++-----
 .../approved-plans-v2_7/q49/simplified.txt    |  262 ++--
 .../approved-plans-v2_7/q51a/explain.txt      |  653 +++++----
 .../approved-plans-v2_7/q51a/simplified.txt   |  201 +--
 .../approved-plans-v2_7/q57/explain.txt       |  283 ++--
 .../approved-plans-v2_7/q57/simplified.txt    |   42 +-
 .../approved-plans-v2_7/q5a/explain.txt       |  427 +++---
 .../approved-plans-v2_7/q5a/simplified.txt    |   90 +-
 .../approved-plans-v2_7/q6/explain.txt        |  190 ++-
 .../approved-plans-v2_7/q6/simplified.txt     |  138 +-
 .../approved-plans-v2_7/q64/explain.txt       |  800 ++++++-----
 .../approved-plans-v2_7/q64/simplified.txt    |  452 +++----
 .../approved-plans-v2_7/q67a/explain.txt      |  487 +++----
 .../approved-plans-v2_7/q67a/simplified.txt   |  130 +-
 .../approved-plans-v2_7/q70a/explain.txt      |  335 ++---
 .../approved-plans-v2_7/q70a/simplified.txt   |  170 +--
 .../approved-plans-v2_7/q72/explain.txt       |  231 ++--
 .../approved-plans-v2_7/q72/simplified.txt    |  182 +--
 .../approved-plans-v2_7/q74/explain.txt       |  574 ++++----
 .../approved-plans-v2_7/q74/simplified.txt    |  180 ++-
 .../approved-plans-v2_7/q75/explain.txt       |  850 ++++++------
 .../approved-plans-v2_7/q75/simplified.txt    |  372 +++---
 .../approved-plans-v2_7/q77a/explain.txt      |  861 ++++++------
 .../approved-plans-v2_7/q77a/simplified.txt   |  144 +-
 .../approved-plans-v2_7/q78/explain.txt       |  508 ++++---
 .../approved-plans-v2_7/q78/simplified.txt    |  144 +-
 .../approved-plans-v2_7/q80a/explain.txt      |  533 ++++----
 .../approved-plans-v2_7/q80a/simplified.txt   |  102 +-
 .../approved-plans-v2_7/q86a/explain.txt      |  233 ++--
 .../approved-plans-v2_7/q86a/simplified.txt   |  108 +-
 .../approved-plans-v2_7/q98/explain.txt       |  130 +-
 .../approved-plans-v2_7/q98/simplified.txt    |   84 +-
 268 files changed, 28033 insertions(+), 29487 deletions(-)

diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt
index acab82fdec..b0ea6bed8b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/explain.txt
@@ -1,48 +1,44 @@
 == Physical Plan ==
-TakeOrderedAndProject (44)
-+- * Project (43)
-   +- * BroadcastHashJoin Inner BuildRight (42)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * Project (30)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :     :- * ColumnarToRow (12)
-      :     :     :  +- CometFilter (11)
-      :     :     :     +- CometHashAggregate (10)
-      :     :     :        +- CometColumnarExchange (9)
-      :     :     :           +- RowToColumnar (8)
-      :     :     :              +- * HashAggregate (7)
-      :     :     :                 +- * Project (6)
-      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :     :                       :- * ColumnarToRow (3)
-      :     :     :                       :  +- CometFilter (2)
-      :     :     :                       :     +- CometScan parquet spark_catalog.default.store_returns (1)
-      :     :     :                       +- ReusedExchange (4)
-      :     :     +- BroadcastExchange (28)
-      :     :        +- * ColumnarToRow (27)
-      :     :           +- CometFilter (26)
-      :     :              +- CometHashAggregate (25)
-      :     :                 +- CometColumnarExchange (24)
-      :     :                    +- CometHashAggregate (23)
-      :     :                       +- CometHashAggregate (22)
-      :     :                          +- CometColumnarExchange (21)
-      :     :                             +- RowToColumnar (20)
-      :     :                                +- * HashAggregate (19)
-      :     :                                   +- * Project (18)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                         :- * ColumnarToRow (15)
-      :     :                                         :  +- CometFilter (14)
-      :     :                                         :     +- CometScan parquet spark_catalog.default.store_returns (13)
-      :     :                                         +- ReusedExchange (16)
-      :     +- BroadcastExchange (35)
-      :        +- * ColumnarToRow (34)
-      :           +- CometProject (33)
-      :              +- CometFilter (32)
-      :                 +- CometScan parquet spark_catalog.default.store (31)
-      +- BroadcastExchange (41)
-         +- * ColumnarToRow (40)
-            +- CometFilter (39)
-               +- CometScan parquet spark_catalog.default.customer (38)
+TakeOrderedAndProject (40)
++- * Project (39)
+   +- * BroadcastHashJoin Inner BuildRight (38)
+      :- * Project (33)
+      :  +- * BroadcastHashJoin Inner BuildRight (32)
+      :     :- * Project (26)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+      :     :     :- * Filter (10)
+      :     :     :  +- * HashAggregate (9)
+      :     :     :     +- Exchange (8)
+      :     :     :        +- * HashAggregate (7)
+      :     :     :           +- * Project (6)
+      :     :     :              +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :     :                 :- * ColumnarToRow (3)
+      :     :     :                 :  +- CometFilter (2)
+      :     :     :                 :     +- CometScan parquet spark_catalog.default.store_returns (1)
+      :     :     :                 +- ReusedExchange (4)
+      :     :     +- BroadcastExchange (24)
+      :     :        +- * Filter (23)
+      :     :           +- * HashAggregate (22)
+      :     :              +- Exchange (21)
+      :     :                 +- * HashAggregate (20)
+      :     :                    +- * HashAggregate (19)
+      :     :                       +- Exchange (18)
+      :     :                          +- * HashAggregate (17)
+      :     :                             +- * Project (16)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (15)
+      :     :                                   :- * ColumnarToRow (13)
+      :     :                                   :  +- CometFilter (12)
+      :     :                                   :     +- CometScan parquet spark_catalog.default.store_returns (11)
+      :     :                                   +- ReusedExchange (14)
+      :     +- BroadcastExchange (31)
+      :        +- * ColumnarToRow (30)
+      :           +- CometProject (29)
+      :              +- CometFilter (28)
+      :                 +- CometScan parquet spark_catalog.default.store (27)
+      +- BroadcastExchange (37)
+         +- * ColumnarToRow (36)
+            +- CometFilter (35)
+               +- CometScan parquet spark_catalog.default.customer (34)
 
 
 (unknown) Scan parquet spark_catalog.default.store_returns
@@ -60,7 +56,7 @@ Condition : (isnotnull(sr_store_sk#2) AND isnotnull(sr_customer_sk#1))
 (3) ColumnarToRow [codegen id : 2]
 Input [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 49]
+(4) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 2]
@@ -80,203 +76,199 @@ Functions [1]: [partial_sum(UnscaledValue(sr_return_amt#3))]
 Aggregate Attributes [1]: [sum#7]
 Results [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
 
-(8) RowToColumnar
+(8) Exchange
 Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
+Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(9) CometColumnarExchange
-Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
-Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
-
-(10) CometHashAggregate
+(9) HashAggregate [codegen id : 9]
 Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#8]
 Keys [2]: [sr_customer_sk#1, sr_store_sk#2]
 Functions [1]: [sum(UnscaledValue(sr_return_amt#3))]
+Aggregate Attributes [1]: [sum(UnscaledValue(sr_return_amt#3))#9]
+Results [3]: [sr_customer_sk#1 AS ctr_customer_sk#10, sr_store_sk#2 AS ctr_store_sk#11, MakeDecimal(sum(UnscaledValue(sr_return_amt#3))#9,17,2) AS ctr_total_return#12]
 
-(11) CometFilter
-Input [3]: [ctr_customer_sk#9, ctr_store_sk#10, ctr_total_return#11]
-Condition : isnotnull(ctr_total_return#11)
-
-(12) ColumnarToRow [codegen id : 8]
-Input [3]: [ctr_customer_sk#9, ctr_store_sk#10, ctr_total_return#11]
+(10) Filter [codegen id : 9]
+Input [3]: [ctr_customer_sk#10, ctr_store_sk#11, ctr_total_return#12]
+Condition : isnotnull(ctr_total_return#12)
 
 (unknown) Scan parquet spark_catalog.default.store_returns
 Output [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(sr_returned_date_sk#4), dynamicpruningexpression(sr_returned_date_sk#4 IN dynamicpruning#12)]
+PartitionFilters: [isnotnull(sr_returned_date_sk#4), dynamicpruningexpression(sr_returned_date_sk#4 IN dynamicpruning#13)]
 PushedFilters: [IsNotNull(sr_store_sk)]
 ReadSchema: struct<sr_customer_sk:int,sr_store_sk:int,sr_return_amt:decimal(7,2)>
 
-(14) CometFilter
+(12) CometFilter
 Input [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 Condition : isnotnull(sr_store_sk#2)
 
-(15) ColumnarToRow [codegen id : 4]
+(13) ColumnarToRow [codegen id : 4]
 Input [4]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4]
 
-(16) ReusedExchange [Reuses operator id: 49]
+(14) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#6]
 
-(17) BroadcastHashJoin [codegen id : 4]
+(15) BroadcastHashJoin [codegen id : 4]
 Left keys [1]: [sr_returned_date_sk#4]
 Right keys [1]: [d_date_sk#6]
 Join type: Inner
 Join condition: None
 
-(18) Project [codegen id : 4]
+(16) Project [codegen id : 4]
 Output [3]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3]
 Input [5]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3, sr_returned_date_sk#4, d_date_sk#6]
 
-(19) HashAggregate [codegen id : 4]
+(17) HashAggregate [codegen id : 4]
 Input [3]: [sr_customer_sk#1, sr_store_sk#2, sr_return_amt#3]
 Keys [2]: [sr_customer_sk#1, sr_store_sk#2]
 Functions [1]: [partial_sum(UnscaledValue(sr_return_amt#3))]
-Aggregate Attributes [1]: [sum#13]
-Results [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
+Aggregate Attributes [1]: [sum#14]
+Results [3]: [sr_customer_sk#1, sr_store_sk#2, sum#15]
 
-(20) RowToColumnar
-Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
+(18) Exchange
+Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#15]
+Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(21) CometColumnarExchange
-Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
-Arguments: hashpartitioning(sr_customer_sk#1, sr_store_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(22) CometHashAggregate
-Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#14]
+(19) HashAggregate [codegen id : 5]
+Input [3]: [sr_customer_sk#1, sr_store_sk#2, sum#15]
 Keys [2]: [sr_customer_sk#1, sr_store_sk#2]
 Functions [1]: [sum(UnscaledValue(sr_return_amt#3))]
-
-(23) CometHashAggregate
-Input [2]: [ctr_store_sk#10, ctr_total_return#11]
-Keys [1]: [ctr_store_sk#10]
-Functions [1]: [partial_avg(ctr_total_return#11)]
-
-(24) CometColumnarExchange
-Input [3]: [ctr_store_sk#10, sum#15, count#16]
-Arguments: hashpartitioning(ctr_store_sk#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(25) CometHashAggregate
-Input [3]: [ctr_store_sk#10, sum#15, count#16]
-Keys [1]: [ctr_store_sk#10]
-Functions [1]: [avg(ctr_total_return#11)]
-
-(26) CometFilter
-Input [2]: [(avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
-Condition : isnotnull((avg(ctr_total_return) * 1.2)#17)
-
-(27) ColumnarToRow [codegen id : 5]
-Input [2]: [(avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
-
-(28) BroadcastExchange
-Input [2]: [(avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
+Aggregate Attributes [1]: [sum(UnscaledValue(sr_return_amt#3))#9]
+Results [2]: [sr_store_sk#2 AS ctr_store_sk#11, MakeDecimal(sum(UnscaledValue(sr_return_amt#3))#9,17,2) AS ctr_total_return#12]
+
+(20) HashAggregate [codegen id : 5]
+Input [2]: [ctr_store_sk#11, ctr_total_return#12]
+Keys [1]: [ctr_store_sk#11]
+Functions [1]: [partial_avg(ctr_total_return#12)]
+Aggregate Attributes [2]: [sum#16, count#17]
+Results [3]: [ctr_store_sk#11, sum#18, count#19]
+
+(21) Exchange
+Input [3]: [ctr_store_sk#11, sum#18, count#19]
+Arguments: hashpartitioning(ctr_store_sk#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+
+(22) HashAggregate [codegen id : 6]
+Input [3]: [ctr_store_sk#11, sum#18, count#19]
+Keys [1]: [ctr_store_sk#11]
+Functions [1]: [avg(ctr_total_return#12)]
+Aggregate Attributes [1]: [avg(ctr_total_return#12)#20]
+Results [2]: [(avg(ctr_total_return#12)#20 * 1.2) AS (avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11 AS ctr_store_sk#11#22]
+
+(23) Filter [codegen id : 6]
+Input [2]: [(avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11#22]
+Condition : isnotnull((avg(ctr_total_return) * 1.2)#21)
+
+(24) BroadcastExchange
+Input [2]: [(avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint)),false), [plan_id=4]
 
-(29) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ctr_store_sk#10]
-Right keys [1]: [ctr_store_sk#10#18]
+(25) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [ctr_store_sk#11]
+Right keys [1]: [ctr_store_sk#11#22]
 Join type: Inner
-Join condition: (cast(ctr_total_return#11 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#17)
+Join condition: (cast(ctr_total_return#12 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#21)
 
-(30) Project [codegen id : 8]
-Output [2]: [ctr_customer_sk#9, ctr_store_sk#10]
-Input [5]: [ctr_customer_sk#9, ctr_store_sk#10, ctr_total_return#11, (avg(ctr_total_return) * 1.2)#17, ctr_store_sk#10#18]
+(26) Project [codegen id : 9]
+Output [2]: [ctr_customer_sk#10, ctr_store_sk#11]
+Input [5]: [ctr_customer_sk#10, ctr_store_sk#11, ctr_total_return#12, (avg(ctr_total_return) * 1.2)#21, ctr_store_sk#11#22]
 
 (unknown) Scan parquet spark_catalog.default.store
-Output [2]: [s_store_sk#19, s_state#20]
+Output [2]: [s_store_sk#23, s_state#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_state), EqualTo(s_state,TN), IsNotNull(s_store_sk)]
 ReadSchema: struct<s_store_sk:int,s_state:string>
 
-(32) CometFilter
-Input [2]: [s_store_sk#19, s_state#20]
-Condition : ((isnotnull(s_state#20) AND (s_state#20 = TN)) AND isnotnull(s_store_sk#19))
+(28) CometFilter
+Input [2]: [s_store_sk#23, s_state#24]
+Condition : ((isnotnull(s_state#24) AND (s_state#24 = TN)) AND isnotnull(s_store_sk#23))
 
-(33) CometProject
-Input [2]: [s_store_sk#19, s_state#20]
-Arguments: [s_store_sk#19], [s_store_sk#19]
+(29) CometProject
+Input [2]: [s_store_sk#23, s_state#24]
+Arguments: [s_store_sk#23], [s_store_sk#23]
 
-(34) ColumnarToRow [codegen id : 6]
-Input [1]: [s_store_sk#19]
+(30) ColumnarToRow [codegen id : 7]
+Input [1]: [s_store_sk#23]
 
-(35) BroadcastExchange
-Input [1]: [s_store_sk#19]
+(31) BroadcastExchange
+Input [1]: [s_store_sk#23]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(36) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ctr_store_sk#10]
-Right keys [1]: [s_store_sk#19]
+(32) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [ctr_store_sk#11]
+Right keys [1]: [s_store_sk#23]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
-Output [1]: [ctr_customer_sk#9]
-Input [3]: [ctr_customer_sk#9, ctr_store_sk#10, s_store_sk#19]
+(33) Project [codegen id : 9]
+Output [1]: [ctr_customer_sk#10]
+Input [3]: [ctr_customer_sk#10, ctr_store_sk#11, s_store_sk#23]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [2]: [c_customer_sk#21, c_customer_id#22]
+Output [2]: [c_customer_sk#25, c_customer_id#26]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string>
 
-(39) CometFilter
-Input [2]: [c_customer_sk#21, c_customer_id#22]
-Condition : isnotnull(c_customer_sk#21)
+(35) CometFilter
+Input [2]: [c_customer_sk#25, c_customer_id#26]
+Condition : isnotnull(c_customer_sk#25)
 
-(40) ColumnarToRow [codegen id : 7]
-Input [2]: [c_customer_sk#21, c_customer_id#22]
+(36) ColumnarToRow [codegen id : 8]
+Input [2]: [c_customer_sk#25, c_customer_id#26]
 
-(41) BroadcastExchange
-Input [2]: [c_customer_sk#21, c_customer_id#22]
+(37) BroadcastExchange
+Input [2]: [c_customer_sk#25, c_customer_id#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(42) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ctr_customer_sk#9]
-Right keys [1]: [c_customer_sk#21]
+(38) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [ctr_customer_sk#10]
+Right keys [1]: [c_customer_sk#25]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 8]
-Output [1]: [c_customer_id#22]
-Input [3]: [ctr_customer_sk#9, c_customer_sk#21, c_customer_id#22]
+(39) Project [codegen id : 9]
+Output [1]: [c_customer_id#26]
+Input [3]: [ctr_customer_sk#10, c_customer_sk#25, c_customer_id#26]
 
-(44) TakeOrderedAndProject
-Input [1]: [c_customer_id#22]
-Arguments: 100, [c_customer_id#22 ASC NULLS FIRST], [c_customer_id#22]
+(40) TakeOrderedAndProject
+Input [1]: [c_customer_id#26]
+Arguments: 100, [c_customer_id#26 ASC NULLS FIRST], [c_customer_id#26]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = sr_returned_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (45)
++- * ColumnarToRow (44)
+   +- CometProject (43)
+      +- CometFilter (42)
+         +- CometScan parquet spark_catalog.default.date_dim (41)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_year#23]
+Output [2]: [d_date_sk#6, d_year#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(46) CometFilter
-Input [2]: [d_date_sk#6, d_year#23]
-Condition : ((isnotnull(d_year#23) AND (d_year#23 = 2000)) AND isnotnull(d_date_sk#6))
+(42) CometFilter
+Input [2]: [d_date_sk#6, d_year#27]
+Condition : ((isnotnull(d_year#27) AND (d_year#27 = 2000)) AND isnotnull(d_date_sk#6))
 
-(47) CometProject
-Input [2]: [d_date_sk#6, d_year#23]
+(43) CometProject
+Input [2]: [d_date_sk#6, d_year#27]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(48) ColumnarToRow [codegen id : 1]
+(44) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(49) BroadcastExchange
+(45) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 13 Hosting Expression = sr_returned_date_sk#4 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 11 Hosting Expression = sr_returned_date_sk#4 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt
index c8f2ec9eb9..6d4c0fca7a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q1/simplified.txt
@@ -1,47 +1,45 @@
 TakeOrderedAndProject [c_customer_id]
-  WholeStageCodegen (8)
+  WholeStageCodegen (9)
     Project [c_customer_id]
       BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
         Project [ctr_customer_sk]
           BroadcastHashJoin [ctr_store_sk,s_store_sk]
             Project [ctr_customer_sk,ctr_store_sk]
               BroadcastHashJoin [ctr_store_sk,ctr_store_sk,ctr_total_return,(avg(ctr_total_return) * 1.2)]
-                ColumnarToRow
-                  InputAdapter
-                    CometFilter [ctr_total_return]
-                      CometHashAggregate [sr_customer_sk,sr_store_sk,sum]
-                        CometColumnarExchange [sr_customer_sk,sr_store_sk] #1
-                          RowToColumnar
-                            WholeStageCodegen (2)
-                              HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
-                                Project [sr_customer_sk,sr_store_sk,sr_return_amt]
-                                  BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [sr_store_sk,sr_customer_sk]
-                                          CometScan parquet spark_catalog.default.store_returns [sr_customer_sk,sr_store_sk,sr_return_amt,sr_returned_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #2
+                Filter [ctr_total_return]
+                  HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_customer_sk,ctr_store_sk,ctr_total_return,sum]
+                    InputAdapter
+                      Exchange [sr_customer_sk,sr_store_sk] #1
+                        WholeStageCodegen (2)
+                          HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
+                            Project [sr_customer_sk,sr_store_sk,sr_return_amt]
+                              BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [sr_store_sk,sr_customer_sk]
+                                      CometScan parquet spark_catalog.default.store_returns [sr_customer_sk,sr_store_sk,sr_return_amt,sr_returned_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_year,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #2
                 InputAdapter
                   BroadcastExchange #3
-                    WholeStageCodegen (5)
-                      ColumnarToRow
-                        InputAdapter
-                          CometFilter [(avg(ctr_total_return) * 1.2)]
-                            CometHashAggregate [ctr_store_sk,sum,count]
-                              CometColumnarExchange [ctr_store_sk] #4
-                                CometHashAggregate [ctr_store_sk,ctr_total_return]
-                                  CometHashAggregate [sr_customer_sk,sr_store_sk,sum]
-                                    CometColumnarExchange [sr_customer_sk,sr_store_sk] #5
-                                      RowToColumnar
+                    WholeStageCodegen (6)
+                      Filter [(avg(ctr_total_return) * 1.2)]
+                        HashAggregate [ctr_store_sk,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),ctr_store_sk,sum,count]
+                          InputAdapter
+                            Exchange [ctr_store_sk] #4
+                              WholeStageCodegen (5)
+                                HashAggregate [ctr_store_sk,ctr_total_return] [sum,count,sum,count]
+                                  HashAggregate [sr_customer_sk,sr_store_sk,sum] [sum(UnscaledValue(sr_return_amt)),ctr_store_sk,ctr_total_return,sum]
+                                    InputAdapter
+                                      Exchange [sr_customer_sk,sr_store_sk] #5
                                         WholeStageCodegen (4)
                                           HashAggregate [sr_customer_sk,sr_store_sk,sr_return_amt] [sum,sum]
                                             Project [sr_customer_sk,sr_store_sk,sr_return_amt]
@@ -55,7 +53,7 @@ TakeOrderedAndProject [c_customer_id]
                                                   ReusedExchange [d_date_sk] #2
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (6)
+                WholeStageCodegen (7)
                   ColumnarToRow
                     InputAdapter
                       CometProject [s_store_sk]
@@ -63,7 +61,7 @@ TakeOrderedAndProject [c_customer_id]
                           CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
         InputAdapter
           BroadcastExchange #7
-            WholeStageCodegen (7)
+            WholeStageCodegen (8)
               ColumnarToRow
                 InputAdapter
                   CometFilter [c_customer_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt
index a99a75e9a6..1ea234408b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/explain.txt
@@ -1,49 +1,47 @@
 == Physical Plan ==
-* ColumnarToRow (45)
-+- CometTakeOrderedAndProject (44)
-   +- CometHashAggregate (43)
-      +- CometColumnarExchange (42)
-         +- RowToColumnar (41)
-            +- * HashAggregate (40)
-               +- * Project (39)
-                  +- * BroadcastHashJoin Inner BuildRight (38)
-                     :- * Project (33)
-                     :  +- * BroadcastHashJoin Inner BuildRight (32)
-                     :     :- * Project (26)
-                     :     :  +- * Filter (25)
-                     :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
-                     :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
-                     :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-                     :     :        :  :  :- * ColumnarToRow (3)
-                     :     :        :  :  :  +- CometFilter (2)
-                     :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-                     :     :        :  :  +- BroadcastExchange (9)
-                     :     :        :  :     +- * Project (8)
-                     :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-                     :     :        :  :           :- * ColumnarToRow (5)
-                     :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-                     :     :        :  :           +- ReusedExchange (6)
-                     :     :        :  +- BroadcastExchange (16)
-                     :     :        :     +- * Project (15)
-                     :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :        :           :- * ColumnarToRow (12)
-                     :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-                     :     :        :           +- ReusedExchange (13)
-                     :     :        +- BroadcastExchange (23)
-                     :     :           +- * Project (22)
-                     :     :              +- * BroadcastHashJoin Inner BuildRight (21)
-                     :     :                 :- * ColumnarToRow (19)
-                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-                     :     :                 +- ReusedExchange (20)
-                     :     +- BroadcastExchange (31)
-                     :        +- * ColumnarToRow (30)
-                     :           +- CometProject (29)
-                     :              +- CometFilter (28)
-                     :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-                     +- BroadcastExchange (37)
-                        +- * ColumnarToRow (36)
-                           +- CometFilter (35)
-                              +- CometScan parquet spark_catalog.default.customer_demographics (34)
+TakeOrderedAndProject (43)
++- * HashAggregate (42)
+   +- Exchange (41)
+      +- * HashAggregate (40)
+         +- * Project (39)
+            +- * BroadcastHashJoin Inner BuildRight (38)
+               :- * Project (33)
+               :  +- * BroadcastHashJoin Inner BuildRight (32)
+               :     :- * Project (26)
+               :     :  +- * Filter (25)
+               :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
+               :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
+               :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+               :     :        :  :  :- * ColumnarToRow (3)
+               :     :        :  :  :  +- CometFilter (2)
+               :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+               :     :        :  :  +- BroadcastExchange (9)
+               :     :        :  :     +- * Project (8)
+               :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :        :  :           :- * ColumnarToRow (5)
+               :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+               :     :        :  :           +- ReusedExchange (6)
+               :     :        :  +- BroadcastExchange (16)
+               :     :        :     +- * Project (15)
+               :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :        :           :- * ColumnarToRow (12)
+               :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+               :     :        :           +- ReusedExchange (13)
+               :     :        +- BroadcastExchange (23)
+               :     :           +- * Project (22)
+               :     :              +- * BroadcastHashJoin Inner BuildRight (21)
+               :     :                 :- * ColumnarToRow (19)
+               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+               :     :                 +- ReusedExchange (20)
+               :     +- BroadcastExchange (31)
+               :        +- * ColumnarToRow (30)
+               :           +- CometProject (29)
+               :              +- CometFilter (28)
+               :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+               +- BroadcastExchange (37)
+                  +- * ColumnarToRow (36)
+                     +- CometFilter (35)
+                        +- CometScan parquet spark_catalog.default.customer_demographics (34)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -70,7 +68,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#6, ss_sold_date_sk#7]
 
-(6) ReusedExchange [Reuses operator id: 50]
+(6) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#9]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -103,7 +101,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#10, ws_sold_date_sk#11]
 
-(13) ReusedExchange [Reuses operator id: 50]
+(13) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#13]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -136,7 +134,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#14, cs_sold_date_sk#15]
 
-(20) ReusedExchange [Reuses operator id: 50]
+(20) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#17]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -234,54 +232,50 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#29]
 Results [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 
-(41) RowToColumnar
+(41) Exchange
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
+Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(42) CometColumnarExchange
-Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
-Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(43) CometHashAggregate
+(42) HashAggregate [codegen id : 10]
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 Keys [8]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#31]
+Results [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, count(1)#31 AS cnt1#32, cd_purchase_estimate#24, count(1)#31 AS cnt2#33, cd_credit_rating#25, count(1)#31 AS cnt3#34, cd_dep_count#26, count(1)#31 AS cnt4#35, cd_dep_employed_count#27, count(1)#31 AS cnt5#36, cd_dep_college_count#28, count(1)#31 AS cnt6#37]
 
-(44) CometTakeOrderedAndProject
-Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_education_status#23 ASC NULLS FIRST,cd_purchase_estimate#24 ASC NULLS FIRST,cd_credit_rating#25 ASC NULLS FIRST,cd_dep_count#26 ASC NULLS FIRST,cd_dep_employed_count#27 ASC NULLS FIRST,cd_dep_college_count#28 ASC NULLS FIRST], output=[cd_gender#21,cd_marital_status#22,cd_education_status#23,cnt1#31,cd_purchase_estimate#24,cnt2#32,cd_credit_rating#25,cnt3#33,cd_dep_count#26,cnt4#34,cd_dep_employed_count#27,cnt5#35,cd_dep_college_count#28,cnt6#36]), 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
-
-(45) ColumnarToRow [codegen id : 10]
-Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
+(43) TakeOrderedAndProject
+Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
+Arguments: 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#9, d_year#37, d_moy#38]
+Output [3]: [d_date_sk#9, d_year#38, d_moy#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2002), GreaterThanOrEqual(d_moy,1), LessThanOrEqual(d_moy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
-Input [3]: [d_date_sk#9, d_year#37, d_moy#38]
-Condition : (((((isnotnull(d_year#37) AND isnotnull(d_moy#38)) AND (d_year#37 = 2002)) AND (d_moy#38 >= 1)) AND (d_moy#38 <= 4)) AND isnotnull(d_date_sk#9))
+(45) CometFilter
+Input [3]: [d_date_sk#9, d_year#38, d_moy#39]
+Condition : (((((isnotnull(d_year#38) AND isnotnull(d_moy#39)) AND (d_year#38 = 2002)) AND (d_moy#39 >= 1)) AND (d_moy#39 <= 4)) AND isnotnull(d_date_sk#9))
 
-(48) CometProject
-Input [3]: [d_date_sk#9, d_year#37, d_moy#38]
+(46) CometProject
+Input [3]: [d_date_sk#9, d_year#38, d_moy#39]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(49) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(50) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt
index 8923131021..89893c831e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q10/simplified.txt
@@ -1,77 +1,75 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
-        CometHashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count]
-          CometColumnarExchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-            RowToColumnar
-              WholeStageCodegen (9)
-                HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
-                  Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                      Project [c_current_cdemo_sk]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [c_current_cdemo_sk,c_current_addr_sk]
-                            Filter [exists,exists]
-                              BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                                BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                    InputAdapter
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (2)
-                                          Project [ss_customer_sk]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
+  WholeStageCodegen (10)
+    HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count] [count(1),cnt1,cnt2,cnt3,cnt4,cnt5,cnt6,count]
+      InputAdapter
+        Exchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+          WholeStageCodegen (9)
+            HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
+              Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                  Project [c_current_cdemo_sk]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [c_current_cdemo_sk,c_current_addr_sk]
+                        Filter [exists,exists]
+                          BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                            BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                ColumnarToRow
                                   InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (4)
-                                        Project [ws_bill_customer_sk]
-                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk] #3
+                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
                                 InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (6)
-                                      Project [cs_ship_customer_sk]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (2)
+                                      Project [ss_customer_sk]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
                                             ReusedExchange [d_date_sk] #3
-                          InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (7)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ca_address_sk]
-                                      CometFilter [ca_county,ca_address_sk]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
+                              InputAdapter
+                                BroadcastExchange #4
+                                  WholeStageCodegen (4)
+                                    Project [ws_bill_customer_sk]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                            InputAdapter
+                              BroadcastExchange #5
+                                WholeStageCodegen (6)
+                                  Project [cs_ship_customer_sk]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (8)
+                        BroadcastExchange #6
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cd_demo_sk]
-                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometProject [ca_address_sk]
+                                  CometFilter [ca_county,ca_address_sk]
+                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
+                  InputAdapter
+                    BroadcastExchange #7
+                      WholeStageCodegen (8)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cd_demo_sk]
+                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt
index a24e545fbc..64f486f71e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/explain.txt
@@ -1,84 +1,76 @@
 == Physical Plan ==
-TakeOrderedAndProject (80)
-+- * Project (79)
-   +- * BroadcastHashJoin Inner BuildRight (78)
-      :- * Project (59)
-      :  +- * BroadcastHashJoin Inner BuildRight (58)
-      :     :- * Project (38)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-      :     :     :- * ColumnarToRow (18)
-      :     :     :  +- CometFilter (17)
-      :     :     :     +- CometHashAggregate (16)
-      :     :     :        +- CometColumnarExchange (15)
-      :     :     :           +- RowToColumnar (14)
-      :     :     :              +- * HashAggregate (13)
-      :     :     :                 +- * Project (12)
-      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :                       :- * Project (9)
-      :     :     :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :     :                       :     :- * ColumnarToRow (3)
-      :     :     :                       :     :  +- CometFilter (2)
-      :     :     :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :     :                       :     +- BroadcastExchange (7)
-      :     :     :                       :        +- * ColumnarToRow (6)
-      :     :     :                       :           +- CometFilter (5)
-      :     :     :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :     :                       +- ReusedExchange (10)
-      :     :     +- BroadcastExchange (36)
-      :     :        +- * ColumnarToRow (35)
-      :     :           +- CometHashAggregate (34)
-      :     :              +- CometColumnarExchange (33)
-      :     :                 +- RowToColumnar (32)
-      :     :                    +- * HashAggregate (31)
-      :     :                       +- * Project (30)
-      :     :                          +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :                             :- * Project (27)
-      :     :                             :  +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :                             :     :- * ColumnarToRow (21)
-      :     :                             :     :  +- CometFilter (20)
-      :     :                             :     :     +- CometScan parquet spark_catalog.default.customer (19)
-      :     :                             :     +- BroadcastExchange (25)
-      :     :                             :        +- * ColumnarToRow (24)
-      :     :                             :           +- CometFilter (23)
-      :     :                             :              +- CometScan parquet spark_catalog.default.store_sales (22)
-      :     :                             +- ReusedExchange (28)
-      :     +- BroadcastExchange (57)
-      :        +- * ColumnarToRow (56)
-      :           +- CometFilter (55)
-      :              +- CometHashAggregate (54)
-      :                 +- CometColumnarExchange (53)
-      :                    +- RowToColumnar (52)
-      :                       +- * HashAggregate (51)
-      :                          +- * Project (50)
-      :                             +- * BroadcastHashJoin Inner BuildRight (49)
-      :                                :- * Project (47)
-      :                                :  +- * BroadcastHashJoin Inner BuildRight (46)
-      :                                :     :- * ColumnarToRow (41)
-      :                                :     :  +- CometFilter (40)
-      :                                :     :     +- CometScan parquet spark_catalog.default.customer (39)
-      :                                :     +- BroadcastExchange (45)
-      :                                :        +- * ColumnarToRow (44)
-      :                                :           +- CometFilter (43)
-      :                                :              +- CometScan parquet spark_catalog.default.web_sales (42)
-      :                                +- ReusedExchange (48)
-      +- BroadcastExchange (77)
-         +- * ColumnarToRow (76)
-            +- CometHashAggregate (75)
-               +- CometColumnarExchange (74)
-                  +- RowToColumnar (73)
-                     +- * HashAggregate (72)
-                        +- * Project (71)
-                           +- * BroadcastHashJoin Inner BuildRight (70)
-                              :- * Project (68)
-                              :  +- * BroadcastHashJoin Inner BuildRight (67)
-                              :     :- * ColumnarToRow (62)
-                              :     :  +- CometFilter (61)
-                              :     :     +- CometScan parquet spark_catalog.default.customer (60)
-                              :     +- BroadcastExchange (66)
-                              :        +- * ColumnarToRow (65)
-                              :           +- CometFilter (64)
-                              :              +- CometScan parquet spark_catalog.default.web_sales (63)
-                              +- ReusedExchange (69)
+TakeOrderedAndProject (72)
++- * Project (71)
+   +- * BroadcastHashJoin Inner BuildRight (70)
+      :- * Project (53)
+      :  +- * BroadcastHashJoin Inner BuildRight (52)
+      :     :- * Project (34)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (33)
+      :     :     :- * Filter (16)
+      :     :     :  +- * HashAggregate (15)
+      :     :     :     +- Exchange (14)
+      :     :     :        +- * HashAggregate (13)
+      :     :     :           +- * Project (12)
+      :     :     :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :                 :- * Project (9)
+      :     :     :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :     :                 :     :- * ColumnarToRow (3)
+      :     :     :                 :     :  +- CometFilter (2)
+      :     :     :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :     :                 :     +- BroadcastExchange (7)
+      :     :     :                 :        +- * ColumnarToRow (6)
+      :     :     :                 :           +- CometFilter (5)
+      :     :     :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :     :                 +- ReusedExchange (10)
+      :     :     +- BroadcastExchange (32)
+      :     :        +- * HashAggregate (31)
+      :     :           +- Exchange (30)
+      :     :              +- * HashAggregate (29)
+      :     :                 +- * Project (28)
+      :     :                    +- * BroadcastHashJoin Inner BuildRight (27)
+      :     :                       :- * Project (25)
+      :     :                       :  +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :                       :     :- * ColumnarToRow (19)
+      :     :                       :     :  +- CometFilter (18)
+      :     :                       :     :     +- CometScan parquet spark_catalog.default.customer (17)
+      :     :                       :     +- BroadcastExchange (23)
+      :     :                       :        +- * ColumnarToRow (22)
+      :     :                       :           +- CometFilter (21)
+      :     :                       :              +- CometScan parquet spark_catalog.default.store_sales (20)
+      :     :                       +- ReusedExchange (26)
+      :     +- BroadcastExchange (51)
+      :        +- * Filter (50)
+      :           +- * HashAggregate (49)
+      :              +- Exchange (48)
+      :                 +- * HashAggregate (47)
+      :                    +- * Project (46)
+      :                       +- * BroadcastHashJoin Inner BuildRight (45)
+      :                          :- * Project (43)
+      :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
+      :                          :     :- * ColumnarToRow (37)
+      :                          :     :  +- CometFilter (36)
+      :                          :     :     +- CometScan parquet spark_catalog.default.customer (35)
+      :                          :     +- BroadcastExchange (41)
+      :                          :        +- * ColumnarToRow (40)
+      :                          :           +- CometFilter (39)
+      :                          :              +- CometScan parquet spark_catalog.default.web_sales (38)
+      :                          +- ReusedExchange (44)
+      +- BroadcastExchange (69)
+         +- * HashAggregate (68)
+            +- Exchange (67)
+               +- * HashAggregate (66)
+                  +- * Project (65)
+                     +- * BroadcastHashJoin Inner BuildRight (64)
+                        :- * Project (62)
+                        :  +- * BroadcastHashJoin Inner BuildRight (61)
+                        :     :- * ColumnarToRow (56)
+                        :     :  +- CometFilter (55)
+                        :     :     +- CometScan parquet spark_catalog.default.customer (54)
+                        :     +- BroadcastExchange (60)
+                        :        +- * ColumnarToRow (59)
+                        :           +- CometFilter (58)
+                        :              +- CometScan parquet spark_catalog.default.web_sales (57)
+                        +- ReusedExchange (63)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -124,7 +116,7 @@ Join condition: None
 Output [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 Input [12]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_customer_sk#9, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 
-(10) ReusedExchange [Reuses operator id: 84]
+(10) ReusedExchange [Reuses operator id: 76]
 Output [2]: [d_date_sk#14, d_year#15]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -144,316 +136,300 @@ Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discoun
 Aggregate Attributes [1]: [sum#16]
 Results [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 
-(14) RowToColumnar
+(14) Exchange
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 16]
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 Keys [8]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8]
 Functions [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18]
+Results [2]: [c_customer_id#2 AS customer_id#19, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18,18,2) AS year_total#20]
 
-(17) CometFilter
-Input [2]: [customer_id#18, year_total#19]
-Condition : (isnotnull(year_total#19) AND (year_total#19 > 0.00))
-
-(18) ColumnarToRow [codegen id : 16]
-Input [2]: [customer_id#18, year_total#19]
+(16) Filter [codegen id : 16]
+Input [2]: [customer_id#19, year_total#20]
+Condition : (isnotnull(year_total#20) AND (year_total#20 > 0.00))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Output [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(20) CometFilter
-Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
-Condition : (isnotnull(c_customer_sk#20) AND isnotnull(c_customer_id#21))
+(18) CometFilter
+Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_customer_id#22))
 
-(21) ColumnarToRow [codegen id : 6]
-Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+(19) ColumnarToRow [codegen id : 6]
+Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+Output [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#31), dynamicpruningexpression(ss_sold_date_sk#31 IN dynamicpruning#32)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#32), dynamicpruningexpression(ss_sold_date_sk#32 IN dynamicpruning#33)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_discount_amt:decimal(7,2),ss_ext_list_price:decimal(7,2)>
 
-(23) CometFilter
-Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
-Condition : isnotnull(ss_customer_sk#28)
+(21) CometFilter
+Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+Condition : isnotnull(ss_customer_sk#29)
 
-(24) ColumnarToRow [codegen id : 4]
-Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+(22) ColumnarToRow [codegen id : 4]
+Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 
-(25) BroadcastExchange
-Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+(23) BroadcastExchange
+Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(26) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#20]
-Right keys [1]: [ss_customer_sk#28]
+(24) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#21]
+Right keys [1]: [ss_customer_sk#29]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
-Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
-Input [12]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+(25) Project [codegen id : 6]
+Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+Input [12]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 
-(28) ReusedExchange [Reuses operator id: 88]
-Output [2]: [d_date_sk#33, d_year#34]
+(26) ReusedExchange [Reuses operator id: 80]
+Output [2]: [d_date_sk#34, d_year#35]
 
-(29) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#31]
-Right keys [1]: [d_date_sk#33]
+(27) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#32]
+Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
-Input [12]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31, d_date_sk#33, d_year#34]
-
-(31) HashAggregate [codegen id : 6]
-Input [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
-Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
-Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
-Aggregate Attributes [1]: [sum#35]
-Results [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-
-(32) RowToColumnar
-Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-
-(33) CometColumnarExchange
-Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-Arguments: hashpartitioning(c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
-Functions [1]: [sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
-
-(35) ColumnarToRow [codegen id : 7]
-Input [3]: [customer_id#37, customer_preferred_cust_flag#38, year_total#39]
-
-(36) BroadcastExchange
-Input [3]: [customer_id#37, customer_preferred_cust_flag#38, year_total#39]
+(28) Project [codegen id : 6]
+Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
+Input [12]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32, d_date_sk#34, d_year#35]
+
+(29) HashAggregate [codegen id : 6]
+Input [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
+Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
+Aggregate Attributes [1]: [sum#36]
+Results [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
+
+(30) Exchange
+Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
+Arguments: hashpartitioning(c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 7]
+Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
+Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Functions [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18]
+Results [3]: [c_customer_id#22 AS customer_id#38, c_preferred_cust_flag#25 AS customer_preferred_cust_flag#39, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18,18,2) AS year_total#40]
+
+(32) BroadcastExchange
+Input [3]: [customer_id#38, customer_preferred_cust_flag#39, year_total#40]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(37) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#18]
-Right keys [1]: [customer_id#37]
+(33) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#19]
+Right keys [1]: [customer_id#38]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 16]
-Output [4]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39]
-Input [5]: [customer_id#18, year_total#19, customer_id#37, customer_preferred_cust_flag#38, year_total#39]
+(34) Project [codegen id : 16]
+Output [4]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40]
+Input [5]: [customer_id#19, year_total#20, customer_id#38, customer_preferred_cust_flag#39, year_total#40]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47]
+Output [8]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(40) CometFilter
-Input [8]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47]
-Condition : (isnotnull(c_customer_sk#40) AND isnotnull(c_customer_id#41))
+(36) CometFilter
+Input [8]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48]
+Condition : (isnotnull(c_customer_sk#41) AND isnotnull(c_customer_id#42))
 
-(41) ColumnarToRow [codegen id : 10]
-Input [8]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47]
+(37) ColumnarToRow [codegen id : 10]
+Input [8]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
+Output [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#52), dynamicpruningexpression(ws_sold_date_sk#52 IN dynamicpruning#53)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(43) CometFilter
-Input [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
-Condition : isnotnull(ws_bill_customer_sk#48)
+(39) CometFilter
+Input [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
+Condition : isnotnull(ws_bill_customer_sk#49)
 
-(44) ColumnarToRow [codegen id : 8]
-Input [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
+(40) ColumnarToRow [codegen id : 8]
+Input [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
 
-(45) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
+(41) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(46) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#40]
-Right keys [1]: [ws_bill_customer_sk#48]
+(42) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#41]
+Right keys [1]: [ws_bill_customer_sk#49]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 10]
-Output [10]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
-Input [12]: [c_customer_sk#40, c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_bill_customer_sk#48, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51]
+(43) Project [codegen id : 10]
+Output [10]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
+Input [12]: [c_customer_sk#41, c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_bill_customer_sk#49, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52]
 
-(48) ReusedExchange [Reuses operator id: 84]
-Output [2]: [d_date_sk#53, d_year#54]
+(44) ReusedExchange [Reuses operator id: 76]
+Output [2]: [d_date_sk#54, d_year#55]
 
-(49) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#51]
-Right keys [1]: [d_date_sk#53]
+(45) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#52]
+Right keys [1]: [d_date_sk#54]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 10]
-Output [10]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, d_year#54]
-Input [12]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54]
-
-(51) HashAggregate [codegen id : 10]
-Input [10]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, ws_ext_discount_amt#49, ws_ext_list_price#50, d_year#54]
-Keys [8]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#50 - ws_ext_discount_amt#49)))]
-Aggregate Attributes [1]: [sum#55]
-Results [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
-
-(52) RowToColumnar
-Input [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
-
-(53) CometColumnarExchange
-Input [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
-Arguments: hashpartitioning(c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(54) CometHashAggregate
-Input [9]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54, sum#56]
-Keys [8]: [c_customer_id#41, c_first_name#42, c_last_name#43, c_preferred_cust_flag#44, c_birth_country#45, c_login#46, c_email_address#47, d_year#54]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#50 - ws_ext_discount_amt#49)))]
-
-(55) CometFilter
-Input [2]: [customer_id#57, year_total#58]
-Condition : (isnotnull(year_total#58) AND (year_total#58 > 0.00))
-
-(56) ColumnarToRow [codegen id : 11]
-Input [2]: [customer_id#57, year_total#58]
-
-(57) BroadcastExchange
-Input [2]: [customer_id#57, year_total#58]
+(46) Project [codegen id : 10]
+Output [10]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, d_year#55]
+Input [12]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, ws_sold_date_sk#52, d_date_sk#54, d_year#55]
+
+(47) HashAggregate [codegen id : 10]
+Input [10]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, ws_ext_discount_amt#50, ws_ext_list_price#51, d_year#55]
+Keys [8]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))]
+Aggregate Attributes [1]: [sum#56]
+Results [9]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, sum#57]
+
+(48) Exchange
+Input [9]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, sum#57]
+Arguments: hashpartitioning(c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(49) HashAggregate [codegen id : 11]
+Input [9]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55, sum#57]
+Keys [8]: [c_customer_id#42, c_first_name#43, c_last_name#44, c_preferred_cust_flag#45, c_birth_country#46, c_login#47, c_email_address#48, d_year#55]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))#58]
+Results [2]: [c_customer_id#42 AS customer_id#59, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#51 - ws_ext_discount_amt#50)))#58,18,2) AS year_total#60]
+
+(50) Filter [codegen id : 11]
+Input [2]: [customer_id#59, year_total#60]
+Condition : (isnotnull(year_total#60) AND (year_total#60 > 0.00))
+
+(51) BroadcastExchange
+Input [2]: [customer_id#59, year_total#60]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(58) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#18]
-Right keys [1]: [customer_id#57]
+(52) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#19]
+Right keys [1]: [customer_id#59]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 16]
-Output [5]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39, year_total#58]
-Input [6]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39, customer_id#57, year_total#58]
+(53) Project [codegen id : 16]
+Output [5]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40, year_total#60]
+Input [6]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40, customer_id#59, year_total#60]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66]
+Output [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(61) CometFilter
-Input [8]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66]
-Condition : (isnotnull(c_customer_sk#59) AND isnotnull(c_customer_id#60))
+(55) CometFilter
+Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
+Condition : (isnotnull(c_customer_sk#61) AND isnotnull(c_customer_id#62))
 
-(62) ColumnarToRow [codegen id : 14]
-Input [8]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66]
+(56) ColumnarToRow [codegen id : 14]
+Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
+Output [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#70), dynamicpruningexpression(ws_sold_date_sk#70 IN dynamicpruning#71)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#72), dynamicpruningexpression(ws_sold_date_sk#72 IN dynamicpruning#73)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(64) CometFilter
-Input [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
-Condition : isnotnull(ws_bill_customer_sk#67)
+(58) CometFilter
+Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+Condition : isnotnull(ws_bill_customer_sk#69)
 
-(65) ColumnarToRow [codegen id : 12]
-Input [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
+(59) ColumnarToRow [codegen id : 12]
+Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 
-(66) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
+(60) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(67) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#59]
-Right keys [1]: [ws_bill_customer_sk#67]
+(61) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#61]
+Right keys [1]: [ws_bill_customer_sk#69]
 Join type: Inner
 Join condition: None
 
-(68) Project [codegen id : 14]
-Output [10]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
-Input [12]: [c_customer_sk#59, c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_bill_customer_sk#67, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70]
+(62) Project [codegen id : 14]
+Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+Input [12]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
 
-(69) ReusedExchange [Reuses operator id: 88]
-Output [2]: [d_date_sk#72, d_year#73]
+(63) ReusedExchange [Reuses operator id: 80]
+Output [2]: [d_date_sk#74, d_year#75]
 
-(70) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#70]
-Right keys [1]: [d_date_sk#72]
+(64) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#72]
+Right keys [1]: [d_date_sk#74]
 Join type: Inner
 Join condition: None
 
-(71) Project [codegen id : 14]
-Output [10]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, d_year#73]
-Input [12]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, ws_sold_date_sk#70, d_date_sk#72, d_year#73]
-
-(72) HashAggregate [codegen id : 14]
-Input [10]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, ws_ext_discount_amt#68, ws_ext_list_price#69, d_year#73]
-Keys [8]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#69 - ws_ext_discount_amt#68)))]
-Aggregate Attributes [1]: [sum#74]
-Results [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
-
-(73) RowToColumnar
-Input [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
-
-(74) CometColumnarExchange
-Input [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
-Arguments: hashpartitioning(c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(75) CometHashAggregate
-Input [9]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73, sum#75]
-Keys [8]: [c_customer_id#60, c_first_name#61, c_last_name#62, c_preferred_cust_flag#63, c_birth_country#64, c_login#65, c_email_address#66, d_year#73]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#69 - ws_ext_discount_amt#68)))]
-
-(76) ColumnarToRow [codegen id : 15]
-Input [2]: [customer_id#76, year_total#77]
-
-(77) BroadcastExchange
-Input [2]: [customer_id#76, year_total#77]
+(65) Project [codegen id : 14]
+Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
+Input [12]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72, d_date_sk#74, d_year#75]
+
+(66) HashAggregate [codegen id : 14]
+Input [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
+Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
+Aggregate Attributes [1]: [sum#76]
+Results [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+
+(67) Exchange
+Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+Arguments: hashpartitioning(c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(68) HashAggregate [codegen id : 15]
+Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
+Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))#58]
+Results [2]: [c_customer_id#62 AS customer_id#78, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))#58,18,2) AS year_total#79]
+
+(69) BroadcastExchange
+Input [2]: [customer_id#78, year_total#79]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(78) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#18]
-Right keys [1]: [customer_id#76]
+(70) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#19]
+Right keys [1]: [customer_id#78]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#58 > 0.00) THEN (year_total#77 / year_total#58) END > CASE WHEN (year_total#19 > 0.00) THEN (year_total#39 / year_total#19) END)
+Join condition: (CASE WHEN (year_total#60 > 0.00) THEN (year_total#79 / year_total#60) END > CASE WHEN (year_total#20 > 0.00) THEN (year_total#40 / year_total#20) END)
 
-(79) Project [codegen id : 16]
-Output [1]: [customer_preferred_cust_flag#38]
-Input [7]: [customer_id#18, year_total#19, customer_preferred_cust_flag#38, year_total#39, year_total#58, customer_id#76, year_total#77]
+(71) Project [codegen id : 16]
+Output [1]: [customer_preferred_cust_flag#39]
+Input [7]: [customer_id#19, year_total#20, customer_preferred_cust_flag#39, year_total#40, year_total#60, customer_id#78, year_total#79]
 
-(80) TakeOrderedAndProject
-Input [1]: [customer_preferred_cust_flag#38]
-Arguments: 100, [customer_preferred_cust_flag#38 ASC NULLS FIRST], [customer_preferred_cust_flag#38]
+(72) TakeOrderedAndProject
+Input [1]: [customer_preferred_cust_flag#39]
+Arguments: 100, [customer_preferred_cust_flag#39 ASC NULLS FIRST], [customer_preferred_cust_flag#39]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (84)
-+- * ColumnarToRow (83)
-   +- CometFilter (82)
-      +- CometScan parquet spark_catalog.default.date_dim (81)
+BroadcastExchange (76)
++- * ColumnarToRow (75)
+   +- CometFilter (74)
+      +- CometScan parquet spark_catalog.default.date_dim (73)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -463,44 +439,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(82) CometFilter
+(74) CometFilter
 Input [2]: [d_date_sk#14, d_year#15]
 Condition : ((isnotnull(d_year#15) AND (d_year#15 = 2001)) AND isnotnull(d_date_sk#14))
 
-(83) ColumnarToRow [codegen id : 1]
+(75) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#14, d_year#15]
 
-(84) BroadcastExchange
+(76) BroadcastExchange
 Input [2]: [d_date_sk#14, d_year#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#31 IN dynamicpruning#32
-BroadcastExchange (88)
-+- * ColumnarToRow (87)
-   +- CometFilter (86)
-      +- CometScan parquet spark_catalog.default.date_dim (85)
+Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#32 IN dynamicpruning#33
+BroadcastExchange (80)
++- * ColumnarToRow (79)
+   +- CometFilter (78)
+      +- CometScan parquet spark_catalog.default.date_dim (77)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#33, d_year#34]
+Output [2]: [d_date_sk#34, d_year#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(86) CometFilter
-Input [2]: [d_date_sk#33, d_year#34]
-Condition : ((isnotnull(d_year#34) AND (d_year#34 = 2002)) AND isnotnull(d_date_sk#33))
+(78) CometFilter
+Input [2]: [d_date_sk#34, d_year#35]
+Condition : ((isnotnull(d_year#35) AND (d_year#35 = 2002)) AND isnotnull(d_date_sk#34))
 
-(87) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#33, d_year#34]
+(79) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#34, d_year#35]
 
-(88) BroadcastExchange
-Input [2]: [d_date_sk#33, d_year#34]
+(80) BroadcastExchange
+Input [2]: [d_date_sk#34, d_year#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 42 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#13
+Subquery:3 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#52 IN dynamicpruning#13
 
-Subquery:4 Hosting operator id = 63 Hosting Expression = ws_sold_date_sk#70 IN dynamicpruning#32
+Subquery:4 Hosting operator id = 57 Hosting Expression = ws_sold_date_sk#72 IN dynamicpruning#33
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt
index 2810bbd068..562b5fdf29 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q11/simplified.txt
@@ -6,13 +6,43 @@ TakeOrderedAndProject [customer_preferred_cust_flag]
           BroadcastHashJoin [customer_id,customer_id]
             Project [customer_id,year_total,customer_preferred_cust_flag,year_total]
               BroadcastHashJoin [customer_id,customer_id]
-                ColumnarToRow
-                  InputAdapter
-                    CometFilter [year_total]
-                      CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
-                        CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
-                          RowToColumnar
-                            WholeStageCodegen (3)
+                Filter [year_total]
+                  HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,year_total,sum]
+                    InputAdapter
+                      Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
+                        WholeStageCodegen (3)
+                          HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [c_customer_sk,c_customer_id]
+                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                    InputAdapter
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_customer_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                InputAdapter
+                                  ReusedExchange [d_date_sk,d_year] #3
+                InputAdapter
+                  BroadcastExchange #4
+                    WholeStageCodegen (7)
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,customer_preferred_cust_flag,year_total,sum]
+                        InputAdapter
+                          Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
+                            WholeStageCodegen (6)
                               HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
                                 Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
                                   BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -23,109 +53,71 @@ TakeOrderedAndProject [customer_preferred_cust_flag]
                                             CometFilter [c_customer_sk,c_customer_id]
                                               CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                         InputAdapter
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
+                                          BroadcastExchange #6
+                                            WholeStageCodegen (4)
                                               ColumnarToRow
                                                 InputAdapter
                                                   CometFilter [ss_customer_sk]
                                                     CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
+                                                      SubqueryBroadcast [d_date_sk] #2
+                                                        BroadcastExchange #7
                                                           WholeStageCodegen (1)
                                                             ColumnarToRow
                                                               InputAdapter
                                                                 CometFilter [d_year,d_date_sk]
                                                                   CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                     InputAdapter
-                                      ReusedExchange [d_date_sk,d_year] #3
-                InputAdapter
-                  BroadcastExchange #4
-                    WholeStageCodegen (7)
-                      ColumnarToRow
-                        InputAdapter
-                          CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
-                            CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
-                              RowToColumnar
-                                WholeStageCodegen (6)
-                                  HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
-                                    Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [c_customer_sk,c_customer_id]
-                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                            InputAdapter
-                                              BroadcastExchange #6
-                                                WholeStageCodegen (4)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [ss_customer_sk]
-                                                        CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                          SubqueryBroadcast [d_date_sk] #2
-                                                            BroadcastExchange #7
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [d_year,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk,d_year] #7
+                                      ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [year_total]
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
-                            RowToColumnar
-                              WholeStageCodegen (10)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                          InputAdapter
-                                            BroadcastExchange #10
-                                              WholeStageCodegen (8)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
+                  Filter [year_total]
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
+                          WholeStageCodegen (10)
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk,c_customer_id]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (8)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              ColumnarToRow
+              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
                 InputAdapter
-                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
-                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
-                      RowToColumnar
-                        WholeStageCodegen (14)
-                          HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_customer_id]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                    InputAdapter
-                                      BroadcastExchange #13
-                                        WholeStageCodegen (12)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #2
+                  Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
+                    WholeStageCodegen (14)
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_customer_sk,c_customer_id]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #7
+                                  BroadcastExchange #13
+                                    WholeStageCodegen (12)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_customer_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #2
+                            InputAdapter
+                              ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt
index b59f6739bb..23ff8f948b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/explain.txt
@@ -1,26 +1,24 @@
 == Physical Plan ==
-TakeOrderedAndProject (22)
-+- * Project (21)
-   +- Window (20)
-      +- * ColumnarToRow (19)
-         +- CometSort (18)
-            +- CometColumnarExchange (17)
-               +- CometHashAggregate (16)
-                  +- CometColumnarExchange (15)
-                     +- RowToColumnar (14)
-                        +- * HashAggregate (13)
-                           +- * Project (12)
-                              +- * BroadcastHashJoin Inner BuildRight (11)
-                                 :- * Project (9)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                 :     :- * ColumnarToRow (3)
-                                 :     :  +- CometFilter (2)
-                                 :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                                 :     +- BroadcastExchange (7)
-                                 :        +- * ColumnarToRow (6)
-                                 :           +- CometFilter (5)
-                                 :              +- CometScan parquet spark_catalog.default.item (4)
-                                 +- ReusedExchange (10)
+TakeOrderedAndProject (20)
++- * Project (19)
+   +- Window (18)
+      +- * Sort (17)
+         +- Exchange (16)
+            +- * HashAggregate (15)
+               +- Exchange (14)
+                  +- * HashAggregate (13)
+                     +- * Project (12)
+                        +- * BroadcastHashJoin Inner BuildRight (11)
+                           :- * Project (9)
+                           :  +- * BroadcastHashJoin Inner BuildRight (8)
+                           :     :- * ColumnarToRow (3)
+                           :     :  +- CometFilter (2)
+                           :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                           :     +- BroadcastExchange (7)
+                           :        +- * ColumnarToRow (6)
+                           :           +- CometFilter (5)
+                           :              +- CometScan parquet spark_catalog.default.item (4)
+                           +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -66,7 +64,7 @@ Join condition: None
 Output [7]: [ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ws_item_sk#1, ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 27]
+(10) ReusedExchange [Reuses operator id: 25]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -86,70 +84,66 @@ Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) RowToColumnar
+(14) Exchange
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#2))#14]
+Results [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS _w0#16, i_item_id#6]
 
-(17) CometColumnarExchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(18) CometSort
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6], [i_class#9 ASC NULLS FIRST]
+(16) Exchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) ColumnarToRow [codegen id : 4]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+(17) Sort [codegen id : 5]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: [i_class#9 ASC NULLS FIRST], false, 0
 
-(20) Window
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
+(18) Window
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
 
-(21) Project [codegen id : 5]
-Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
-Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
+(19) Project [codegen id : 6]
+Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18, i_item_id#6]
+Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6, _we0#17]
 
-(22) TakeOrderedAndProject
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(20) TakeOrderedAndProject
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (25)
++- * ColumnarToRow (24)
+   +- CometProject (23)
+      +- CometFilter (22)
+         +- CometScan parquet spark_catalog.default.date_dim (21)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#18]
+Output [2]: [d_date_sk#11, d_date#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(24) CometFilter
-Input [2]: [d_date_sk#11, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(22) CometFilter
+Input [2]: [d_date_sk#11, d_date#19]
+Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(25) CometProject
-Input [2]: [d_date_sk#11, d_date#18]
+(23) CometProject
+Input [2]: [d_date_sk#11, d_date#19]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(26) ColumnarToRow [codegen id : 1]
+(24) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(27) BroadcastExchange
+(25) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt
index 985a824e6e..fae1c6dba1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q12/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (5)
+  WholeStageCodegen (6)
     Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (4)
-            ColumnarToRow
+          WholeStageCodegen (5)
+            Sort [i_class]
               InputAdapter
-                CometSort [i_class]
-                  CometColumnarExchange [i_class] #1
-                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
-                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
-                        RowToColumnar
+                Exchange [i_class] #1
+                  WholeStageCodegen (4)
+                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ws_ext_sales_price)),itemrevenue,_w0,sum]
+                      InputAdapter
+                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ws_ext_sales_price] [sum,sum]
                               Project [ws_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt
index a6d0b9b416..759871556e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/explain.txt
@@ -1,40 +1,38 @@
 == Physical Plan ==
-* ColumnarToRow (36)
-+- CometHashAggregate (35)
-   +- CometColumnarExchange (34)
-      +- RowToColumnar (33)
-         +- * HashAggregate (32)
-            +- * Project (31)
-               +- * BroadcastHashJoin Inner BuildRight (30)
-                  :- * Project (25)
-                  :  +- * BroadcastHashJoin Inner BuildRight (24)
-                  :     :- * Project (19)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (18)
-                  :     :     :- * Project (16)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
-                  :     :     :     :- * Project (9)
-                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :     :     :     :     +- BroadcastExchange (7)
-                  :     :     :     :        +- * ColumnarToRow (6)
-                  :     :     :     :           +- CometFilter (5)
-                  :     :     :     :              +- CometScan parquet spark_catalog.default.store (4)
-                  :     :     :     +- BroadcastExchange (14)
-                  :     :     :        +- * ColumnarToRow (13)
-                  :     :     :           +- CometProject (12)
-                  :     :     :              +- CometFilter (11)
-                  :     :     :                 +- CometScan parquet spark_catalog.default.customer_address (10)
-                  :     :     +- ReusedExchange (17)
-                  :     +- BroadcastExchange (23)
-                  :        +- * ColumnarToRow (22)
-                  :           +- CometFilter (21)
-                  :              +- CometScan parquet spark_catalog.default.customer_demographics (20)
-                  +- BroadcastExchange (29)
-                     +- * ColumnarToRow (28)
-                        +- CometFilter (27)
-                           +- CometScan parquet spark_catalog.default.household_demographics (26)
+* HashAggregate (34)
++- Exchange (33)
+   +- * HashAggregate (32)
+      +- * Project (31)
+         +- * BroadcastHashJoin Inner BuildRight (30)
+            :- * Project (25)
+            :  +- * BroadcastHashJoin Inner BuildRight (24)
+            :     :- * Project (19)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (18)
+            :     :     :- * Project (16)
+            :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
+            :     :     :     :- * Project (9)
+            :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+            :     :     :     :     :- * ColumnarToRow (3)
+            :     :     :     :     :  +- CometFilter (2)
+            :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :     :     :     :     +- BroadcastExchange (7)
+            :     :     :     :        +- * ColumnarToRow (6)
+            :     :     :     :           +- CometFilter (5)
+            :     :     :     :              +- CometScan parquet spark_catalog.default.store (4)
+            :     :     :     +- BroadcastExchange (14)
+            :     :     :        +- * ColumnarToRow (13)
+            :     :     :           +- CometProject (12)
+            :     :     :              +- CometFilter (11)
+            :     :     :                 +- CometScan parquet spark_catalog.default.customer_address (10)
+            :     :     +- ReusedExchange (17)
+            :     +- BroadcastExchange (23)
+            :        +- * ColumnarToRow (22)
+            :           +- CometFilter (21)
+            :              +- CometScan parquet spark_catalog.default.customer_demographics (20)
+            +- BroadcastExchange (29)
+               +- * ColumnarToRow (28)
+                  +- CometFilter (27)
+                     +- CometScan parquet spark_catalog.default.household_demographics (26)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -112,7 +110,7 @@ Join condition: ((((ca_state#14 IN (TX,OH) AND (ss_net_profit#9 >= 100.00)) AND
 Output [7]: [ss_cdemo_sk#1, ss_hdemo_sk#2, ss_quantity#5, ss_sales_price#6, ss_ext_sales_price#7, ss_ext_wholesale_cost#8, ss_sold_date_sk#10]
 Input [11]: [ss_cdemo_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_quantity#5, ss_sales_price#6, ss_ext_sales_price#7, ss_ext_wholesale_cost#8, ss_net_profit#9, ss_sold_date_sk#10, ca_address_sk#13, ca_state#14]
 
-(17) ReusedExchange [Reuses operator id: 41]
+(17) ReusedExchange [Reuses operator id: 39]
 Output [1]: [d_date_sk#16]
 
 (18) BroadcastHashJoin [codegen id : 6]
@@ -188,50 +186,46 @@ Functions [4]: [partial_avg(ss_quantity#5), partial_avg(UnscaledValue(ss_ext_sal
 Aggregate Attributes [7]: [sum#22, count#23, sum#24, count#25, sum#26, count#27, sum#28]
 Results [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
 
-(33) RowToColumnar
+(33) Exchange
 Input [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=5]
 
-(34) CometColumnarExchange
-Input [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(35) CometHashAggregate
+(34) HashAggregate [codegen id : 7]
 Input [7]: [sum#29, count#30, sum#31, count#32, sum#33, count#34, sum#35]
 Keys: []
 Functions [4]: [avg(ss_quantity#5), avg(UnscaledValue(ss_ext_sales_price#7)), avg(UnscaledValue(ss_ext_wholesale_cost#8)), sum(UnscaledValue(ss_ext_wholesale_cost#8))]
-
-(36) ColumnarToRow [codegen id : 7]
-Input [4]: [avg(ss_quantity)#36, avg(ss_ext_sales_price)#37, avg(ss_ext_wholesale_cost)#38, sum(ss_ext_wholesale_cost)#39]
+Aggregate Attributes [4]: [avg(ss_quantity#5)#36, avg(UnscaledValue(ss_ext_sales_price#7))#37, avg(UnscaledValue(ss_ext_wholesale_cost#8))#38, sum(UnscaledValue(ss_ext_wholesale_cost#8))#39]
+Results [4]: [avg(ss_quantity#5)#36 AS avg(ss_quantity)#40, cast((avg(UnscaledValue(ss_ext_sales_price#7))#37 / 100.0) as decimal(11,6)) AS avg(ss_ext_sales_price)#41, cast((avg(UnscaledValue(ss_ext_wholesale_cost#8))#38 / 100.0) as decimal(11,6)) AS avg(ss_ext_wholesale_cost)#42, MakeDecimal(sum(UnscaledValue(ss_ext_wholesale_cost#8))#39,17,2) AS sum(ss_ext_wholesale_cost)#43]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#10 IN dynamicpruning#11
-BroadcastExchange (41)
-+- * ColumnarToRow (40)
-   +- CometProject (39)
-      +- CometFilter (38)
-         +- CometScan parquet spark_catalog.default.date_dim (37)
+BroadcastExchange (39)
++- * ColumnarToRow (38)
+   +- CometProject (37)
+      +- CometFilter (36)
+         +- CometScan parquet spark_catalog.default.date_dim (35)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#16, d_year#40]
+Output [2]: [d_date_sk#16, d_year#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(38) CometFilter
-Input [2]: [d_date_sk#16, d_year#40]
-Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2001)) AND isnotnull(d_date_sk#16))
+(36) CometFilter
+Input [2]: [d_date_sk#16, d_year#44]
+Condition : ((isnotnull(d_year#44) AND (d_year#44 = 2001)) AND isnotnull(d_date_sk#16))
 
-(39) CometProject
-Input [2]: [d_date_sk#16, d_year#40]
+(37) CometProject
+Input [2]: [d_date_sk#16, d_year#44]
 Arguments: [d_date_sk#16], [d_date_sk#16]
 
-(40) ColumnarToRow [codegen id : 1]
+(38) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#16]
 
-(41) BroadcastExchange
+(39) BroadcastExchange
 Input [1]: [d_date_sk#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt
index 87b7bf67e8..5e5fc41f83 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q13/simplified.txt
@@ -1,61 +1,59 @@
 WholeStageCodegen (7)
-  ColumnarToRow
+  HashAggregate [sum,count,sum,count,sum,count,sum] [avg(ss_quantity),avg(UnscaledValue(ss_ext_sales_price)),avg(UnscaledValue(ss_ext_wholesale_cost)),sum(UnscaledValue(ss_ext_wholesale_cost)),avg(ss_quantity),avg(ss_ext_sales_price),avg(ss_ext_wholesale_cost),sum(ss_ext_wholesale_cost),sum,count,sum,count,sum,count,sum]
     InputAdapter
-      CometHashAggregate [sum,count,sum,count,sum,count,sum]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (6)
-              HashAggregate [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost] [sum,count,sum,count,sum,count,sum,sum,count,sum,count,sum,count,sum]
-                Project [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost]
-                  BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price,hd_dep_count]
-                    Project [ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,cd_marital_status,cd_education_status]
-                      BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
-                        Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
-                                Project [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
-                                  BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_store_sk,ss_addr_sk,ss_cdemo_sk,ss_hdemo_sk,ss_net_profit,ss_sales_price]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                    InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk]
+      Exchange #1
+        WholeStageCodegen (6)
+          HashAggregate [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost] [sum,count,sum,count,sum,count,sum,sum,count,sum,count,sum,count,sum]
+            Project [ss_quantity,ss_ext_sales_price,ss_ext_wholesale_cost]
+              BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price,hd_dep_count]
+                Project [ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,cd_marital_status,cd_education_status]
+                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
+                    Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost]
+                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                        Project [ss_cdemo_sk,ss_hdemo_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_sold_date_sk]
+                          BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
+                            Project [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_store_sk,ss_addr_sk,ss_cdemo_sk,ss_hdemo_sk,ss_net_profit,ss_sales_price]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_ext_sales_price,ss_ext_wholesale_cost,ss_net_profit,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_year,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                 InputAdapter
-                                  BroadcastExchange #4
-                                    WholeStageCodegen (2)
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometProject [ca_address_sk,ca_state]
-                                            CometFilter [ca_country,ca_address_sk,ca_state]
-                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                                          CometFilter [s_store_sk]
+                                            CometScan parquet spark_catalog.default.store [s_store_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #4
+                                WholeStageCodegen (2)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [ca_address_sk,ca_state]
+                                        CometFilter [ca_country,ca_address_sk,ca_state]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                         InputAdapter
-                          BroadcastExchange #5
-                            WholeStageCodegen (4)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
-                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
+                          ReusedExchange [d_date_sk] #2
                     InputAdapter
-                      BroadcastExchange #6
-                        WholeStageCodegen (5)
+                      BroadcastExchange #5
+                        WholeStageCodegen (4)
                           ColumnarToRow
                             InputAdapter
-                              CometFilter [hd_demo_sk,hd_dep_count]
-                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
+                              CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
+                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
+                InputAdapter
+                  BroadcastExchange #6
+                    WholeStageCodegen (5)
+                      ColumnarToRow
+                        InputAdapter
+                          CometFilter [hd_demo_sk,hd_dep_count]
+                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt
index bfb15cc6a7..1323cb8df5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/explain.txt
@@ -1,115 +1,109 @@
 == Physical Plan ==
-* ColumnarToRow (111)
-+- CometTakeOrderedAndProject (110)
-   +- CometHashAggregate (109)
-      +- CometColumnarExchange (108)
-         +- CometHashAggregate (107)
-            +- CometExpand (106)
-               +- CometUnion (105)
-                  :- CometProject (70)
-                  :  +- CometFilter (69)
-                  :     +- CometHashAggregate (68)
-                  :        +- CometColumnarExchange (67)
-                  :           +- RowToColumnar (66)
-                  :              +- * HashAggregate (65)
-                  :                 +- * Project (64)
-                  :                    +- * BroadcastHashJoin Inner BuildRight (63)
-                  :                       :- * Project (61)
-                  :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
-                  :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
-                  :                       :     :  :- * ColumnarToRow (3)
-                  :                       :     :  :  +- CometFilter (2)
-                  :                       :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :                       :     :  +- BroadcastExchange (52)
-                  :                       :     :     +- * Project (51)
-                  :                       :     :        +- * BroadcastHashJoin Inner BuildRight (50)
-                  :                       :     :           :- * ColumnarToRow (6)
-                  :                       :     :           :  +- CometFilter (5)
-                  :                       :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-                  :                       :     :           +- BroadcastExchange (49)
-                  :                       :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
-                  :                       :     :                 :- * ColumnarToRow (37)
-                  :                       :     :                 :  +- CometHashAggregate (36)
-                  :                       :     :                 :     +- CometColumnarExchange (35)
-                  :                       :     :                 :        +- RowToColumnar (34)
-                  :                       :     :                 :           +- * HashAggregate (33)
-                  :                       :     :                 :              +- * Project (32)
-                  :                       :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
-                  :                       :     :                 :                    :- * Project (29)
-                  :                       :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
-                  :                       :     :                 :                    :     :- * ColumnarToRow (9)
-                  :                       :     :                 :                    :     :  +- CometFilter (8)
-                  :                       :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-                  :                       :     :                 :                    :     +- BroadcastExchange (27)
-                  :                       :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-                  :                       :     :                 :                    :           :- * ColumnarToRow (12)
-                  :                       :     :                 :                    :           :  +- CometFilter (11)
-                  :                       :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
-                  :                       :     :                 :                    :           +- BroadcastExchange (25)
-                  :                       :     :                 :                    :              +- * Project (24)
-                  :                       :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
-                  :                       :     :                 :                    :                    :- * Project (21)
-                  :                       :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-                  :                       :     :                 :                    :                    :     :- * ColumnarToRow (15)
-                  :                       :     :                 :                    :                    :     :  +- CometFilter (14)
-                  :                       :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-                  :                       :     :                 :                    :                    :     +- BroadcastExchange (19)
-                  :                       :     :                 :                    :                    :        +- * ColumnarToRow (18)
-                  :                       :     :                 :                    :                    :           +- CometFilter (17)
-                  :                       :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
-                  :                       :     :                 :                    :                    +- ReusedExchange (22)
-                  :                       :     :                 :                    +- ReusedExchange (30)
-                  :                       :     :                 +- BroadcastExchange (47)
-                  :                       :     :                    +- * Project (46)
-                  :                       :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
-                  :                       :     :                          :- * Project (43)
-                  :                       :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
-                  :                       :     :                          :     :- * ColumnarToRow (40)
-                  :                       :     :                          :     :  +- CometFilter (39)
-                  :                       :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
-                  :                       :     :                          :     +- ReusedExchange (41)
-                  :                       :     :                          +- ReusedExchange (44)
-                  :                       :     +- BroadcastExchange (59)
-                  :                       :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
-                  :                       :           :- * ColumnarToRow (56)
-                  :                       :           :  +- CometFilter (55)
-                  :                       :           :     +- CometScan parquet spark_catalog.default.item (54)
-                  :                       :           +- ReusedExchange (57)
-                  :                       +- ReusedExchange (62)
-                  :- CometProject (87)
-                  :  +- CometFilter (86)
-                  :     +- CometHashAggregate (85)
-                  :        +- CometColumnarExchange (84)
-                  :           +- RowToColumnar (83)
-                  :              +- * HashAggregate (82)
-                  :                 +- * Project (81)
-                  :                    +- * BroadcastHashJoin Inner BuildRight (80)
-                  :                       :- * Project (78)
-                  :                       :  +- * BroadcastHashJoin Inner BuildRight (77)
-                  :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (75)
-                  :                       :     :  :- * ColumnarToRow (73)
-                  :                       :     :  :  +- CometFilter (72)
-                  :                       :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (71)
-                  :                       :     :  +- ReusedExchange (74)
-                  :                       :     +- ReusedExchange (76)
-                  :                       +- ReusedExchange (79)
-                  +- CometProject (104)
-                     +- CometFilter (103)
-                        +- CometHashAggregate (102)
-                           +- CometColumnarExchange (101)
-                              +- RowToColumnar (100)
-                                 +- * HashAggregate (99)
-                                    +- * Project (98)
-                                       +- * BroadcastHashJoin Inner BuildRight (97)
-                                          :- * Project (95)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (94)
-                                          :     :- * BroadcastHashJoin LeftSemi BuildRight (92)
-                                          :     :  :- * ColumnarToRow (90)
-                                          :     :  :  +- CometFilter (89)
-                                          :     :  :     +- CometScan parquet spark_catalog.default.web_sales (88)
-                                          :     :  +- ReusedExchange (91)
-                                          :     +- ReusedExchange (93)
-                                          +- ReusedExchange (96)
+TakeOrderedAndProject (105)
++- * HashAggregate (104)
+   +- Exchange (103)
+      +- * HashAggregate (102)
+         +- * Expand (101)
+            +- Union (100)
+               :- * Project (67)
+               :  +- * Filter (66)
+               :     +- * HashAggregate (65)
+               :        +- Exchange (64)
+               :           +- * HashAggregate (63)
+               :              +- * Project (62)
+               :                 +- * BroadcastHashJoin Inner BuildRight (61)
+               :                    :- * Project (59)
+               :                    :  +- * BroadcastHashJoin Inner BuildRight (58)
+               :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
+               :                    :     :  :- * ColumnarToRow (3)
+               :                    :     :  :  +- CometFilter (2)
+               :                    :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :                    :     :  +- BroadcastExchange (50)
+               :                    :     :     +- * Project (49)
+               :                    :     :        +- * BroadcastHashJoin Inner BuildRight (48)
+               :                    :     :           :- * ColumnarToRow (6)
+               :                    :     :           :  +- CometFilter (5)
+               :                    :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+               :                    :     :           +- BroadcastExchange (47)
+               :                    :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
+               :                    :     :                 :- * HashAggregate (35)
+               :                    :     :                 :  +- Exchange (34)
+               :                    :     :                 :     +- * HashAggregate (33)
+               :                    :     :                 :        +- * Project (32)
+               :                    :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
+               :                    :     :                 :              :- * Project (29)
+               :                    :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
+               :                    :     :                 :              :     :- * ColumnarToRow (9)
+               :                    :     :                 :              :     :  +- CometFilter (8)
+               :                    :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+               :                    :     :                 :              :     +- BroadcastExchange (27)
+               :                    :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+               :                    :     :                 :              :           :- * ColumnarToRow (12)
+               :                    :     :                 :              :           :  +- CometFilter (11)
+               :                    :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
+               :                    :     :                 :              :           +- BroadcastExchange (25)
+               :                    :     :                 :              :              +- * Project (24)
+               :                    :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
+               :                    :     :                 :              :                    :- * Project (21)
+               :                    :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :                    :     :                 :              :                    :     :- * ColumnarToRow (15)
+               :                    :     :                 :              :                    :     :  +- CometFilter (14)
+               :                    :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+               :                    :     :                 :              :                    :     +- BroadcastExchange (19)
+               :                    :     :                 :              :                    :        +- * ColumnarToRow (18)
+               :                    :     :                 :              :                    :           +- CometFilter (17)
+               :                    :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
+               :                    :     :                 :              :                    +- ReusedExchange (22)
+               :                    :     :                 :              +- ReusedExchange (30)
+               :                    :     :                 +- BroadcastExchange (45)
+               :                    :     :                    +- * Project (44)
+               :                    :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
+               :                    :     :                          :- * Project (41)
+               :                    :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
+               :                    :     :                          :     :- * ColumnarToRow (38)
+               :                    :     :                          :     :  +- CometFilter (37)
+               :                    :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
+               :                    :     :                          :     +- ReusedExchange (39)
+               :                    :     :                          +- ReusedExchange (42)
+               :                    :     +- BroadcastExchange (57)
+               :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
+               :                    :           :- * ColumnarToRow (54)
+               :                    :           :  +- CometFilter (53)
+               :                    :           :     +- CometScan parquet spark_catalog.default.item (52)
+               :                    :           +- ReusedExchange (55)
+               :                    +- ReusedExchange (60)
+               :- * Project (83)
+               :  +- * Filter (82)
+               :     +- * HashAggregate (81)
+               :        +- Exchange (80)
+               :           +- * HashAggregate (79)
+               :              +- * Project (78)
+               :                 +- * BroadcastHashJoin Inner BuildRight (77)
+               :                    :- * Project (75)
+               :                    :  +- * BroadcastHashJoin Inner BuildRight (74)
+               :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (72)
+               :                    :     :  :- * ColumnarToRow (70)
+               :                    :     :  :  +- CometFilter (69)
+               :                    :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (68)
+               :                    :     :  +- ReusedExchange (71)
+               :                    :     +- ReusedExchange (73)
+               :                    +- ReusedExchange (76)
+               +- * Project (99)
+                  +- * Filter (98)
+                     +- * HashAggregate (97)
+                        +- Exchange (96)
+                           +- * HashAggregate (95)
+                              +- * Project (94)
+                                 +- * BroadcastHashJoin Inner BuildRight (93)
+                                    :- * Project (91)
+                                    :  +- * BroadcastHashJoin Inner BuildRight (90)
+                                    :     :- * BroadcastHashJoin LeftSemi BuildRight (88)
+                                    :     :  :- * ColumnarToRow (86)
+                                    :     :  :  +- CometFilter (85)
+                                    :     :  :     +- CometScan parquet spark_catalog.default.web_sales (84)
+                                    :     :  +- ReusedExchange (87)
+                                    :     +- ReusedExchange (89)
+                                    +- ReusedExchange (92)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -213,7 +207,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 142]
+(22) ReusedExchange [Reuses operator id: 134]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -250,7 +244,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 142]
+(30) ReusedExchange [Reuses operator id: 134]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -270,20 +264,16 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) RowToColumnar
+(34) Exchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) CometColumnarExchange
-Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(36) CometHashAggregate
+(35) HashAggregate [codegen id : 10]
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-
-(37) ColumnarToRow [codegen id : 10]
-Input [3]: [brand_id#26, class_id#27, category_id#28]
+Aggregate Attributes: []
+Results [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -293,68 +283,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(39) CometFilter
+(37) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(40) ColumnarToRow [codegen id : 9]
+(38) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(41) ReusedExchange [Reuses operator id: 19]
+(39) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) BroadcastHashJoin [codegen id : 9]
+(40) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 9]
+(41) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(44) ReusedExchange [Reuses operator id: 142]
+(42) ReusedExchange [Reuses operator id: 134]
 Output [1]: [d_date_sk#36]
 
-(45) BroadcastHashJoin [codegen id : 9]
+(43) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 9]
+(44) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(48) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(50) BroadcastHashJoin [codegen id : 11]
+(48) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 11]
+(49) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(53) BroadcastHashJoin [codegen id : 25]
+(51) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -367,455 +357,444 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(55) CometFilter
+(53) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : isnotnull(i_item_sk#38)
 
-(56) ColumnarToRow [codegen id : 23]
+(54) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(57) ReusedExchange [Reuses operator id: 52]
+(55) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(58) BroadcastHashJoin [codegen id : 23]
+(56) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(59) BroadcastExchange
+(57) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 25]
+(58) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 25]
+(59) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(62) ReusedExchange [Reuses operator id: 137]
+(60) ReusedExchange [Reuses operator id: 129]
 Output [1]: [d_date_sk#42]
 
-(63) BroadcastHashJoin [codegen id : 25]
+(61) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 25]
+(62) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(65) HashAggregate [codegen id : 25]
+(63) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(66) RowToColumnar
-Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-
-(67) CometColumnarExchange
+(64) Exchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(68) CometHashAggregate
+(65) HashAggregate [codegen id : 26]
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
+Results [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#51, count(1)#50 AS number_sales#52]
 
-(69) CometFilter
-Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#49, number_sales#50]
-Condition : (isnotnull(sales#49) AND (cast(sales#49 as decimal(32,6)) > cast(Subquery scalar-subquery#51, [id=#52] as decimal(32,6))))
+(66) Filter [codegen id : 26]
+Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#51, number_sales#52]
+Condition : (isnotnull(sales#51) AND (cast(sales#51 as decimal(32,6)) > cast(Subquery scalar-subquery#53, [id=#54] as decimal(32,6))))
 
-(70) CometProject
-Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#49, number_sales#50]
-Arguments: [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56], [sales#49, number_sales#50, store AS channel#53, i_brand_id#39 AS i_brand_id#54, i_class_id#40 AS i_class_id#55, i_category_id#41 AS i_category_id#56]
+(67) Project [codegen id : 26]
+Output [6]: [sales#51, number_sales#52, store AS channel#55, i_brand_id#39 AS i_brand_id#56, i_class_id#40 AS i_class_id#57, i_category_id#41 AS i_category_id#58]
+Input [5]: [i_brand_id#39, i_class_id#40, i_category_id#41, sales#51, number_sales#52]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60]
+Output [4]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#60), dynamicpruningexpression(cs_sold_date_sk#60 IN dynamicpruning#61)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#62), dynamicpruningexpression(cs_sold_date_sk#62 IN dynamicpruning#63)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(72) CometFilter
-Input [4]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60]
-Condition : isnotnull(cs_item_sk#57)
+(69) CometFilter
+Input [4]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62]
+Condition : isnotnull(cs_item_sk#59)
 
-(73) ColumnarToRow [codegen id : 50]
-Input [4]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60]
+(70) ColumnarToRow [codegen id : 51]
+Input [4]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62]
 
-(74) ReusedExchange [Reuses operator id: 52]
+(71) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(75) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [cs_item_sk#57]
+(72) BroadcastHashJoin [codegen id : 51]
+Left keys [1]: [cs_item_sk#59]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(76) ReusedExchange [Reuses operator id: 59]
-Output [4]: [i_item_sk#62, i_brand_id#63, i_class_id#64, i_category_id#65]
+(73) ReusedExchange [Reuses operator id: 57]
+Output [4]: [i_item_sk#64, i_brand_id#65, i_class_id#66, i_category_id#67]
 
-(77) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [cs_item_sk#57]
-Right keys [1]: [i_item_sk#62]
+(74) BroadcastHashJoin [codegen id : 51]
+Left keys [1]: [cs_item_sk#59]
+Right keys [1]: [i_item_sk#64]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 50]
-Output [6]: [cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60, i_brand_id#63, i_class_id#64, i_category_id#65]
-Input [8]: [cs_item_sk#57, cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60, i_item_sk#62, i_brand_id#63, i_class_id#64, i_category_id#65]
+(75) Project [codegen id : 51]
+Output [6]: [cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62, i_brand_id#65, i_class_id#66, i_category_id#67]
+Input [8]: [cs_item_sk#59, cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62, i_item_sk#64, i_brand_id#65, i_class_id#66, i_category_id#67]
 
-(79) ReusedExchange [Reuses operator id: 137]
-Output [1]: [d_date_sk#66]
+(76) ReusedExchange [Reuses operator id: 129]
+Output [1]: [d_date_sk#68]
 
-(80) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [cs_sold_date_sk#60]
-Right keys [1]: [d_date_sk#66]
+(77) BroadcastHashJoin [codegen id : 51]
+Left keys [1]: [cs_sold_date_sk#62]
+Right keys [1]: [d_date_sk#68]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 50]
-Output [5]: [cs_quantity#58, cs_list_price#59, i_brand_id#63, i_class_id#64, i_category_id#65]
-Input [7]: [cs_quantity#58, cs_list_price#59, cs_sold_date_sk#60, i_brand_id#63, i_class_id#64, i_category_id#65, d_date_sk#66]
-
-(82) HashAggregate [codegen id : 50]
-Input [5]: [cs_quantity#58, cs_list_price#59, i_brand_id#63, i_class_id#64, i_category_id#65]
-Keys [3]: [i_brand_id#63, i_class_id#64, i_category_id#65]
-Functions [2]: [partial_sum((cast(cs_quantity#58 as decimal(10,0)) * cs_list_price#59)), partial_count(1)]
-Aggregate Attributes [3]: [sum#67, isEmpty#68, count#69]
-Results [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
+(78) Project [codegen id : 51]
+Output [5]: [cs_quantity#60, cs_list_price#61, i_brand_id#65, i_class_id#66, i_category_id#67]
+Input [7]: [cs_quantity#60, cs_list_price#61, cs_sold_date_sk#62, i_brand_id#65, i_class_id#66, i_category_id#67, d_date_sk#68]
 
-(83) RowToColumnar
-Input [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
+(79) HashAggregate [codegen id : 51]
+Input [5]: [cs_quantity#60, cs_list_price#61, i_brand_id#65, i_class_id#66, i_category_id#67]
+Keys [3]: [i_brand_id#65, i_class_id#66, i_category_id#67]
+Functions [2]: [partial_sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61)), partial_count(1)]
+Aggregate Attributes [3]: [sum#69, isEmpty#70, count#71]
+Results [6]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum#72, isEmpty#73, count#74]
 
-(84) CometColumnarExchange
-Input [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
-Arguments: hashpartitioning(i_brand_id#63, i_class_id#64, i_category_id#65, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(80) Exchange
+Input [6]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum#72, isEmpty#73, count#74]
+Arguments: hashpartitioning(i_brand_id#65, i_class_id#66, i_category_id#67, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(85) CometHashAggregate
-Input [6]: [i_brand_id#63, i_class_id#64, i_category_id#65, sum#70, isEmpty#71, count#72]
-Keys [3]: [i_brand_id#63, i_class_id#64, i_category_id#65]
-Functions [2]: [sum((cast(cs_quantity#58 as decimal(10,0)) * cs_list_price#59)), count(1)]
+(81) HashAggregate [codegen id : 52]
+Input [6]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum#72, isEmpty#73, count#74]
+Keys [3]: [i_brand_id#65, i_class_id#66, i_category_id#67]
+Functions [2]: [sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61)), count(1)]
+Aggregate Attributes [2]: [sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61))#75, count(1)#76]
+Results [5]: [i_brand_id#65, i_class_id#66, i_category_id#67, sum((cast(cs_quantity#60 as decimal(10,0)) * cs_list_price#61))#75 AS sales#77, count(1)#76 AS number_sales#78]
 
-(86) CometFilter
-Input [5]: [i_brand_id#63, i_class_id#64, i_category_id#65, sales#73, number_sales#74]
-Condition : (isnotnull(sales#73) AND (cast(sales#73 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#51, [id=#52] as decimal(32,6))))
+(82) Filter [codegen id : 52]
+Input [5]: [i_brand_id#65, i_class_id#66, i_category_id#67, sales#77, number_sales#78]
+Condition : (isnotnull(sales#77) AND (cast(sales#77 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#53, [id=#54] as decimal(32,6))))
 
-(87) CometProject
-Input [5]: [i_brand_id#63, i_class_id#64, i_category_id#65, sales#73, number_sales#74]
-Arguments: [sales#73, number_sales#74, channel#75, i_brand_id#63, i_class_id#64, i_category_id#65], [sales#73, number_sales#74, catalog AS channel#75, i_brand_id#63, i_class_id#64, i_category_id#65]
+(83) Project [codegen id : 52]
+Output [6]: [sales#77, number_sales#78, catalog AS channel#79, i_brand_id#65, i_class_id#66, i_category_id#67]
+Input [5]: [i_brand_id#65, i_class_id#66, i_category_id#67, sales#77, number_sales#78]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79]
+Output [4]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#79), dynamicpruningexpression(ws_sold_date_sk#79 IN dynamicpruning#80)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#83), dynamicpruningexpression(ws_sold_date_sk#83 IN dynamicpruning#84)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(89) CometFilter
-Input [4]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79]
-Condition : isnotnull(ws_item_sk#76)
+(85) CometFilter
+Input [4]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83]
+Condition : isnotnull(ws_item_sk#80)
 
-(90) ColumnarToRow [codegen id : 75]
-Input [4]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79]
+(86) ColumnarToRow [codegen id : 77]
+Input [4]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83]
 
-(91) ReusedExchange [Reuses operator id: 52]
+(87) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(92) BroadcastHashJoin [codegen id : 75]
-Left keys [1]: [ws_item_sk#76]
+(88) BroadcastHashJoin [codegen id : 77]
+Left keys [1]: [ws_item_sk#80]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(93) ReusedExchange [Reuses operator id: 59]
-Output [4]: [i_item_sk#81, i_brand_id#82, i_class_id#83, i_category_id#84]
+(89) ReusedExchange [Reuses operator id: 57]
+Output [4]: [i_item_sk#85, i_brand_id#86, i_class_id#87, i_category_id#88]
 
-(94) BroadcastHashJoin [codegen id : 75]
-Left keys [1]: [ws_item_sk#76]
-Right keys [1]: [i_item_sk#81]
+(90) BroadcastHashJoin [codegen id : 77]
+Left keys [1]: [ws_item_sk#80]
+Right keys [1]: [i_item_sk#85]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 75]
-Output [6]: [ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79, i_brand_id#82, i_class_id#83, i_category_id#84]
-Input [8]: [ws_item_sk#76, ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79, i_item_sk#81, i_brand_id#82, i_class_id#83, i_category_id#84]
+(91) Project [codegen id : 77]
+Output [6]: [ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83, i_brand_id#86, i_class_id#87, i_category_id#88]
+Input [8]: [ws_item_sk#80, ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83, i_item_sk#85, i_brand_id#86, i_class_id#87, i_category_id#88]
 
-(96) ReusedExchange [Reuses operator id: 137]
-Output [1]: [d_date_sk#85]
+(92) ReusedExchange [Reuses operator id: 129]
+Output [1]: [d_date_sk#89]
 
-(97) BroadcastHashJoin [codegen id : 75]
-Left keys [1]: [ws_sold_date_sk#79]
-Right keys [1]: [d_date_sk#85]
+(93) BroadcastHashJoin [codegen id : 77]
+Left keys [1]: [ws_sold_date_sk#83]
+Right keys [1]: [d_date_sk#89]
 Join type: Inner
 Join condition: None
 
-(98) Project [codegen id : 75]
-Output [5]: [ws_quantity#77, ws_list_price#78, i_brand_id#82, i_class_id#83, i_category_id#84]
-Input [7]: [ws_quantity#77, ws_list_price#78, ws_sold_date_sk#79, i_brand_id#82, i_class_id#83, i_category_id#84, d_date_sk#85]
-
-(99) HashAggregate [codegen id : 75]
-Input [5]: [ws_quantity#77, ws_list_price#78, i_brand_id#82, i_class_id#83, i_category_id#84]
-Keys [3]: [i_brand_id#82, i_class_id#83, i_category_id#84]
-Functions [2]: [partial_sum((cast(ws_quantity#77 as decimal(10,0)) * ws_list_price#78)), partial_count(1)]
-Aggregate Attributes [3]: [sum#86, isEmpty#87, count#88]
-Results [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
-
-(100) RowToColumnar
-Input [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
-
-(101) CometColumnarExchange
-Input [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
-Arguments: hashpartitioning(i_brand_id#82, i_class_id#83, i_category_id#84, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
-
-(102) CometHashAggregate
-Input [6]: [i_brand_id#82, i_class_id#83, i_category_id#84, sum#89, isEmpty#90, count#91]
-Keys [3]: [i_brand_id#82, i_class_id#83, i_category_id#84]
-Functions [2]: [sum((cast(ws_quantity#77 as decimal(10,0)) * ws_list_price#78)), count(1)]
-
-(103) CometFilter
-Input [5]: [i_brand_id#82, i_class_id#83, i_category_id#84, sales#92, number_sales#93]
-Condition : (isnotnull(sales#92) AND (cast(sales#92 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#51, [id=#52] as decimal(32,6))))
-
-(104) CometProject
-Input [5]: [i_brand_id#82, i_class_id#83, i_category_id#84, sales#92, number_sales#93]
-Arguments: [sales#92, number_sales#93, channel#94, i_brand_id#82, i_class_id#83, i_category_id#84], [sales#92, number_sales#93, web AS channel#94, i_brand_id#82, i_class_id#83, i_category_id#84]
-
-(105) CometUnion
-Child 0 Input [6]: [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56]
-Child 1 Input [6]: [sales#73, number_sales#74, channel#75, i_brand_id#63, i_class_id#64, i_category_id#65]
-Child 2 Input [6]: [sales#92, number_sales#93, channel#94, i_brand_id#82, i_class_id#83, i_category_id#84]
-
-(106) CometExpand
-Input [6]: [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56]
-Arguments: [[sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, i_category_id#56, 0], [sales#49, number_sales#50, channel#53, i_brand_id#54, i_class_id#55, null, 1], [sales#49, number_sales#50, channel#53, i_brand_id#54, null, null, 3], [sales#49, number_sales#50, channel#53, null, null, null, 7], [sales#49, number_sales#50, null, null, null, null, 15]], [sales#49, number_sales#50, channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
-
-(107) CometHashAggregate
-Input [7]: [sales#49, number_sales#50, channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
-Keys [5]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
-Functions [2]: [partial_sum(sales#49), partial_sum(number_sales#50)]
-
-(108) CometColumnarExchange
-Input [8]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99, sum#100, isEmpty#101, sum#102]
-Arguments: hashpartitioning(channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
-
-(109) CometHashAggregate
-Input [8]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99, sum#100, isEmpty#101, sum#102]
-Keys [5]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, spark_grouping_id#99]
-Functions [2]: [sum(sales#49), sum(number_sales#50)]
-
-(110) CometTakeOrderedAndProject
-Input [6]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, sum(sales)#103, sum(number_sales)#104]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#95 ASC NULLS FIRST,i_brand_id#96 ASC NULLS FIRST,i_class_id#97 ASC NULLS FIRST,i_category_id#98 ASC NULLS FIRST], output=[channel#95,i_brand_id#96,i_class_id#97,i_category_id#98,sum(sales)#103,sum(number_sales)#104]), 100, [channel#95 ASC NULLS FIRST, i_brand_id#96 ASC NULLS FIRST, i_class_id#97 ASC NULLS FIRST, i_category_id#98 ASC NULLS FIRST], [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, sum(sales)#103, sum(number_sales)#104]
-
-(111) ColumnarToRow [codegen id : 76]
-Input [6]: [channel#95, i_brand_id#96, i_class_id#97, i_category_id#98, sum(sales)#103, sum(number_sales)#104]
+(94) Project [codegen id : 77]
+Output [5]: [ws_quantity#81, ws_list_price#82, i_brand_id#86, i_class_id#87, i_category_id#88]
+Input [7]: [ws_quantity#81, ws_list_price#82, ws_sold_date_sk#83, i_brand_id#86, i_class_id#87, i_category_id#88, d_date_sk#89]
+
+(95) HashAggregate [codegen id : 77]
+Input [5]: [ws_quantity#81, ws_list_price#82, i_brand_id#86, i_class_id#87, i_category_id#88]
+Keys [3]: [i_brand_id#86, i_class_id#87, i_category_id#88]
+Functions [2]: [partial_sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82)), partial_count(1)]
+Aggregate Attributes [3]: [sum#90, isEmpty#91, count#92]
+Results [6]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum#93, isEmpty#94, count#95]
+
+(96) Exchange
+Input [6]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum#93, isEmpty#94, count#95]
+Arguments: hashpartitioning(i_brand_id#86, i_class_id#87, i_category_id#88, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+
+(97) HashAggregate [codegen id : 78]
+Input [6]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum#93, isEmpty#94, count#95]
+Keys [3]: [i_brand_id#86, i_class_id#87, i_category_id#88]
+Functions [2]: [sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82))#96, count(1)#97]
+Results [5]: [i_brand_id#86, i_class_id#87, i_category_id#88, sum((cast(ws_quantity#81 as decimal(10,0)) * ws_list_price#82))#96 AS sales#98, count(1)#97 AS number_sales#99]
+
+(98) Filter [codegen id : 78]
+Input [5]: [i_brand_id#86, i_class_id#87, i_category_id#88, sales#98, number_sales#99]
+Condition : (isnotnull(sales#98) AND (cast(sales#98 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#53, [id=#54] as decimal(32,6))))
+
+(99) Project [codegen id : 78]
+Output [6]: [sales#98, number_sales#99, web AS channel#100, i_brand_id#86, i_class_id#87, i_category_id#88]
+Input [5]: [i_brand_id#86, i_class_id#87, i_category_id#88, sales#98, number_sales#99]
+
+(100) Union
+
+(101) Expand [codegen id : 79]
+Input [6]: [sales#51, number_sales#52, channel#55, i_brand_id#56, i_class_id#57, i_category_id#58]
+Arguments: [[sales#51, number_sales#52, channel#55, i_brand_id#56, i_class_id#57, i_category_id#58, 0], [sales#51, number_sales#52, channel#55, i_brand_id#56, i_class_id#57, null, 1], [sales#51, number_sales#52, channel#55, i_brand_id#56, null, null, 3], [sales#51, number_sales#52, channel#55, null, null, null, 7], [sales#51, number_sales#52, null, null, null, null, 15]], [sales#51, number_sales#52, channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
+
+(102) HashAggregate [codegen id : 79]
+Input [7]: [sales#51, number_sales#52, channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
+Keys [5]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
+Functions [2]: [partial_sum(sales#51), partial_sum(number_sales#52)]
+Aggregate Attributes [3]: [sum#106, isEmpty#107, sum#108]
+Results [8]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, sum#109, isEmpty#110, sum#111]
+
+(103) Exchange
+Input [8]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, sum#109, isEmpty#110, sum#111]
+Arguments: hashpartitioning(channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+
+(104) HashAggregate [codegen id : 80]
+Input [8]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105, sum#109, isEmpty#110, sum#111]
+Keys [5]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, spark_grouping_id#105]
+Functions [2]: [sum(sales#51), sum(number_sales#52)]
+Aggregate Attributes [2]: [sum(sales#51)#112, sum(number_sales#52)#113]
+Results [6]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, sum(sales#51)#112 AS sum(sales)#114, sum(number_sales#52)#113 AS sum(number_sales)#115]
+
+(105) TakeOrderedAndProject
+Input [6]: [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, sum(sales)#114, sum(number_sales)#115]
+Arguments: 100, [channel#101 ASC NULLS FIRST, i_brand_id#102 ASC NULLS FIRST, i_class_id#103 ASC NULLS FIRST, i_category_id#104 ASC NULLS FIRST], [channel#101, i_brand_id#102, i_class_id#103, i_category_id#104, sum(sales)#114, sum(number_sales)#115]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#51, [id=#52]
-* ColumnarToRow (132)
-+- CometHashAggregate (131)
-   +- CometColumnarExchange (130)
-      +- RowToColumnar (129)
-         +- * HashAggregate (128)
-            +- Union (127)
-               :- * Project (116)
-               :  +- * BroadcastHashJoin Inner BuildRight (115)
-               :     :- * ColumnarToRow (113)
-               :     :  +- CometScan parquet spark_catalog.default.store_sales (112)
-               :     +- ReusedExchange (114)
-               :- * Project (121)
-               :  +- * BroadcastHashJoin Inner BuildRight (120)
-               :     :- * ColumnarToRow (118)
-               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (117)
-               :     +- ReusedExchange (119)
-               +- * Project (126)
-                  +- * BroadcastHashJoin Inner BuildRight (125)
-                     :- * ColumnarToRow (123)
-                     :  +- CometScan parquet spark_catalog.default.web_sales (122)
-                     +- ReusedExchange (124)
+Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#53, [id=#54]
+* HashAggregate (124)
++- Exchange (123)
+   +- * HashAggregate (122)
+      +- Union (121)
+         :- * Project (110)
+         :  +- * BroadcastHashJoin Inner BuildRight (109)
+         :     :- * ColumnarToRow (107)
+         :     :  +- CometScan parquet spark_catalog.default.store_sales (106)
+         :     +- ReusedExchange (108)
+         :- * Project (115)
+         :  +- * BroadcastHashJoin Inner BuildRight (114)
+         :     :- * ColumnarToRow (112)
+         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (111)
+         :     +- ReusedExchange (113)
+         +- * Project (120)
+            +- * BroadcastHashJoin Inner BuildRight (119)
+               :- * ColumnarToRow (117)
+               :  +- CometScan parquet spark_catalog.default.web_sales (116)
+               +- ReusedExchange (118)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#105, ss_list_price#106, ss_sold_date_sk#107]
+Output [3]: [ss_quantity#116, ss_list_price#117, ss_sold_date_sk#118]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#107), dynamicpruningexpression(ss_sold_date_sk#107 IN dynamicpruning#108)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#118), dynamicpruningexpression(ss_sold_date_sk#118 IN dynamicpruning#119)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(113) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#105, ss_list_price#106, ss_sold_date_sk#107]
+(107) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#116, ss_list_price#117, ss_sold_date_sk#118]
 
-(114) ReusedExchange [Reuses operator id: 142]
-Output [1]: [d_date_sk#109]
+(108) ReusedExchange [Reuses operator id: 134]
+Output [1]: [d_date_sk#120]
 
-(115) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#107]
-Right keys [1]: [d_date_sk#109]
+(109) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#118]
+Right keys [1]: [d_date_sk#120]
 Join type: Inner
 Join condition: None
 
-(116) Project [codegen id : 2]
-Output [2]: [ss_quantity#105 AS quantity#110, ss_list_price#106 AS list_price#111]
-Input [4]: [ss_quantity#105, ss_list_price#106, ss_sold_date_sk#107, d_date_sk#109]
+(110) Project [codegen id : 2]
+Output [2]: [ss_quantity#116 AS quantity#121, ss_list_price#117 AS list_price#122]
+Input [4]: [ss_quantity#116, ss_list_price#117, ss_sold_date_sk#118, d_date_sk#120]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#112, cs_list_price#113, cs_sold_date_sk#114]
+Output [3]: [cs_quantity#123, cs_list_price#124, cs_sold_date_sk#125]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#114), dynamicpruningexpression(cs_sold_date_sk#114 IN dynamicpruning#115)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#125), dynamicpruningexpression(cs_sold_date_sk#125 IN dynamicpruning#126)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(118) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#112, cs_list_price#113, cs_sold_date_sk#114]
+(112) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#123, cs_list_price#124, cs_sold_date_sk#125]
 
-(119) ReusedExchange [Reuses operator id: 142]
-Output [1]: [d_date_sk#116]
+(113) ReusedExchange [Reuses operator id: 134]
+Output [1]: [d_date_sk#127]
 
-(120) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#114]
-Right keys [1]: [d_date_sk#116]
+(114) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#125]
+Right keys [1]: [d_date_sk#127]
 Join type: Inner
 Join condition: None
 
-(121) Project [codegen id : 4]
-Output [2]: [cs_quantity#112 AS quantity#117, cs_list_price#113 AS list_price#118]
-Input [4]: [cs_quantity#112, cs_list_price#113, cs_sold_date_sk#114, d_date_sk#116]
+(115) Project [codegen id : 4]
+Output [2]: [cs_quantity#123 AS quantity#128, cs_list_price#124 AS list_price#129]
+Input [4]: [cs_quantity#123, cs_list_price#124, cs_sold_date_sk#125, d_date_sk#127]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#119, ws_list_price#120, ws_sold_date_sk#121]
+Output [3]: [ws_quantity#130, ws_list_price#131, ws_sold_date_sk#132]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#121), dynamicpruningexpression(ws_sold_date_sk#121 IN dynamicpruning#122)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#132), dynamicpruningexpression(ws_sold_date_sk#132 IN dynamicpruning#133)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(123) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#119, ws_list_price#120, ws_sold_date_sk#121]
+(117) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#130, ws_list_price#131, ws_sold_date_sk#132]
 
-(124) ReusedExchange [Reuses operator id: 142]
-Output [1]: [d_date_sk#123]
+(118) ReusedExchange [Reuses operator id: 134]
+Output [1]: [d_date_sk#134]
 
-(125) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#121]
-Right keys [1]: [d_date_sk#123]
+(119) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#132]
+Right keys [1]: [d_date_sk#134]
 Join type: Inner
 Join condition: None
 
-(126) Project [codegen id : 6]
-Output [2]: [ws_quantity#119 AS quantity#124, ws_list_price#120 AS list_price#125]
-Input [4]: [ws_quantity#119, ws_list_price#120, ws_sold_date_sk#121, d_date_sk#123]
+(120) Project [codegen id : 6]
+Output [2]: [ws_quantity#130 AS quantity#135, ws_list_price#131 AS list_price#136]
+Input [4]: [ws_quantity#130, ws_list_price#131, ws_sold_date_sk#132, d_date_sk#134]
 
-(127) Union
+(121) Union
 
-(128) HashAggregate [codegen id : 7]
-Input [2]: [quantity#110, list_price#111]
+(122) HashAggregate [codegen id : 7]
+Input [2]: [quantity#121, list_price#122]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#110 as decimal(10,0)) * list_price#111))]
-Aggregate Attributes [2]: [sum#126, count#127]
-Results [2]: [sum#128, count#129]
-
-(129) RowToColumnar
-Input [2]: [sum#128, count#129]
+Functions [1]: [partial_avg((cast(quantity#121 as decimal(10,0)) * list_price#122))]
+Aggregate Attributes [2]: [sum#137, count#138]
+Results [2]: [sum#139, count#140]
 
-(130) CometColumnarExchange
-Input [2]: [sum#128, count#129]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+(123) Exchange
+Input [2]: [sum#139, count#140]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=13]
 
-(131) CometHashAggregate
-Input [2]: [sum#128, count#129]
+(124) HashAggregate [codegen id : 8]
+Input [2]: [sum#139, count#140]
 Keys: []
-Functions [1]: [avg((cast(quantity#110 as decimal(10,0)) * list_price#111))]
-
-(132) ColumnarToRow [codegen id : 8]
-Input [1]: [average_sales#130]
+Functions [1]: [avg((cast(quantity#121 as decimal(10,0)) * list_price#122))]
+Aggregate Attributes [1]: [avg((cast(quantity#121 as decimal(10,0)) * list_price#122))#141]
+Results [1]: [avg((cast(quantity#121 as decimal(10,0)) * list_price#122))#141 AS average_sales#142]
 
-Subquery:2 Hosting operator id = 112 Hosting Expression = ss_sold_date_sk#107 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 106 Hosting Expression = ss_sold_date_sk#118 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 117 Hosting Expression = cs_sold_date_sk#114 IN dynamicpruning#12
+Subquery:3 Hosting operator id = 111 Hosting Expression = cs_sold_date_sk#125 IN dynamicpruning#12
 
-Subquery:4 Hosting operator id = 122 Hosting Expression = ws_sold_date_sk#121 IN dynamicpruning#12
+Subquery:4 Hosting operator id = 116 Hosting Expression = ws_sold_date_sk#132 IN dynamicpruning#12
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (137)
-+- * ColumnarToRow (136)
-   +- CometProject (135)
-      +- CometFilter (134)
-         +- CometScan parquet spark_catalog.default.date_dim (133)
+BroadcastExchange (129)
++- * ColumnarToRow (128)
+   +- CometProject (127)
+      +- CometFilter (126)
+         +- CometScan parquet spark_catalog.default.date_dim (125)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#42, d_year#131, d_moy#132]
+Output [3]: [d_date_sk#42, d_year#143, d_moy#144]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(134) CometFilter
-Input [3]: [d_date_sk#42, d_year#131, d_moy#132]
-Condition : ((((isnotnull(d_year#131) AND isnotnull(d_moy#132)) AND (d_year#131 = 2001)) AND (d_moy#132 = 11)) AND isnotnull(d_date_sk#42))
+(126) CometFilter
+Input [3]: [d_date_sk#42, d_year#143, d_moy#144]
+Condition : ((((isnotnull(d_year#143) AND isnotnull(d_moy#144)) AND (d_year#143 = 2001)) AND (d_moy#144 = 11)) AND isnotnull(d_date_sk#42))
 
-(135) CometProject
-Input [3]: [d_date_sk#42, d_year#131, d_moy#132]
+(127) CometProject
+Input [3]: [d_date_sk#42, d_year#143, d_moy#144]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(136) ColumnarToRow [codegen id : 1]
+(128) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(137) BroadcastExchange
+(129) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
 Subquery:6 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (142)
-+- * ColumnarToRow (141)
-   +- CometProject (140)
-      +- CometFilter (139)
-         +- CometScan parquet spark_catalog.default.date_dim (138)
+BroadcastExchange (134)
++- * ColumnarToRow (133)
+   +- CometProject (132)
+      +- CometFilter (131)
+         +- CometScan parquet spark_catalog.default.date_dim (130)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#133]
+Output [2]: [d_date_sk#25, d_year#145]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1999), LessThanOrEqual(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(139) CometFilter
-Input [2]: [d_date_sk#25, d_year#133]
-Condition : (((isnotnull(d_year#133) AND (d_year#133 >= 1999)) AND (d_year#133 <= 2001)) AND isnotnull(d_date_sk#25))
+(131) CometFilter
+Input [2]: [d_date_sk#25, d_year#145]
+Condition : (((isnotnull(d_year#145) AND (d_year#145 >= 1999)) AND (d_year#145 <= 2001)) AND isnotnull(d_date_sk#25))
 
-(140) CometProject
-Input [2]: [d_date_sk#25, d_year#133]
+(132) CometProject
+Input [2]: [d_date_sk#25, d_year#145]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(141) ColumnarToRow [codegen id : 1]
+(133) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(142) BroadcastExchange
+(134) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
 Subquery:7 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:8 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:8 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 86 Hosting Expression = ReusedSubquery Subquery scalar-subquery#51, [id=#52]
+Subquery:9 Hosting operator id = 82 Hosting Expression = ReusedSubquery Subquery scalar-subquery#53, [id=#54]
 
-Subquery:10 Hosting operator id = 71 Hosting Expression = cs_sold_date_sk#60 IN dynamicpruning#5
+Subquery:10 Hosting operator id = 68 Hosting Expression = cs_sold_date_sk#62 IN dynamicpruning#5
 
-Subquery:11 Hosting operator id = 103 Hosting Expression = ReusedSubquery Subquery scalar-subquery#51, [id=#52]
+Subquery:11 Hosting operator id = 98 Hosting Expression = ReusedSubquery Subquery scalar-subquery#53, [id=#54]
 
-Subquery:12 Hosting operator id = 88 Hosting Expression = ws_sold_date_sk#79 IN dynamicpruning#5
+Subquery:12 Hosting operator id = 84 Hosting Expression = ws_sold_date_sk#83 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt
index cd494e1546..cf688c4486 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14a/simplified.txt
@@ -1,21 +1,21 @@
-WholeStageCodegen (76)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum(sales),sum(number_sales)]
-        CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sum,isEmpty,sum]
-          CometColumnarExchange [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id] #1
-            CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sales,number_sales]
-              CometExpand [channel,i_brand_id,i_class_id,i_category_id] [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id]
-                CometUnion
-                  CometProject [i_brand_id,i_class_id,i_category_id] [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
-                    CometFilter [sales]
-                      Subquery #3
-                        WholeStageCodegen (8)
-                          ColumnarToRow
-                            InputAdapter
-                              CometHashAggregate [sum,count]
-                                CometColumnarExchange #13
-                                  RowToColumnar
+TakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum(sales),sum(number_sales)]
+  WholeStageCodegen (80)
+    HashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum(sales),sum(number_sales),sum,isEmpty,sum]
+      InputAdapter
+        Exchange [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id] #1
+          WholeStageCodegen (79)
+            HashAggregate [channel,i_brand_id,i_class_id,i_category_id,spark_grouping_id,sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
+              Expand [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
+                InputAdapter
+                  Union
+                    WholeStageCodegen (26)
+                      Project [sales,number_sales,i_brand_id,i_class_id,i_category_id]
+                        Filter [sales]
+                          Subquery #3
+                            WholeStageCodegen (8)
+                              HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
+                                InputAdapter
+                                  Exchange #13
                                     WholeStageCodegen (7)
                                       HashAggregate [quantity,list_price] [sum,count,sum,count]
                                         InputAdapter
@@ -47,46 +47,44 @@ WholeStageCodegen (76)
                                                         ReusedSubquery [d_date_sk] #2
                                                   InputAdapter
                                                     ReusedExchange [d_date_sk] #7
-                      CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                        CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #2
-                          RowToColumnar
-                            WholeStageCodegen (25)
-                              HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                        BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_item_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                          InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (11)
-                                                Project [i_item_sk]
-                                                  BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [i_brand_id,i_class_id,i_category_id]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                    InputAdapter
-                                                      BroadcastExchange #5
-                                                        WholeStageCodegen (10)
-                                                          BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                          HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),sales,number_sales,sum,isEmpty,count]
+                            InputAdapter
+                              Exchange [i_brand_id,i_class_id,i_category_id] #2
+                                WholeStageCodegen (25)
+                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                    Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                        Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                            BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_item_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
                                                             ColumnarToRow
                                                               InputAdapter
-                                                                CometHashAggregate [brand_id,class_id,category_id]
-                                                                  CometColumnarExchange [brand_id,class_id,category_id] #6
-                                                                    RowToColumnar
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_year,d_moy,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #4
+                                                  WholeStageCodegen (11)
+                                                    Project [i_item_sk]
+                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [i_brand_id,i_class_id,i_category_id]
+                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                        InputAdapter
+                                                          BroadcastExchange #5
+                                                            WholeStageCodegen (10)
+                                                              BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                                                HashAggregate [brand_id,class_id,category_id]
+                                                                  InputAdapter
+                                                                    Exchange [brand_id,class_id,category_id] #6
                                                                       WholeStageCodegen (6)
                                                                         HashAggregate [brand_id,class_id,category_id]
                                                                           Project [i_brand_id,i_class_id,i_category_id]
@@ -136,79 +134,81 @@ WholeStageCodegen (76)
                                                                                                       ReusedExchange [d_date_sk] #7
                                                                               InputAdapter
                                                                                 ReusedExchange [d_date_sk] #7
-                                                            InputAdapter
-                                                              BroadcastExchange #11
-                                                                WholeStageCodegen (9)
-                                                                  Project [i_brand_id,i_class_id,i_category_id]
-                                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                      Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                        BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometFilter [ws_item_sk]
-                                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                                  ReusedSubquery [d_date_sk] #2
+                                                                InputAdapter
+                                                                  BroadcastExchange #11
+                                                                    WholeStageCodegen (9)
+                                                                      Project [i_brand_id,i_class_id,i_category_id]
+                                                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                          Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                            BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometFilter [ws_item_sk]
+                                                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                                      ReusedSubquery [d_date_sk] #2
+                                                                              InputAdapter
+                                                                                ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #10
                                                                           InputAdapter
-                                                                            ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #10
-                                                                      InputAdapter
-                                                                        ReusedExchange [d_date_sk] #7
+                                                                            ReusedExchange [d_date_sk] #7
+                                            InputAdapter
+                                              BroadcastExchange #12
+                                                WholeStageCodegen (23)
+                                                  BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [i_item_sk]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                    InputAdapter
+                                                      ReusedExchange [ss_item_sk] #4
                                         InputAdapter
-                                          BroadcastExchange #12
-                                            WholeStageCodegen (23)
-                                              BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [i_item_sk]
-                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                          ReusedExchange [d_date_sk] #3
+                    WholeStageCodegen (52)
+                      Project [sales,number_sales,i_brand_id,i_class_id,i_category_id]
+                        Filter [sales]
+                          ReusedSubquery [average_sales] #3
+                          HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(cs_quantity as decimal(10,0)) * cs_list_price)),count(1),sales,number_sales,sum,isEmpty,count]
+                            InputAdapter
+                              Exchange [i_brand_id,i_class_id,i_category_id] #14
+                                WholeStageCodegen (51)
+                                  HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                    Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                        Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                          BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                            BroadcastHashJoin [cs_item_sk,ss_item_sk]
+                                              ColumnarToRow
                                                 InputAdapter
-                                                  ReusedExchange [ss_item_sk] #4
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #3
-                  CometProject [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
-                    CometFilter [sales]
-                      ReusedSubquery [average_sales] #3
-                      CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                        CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #14
-                          RowToColumnar
-                            WholeStageCodegen (50)
-                              HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
-                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                    Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                        BroadcastHashJoin [cs_item_sk,ss_item_sk]
-                                          ColumnarToRow
+                                                  CometFilter [cs_item_sk]
+                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [ss_item_sk] #4
                                             InputAdapter
-                                              CometFilter [cs_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [ss_item_sk] #4
+                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
                                         InputAdapter
-                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #3
-                  CometProject [sales,number_sales,channel,i_brand_id,i_class_id,i_category_id]
-                    CometFilter [sales]
-                      ReusedSubquery [average_sales] #3
-                      CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                        CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #15
-                          RowToColumnar
-                            WholeStageCodegen (75)
-                              HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
-                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                    Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                        BroadcastHashJoin [ws_item_sk,ss_item_sk]
-                                          ColumnarToRow
+                                          ReusedExchange [d_date_sk] #3
+                    WholeStageCodegen (78)
+                      Project [sales,number_sales,i_brand_id,i_class_id,i_category_id]
+                        Filter [sales]
+                          ReusedSubquery [average_sales] #3
+                          HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ws_quantity as decimal(10,0)) * ws_list_price)),count(1),sales,number_sales,sum,isEmpty,count]
+                            InputAdapter
+                              Exchange [i_brand_id,i_class_id,i_category_id] #15
+                                WholeStageCodegen (77)
+                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                    Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                            BroadcastHashJoin [ws_item_sk,ss_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ws_item_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [ss_item_sk] #4
                                             InputAdapter
-                                              CometFilter [ws_item_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [ss_item_sk] #4
+                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
                                         InputAdapter
-                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #12
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #3
+                                          ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt
index 3ce08e1136..536306de5d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/explain.txt
@@ -1,94 +1,88 @@
 == Physical Plan ==
-TakeOrderedAndProject (90)
-+- * BroadcastHashJoin Inner BuildRight (89)
-   :- * ColumnarToRow (70)
-   :  +- CometFilter (69)
-   :     +- CometHashAggregate (68)
-   :        +- CometColumnarExchange (67)
-   :           +- RowToColumnar (66)
-   :              +- * HashAggregate (65)
-   :                 +- * Project (64)
-   :                    +- * BroadcastHashJoin Inner BuildRight (63)
-   :                       :- * Project (61)
-   :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
-   :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
-   :                       :     :  :- * ColumnarToRow (3)
-   :                       :     :  :  +- CometFilter (2)
-   :                       :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :                       :     :  +- BroadcastExchange (52)
-   :                       :     :     +- * Project (51)
-   :                       :     :        +- * BroadcastHashJoin Inner BuildRight (50)
-   :                       :     :           :- * ColumnarToRow (6)
-   :                       :     :           :  +- CometFilter (5)
-   :                       :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-   :                       :     :           +- BroadcastExchange (49)
-   :                       :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
-   :                       :     :                 :- * ColumnarToRow (37)
-   :                       :     :                 :  +- CometHashAggregate (36)
-   :                       :     :                 :     +- CometColumnarExchange (35)
-   :                       :     :                 :        +- RowToColumnar (34)
-   :                       :     :                 :           +- * HashAggregate (33)
-   :                       :     :                 :              +- * Project (32)
-   :                       :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
-   :                       :     :                 :                    :- * Project (29)
-   :                       :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
-   :                       :     :                 :                    :     :- * ColumnarToRow (9)
-   :                       :     :                 :                    :     :  +- CometFilter (8)
-   :                       :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-   :                       :     :                 :                    :     +- BroadcastExchange (27)
-   :                       :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-   :                       :     :                 :                    :           :- * ColumnarToRow (12)
-   :                       :     :                 :                    :           :  +- CometFilter (11)
-   :                       :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
-   :                       :     :                 :                    :           +- BroadcastExchange (25)
-   :                       :     :                 :                    :              +- * Project (24)
-   :                       :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
-   :                       :     :                 :                    :                    :- * Project (21)
-   :                       :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-   :                       :     :                 :                    :                    :     :- * ColumnarToRow (15)
-   :                       :     :                 :                    :                    :     :  +- CometFilter (14)
-   :                       :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-   :                       :     :                 :                    :                    :     +- BroadcastExchange (19)
-   :                       :     :                 :                    :                    :        +- * ColumnarToRow (18)
-   :                       :     :                 :                    :                    :           +- CometFilter (17)
-   :                       :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
-   :                       :     :                 :                    :                    +- ReusedExchange (22)
-   :                       :     :                 :                    +- ReusedExchange (30)
-   :                       :     :                 +- BroadcastExchange (47)
-   :                       :     :                    +- * Project (46)
-   :                       :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
-   :                       :     :                          :- * Project (43)
-   :                       :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
-   :                       :     :                          :     :- * ColumnarToRow (40)
-   :                       :     :                          :     :  +- CometFilter (39)
-   :                       :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
-   :                       :     :                          :     +- ReusedExchange (41)
-   :                       :     :                          +- ReusedExchange (44)
-   :                       :     +- BroadcastExchange (59)
-   :                       :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
-   :                       :           :- * ColumnarToRow (56)
-   :                       :           :  +- CometFilter (55)
-   :                       :           :     +- CometScan parquet spark_catalog.default.item (54)
-   :                       :           +- ReusedExchange (57)
-   :                       +- ReusedExchange (62)
-   +- BroadcastExchange (88)
-      +- * ColumnarToRow (87)
-         +- CometFilter (86)
-            +- CometHashAggregate (85)
-               +- CometColumnarExchange (84)
-                  +- RowToColumnar (83)
-                     +- * HashAggregate (82)
-                        +- * Project (81)
-                           +- * BroadcastHashJoin Inner BuildRight (80)
-                              :- * Project (78)
-                              :  +- * BroadcastHashJoin Inner BuildRight (77)
-                              :     :- * BroadcastHashJoin LeftSemi BuildRight (75)
-                              :     :  :- * ColumnarToRow (73)
-                              :     :  :  +- CometFilter (72)
-                              :     :  :     +- CometScan parquet spark_catalog.default.store_sales (71)
-                              :     :  +- ReusedExchange (74)
-                              :     +- ReusedExchange (76)
-                              +- ReusedExchange (79)
+TakeOrderedAndProject (84)
++- * BroadcastHashJoin Inner BuildRight (83)
+   :- * Filter (66)
+   :  +- * HashAggregate (65)
+   :     +- Exchange (64)
+   :        +- * HashAggregate (63)
+   :           +- * Project (62)
+   :              +- * BroadcastHashJoin Inner BuildRight (61)
+   :                 :- * Project (59)
+   :                 :  +- * BroadcastHashJoin Inner BuildRight (58)
+   :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
+   :                 :     :  :- * ColumnarToRow (3)
+   :                 :     :  :  +- CometFilter (2)
+   :                 :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :                 :     :  +- BroadcastExchange (50)
+   :                 :     :     +- * Project (49)
+   :                 :     :        +- * BroadcastHashJoin Inner BuildRight (48)
+   :                 :     :           :- * ColumnarToRow (6)
+   :                 :     :           :  +- CometFilter (5)
+   :                 :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+   :                 :     :           +- BroadcastExchange (47)
+   :                 :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
+   :                 :     :                 :- * HashAggregate (35)
+   :                 :     :                 :  +- Exchange (34)
+   :                 :     :                 :     +- * HashAggregate (33)
+   :                 :     :                 :        +- * Project (32)
+   :                 :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
+   :                 :     :                 :              :- * Project (29)
+   :                 :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
+   :                 :     :                 :              :     :- * ColumnarToRow (9)
+   :                 :     :                 :              :     :  +- CometFilter (8)
+   :                 :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+   :                 :     :                 :              :     +- BroadcastExchange (27)
+   :                 :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+   :                 :     :                 :              :           :- * ColumnarToRow (12)
+   :                 :     :                 :              :           :  +- CometFilter (11)
+   :                 :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
+   :                 :     :                 :              :           +- BroadcastExchange (25)
+   :                 :     :                 :              :              +- * Project (24)
+   :                 :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
+   :                 :     :                 :              :                    :- * Project (21)
+   :                 :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+   :                 :     :                 :              :                    :     :- * ColumnarToRow (15)
+   :                 :     :                 :              :                    :     :  +- CometFilter (14)
+   :                 :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+   :                 :     :                 :              :                    :     +- BroadcastExchange (19)
+   :                 :     :                 :              :                    :        +- * ColumnarToRow (18)
+   :                 :     :                 :              :                    :           +- CometFilter (17)
+   :                 :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
+   :                 :     :                 :              :                    +- ReusedExchange (22)
+   :                 :     :                 :              +- ReusedExchange (30)
+   :                 :     :                 +- BroadcastExchange (45)
+   :                 :     :                    +- * Project (44)
+   :                 :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
+   :                 :     :                          :- * Project (41)
+   :                 :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
+   :                 :     :                          :     :- * ColumnarToRow (38)
+   :                 :     :                          :     :  +- CometFilter (37)
+   :                 :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
+   :                 :     :                          :     +- ReusedExchange (39)
+   :                 :     :                          +- ReusedExchange (42)
+   :                 :     +- BroadcastExchange (57)
+   :                 :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
+   :                 :           :- * ColumnarToRow (54)
+   :                 :           :  +- CometFilter (53)
+   :                 :           :     +- CometScan parquet spark_catalog.default.item (52)
+   :                 :           +- ReusedExchange (55)
+   :                 +- ReusedExchange (60)
+   +- BroadcastExchange (82)
+      +- * Filter (81)
+         +- * HashAggregate (80)
+            +- Exchange (79)
+               +- * HashAggregate (78)
+                  +- * Project (77)
+                     +- * BroadcastHashJoin Inner BuildRight (76)
+                        :- * Project (74)
+                        :  +- * BroadcastHashJoin Inner BuildRight (73)
+                        :     :- * BroadcastHashJoin LeftSemi BuildRight (71)
+                        :     :  :- * ColumnarToRow (69)
+                        :     :  :  +- CometFilter (68)
+                        :     :  :     +- CometScan parquet spark_catalog.default.store_sales (67)
+                        :     :  +- ReusedExchange (70)
+                        :     +- ReusedExchange (72)
+                        +- ReusedExchange (75)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -192,7 +186,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 125]
+(22) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -229,7 +223,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 125]
+(30) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -249,20 +243,16 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) RowToColumnar
+(34) Exchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) CometColumnarExchange
-Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(36) CometHashAggregate
+(35) HashAggregate [codegen id : 10]
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-
-(37) ColumnarToRow [codegen id : 10]
-Input [3]: [brand_id#26, class_id#27, category_id#28]
+Aggregate Attributes: []
+Results [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -272,68 +262,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(39) CometFilter
+(37) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(40) ColumnarToRow [codegen id : 9]
+(38) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(41) ReusedExchange [Reuses operator id: 19]
+(39) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) BroadcastHashJoin [codegen id : 9]
+(40) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 9]
+(41) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(44) ReusedExchange [Reuses operator id: 125]
+(42) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#36]
 
-(45) BroadcastHashJoin [codegen id : 9]
+(43) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 9]
+(44) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(48) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(50) BroadcastHashJoin [codegen id : 11]
+(48) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 11]
+(49) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(53) BroadcastHashJoin [codegen id : 25]
+(51) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -346,434 +336,420 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk), IsNotNull(i_brand_id), IsNotNull(i_class_id), IsNotNull(i_category_id)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(55) CometFilter
+(53) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : (((isnotnull(i_item_sk#38) AND isnotnull(i_brand_id#39)) AND isnotnull(i_class_id#40)) AND isnotnull(i_category_id#41))
 
-(56) ColumnarToRow [codegen id : 23]
+(54) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(57) ReusedExchange [Reuses operator id: 52]
+(55) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(58) BroadcastHashJoin [codegen id : 23]
+(56) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(59) BroadcastExchange
+(57) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 25]
+(58) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 25]
+(59) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(62) ReusedExchange [Reuses operator id: 116]
+(60) ReusedExchange [Reuses operator id: 108]
 Output [1]: [d_date_sk#42]
 
-(63) BroadcastHashJoin [codegen id : 25]
+(61) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 25]
+(62) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(65) HashAggregate [codegen id : 25]
+(63) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(66) RowToColumnar
-Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-
-(67) CometColumnarExchange
+(64) Exchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(68) CometHashAggregate
+(65) HashAggregate [codegen id : 52]
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
+Results [6]: [store AS channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#52, count(1)#50 AS number_sales#53]
 
-(69) CometFilter
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
-Condition : (isnotnull(sales#50) AND (cast(sales#50 as decimal(32,6)) > cast(Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
-
-(70) ColumnarToRow [codegen id : 52]
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+(66) Filter [codegen id : 52]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
+Condition : (isnotnull(sales#52) AND (cast(sales#52 as decimal(32,6)) > cast(Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
+Output [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#57), dynamicpruningexpression(ss_sold_date_sk#57 IN dynamicpruning#58)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#59), dynamicpruningexpression(ss_sold_date_sk#59 IN dynamicpruning#60)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(72) CometFilter
-Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
-Condition : isnotnull(ss_item_sk#54)
+(68) CometFilter
+Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
+Condition : isnotnull(ss_item_sk#56)
 
-(73) ColumnarToRow [codegen id : 50]
-Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
+(69) ColumnarToRow [codegen id : 50]
+Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
 
-(74) ReusedExchange [Reuses operator id: 52]
+(70) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(75) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#54]
+(71) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#56]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(76) ReusedExchange [Reuses operator id: 59]
-Output [4]: [i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
+(72) ReusedExchange [Reuses operator id: 57]
+Output [4]: [i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
 
-(77) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#54]
-Right keys [1]: [i_item_sk#59]
+(73) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#56]
+Right keys [1]: [i_item_sk#61]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 50]
-Output [6]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62]
-Input [8]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
+(74) Project [codegen id : 50]
+Output [6]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64]
+Input [8]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
 
-(79) ReusedExchange [Reuses operator id: 130]
-Output [1]: [d_date_sk#63]
+(75) ReusedExchange [Reuses operator id: 122]
+Output [1]: [d_date_sk#65]
 
-(80) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_sold_date_sk#57]
-Right keys [1]: [d_date_sk#63]
+(76) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_sold_date_sk#59]
+Right keys [1]: [d_date_sk#65]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 50]
-Output [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
-Input [7]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62, d_date_sk#63]
-
-(82) HashAggregate [codegen id : 50]
-Input [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
-Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
-Functions [2]: [partial_sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), partial_count(1)]
-Aggregate Attributes [3]: [sum#64, isEmpty#65, count#66]
-Results [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-
-(83) RowToColumnar
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-
-(84) CometColumnarExchange
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-Arguments: hashpartitioning(i_brand_id#60, i_class_id#61, i_category_id#62, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(85) CometHashAggregate
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
-Functions [2]: [sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), count(1)]
-
-(86) CometFilter
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-Condition : (isnotnull(sales#71) AND (cast(sales#71 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
-
-(87) ColumnarToRow [codegen id : 51]
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-
-(88) BroadcastExchange
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+(77) Project [codegen id : 50]
+Output [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
+Input [7]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64, d_date_sk#65]
+
+(78) HashAggregate [codegen id : 50]
+Input [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
+Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Functions [2]: [partial_sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), partial_count(1)]
+Aggregate Attributes [3]: [sum#66, isEmpty#67, count#68]
+Results [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+
+(79) Exchange
+Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+Arguments: hashpartitioning(i_brand_id#62, i_class_id#63, i_category_id#64, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(80) HashAggregate [codegen id : 51]
+Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Functions [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72, count(1)#73]
+Results [6]: [store AS channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72 AS sales#75, count(1)#73 AS number_sales#76]
+
+(81) Filter [codegen id : 51]
+Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+Condition : (isnotnull(sales#75) AND (cast(sales#75 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+
+(82) BroadcastExchange
+Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
 Arguments: HashedRelationBroadcastMode(List(input[1, int, true], input[2, int, true], input[3, int, true]),false), [plan_id=11]
 
-(89) BroadcastHashJoin [codegen id : 52]
+(83) BroadcastHashJoin [codegen id : 52]
 Left keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
-Right keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Right keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
 Join type: Inner
 Join condition: None
 
-(90) TakeOrderedAndProject
-Input [12]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+(84) TakeOrderedAndProject
+Input [12]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#52, [id=#53]
-* ColumnarToRow (111)
-+- CometHashAggregate (110)
-   +- CometColumnarExchange (109)
-      +- RowToColumnar (108)
-         +- * HashAggregate (107)
-            +- Union (106)
-               :- * Project (95)
-               :  +- * BroadcastHashJoin Inner BuildRight (94)
-               :     :- * ColumnarToRow (92)
-               :     :  +- CometScan parquet spark_catalog.default.store_sales (91)
-               :     +- ReusedExchange (93)
-               :- * Project (100)
-               :  +- * BroadcastHashJoin Inner BuildRight (99)
-               :     :- * ColumnarToRow (97)
-               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (96)
-               :     +- ReusedExchange (98)
-               +- * Project (105)
-                  +- * BroadcastHashJoin Inner BuildRight (104)
-                     :- * ColumnarToRow (102)
-                     :  +- CometScan parquet spark_catalog.default.web_sales (101)
-                     +- ReusedExchange (103)
+Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#54, [id=#55]
+* HashAggregate (103)
++- Exchange (102)
+   +- * HashAggregate (101)
+      +- Union (100)
+         :- * Project (89)
+         :  +- * BroadcastHashJoin Inner BuildRight (88)
+         :     :- * ColumnarToRow (86)
+         :     :  +- CometScan parquet spark_catalog.default.store_sales (85)
+         :     +- ReusedExchange (87)
+         :- * Project (94)
+         :  +- * BroadcastHashJoin Inner BuildRight (93)
+         :     :- * ColumnarToRow (91)
+         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (90)
+         :     +- ReusedExchange (92)
+         +- * Project (99)
+            +- * BroadcastHashJoin Inner BuildRight (98)
+               :- * ColumnarToRow (96)
+               :  +- CometScan parquet spark_catalog.default.web_sales (95)
+               +- ReusedExchange (97)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
+Output [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#75), dynamicpruningexpression(ss_sold_date_sk#75 IN dynamicpruning#76)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#79), dynamicpruningexpression(ss_sold_date_sk#79 IN dynamicpruning#80)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(92) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
+(86) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
 
-(93) ReusedExchange [Reuses operator id: 125]
-Output [1]: [d_date_sk#77]
+(87) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#81]
 
-(94) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#75]
-Right keys [1]: [d_date_sk#77]
+(88) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#79]
+Right keys [1]: [d_date_sk#81]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 2]
-Output [2]: [ss_quantity#73 AS quantity#78, ss_list_price#74 AS list_price#79]
-Input [4]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75, d_date_sk#77]
+(89) Project [codegen id : 2]
+Output [2]: [ss_quantity#77 AS quantity#82, ss_list_price#78 AS list_price#83]
+Input [4]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79, d_date_sk#81]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
+Output [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#82), dynamicpruningexpression(cs_sold_date_sk#82 IN dynamicpruning#83)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#86), dynamicpruningexpression(cs_sold_date_sk#86 IN dynamicpruning#87)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(97) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
+(91) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
 
-(98) ReusedExchange [Reuses operator id: 125]
-Output [1]: [d_date_sk#84]
+(92) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#88]
 
-(99) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#82]
-Right keys [1]: [d_date_sk#84]
+(93) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#86]
+Right keys [1]: [d_date_sk#88]
 Join type: Inner
 Join condition: None
 
-(100) Project [codegen id : 4]
-Output [2]: [cs_quantity#80 AS quantity#85, cs_list_price#81 AS list_price#86]
-Input [4]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82, d_date_sk#84]
+(94) Project [codegen id : 4]
+Output [2]: [cs_quantity#84 AS quantity#89, cs_list_price#85 AS list_price#90]
+Input [4]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86, d_date_sk#88]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
+Output [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#89), dynamicpruningexpression(ws_sold_date_sk#89 IN dynamicpruning#90)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#93), dynamicpruningexpression(ws_sold_date_sk#93 IN dynamicpruning#94)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(102) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
+(96) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
 
-(103) ReusedExchange [Reuses operator id: 125]
-Output [1]: [d_date_sk#91]
+(97) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#95]
 
-(104) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#89]
-Right keys [1]: [d_date_sk#91]
+(98) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#93]
+Right keys [1]: [d_date_sk#95]
 Join type: Inner
 Join condition: None
 
-(105) Project [codegen id : 6]
-Output [2]: [ws_quantity#87 AS quantity#92, ws_list_price#88 AS list_price#93]
-Input [4]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89, d_date_sk#91]
+(99) Project [codegen id : 6]
+Output [2]: [ws_quantity#91 AS quantity#96, ws_list_price#92 AS list_price#97]
+Input [4]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93, d_date_sk#95]
 
-(106) Union
+(100) Union
 
-(107) HashAggregate [codegen id : 7]
-Input [2]: [quantity#78, list_price#79]
+(101) HashAggregate [codegen id : 7]
+Input [2]: [quantity#82, list_price#83]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
-Aggregate Attributes [2]: [sum#94, count#95]
-Results [2]: [sum#96, count#97]
+Functions [1]: [partial_avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
+Aggregate Attributes [2]: [sum#98, count#99]
+Results [2]: [sum#100, count#101]
 
-(108) RowToColumnar
-Input [2]: [sum#96, count#97]
+(102) Exchange
+Input [2]: [sum#100, count#101]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
 
-(109) CometColumnarExchange
-Input [2]: [sum#96, count#97]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
-
-(110) CometHashAggregate
-Input [2]: [sum#96, count#97]
+(103) HashAggregate [codegen id : 8]
+Input [2]: [sum#100, count#101]
 Keys: []
-Functions [1]: [avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
-
-(111) ColumnarToRow [codegen id : 8]
-Input [1]: [average_sales#98]
+Functions [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
+Aggregate Attributes [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102]
+Results [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102 AS average_sales#103]
 
-Subquery:2 Hosting operator id = 91 Hosting Expression = ss_sold_date_sk#75 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 85 Hosting Expression = ss_sold_date_sk#79 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 96 Hosting Expression = cs_sold_date_sk#82 IN dynamicpruning#12
+Subquery:3 Hosting operator id = 90 Hosting Expression = cs_sold_date_sk#86 IN dynamicpruning#12
 
-Subquery:4 Hosting operator id = 101 Hosting Expression = ws_sold_date_sk#89 IN dynamicpruning#12
+Subquery:4 Hosting operator id = 95 Hosting Expression = ws_sold_date_sk#93 IN dynamicpruning#12
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (116)
-+- * ColumnarToRow (115)
-   +- CometProject (114)
-      +- CometFilter (113)
-         +- CometScan parquet spark_catalog.default.date_dim (112)
+BroadcastExchange (108)
++- * ColumnarToRow (107)
+   +- CometProject (106)
+      +- CometFilter (105)
+         +- CometScan parquet spark_catalog.default.date_dim (104)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#42, d_week_seq#99]
+Output [2]: [d_date_sk#42, d_week_seq#104]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(113) CometFilter
-Input [2]: [d_date_sk#42, d_week_seq#99]
-Condition : ((isnotnull(d_week_seq#99) AND (d_week_seq#99 = Subquery scalar-subquery#100, [id=#101])) AND isnotnull(d_date_sk#42))
+(105) CometFilter
+Input [2]: [d_date_sk#42, d_week_seq#104]
+Condition : ((isnotnull(d_week_seq#104) AND (d_week_seq#104 = Subquery scalar-subquery#105, [id=#106])) AND isnotnull(d_date_sk#42))
 
-(114) CometProject
-Input [2]: [d_date_sk#42, d_week_seq#99]
+(106) CometProject
+Input [2]: [d_date_sk#42, d_week_seq#104]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(115) ColumnarToRow [codegen id : 1]
+(107) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(116) BroadcastExchange
+(108) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:6 Hosting operator id = 113 Hosting Expression = Subquery scalar-subquery#100, [id=#101]
-* ColumnarToRow (120)
-+- CometProject (119)
-   +- CometFilter (118)
-      +- CometScan parquet spark_catalog.default.date_dim (117)
+Subquery:6 Hosting operator id = 105 Hosting Expression = Subquery scalar-subquery#105, [id=#106]
+* ColumnarToRow (112)
++- CometProject (111)
+   +- CometFilter (110)
+      +- CometScan parquet spark_catalog.default.date_dim (109)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
+Output [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,2000), EqualTo(d_moy,12), EqualTo(d_dom,11)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(118) CometFilter
-Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
-Condition : (((((isnotnull(d_year#103) AND isnotnull(d_moy#104)) AND isnotnull(d_dom#105)) AND (d_year#103 = 2000)) AND (d_moy#104 = 12)) AND (d_dom#105 = 11))
+(110) CometFilter
+Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
+Condition : (((((isnotnull(d_year#108) AND isnotnull(d_moy#109)) AND isnotnull(d_dom#110)) AND (d_year#108 = 2000)) AND (d_moy#109 = 12)) AND (d_dom#110 = 11))
 
-(119) CometProject
-Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
-Arguments: [d_week_seq#102], [d_week_seq#102]
+(111) CometProject
+Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
+Arguments: [d_week_seq#107], [d_week_seq#107]
 
-(120) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#102]
+(112) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#107]
 
 Subquery:7 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (125)
-+- * ColumnarToRow (124)
-   +- CometProject (123)
-      +- CometFilter (122)
-         +- CometScan parquet spark_catalog.default.date_dim (121)
+BroadcastExchange (117)
++- * ColumnarToRow (116)
+   +- CometProject (115)
+      +- CometFilter (114)
+         +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#106]
+Output [2]: [d_date_sk#25, d_year#111]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1999), LessThanOrEqual(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(122) CometFilter
-Input [2]: [d_date_sk#25, d_year#106]
-Condition : (((isnotnull(d_year#106) AND (d_year#106 >= 1999)) AND (d_year#106 <= 2001)) AND isnotnull(d_date_sk#25))
+(114) CometFilter
+Input [2]: [d_date_sk#25, d_year#111]
+Condition : (((isnotnull(d_year#111) AND (d_year#111 >= 1999)) AND (d_year#111 <= 2001)) AND isnotnull(d_date_sk#25))
 
-(123) CometProject
-Input [2]: [d_date_sk#25, d_year#106]
+(115) CometProject
+Input [2]: [d_date_sk#25, d_year#111]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(124) ColumnarToRow [codegen id : 1]
+(116) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(125) BroadcastExchange
+(117) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
 Subquery:8 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:9 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:10 Hosting operator id = 86 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
+Subquery:10 Hosting operator id = 81 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
 
-Subquery:11 Hosting operator id = 71 Hosting Expression = ss_sold_date_sk#57 IN dynamicpruning#58
-BroadcastExchange (130)
-+- * ColumnarToRow (129)
-   +- CometProject (128)
-      +- CometFilter (127)
-         +- CometScan parquet spark_catalog.default.date_dim (126)
+Subquery:11 Hosting operator id = 67 Hosting Expression = ss_sold_date_sk#59 IN dynamicpruning#60
+BroadcastExchange (122)
++- * ColumnarToRow (121)
+   +- CometProject (120)
+      +- CometFilter (119)
+         +- CometScan parquet spark_catalog.default.date_dim (118)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#63, d_week_seq#107]
+Output [2]: [d_date_sk#65, d_week_seq#112]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(127) CometFilter
-Input [2]: [d_date_sk#63, d_week_seq#107]
-Condition : ((isnotnull(d_week_seq#107) AND (d_week_seq#107 = Subquery scalar-subquery#108, [id=#109])) AND isnotnull(d_date_sk#63))
+(119) CometFilter
+Input [2]: [d_date_sk#65, d_week_seq#112]
+Condition : ((isnotnull(d_week_seq#112) AND (d_week_seq#112 = Subquery scalar-subquery#113, [id=#114])) AND isnotnull(d_date_sk#65))
 
-(128) CometProject
-Input [2]: [d_date_sk#63, d_week_seq#107]
-Arguments: [d_date_sk#63], [d_date_sk#63]
+(120) CometProject
+Input [2]: [d_date_sk#65, d_week_seq#112]
+Arguments: [d_date_sk#65], [d_date_sk#65]
 
-(129) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#63]
+(121) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#65]
 
-(130) BroadcastExchange
-Input [1]: [d_date_sk#63]
+(122) BroadcastExchange
+Input [1]: [d_date_sk#65]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
-Subquery:12 Hosting operator id = 127 Hosting Expression = Subquery scalar-subquery#108, [id=#109]
-* ColumnarToRow (134)
-+- CometProject (133)
-   +- CometFilter (132)
-      +- CometScan parquet spark_catalog.default.date_dim (131)
+Subquery:12 Hosting operator id = 119 Hosting Expression = Subquery scalar-subquery#113, [id=#114]
+* ColumnarToRow (126)
++- CometProject (125)
+   +- CometFilter (124)
+      +- CometScan parquet spark_catalog.default.date_dim (123)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
+Output [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,1999), EqualTo(d_moy,12), EqualTo(d_dom,11)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(132) CometFilter
-Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
-Condition : (((((isnotnull(d_year#111) AND isnotnull(d_moy#112)) AND isnotnull(d_dom#113)) AND (d_year#111 = 1999)) AND (d_moy#112 = 12)) AND (d_dom#113 = 11))
+(124) CometFilter
+Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
+Condition : (((((isnotnull(d_year#116) AND isnotnull(d_moy#117)) AND isnotnull(d_dom#118)) AND (d_year#116 = 1999)) AND (d_moy#117 = 12)) AND (d_dom#118 = 11))
 
-(133) CometProject
-Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
-Arguments: [d_week_seq#110], [d_week_seq#110]
+(125) CometProject
+Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
+Arguments: [d_week_seq#115], [d_week_seq#115]
 
-(134) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#110]
+(126) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#115]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt
index 13ac319fbd..09d8d9dde3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q14b/simplified.txt
@@ -1,210 +1,202 @@
 TakeOrderedAndProject [i_brand_id,i_class_id,i_category_id,channel,sales,number_sales,channel,i_brand_id,i_class_id,i_category_id,sales,number_sales]
   WholeStageCodegen (52)
     BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-      ColumnarToRow
-        InputAdapter
-          CometFilter [sales]
-            Subquery #4
-              WholeStageCodegen (8)
-                ColumnarToRow
-                  InputAdapter
-                    CometHashAggregate [sum,count]
-                      CometColumnarExchange #12
-                        RowToColumnar
-                          WholeStageCodegen (7)
-                            HashAggregate [quantity,list_price] [sum,count,sum,count]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (2)
-                                    Project [ss_quantity,ss_list_price]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #6
-                                  WholeStageCodegen (4)
-                                    Project [cs_quantity,cs_list_price]
-                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #6
-                                  WholeStageCodegen (6)
-                                    Project [ws_quantity,ws_list_price]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #6
-            CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-              CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #1
-                RowToColumnar
-                  WholeStageCodegen (25)
-                    HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                      Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                          Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              BroadcastHashJoin [ss_item_sk,ss_item_sk]
+      Filter [sales]
+        Subquery #4
+          WholeStageCodegen (8)
+            HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
+              InputAdapter
+                Exchange #12
+                  WholeStageCodegen (7)
+                    HashAggregate [quantity,list_price] [sum,count,sum,count]
+                      InputAdapter
+                        Union
+                          WholeStageCodegen (2)
+                            Project [ss_quantity,ss_list_price]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_week_seq,d_date_sk]
-                                                      Subquery #2
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_week_seq]
-                                                                CometFilter [d_year,d_moy,d_dom]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #3
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #6
+                          WholeStageCodegen (4)
+                            Project [cs_quantity,cs_list_price]
+                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #3
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #6
+                          WholeStageCodegen (6)
+                            Project [ws_quantity,ws_list_price]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #3
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (11)
-                                      Project [i_item_sk]
-                                        BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                  ReusedExchange [d_date_sk] #6
+        HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+          InputAdapter
+            Exchange [i_brand_id,i_class_id,i_category_id] #1
+              WholeStageCodegen (25)
+                HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                  Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                      Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                          BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [i_brand_id,i_class_id,i_category_id]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                          InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (10)
-                                                BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometHashAggregate [brand_id,class_id,category_id]
-                                                        CometColumnarExchange [brand_id,class_id,category_id] #5
-                                                          RowToColumnar
-                                                            WholeStageCodegen (6)
-                                                              HashAggregate [brand_id,class_id,category_id]
-                                                                Project [i_brand_id,i_class_id,i_category_id]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_week_seq,d_date_sk]
+                                                  Subquery #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_week_seq]
+                                                            CometFilter [d_year,d_moy,d_dom]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                            InputAdapter
+                              BroadcastExchange #3
+                                WholeStageCodegen (11)
+                                  Project [i_item_sk]
+                                    BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_brand_id,i_class_id,i_category_id]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                      InputAdapter
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (10)
+                                            BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                              HashAggregate [brand_id,class_id,category_id]
+                                                InputAdapter
+                                                  Exchange [brand_id,class_id,category_id] #5
+                                                    WholeStageCodegen (6)
+                                                      HashAggregate [brand_id,class_id,category_id]
+                                                        Project [i_brand_id,i_class_id,i_category_id]
+                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                            Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [ss_item_sk]
+                                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                        SubqueryBroadcast [d_date_sk] #3
+                                                                          BroadcastExchange #6
+                                                                            WholeStageCodegen (1)
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometProject [d_date_sk]
+                                                                                    CometFilter [d_year,d_date_sk]
+                                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                InputAdapter
+                                                                  BroadcastExchange #7
+                                                                    WholeStageCodegen (4)
+                                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #3
-                                                                                  BroadcastExchange #6
-                                                                                    WholeStageCodegen (1)
+                                                                            CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                        InputAdapter
+                                                                          BroadcastExchange #8
+                                                                            WholeStageCodegen (3)
+                                                                              Project [i_brand_id,i_class_id,i_category_id]
+                                                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                                  Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                                                       ColumnarToRow
                                                                                         InputAdapter
-                                                                                          CometProject [d_date_sk]
-                                                                                            CometFilter [d_year,d_date_sk]
-                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #7
-                                                                            WholeStageCodegen (4)
-                                                                              BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                InputAdapter
-                                                                                  BroadcastExchange #8
-                                                                                    WholeStageCodegen (3)
-                                                                                      Project [i_brand_id,i_class_id,i_category_id]
-                                                                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                                          Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                            BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                                              ColumnarToRow
-                                                                                                InputAdapter
-                                                                                                  CometFilter [cs_item_sk]
-                                                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
-                                                                                                      ReusedSubquery [d_date_sk] #3
+                                                                                          CometFilter [cs_item_sk]
+                                                                                            CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                                                                              ReusedSubquery [d_date_sk] #3
+                                                                                      InputAdapter
+                                                                                        BroadcastExchange #9
+                                                                                          WholeStageCodegen (1)
+                                                                                            ColumnarToRow
                                                                                               InputAdapter
-                                                                                                BroadcastExchange #9
-                                                                                                  WholeStageCodegen (1)
-                                                                                                    ColumnarToRow
-                                                                                                      InputAdapter
-                                                                                                        CometFilter [i_item_sk]
-                                                                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                          InputAdapter
-                                                                                            ReusedExchange [d_date_sk] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk] #6
-                                                  InputAdapter
-                                                    BroadcastExchange #10
-                                                      WholeStageCodegen (9)
-                                                        Project [i_brand_id,i_class_id,i_category_id]
-                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                            Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                              BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [ws_item_sk]
-                                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                        ReusedSubquery [d_date_sk] #3
-                                                                InputAdapter
-                                                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
+                                                                                                CometFilter [i_item_sk]
+                                                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                  InputAdapter
+                                                                                    ReusedExchange [d_date_sk] #6
                                                             InputAdapter
                                                               ReusedExchange [d_date_sk] #6
-                              InputAdapter
-                                BroadcastExchange #11
-                                  WholeStageCodegen (23)
-                                    BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                      InputAdapter
-                                        ReusedExchange [ss_item_sk] #3
+                                              InputAdapter
+                                                BroadcastExchange #10
+                                                  WholeStageCodegen (9)
+                                                    Project [i_brand_id,i_class_id,i_category_id]
+                                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                        Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [ws_item_sk]
+                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                    ReusedSubquery [d_date_sk] #3
+                                                            InputAdapter
+                                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
+                                                        InputAdapter
+                                                          ReusedExchange [d_date_sk] #6
                           InputAdapter
-                            ReusedExchange [d_date_sk] #2
+                            BroadcastExchange #11
+                              WholeStageCodegen (23)
+                                BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                  InputAdapter
+                                    ReusedExchange [ss_item_sk] #3
+                      InputAdapter
+                        ReusedExchange [d_date_sk] #2
       InputAdapter
         BroadcastExchange #13
           WholeStageCodegen (51)
-            ColumnarToRow
-              InputAdapter
-                CometFilter [sales]
-                  ReusedSubquery [average_sales] #4
-                  CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                    CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #14
-                      RowToColumnar
-                        WholeStageCodegen (50)
-                          HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                            Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                    BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #5
-                                                BroadcastExchange #15
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_week_seq,d_date_sk]
-                                                            Subquery #6
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [d_week_seq]
-                                                                      CometFilter [d_year,d_moy,d_dom]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
-                                      InputAdapter
-                                        ReusedExchange [ss_item_sk] #3
+            Filter [sales]
+              ReusedSubquery [average_sales] #4
+              HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+                InputAdapter
+                  Exchange [i_brand_id,i_class_id,i_category_id] #14
+                    WholeStageCodegen (50)
+                      HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                        Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                  ColumnarToRow
                                     InputAdapter
-                                      ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
+                                      CometFilter [ss_item_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #5
+                                            BroadcastExchange #15
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_week_seq,d_date_sk]
+                                                        Subquery #6
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_week_seq]
+                                                                  CometFilter [d_year,d_moy,d_dom]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                  InputAdapter
+                                    ReusedExchange [ss_item_sk] #3
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #15
+                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #15
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt
index 135162ca9d..811a9eef51 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/explain.txt
@@ -1,28 +1,26 @@
 == Physical Plan ==
-* ColumnarToRow (24)
-+- CometTakeOrderedAndProject (23)
-   +- CometHashAggregate (22)
-      +- CometColumnarExchange (21)
-         +- RowToColumnar (20)
-            +- * HashAggregate (19)
-               +- * Project (18)
-                  +- * BroadcastHashJoin Inner BuildRight (17)
-                     :- * Project (15)
-                     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :- * Project (9)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :- * ColumnarToRow (3)
-                     :     :     :  +- CometFilter (2)
-                     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                     :     :     +- BroadcastExchange (7)
-                     :     :        +- * ColumnarToRow (6)
-                     :     :           +- CometFilter (5)
-                     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                     :     +- BroadcastExchange (13)
-                     :        +- * ColumnarToRow (12)
-                     :           +- CometFilter (11)
-                     :              +- CometScan parquet spark_catalog.default.customer_address (10)
-                     +- ReusedExchange (16)
+TakeOrderedAndProject (22)
++- * HashAggregate (21)
+   +- Exchange (20)
+      +- * HashAggregate (19)
+         +- * Project (18)
+            +- * BroadcastHashJoin Inner BuildRight (17)
+               :- * Project (15)
+               :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :- * Project (9)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :- * ColumnarToRow (3)
+               :     :     :  +- CometFilter (2)
+               :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :     :     +- BroadcastExchange (7)
+               :     :        +- * ColumnarToRow (6)
+               :     :           +- CometFilter (5)
+               :     :              +- CometScan parquet spark_catalog.default.customer (4)
+               :     +- BroadcastExchange (13)
+               :        +- * ColumnarToRow (12)
+               :           +- CometFilter (11)
+               :              +- CometScan parquet spark_catalog.default.customer_address (10)
+               +- ReusedExchange (16)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -96,7 +94,7 @@ Join condition: ((substr(ca_zip#9, 1, 5) IN (85669,86197,88274,83405,86475,85392
 Output [3]: [cs_sales_price#2, cs_sold_date_sk#3, ca_zip#9]
 Input [6]: [cs_sales_price#2, cs_sold_date_sk#3, c_current_addr_sk#6, ca_address_sk#7, ca_state#8, ca_zip#9]
 
-(16) ReusedExchange [Reuses operator id: 29]
+(16) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#10]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -116,54 +114,50 @@ Functions [1]: [partial_sum(UnscaledValue(cs_sales_price#2))]
 Aggregate Attributes [1]: [sum#11]
 Results [2]: [ca_zip#9, sum#12]
 
-(20) RowToColumnar
+(20) Exchange
 Input [2]: [ca_zip#9, sum#12]
+Arguments: hashpartitioning(ca_zip#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [2]: [ca_zip#9, sum#12]
-Arguments: hashpartitioning(ca_zip#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [2]: [ca_zip#9, sum#12]
 Keys [1]: [ca_zip#9]
 Functions [1]: [sum(UnscaledValue(cs_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#2))#13]
+Results [2]: [ca_zip#9, MakeDecimal(sum(UnscaledValue(cs_sales_price#2))#13,17,2) AS sum(cs_sales_price)#14]
 
-(23) CometTakeOrderedAndProject
-Input [2]: [ca_zip#9, sum(cs_sales_price)#13]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_zip#9 ASC NULLS FIRST], output=[ca_zip#9,sum(cs_sales_price)#13]), 100, [ca_zip#9 ASC NULLS FIRST], [ca_zip#9, sum(cs_sales_price)#13]
-
-(24) ColumnarToRow [codegen id : 5]
-Input [2]: [ca_zip#9, sum(cs_sales_price)#13]
+(22) TakeOrderedAndProject
+Input [2]: [ca_zip#9, sum(cs_sales_price)#14]
+Arguments: 100, [ca_zip#9 ASC NULLS FIRST], [ca_zip#9, sum(cs_sales_price)#14]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (29)
-+- * ColumnarToRow (28)
-   +- CometProject (27)
-      +- CometFilter (26)
-         +- CometScan parquet spark_catalog.default.date_dim (25)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#14, d_qoy#15]
+Output [3]: [d_date_sk#10, d_year#15, d_qoy#16]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(26) CometFilter
-Input [3]: [d_date_sk#10, d_year#14, d_qoy#15]
-Condition : ((((isnotnull(d_qoy#15) AND isnotnull(d_year#14)) AND (d_qoy#15 = 2)) AND (d_year#14 = 2001)) AND isnotnull(d_date_sk#10))
+(24) CometFilter
+Input [3]: [d_date_sk#10, d_year#15, d_qoy#16]
+Condition : ((((isnotnull(d_qoy#16) AND isnotnull(d_year#15)) AND (d_qoy#16 = 2)) AND (d_year#15 = 2001)) AND isnotnull(d_date_sk#10))
 
-(27) CometProject
-Input [3]: [d_date_sk#10, d_year#14, d_qoy#15]
+(25) CometProject
+Input [3]: [d_date_sk#10, d_year#15, d_qoy#16]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(28) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(29) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt
index 58d3742879..5c750b2db8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q15/simplified.txt
@@ -1,43 +1,41 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_zip,sum(cs_sales_price)]
-        CometHashAggregate [ca_zip,sum]
-          CometColumnarExchange [ca_zip] #1
-            RowToColumnar
-              WholeStageCodegen (4)
-                HashAggregate [ca_zip,cs_sales_price] [sum,sum]
-                  Project [cs_sales_price,ca_zip]
-                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                      Project [cs_sales_price,cs_sold_date_sk,ca_zip]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_zip,ca_state,cs_sales_price]
-                          Project [cs_sales_price,cs_sold_date_sk,c_current_addr_sk]
-                            BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [cs_bill_customer_sk]
-                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sales_price,cs_sold_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [d_date_sk]
-                                                  CometFilter [d_qoy,d_year,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                              InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_current_addr_sk]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+TakeOrderedAndProject [ca_zip,sum(cs_sales_price)]
+  WholeStageCodegen (5)
+    HashAggregate [ca_zip,sum] [sum(UnscaledValue(cs_sales_price)),sum(cs_sales_price),sum]
+      InputAdapter
+        Exchange [ca_zip] #1
+          WholeStageCodegen (4)
+            HashAggregate [ca_zip,cs_sales_price] [sum,sum]
+              Project [cs_sales_price,ca_zip]
+                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                  Project [cs_sales_price,cs_sold_date_sk,ca_zip]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_zip,ca_state,cs_sales_price]
+                      Project [cs_sales_price,cs_sold_date_sk,c_current_addr_sk]
+                        BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [cs_bill_customer_sk]
+                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sales_price,cs_sold_date_sk]
+                                  SubqueryBroadcast [d_date_sk] #1
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [d_date_sk]
+                                              CometFilter [d_qoy,d_year,d_date_sk]
+                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (2)
+                            BroadcastExchange #3
+                              WholeStageCodegen (1)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip]
+                                    CometFilter [c_customer_sk,c_current_addr_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                       InputAdapter
-                        ReusedExchange [d_date_sk] #2
+                        BroadcastExchange #4
+                          WholeStageCodegen (2)
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ca_address_sk]
+                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip]
+                  InputAdapter
+                    ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
index cb01af81df..1762c8c6c8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-* ColumnarToRow (47)
-+- CometHashAggregate (46)
-   +- CometColumnarExchange (45)
-      +- RowToColumnar (44)
-         +- * HashAggregate (43)
-            +- * HashAggregate (42)
-               +- * HashAggregate (41)
-                  +- * Project (40)
-                     +- * BroadcastHashJoin Inner BuildRight (39)
-                        :- * Project (33)
-                        :  +- * BroadcastHashJoin Inner BuildRight (32)
-                        :     :- * Project (26)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                        :     :     :- * SortMergeJoin LeftAnti (19)
-                        :     :     :  :- * Project (13)
-                        :     :     :  :  +- * SortMergeJoin LeftSemi (12)
-                        :     :     :  :     :- * ColumnarToRow (6)
-                        :     :     :  :     :  +- CometSort (5)
-                        :     :     :  :     :     +- CometColumnarExchange (4)
-                        :     :     :  :     :        +- CometProject (3)
-                        :     :     :  :     :           +- CometFilter (2)
-                        :     :     :  :     :              +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                        :     :     :  :     +- * ColumnarToRow (11)
-                        :     :     :  :        +- CometSort (10)
-                        :     :     :  :           +- CometColumnarExchange (9)
-                        :     :     :  :              +- CometProject (8)
-                        :     :     :  :                 +- CometScan parquet spark_catalog.default.catalog_sales (7)
-                        :     :     :  +- * ColumnarToRow (18)
-                        :     :     :     +- CometSort (17)
-                        :     :     :        +- CometColumnarExchange (16)
-                        :     :     :           +- CometProject (15)
-                        :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (14)
-                        :     :     +- BroadcastExchange (24)
-                        :     :        +- * ColumnarToRow (23)
-                        :     :           +- CometProject (22)
-                        :     :              +- CometFilter (21)
-                        :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
-                        :     +- BroadcastExchange (31)
-                        :        +- * ColumnarToRow (30)
-                        :           +- CometProject (29)
-                        :              +- CometFilter (28)
-                        :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-                        +- BroadcastExchange (38)
-                           +- * ColumnarToRow (37)
-                              +- CometProject (36)
-                                 +- CometFilter (35)
-                                    +- CometScan parquet spark_catalog.default.call_center (34)
+* HashAggregate (45)
++- Exchange (44)
+   +- * HashAggregate (43)
+      +- * HashAggregate (42)
+         +- * HashAggregate (41)
+            +- * Project (40)
+               +- * BroadcastHashJoin Inner BuildRight (39)
+                  :- * Project (33)
+                  :  +- * BroadcastHashJoin Inner BuildRight (32)
+                  :     :- * Project (26)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                  :     :     :- * SortMergeJoin LeftAnti (19)
+                  :     :     :  :- * Project (13)
+                  :     :     :  :  +- * SortMergeJoin LeftSemi (12)
+                  :     :     :  :     :- * ColumnarToRow (6)
+                  :     :     :  :     :  +- CometSort (5)
+                  :     :     :  :     :     +- CometExchange (4)
+                  :     :     :  :     :        +- CometProject (3)
+                  :     :     :  :     :           +- CometFilter (2)
+                  :     :     :  :     :              +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                  :     :     :  :     +- * ColumnarToRow (11)
+                  :     :     :  :        +- CometSort (10)
+                  :     :     :  :           +- CometExchange (9)
+                  :     :     :  :              +- CometProject (8)
+                  :     :     :  :                 +- CometScan parquet spark_catalog.default.catalog_sales (7)
+                  :     :     :  +- * ColumnarToRow (18)
+                  :     :     :     +- CometSort (17)
+                  :     :     :        +- CometExchange (16)
+                  :     :     :           +- CometProject (15)
+                  :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (14)
+                  :     :     +- BroadcastExchange (24)
+                  :     :        +- * ColumnarToRow (23)
+                  :     :           +- CometProject (22)
+                  :     :              +- CometFilter (21)
+                  :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
+                  :     +- BroadcastExchange (31)
+                  :        +- * ColumnarToRow (30)
+                  :           +- CometProject (29)
+                  :              +- CometFilter (28)
+                  :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+                  +- BroadcastExchange (38)
+                     +- * ColumnarToRow (37)
+                        +- CometProject (36)
+                           +- CometFilter (35)
+                              +- CometScan parquet spark_catalog.default.call_center (34)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -63,9 +61,9 @@ Condition : ((isnotnull(cs_ship_date_sk#1) AND isnotnull(cs_ship_addr_sk#2)) AND
 Input [8]: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7, cs_sold_date_sk#8]
 Arguments: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7], [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7]
 
-(4) CometColumnarExchange
+(4) CometExchange
 Input [7]: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7]
-Arguments: hashpartitioning(cs_order_number#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(cs_order_number#5, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (5) CometSort
 Input [7]: [cs_ship_date_sk#1, cs_ship_addr_sk#2, cs_call_center_sk#3, cs_warehouse_sk#4, cs_order_number#5, cs_ext_ship_cost#6, cs_net_profit#7]
@@ -84,9 +82,9 @@ ReadSchema: struct<cs_warehouse_sk:int,cs_order_number:int>
 Input [3]: [cs_warehouse_sk#9, cs_order_number#10, cs_sold_date_sk#11]
 Arguments: [cs_warehouse_sk#9, cs_order_number#10], [cs_warehouse_sk#9, cs_order_number#10]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [2]: [cs_warehouse_sk#9, cs_order_number#10]
-Arguments: hashpartitioning(cs_order_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(cs_order_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [cs_warehouse_sk#9, cs_order_number#10]
@@ -115,9 +113,9 @@ ReadSchema: struct<cr_order_number:int>
 Input [2]: [cr_order_number#12, cr_returned_date_sk#13]
 Arguments: [cr_order_number#12], [cr_order_number#12]
 
-(16) CometColumnarExchange
+(16) CometExchange
 Input [1]: [cr_order_number#12]
-Arguments: hashpartitioning(cr_order_number#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(cr_order_number#12, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
 (17) CometSort
 Input [1]: [cr_order_number#12]
@@ -249,18 +247,14 @@ Functions [3]: [merge_sum(UnscaledValue(cs_ext_ship_cost#6)), merge_sum(Unscaled
 Aggregate Attributes [3]: [sum(UnscaledValue(cs_ext_ship_cost#6))#20, sum(UnscaledValue(cs_net_profit#7))#21, count(cs_order_number#5)#24]
 Results [3]: [sum#22, sum#23, count#25]
 
-(44) RowToColumnar
+(44) Exchange
 Input [3]: [sum#22, sum#23, count#25]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(45) CometColumnarExchange
-Input [3]: [sum#22, sum#23, count#25]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(46) CometHashAggregate
+(45) HashAggregate [codegen id : 9]
 Input [3]: [sum#22, sum#23, count#25]
 Keys: []
 Functions [3]: [sum(UnscaledValue(cs_ext_ship_cost#6)), sum(UnscaledValue(cs_net_profit#7)), count(distinct cs_order_number#5)]
-
-(47) ColumnarToRow [codegen id : 9]
-Input [3]: [order count #26, total shipping cost #27, total net profit #28]
+Aggregate Attributes [3]: [sum(UnscaledValue(cs_ext_ship_cost#6))#20, sum(UnscaledValue(cs_net_profit#7))#21, count(cs_order_number#5)#24]
+Results [3]: [count(cs_order_number#5)#24 AS order count #26, MakeDecimal(sum(UnscaledValue(cs_ext_ship_cost#6))#20,17,2) AS total shipping cost #27, MakeDecimal(sum(UnscaledValue(cs_net_profit#7))#21,17,2) AS total net profit #28]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt
index eed6c6d22d..213726372e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q16/simplified.txt
@@ -1,70 +1,68 @@
 WholeStageCodegen (9)
-  ColumnarToRow
+  HashAggregate [sum,sum,count] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
     InputAdapter
-      CometHashAggregate [sum,sum,count]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (8)
-              HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),sum,sum,count,sum,sum,count]
-                HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
-                  HashAggregate [cs_order_number,cs_ext_ship_cost,cs_net_profit] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
-                    Project [cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                      BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
-                        Project [cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                          BroadcastHashJoin [cs_ship_addr_sk,ca_address_sk]
-                            Project [cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                              BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
-                                SortMergeJoin [cs_order_number,cr_order_number]
-                                  InputAdapter
-                                    WholeStageCodegen (3)
-                                      Project [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                                        SortMergeJoin [cs_order_number,cs_order_number,cs_warehouse_sk,cs_warehouse_sk]
-                                          InputAdapter
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometSort [cs_order_number]
-                                                    CometColumnarExchange [cs_order_number] #2
-                                                      CometProject [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
-                                                        CometFilter [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk]
-                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit,cs_sold_date_sk]
-                                          InputAdapter
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometSort [cs_order_number]
-                                                    CometColumnarExchange [cs_order_number] #3
-                                                      CometProject [cs_warehouse_sk,cs_order_number]
-                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_order_number,cs_sold_date_sk]
-                                  InputAdapter
-                                    WholeStageCodegen (4)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometSort [cr_order_number]
-                                            CometColumnarExchange [cr_order_number] #4
-                                              CometProject [cr_order_number]
-                                                CometScan parquet spark_catalog.default.catalog_returns [cr_order_number,cr_returned_date_sk]
-                                InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (5)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [d_date_sk]
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+      Exchange #1
+        WholeStageCodegen (8)
+          HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),count(cs_order_number),sum,sum,count,sum,sum,count]
+            HashAggregate [cs_order_number] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
+              HashAggregate [cs_order_number,cs_ext_ship_cost,cs_net_profit] [sum(UnscaledValue(cs_ext_ship_cost)),sum(UnscaledValue(cs_net_profit)),sum,sum,sum,sum]
+                Project [cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                  BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
+                    Project [cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                      BroadcastHashJoin [cs_ship_addr_sk,ca_address_sk]
+                        Project [cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                          BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
+                            SortMergeJoin [cs_order_number,cr_order_number]
+                              InputAdapter
+                                WholeStageCodegen (3)
+                                  Project [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                                    SortMergeJoin [cs_order_number,cs_order_number,cs_warehouse_sk,cs_warehouse_sk]
+                                      InputAdapter
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [cs_order_number]
+                                                CometExchange [cs_order_number] #2
+                                                  CometProject [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit]
+                                                    CometFilter [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk]
+                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_ship_addr_sk,cs_call_center_sk,cs_warehouse_sk,cs_order_number,cs_ext_ship_cost,cs_net_profit,cs_sold_date_sk]
+                                      InputAdapter
+                                        WholeStageCodegen (2)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [cs_order_number]
+                                                CometExchange [cs_order_number] #3
+                                                  CometProject [cs_warehouse_sk,cs_order_number]
+                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_order_number,cs_sold_date_sk]
+                              InputAdapter
+                                WholeStageCodegen (4)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometSort [cr_order_number]
+                                        CometExchange [cr_order_number] #4
+                                          CometProject [cr_order_number]
+                                            CometScan parquet spark_catalog.default.catalog_returns [cr_order_number,cr_returned_date_sk]
                             InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (6)
+                              BroadcastExchange #5
+                                WholeStageCodegen (5)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [ca_address_sk]
-                                        CometFilter [ca_state,ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                      CometProject [d_date_sk]
+                                        CometFilter [d_date,d_date_sk]
+                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (7)
+                          BroadcastExchange #6
+                            WholeStageCodegen (6)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [cc_call_center_sk]
-                                    CometFilter [cc_county,cc_call_center_sk]
-                                      CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_county]
+                                  CometProject [ca_address_sk]
+                                    CometFilter [ca_state,ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (7)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [cc_call_center_sk]
+                                CometFilter [cc_county,cc_call_center_sk]
+                                  CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_county]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt
index 759cb2384e..5e9b6d1da7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/explain.txt
@@ -1,46 +1,44 @@
 == Physical Plan ==
-TakeOrderedAndProject (42)
-+- * HashAggregate (41)
-   +- * ColumnarToRow (40)
-      +- CometColumnarExchange (39)
-         +- RowToColumnar (38)
-            +- * HashAggregate (37)
-               +- * Project (36)
-                  +- * BroadcastHashJoin Inner BuildRight (35)
-                     :- * Project (30)
-                     :  +- * BroadcastHashJoin Inner BuildRight (29)
-                     :     :- * Project (24)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (23)
-                     :     :     :- * Project (21)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :     :     :     :- * Project (18)
-                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                     :     :     :     :     :- * Project (15)
-                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :     :     :     :- * Project (9)
-                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :     :     :     :     :     +- BroadcastExchange (7)
-                     :     :     :     :     :     :        +- * ColumnarToRow (6)
-                     :     :     :     :     :     :           +- CometFilter (5)
-                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-                     :     :     :     :     :     +- BroadcastExchange (13)
-                     :     :     :     :     :        +- * ColumnarToRow (12)
-                     :     :     :     :     :           +- CometFilter (11)
-                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
-                     :     :     :     :     +- ReusedExchange (16)
-                     :     :     :     +- ReusedExchange (19)
-                     :     :     +- ReusedExchange (22)
-                     :     +- BroadcastExchange (28)
-                     :        +- * ColumnarToRow (27)
-                     :           +- CometFilter (26)
-                     :              +- CometScan parquet spark_catalog.default.store (25)
-                     +- BroadcastExchange (34)
-                        +- * ColumnarToRow (33)
-                           +- CometFilter (32)
-                              +- CometScan parquet spark_catalog.default.item (31)
+TakeOrderedAndProject (40)
++- * HashAggregate (39)
+   +- Exchange (38)
+      +- * HashAggregate (37)
+         +- * Project (36)
+            +- * BroadcastHashJoin Inner BuildRight (35)
+               :- * Project (30)
+               :  +- * BroadcastHashJoin Inner BuildRight (29)
+               :     :- * Project (24)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (23)
+               :     :     :- * Project (21)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :     :     :     :- * Project (18)
+               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+               :     :     :     :     :- * Project (15)
+               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :     :     :     :- * Project (9)
+               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :     :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :     :     :     :  +- CometFilter (2)
+               :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :     :     :     :     :     +- BroadcastExchange (7)
+               :     :     :     :     :     :        +- * ColumnarToRow (6)
+               :     :     :     :     :     :           +- CometFilter (5)
+               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+               :     :     :     :     :     +- BroadcastExchange (13)
+               :     :     :     :     :        +- * ColumnarToRow (12)
+               :     :     :     :     :           +- CometFilter (11)
+               :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
+               :     :     :     :     +- ReusedExchange (16)
+               :     :     :     +- ReusedExchange (19)
+               :     :     +- ReusedExchange (22)
+               :     +- BroadcastExchange (28)
+               :        +- * ColumnarToRow (27)
+               :           +- CometFilter (26)
+               :              +- CometScan parquet spark_catalog.default.store (25)
+               +- BroadcastExchange (34)
+                  +- * ColumnarToRow (33)
+                     +- CometFilter (32)
+                        +- CometScan parquet spark_catalog.default.item (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -116,7 +114,7 @@ Join condition: None
 Output [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [12]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_item_sk#8, sr_customer_sk#9, sr_return_quantity#11, sr_returned_date_sk#12, cs_bill_customer_sk#14, cs_item_sk#15, cs_quantity#16, cs_sold_date_sk#17]
 
-(16) ReusedExchange [Reuses operator id: 47]
+(16) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#19]
 
 (17) BroadcastHashJoin [codegen id : 8]
@@ -129,7 +127,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [9]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#19]
 
-(19) ReusedExchange [Reuses operator id: 52]
+(19) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#20]
 
 (20) BroadcastHashJoin [codegen id : 8]
@@ -142,7 +140,7 @@ Join condition: None
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, cs_quantity#16, cs_sold_date_sk#17]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#20]
 
-(22) ReusedExchange [Reuses operator id: 52]
+(22) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#21]
 
 (23) BroadcastHashJoin [codegen id : 8]
@@ -218,35 +216,29 @@ Functions [9]: [partial_count(ss_quantity#5), partial_avg(ss_quantity#5), partia
 Aggregate Attributes [18]: [count#27, sum#28, count#29, n#30, avg#31, m2#32, count#33, sum#34, count#35, n#36, avg#37, m2#38, count#39, sum#40, count#41, n#42, avg#43, m2#44]
 Results [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
 
-(38) RowToColumnar
+(38) Exchange
 Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
+Arguments: hashpartitioning(i_item_id#25, i_item_desc#26, s_state#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) CometColumnarExchange
-Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
-Arguments: hashpartitioning(i_item_id#25, i_item_desc#26, s_state#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(40) ColumnarToRow [codegen id : 9]
-Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
-
-(41) HashAggregate [codegen id : 9]
+(39) HashAggregate [codegen id : 9]
 Input [21]: [i_item_id#25, i_item_desc#26, s_state#23, count#45, sum#46, count#47, n#48, avg#49, m2#50, count#51, sum#52, count#53, n#54, avg#55, m2#56, count#57, sum#58, count#59, n#60, avg#61, m2#62]
 Keys [3]: [i_item_id#25, i_item_desc#26, s_state#23]
 Functions [9]: [count(ss_quantity#5), avg(ss_quantity#5), stddev_samp(cast(ss_quantity#5 as double)), count(sr_return_quantity#11), avg(sr_return_quantity#11), stddev_samp(cast(sr_return_quantity#11 as double)), count(cs_quantity#16), avg(cs_quantity#16), stddev_samp(cast(cs_quantity#16 as double))]
 Aggregate Attributes [9]: [count(ss_quantity#5)#63, avg(ss_quantity#5)#64, stddev_samp(cast(ss_quantity#5 as double))#65, count(sr_return_quantity#11)#66, avg(sr_return_quantity#11)#67, stddev_samp(cast(sr_return_quantity#11 as double))#68, count(cs_quantity#16)#69, avg(cs_quantity#16)#70, stddev_samp(cast(cs_quantity#16 as double))#71]
 Results [15]: [i_item_id#25, i_item_desc#26, s_state#23, count(ss_quantity#5)#63 AS store_sales_quantitycount#72, avg(ss_quantity#5)#64 AS store_sales_quantityave#73, stddev_samp(cast(ss_quantity#5 as double))#65 AS store_sales_quantitystdev#74, (stddev_samp(cast(ss_quantity#5 as double))#65 / avg(ss_quantity#5)#64) AS store_sales_quantitycov#75, count(sr_return_quantity#11)#66 AS as_store_returns_quantitycount#76, avg(sr_return_quantity#11)#67 AS as_store_returns_quantityave#77, stddev_samp(cast(sr_return_quantity#11 as double))#68 AS as_store_returns_quantitystdev#78, (stddev_samp(cast(sr_return_quantity#11 as double))#68 / avg(sr_return_quantity#11)#67) AS store_returns_quantitycov#79, count(cs_quantity#16)#69 AS catalog_sales_quantitycount#80, avg(cs_quantity#16)#70 AS catalog_sales_quantityave#81, (stddev_samp(cast(cs_quantity#16 as double))#71 / avg(cs_quantity#16)#70) AS catalog_sales_quantitystdev#82, (stddev_samp(cast(cs_quantity#16 as double))#71 / avg(cs_quantity#16)#70) AS catalog_sales_quantitycov#83]
 
-(42) TakeOrderedAndProject
+(40) TakeOrderedAndProject
 Input [15]: [i_item_id#25, i_item_desc#26, s_state#23, store_sales_quantitycount#72, store_sales_quantityave#73, store_sales_quantitystdev#74, store_sales_quantitycov#75, as_store_returns_quantitycount#76, as_store_returns_quantityave#77, as_store_returns_quantitystdev#78, store_returns_quantitycov#79, catalog_sales_quantitycount#80, catalog_sales_quantityave#81, catalog_sales_quantitystdev#82, catalog_sales_quantitycov#83]
 Arguments: 100, [i_item_id#25 ASC NULLS FIRST, i_item_desc#26 ASC NULLS FIRST, s_state#23 ASC NULLS FIRST], [i_item_id#25, i_item_desc#26, s_state#23, store_sales_quantitycount#72, store_sales_quantityave#73, store_sales_quantitystdev#74, store_sales_quantitycov#75, as_store_returns_quantitycount#76, as_store_returns_quantityave#77, as_store_returns_quantitystdev#78, store_returns_quantitycov#79, catalog_sales_quantitycount#80, catalog_sales_quantityave#81, catalog_sales_quantitystdev#82, catalog_sales_quantitycov#83]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (45)
++- * ColumnarToRow (44)
+   +- CometProject (43)
+      +- CometFilter (42)
+         +- CometScan parquet spark_catalog.default.date_dim (41)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -256,27 +248,27 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_quarter_name), EqualTo(d_quarter_name,2001Q1), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_quarter_name:string>
 
-(44) CometFilter
+(42) CometFilter
 Input [2]: [d_date_sk#19, d_quarter_name#84]
 Condition : ((isnotnull(d_quarter_name#84) AND (d_quarter_name#84 = 2001Q1)) AND isnotnull(d_date_sk#19))
 
-(45) CometProject
+(43) CometProject
 Input [2]: [d_date_sk#19, d_quarter_name#84]
 Arguments: [d_date_sk#19], [d_date_sk#19]
 
-(46) ColumnarToRow [codegen id : 1]
+(44) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#19]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [1]: [d_date_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (52)
-+- * ColumnarToRow (51)
-   +- CometProject (50)
-      +- CometFilter (49)
-         +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -286,18 +278,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_quarter_name, [2001Q1,2001Q2,2001Q3]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_quarter_name:string>
 
-(49) CometFilter
+(47) CometFilter
 Input [2]: [d_date_sk#20, d_quarter_name#85]
 Condition : (d_quarter_name#85 IN (2001Q1,2001Q2,2001Q3) AND isnotnull(d_date_sk#20))
 
-(50) CometProject
+(48) CometProject
 Input [2]: [d_date_sk#20, d_quarter_name#85]
 Arguments: [d_date_sk#20], [d_date_sk#20]
 
-(51) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#20]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt
index 13d7ab8775..9f4d67decc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q17/simplified.txt
@@ -1,78 +1,76 @@
 TakeOrderedAndProject [i_item_id,i_item_desc,s_state,store_sales_quantitycount,store_sales_quantityave,store_sales_quantitystdev,store_sales_quantitycov,as_store_returns_quantitycount,as_store_returns_quantityave,as_store_returns_quantitystdev,store_returns_quantitycov,catalog_sales_quantitycount,catalog_sales_quantityave,catalog_sales_quantitystdev,catalog_sales_quantitycov]
   WholeStageCodegen (9)
     HashAggregate [i_item_id,i_item_desc,s_state,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2] [count(ss_quantity),avg(ss_quantity),stddev_samp(cast(ss_quantity as double)),count(sr_return_quantity),avg(sr_return_quantity),stddev_samp(cast(sr_return_quantity as double)),count(cs_quantity),avg(cs_quantity),stddev_samp(cast(cs_quantity as double)),store_sales_quantitycount,store_sales_quantityave,store_sales_quantitystdev,store_sales_quantitycov,as_store_returns_quantitycount,as_store_returns_quantityave,as_store_returns_quantitystdev,store_returns_quantitycov,catalog_sales_quantitycount,catalog_sales_quantityave,catalog_sales_quantitystdev,catalog_sales_quantitycov,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2]
-      ColumnarToRow
-        InputAdapter
-          CometColumnarExchange [i_item_id,i_item_desc,s_state] #1
-            RowToColumnar
-              WholeStageCodegen (8)
-                HashAggregate [i_item_id,i_item_desc,s_state,ss_quantity,sr_return_quantity,cs_quantity] [count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2]
-                  Project [ss_quantity,sr_return_quantity,cs_quantity,s_state,i_item_id,i_item_desc]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_state]
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
-                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
-                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                  Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                        BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
-                                          Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
-                                            BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #2
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_quarter_name,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
-                                              InputAdapter
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #2
-                                                              BroadcastExchange #4
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_quarter_name,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
+      InputAdapter
+        Exchange [i_item_id,i_item_desc,s_state] #1
+          WholeStageCodegen (8)
+            HashAggregate [i_item_id,i_item_desc,s_state,ss_quantity,sr_return_quantity,cs_quantity] [count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2,count,sum,count,n,avg,m2]
+              Project [ss_quantity,sr_return_quantity,cs_quantity,s_state,i_item_id,i_item_desc]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_state]
+                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                      Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
+                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
+                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                    BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
+                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
+                                        BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #2
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_quarter_name,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
                                           InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (2)
+                                            BroadcastExchange #3
+                                              WholeStageCodegen (1)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [cs_bill_customer_sk,cs_item_sk]
-                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #2
+                                                    CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #2
+                                                          BroadcastExchange #4
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometProject [d_date_sk]
+                                                                    CometFilter [d_quarter_name,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_quarter_name]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #2
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (2)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #2
                                   InputAdapter
-                                    ReusedExchange [d_date_sk] #4
+                                    ReusedExchange [d_date_sk] #2
                               InputAdapter
                                 ReusedExchange [d_date_sk] #4
                           InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (6)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [s_store_sk]
-                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                            ReusedExchange [d_date_sk] #4
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (7)
+                        BroadcastExchange #6
+                          WholeStageCodegen (6)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
+                                CometFilter [s_store_sk]
+                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                  InputAdapter
+                    BroadcastExchange #7
+                      WholeStageCodegen (7)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [i_item_sk]
+                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt
index 159a82afde..613377a61a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/explain.txt
@@ -1,49 +1,47 @@
 == Physical Plan ==
-* ColumnarToRow (45)
-+- CometTakeOrderedAndProject (44)
-   +- CometHashAggregate (43)
-      +- CometColumnarExchange (42)
-         +- RowToColumnar (41)
-            +- * HashAggregate (40)
-               +- * Expand (39)
-                  +- * Project (38)
-                     +- * BroadcastHashJoin Inner BuildRight (37)
-                        :- * Project (32)
-                        :  +- * BroadcastHashJoin Inner BuildRight (31)
-                        :     :- * Project (29)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (28)
-                        :     :     :- * Project (23)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
-                        :     :     :     :- * Project (17)
-                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-                        :     :     :     :     :- * Project (10)
-                        :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                        :     :     :     :     :     :- * ColumnarToRow (3)
-                        :     :     :     :     :     :  +- CometFilter (2)
-                        :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                        :     :     :     :     :     +- BroadcastExchange (8)
-                        :     :     :     :     :        +- * ColumnarToRow (7)
-                        :     :     :     :     :           +- CometProject (6)
-                        :     :     :     :     :              +- CometFilter (5)
-                        :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-                        :     :     :     :     +- BroadcastExchange (15)
-                        :     :     :     :        +- * ColumnarToRow (14)
-                        :     :     :     :           +- CometProject (13)
-                        :     :     :     :              +- CometFilter (12)
-                        :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
-                        :     :     :     +- BroadcastExchange (21)
-                        :     :     :        +- * ColumnarToRow (20)
-                        :     :     :           +- CometFilter (19)
-                        :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
-                        :     :     +- BroadcastExchange (27)
-                        :     :        +- * ColumnarToRow (26)
-                        :     :           +- CometFilter (25)
-                        :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
-                        :     +- ReusedExchange (30)
-                        +- BroadcastExchange (36)
-                           +- * ColumnarToRow (35)
-                              +- CometFilter (34)
-                                 +- CometScan parquet spark_catalog.default.item (33)
+TakeOrderedAndProject (43)
++- * HashAggregate (42)
+   +- Exchange (41)
+      +- * HashAggregate (40)
+         +- * Expand (39)
+            +- * Project (38)
+               +- * BroadcastHashJoin Inner BuildRight (37)
+                  :- * Project (32)
+                  :  +- * BroadcastHashJoin Inner BuildRight (31)
+                  :     :- * Project (29)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (28)
+                  :     :     :- * Project (23)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
+                  :     :     :     :- * Project (17)
+                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+                  :     :     :     :     :- * Project (10)
+                  :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                  :     :     :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                  :     :     :     :     :     +- BroadcastExchange (8)
+                  :     :     :     :     :        +- * ColumnarToRow (7)
+                  :     :     :     :     :           +- CometProject (6)
+                  :     :     :     :     :              +- CometFilter (5)
+                  :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+                  :     :     :     :     +- BroadcastExchange (15)
+                  :     :     :     :        +- * ColumnarToRow (14)
+                  :     :     :     :           +- CometProject (13)
+                  :     :     :     :              +- CometFilter (12)
+                  :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
+                  :     :     :     +- BroadcastExchange (21)
+                  :     :     :        +- * ColumnarToRow (20)
+                  :     :     :           +- CometFilter (19)
+                  :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
+                  :     :     +- BroadcastExchange (27)
+                  :     :        +- * ColumnarToRow (26)
+                  :     :           +- CometFilter (25)
+                  :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
+                  :     +- ReusedExchange (30)
+                  +- BroadcastExchange (36)
+                     +- * ColumnarToRow (35)
+                        +- CometFilter (34)
+                           +- CometScan parquet spark_catalog.default.item (33)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -181,7 +179,7 @@ Join condition: None
 Output [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_county#22, ca_state#23, ca_country#24]
 Input [14]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_county#22, ca_state#23, ca_country#24]
 
-(30) ReusedExchange [Reuses operator id: 50]
+(30) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 7]
@@ -233,54 +231,50 @@ Functions [7]: [partial_avg(cast(cs_quantity#4 as decimal(12,2))), partial_avg(c
 Aggregate Attributes [14]: [sum#33, count#34, sum#35, count#36, sum#37, count#38, sum#39, count#40, sum#41, count#42, sum#43, count#44, sum#45, count#46]
 Results [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
 
-(41) RowToColumnar
+(41) Exchange
 Input [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
+Arguments: hashpartitioning(i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(42) CometColumnarExchange
-Input [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
-Arguments: hashpartitioning(i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(43) CometHashAggregate
+(42) HashAggregate [codegen id : 8]
 Input [19]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32, sum#47, count#48, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60]
 Keys [5]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, spark_grouping_id#32]
 Functions [7]: [avg(cast(cs_quantity#4 as decimal(12,2))), avg(cast(cs_list_price#5 as decimal(12,2))), avg(cast(cs_coupon_amt#7 as decimal(12,2))), avg(cast(cs_sales_price#6 as decimal(12,2))), avg(cast(cs_net_profit#8 as decimal(12,2))), avg(cast(c_birth_year#19 as decimal(12,2))), avg(cast(cd_dep_count#14 as decimal(12,2)))]
+Aggregate Attributes [7]: [avg(cast(cs_quantity#4 as decimal(12,2)))#61, avg(cast(cs_list_price#5 as decimal(12,2)))#62, avg(cast(cs_coupon_amt#7 as decimal(12,2)))#63, avg(cast(cs_sales_price#6 as decimal(12,2)))#64, avg(cast(cs_net_profit#8 as decimal(12,2)))#65, avg(cast(c_birth_year#19 as decimal(12,2)))#66, avg(cast(cd_dep_count#14 as decimal(12,2)))#67]
+Results [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, avg(cast(cs_quantity#4 as decimal(12,2)))#61 AS agg1#68, avg(cast(cs_list_price#5 as decimal(12,2)))#62 AS agg2#69, avg(cast(cs_coupon_amt#7 as decimal(12,2)))#63 AS agg3#70, avg(cast(cs_sales_price#6 as decimal(12,2)))#64 AS agg4#71, avg(cast(cs_net_profit#8 as decimal(12,2)))#65 AS agg5#72, avg(cast(c_birth_year#19 as decimal(12,2)))#66 AS agg6#73, avg(cast(cd_dep_count#14 as decimal(12,2)))#67 AS agg7#74]
 
-(44) CometTakeOrderedAndProject
-Input [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#61, agg2#62, agg3#63, agg4#64, agg5#65, agg6#66, agg7#67]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_country#29 ASC NULLS FIRST,ca_state#30 ASC NULLS FIRST,ca_county#31 ASC NULLS FIRST,i_item_id#28 ASC NULLS FIRST], output=[i_item_id#28,ca_country#29,ca_state#30,ca_county#31,agg1#61,agg2#62,agg3#63,agg4#64,agg5#65,agg6#66,agg7#67]), 100, [ca_country#29 ASC NULLS FIRST, ca_state#30 ASC NULLS FIRST, ca_county#31 ASC NULLS FIRST, i_item_id#28 ASC NULLS FIRST], [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#61, agg2#62, agg3#63, agg4#64, agg5#65, agg6#66, agg7#67]
-
-(45) ColumnarToRow [codegen id : 8]
-Input [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#61, agg2#62, agg3#63, agg4#64, agg5#65, agg6#66, agg7#67]
+(43) TakeOrderedAndProject
+Input [11]: [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#68, agg2#69, agg3#70, agg4#71, agg5#72, agg6#73, agg7#74]
+Arguments: 100, [ca_country#29 ASC NULLS FIRST, ca_state#30 ASC NULLS FIRST, ca_county#31 ASC NULLS FIRST, i_item_id#28 ASC NULLS FIRST], [i_item_id#28, ca_country#29, ca_state#30, ca_county#31, agg1#68, agg2#69, agg3#70, agg4#71, agg5#72, agg6#73, agg7#74]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#68]
+Output [2]: [d_date_sk#25, d_year#75]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(47) CometFilter
-Input [2]: [d_date_sk#25, d_year#68]
-Condition : ((isnotnull(d_year#68) AND (d_year#68 = 1998)) AND isnotnull(d_date_sk#25))
+(45) CometFilter
+Input [2]: [d_date_sk#25, d_year#75]
+Condition : ((isnotnull(d_year#75) AND (d_year#75 = 1998)) AND isnotnull(d_date_sk#25))
 
-(48) CometProject
-Input [2]: [d_date_sk#25, d_year#68]
+(46) CometProject
+Input [2]: [d_date_sk#25, d_year#75]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(49) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(50) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt
index 0f94dd57c4..47911b9ba3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q18/simplified.txt
@@ -1,73 +1,71 @@
-WholeStageCodegen (8)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
-        CometHashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-          CometColumnarExchange [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (7)
-                HashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                  Expand [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
-                    Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #2
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                            InputAdapter
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [cd_demo_sk,cd_dep_count]
-                                                        CometFilter [cd_gender,cd_education_status,cd_demo_sk]
-                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
+TakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
+  WholeStageCodegen (8)
+    HashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(cast(cs_quantity as decimal(12,2))),avg(cast(cs_list_price as decimal(12,2))),avg(cast(cs_coupon_amt as decimal(12,2))),avg(cast(cs_sales_price as decimal(12,2))),avg(cast(cs_net_profit as decimal(12,2))),avg(cast(c_birth_year as decimal(12,2))),avg(cast(cd_dep_count as decimal(12,2))),agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+      InputAdapter
+        Exchange [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id] #1
+          WholeStageCodegen (7)
+            HashAggregate [i_item_id,ca_country,ca_state,ca_county,spark_grouping_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+              Expand [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
+                Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,i_item_id,ca_country,ca_state,ca_county]
+                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                         InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
+                                          BroadcastExchange #3
+                                            WholeStageCodegen (1)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                                    CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
+                                                  CometProject [cd_demo_sk,cd_dep_count]
+                                                    CometFilter [cd_gender,cd_education_status,cd_demo_sk]
+                                                      CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
                                     InputAdapter
-                                      BroadcastExchange #5
-                                        WholeStageCodegen (3)
+                                      BroadcastExchange #4
+                                        WholeStageCodegen (2)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [cd_demo_sk]
-                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
+                                              CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                                CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
                                 InputAdapter
-                                  BroadcastExchange #6
-                                    WholeStageCodegen (4)
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (3)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [ca_state,ca_address_sk]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
+                                          CometFilter [cd_demo_sk]
+                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #6
+                                WholeStageCodegen (4)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ca_state,ca_address_sk]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (6)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                          ReusedExchange [d_date_sk] #2
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (6)
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt
index 5f4b64a18d..1150b3d665 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/explain.txt
@@ -1,45 +1,43 @@
 == Physical Plan ==
-* ColumnarToRow (41)
-+- CometTakeOrderedAndProject (40)
-   +- CometHashAggregate (39)
-      +- CometColumnarExchange (38)
-         +- RowToColumnar (37)
-            +- * HashAggregate (36)
-               +- * Project (35)
-                  +- * BroadcastHashJoin Inner BuildRight (34)
-                     :- * Project (29)
-                     :  +- * BroadcastHashJoin Inner BuildRight (28)
-                     :     :- * Project (23)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
-                     :     :     :- * Project (17)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-                     :     :     :     :- * Project (10)
-                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :     :     :     :- * ColumnarToRow (4)
-                     :     :     :     :     :  +- CometProject (3)
-                     :     :     :     :     :     +- CometFilter (2)
-                     :     :     :     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-                     :     :     :     :     +- BroadcastExchange (8)
-                     :     :     :     :        +- * ColumnarToRow (7)
-                     :     :     :     :           +- CometFilter (6)
-                     :     :     :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                     :     :     :     +- BroadcastExchange (15)
-                     :     :     :        +- * ColumnarToRow (14)
-                     :     :     :           +- CometProject (13)
-                     :     :     :              +- CometFilter (12)
-                     :     :     :                 +- CometScan parquet spark_catalog.default.item (11)
-                     :     :     +- BroadcastExchange (21)
-                     :     :        +- * ColumnarToRow (20)
-                     :     :           +- CometFilter (19)
-                     :     :              +- CometScan parquet spark_catalog.default.customer (18)
-                     :     +- BroadcastExchange (27)
-                     :        +- * ColumnarToRow (26)
-                     :           +- CometFilter (25)
-                     :              +- CometScan parquet spark_catalog.default.customer_address (24)
-                     +- BroadcastExchange (33)
-                        +- * ColumnarToRow (32)
-                           +- CometFilter (31)
-                              +- CometScan parquet spark_catalog.default.store (30)
+TakeOrderedAndProject (39)
++- * HashAggregate (38)
+   +- Exchange (37)
+      +- * HashAggregate (36)
+         +- * Project (35)
+            +- * BroadcastHashJoin Inner BuildRight (34)
+               :- * Project (29)
+               :  +- * BroadcastHashJoin Inner BuildRight (28)
+               :     :- * Project (23)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (22)
+               :     :     :- * Project (17)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+               :     :     :     :- * Project (10)
+               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :     :     :     :- * ColumnarToRow (4)
+               :     :     :     :     :  +- CometProject (3)
+               :     :     :     :     :     +- CometFilter (2)
+               :     :     :     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+               :     :     :     :     +- BroadcastExchange (8)
+               :     :     :     :        +- * ColumnarToRow (7)
+               :     :     :     :           +- CometFilter (6)
+               :     :     :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+               :     :     :     +- BroadcastExchange (15)
+               :     :     :        +- * ColumnarToRow (14)
+               :     :     :           +- CometProject (13)
+               :     :     :              +- CometFilter (12)
+               :     :     :                 +- CometScan parquet spark_catalog.default.item (11)
+               :     :     +- BroadcastExchange (21)
+               :     :        +- * ColumnarToRow (20)
+               :     :           +- CometFilter (19)
+               :     :              +- CometScan parquet spark_catalog.default.customer (18)
+               :     +- BroadcastExchange (27)
+               :        +- * ColumnarToRow (26)
+               :           +- CometFilter (25)
+               :              +- CometScan parquet spark_catalog.default.customer_address (24)
+               +- BroadcastExchange (33)
+                  +- * ColumnarToRow (32)
+                     +- CometFilter (31)
+                        +- CometScan parquet spark_catalog.default.store (30)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -212,22 +210,18 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#7))]
 Aggregate Attributes [1]: [sum#21]
 Results [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
 
-(37) RowToColumnar
+(37) Exchange
 Input [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
+Arguments: hashpartitioning(i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(38) CometColumnarExchange
-Input [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
-Arguments: hashpartitioning(i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(39) CometHashAggregate
+(38) HashAggregate [codegen id : 7]
 Input [5]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13, sum#22]
 Keys [4]: [i_brand#11, i_brand_id#10, i_manufact_id#12, i_manufact#13]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#7))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#7))#23]
+Results [5]: [i_brand_id#10 AS brand_id#24, i_brand#11 AS brand#25, i_manufact_id#12, i_manufact#13, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#7))#23,17,2) AS ext_price#26]
 
-(40) CometTakeOrderedAndProject
-Input [5]: [brand_id#23, brand#24, i_manufact_id#12, i_manufact#13, ext_price#25]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ext_price#25 DESC NULLS LAST,brand#24 ASC NULLS FIRST,brand_id#23 ASC NULLS FIRST,i_manufact_id#12 ASC NULLS FIRST,i_manufact#13 ASC NULLS FIRST], output=[brand_id#23,brand#24,i_manufact_id#12,i_manufact#13,ext_price#25]), 100, [ext_price#25 DESC NULLS LAST, brand#24 ASC NULLS FIRST, brand_id#23 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST, i_manufact#13 ASC NULLS FIRST], [brand_id#23, brand#24, i_manufact_id#12, i_manufact#13, ext_price#25]
-
-(41) ColumnarToRow [codegen id : 7]
-Input [5]: [brand_id#23, brand#24, i_manufact_id#12, i_manufact#13, ext_price#25]
+(39) TakeOrderedAndProject
+Input [5]: [brand_id#24, brand#25, i_manufact_id#12, i_manufact#13, ext_price#26]
+Arguments: 100, [ext_price#26 DESC NULLS LAST, brand#25 ASC NULLS FIRST, brand_id#24 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST, i_manufact#13 ASC NULLS FIRST], [brand_id#24, brand#25, i_manufact_id#12, i_manufact#13, ext_price#26]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt
index 5b9f4956e5..c2f5d1a876 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q19/simplified.txt
@@ -1,60 +1,58 @@
-WholeStageCodegen (7)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ext_price,brand,brand_id,i_manufact_id,i_manufact]
-        CometHashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,sum]
-          CometColumnarExchange [i_brand,i_brand_id,i_manufact_id,i_manufact] #1
-            RowToColumnar
-              WholeStageCodegen (6)
-                HashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,ss_ext_sales_price] [sum,sum]
-                  Project [ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
-                    BroadcastHashJoin [ss_store_sk,s_store_sk,ca_zip,s_zip]
-                      Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,ca_zip]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,c_current_addr_sk]
-                            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                              Project [ss_customer_sk,ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
-                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                  Project [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [d_date_sk]
-                                            CometFilter [d_moy,d_year,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_item_sk,ss_customer_sk,ss_store_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
+TakeOrderedAndProject [ext_price,brand,brand_id,i_manufact_id,i_manufact]
+  WholeStageCodegen (7)
+    HashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,ext_price,sum]
+      InputAdapter
+        Exchange [i_brand,i_brand_id,i_manufact_id,i_manufact] #1
+          WholeStageCodegen (6)
+            HashAggregate [i_brand,i_brand_id,i_manufact_id,i_manufact,ss_ext_sales_price] [sum,sum]
+              Project [ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
+                BroadcastHashJoin [ss_store_sk,s_store_sk,ca_zip,s_zip]
+                  Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,ca_zip]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact,c_current_addr_sk]
+                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                          Project [ss_customer_sk,ss_store_sk,ss_ext_sales_price,i_brand_id,i_brand,i_manufact_id,i_manufact]
+                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                              Project [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price]
+                                BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [d_date_sk]
+                                        CometFilter [d_moy,d_year,d_date_sk]
+                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                   InputAdapter
-                                    BroadcastExchange #3
-                                      WholeStageCodegen (2)
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact]
-                                              CometFilter [i_manager_id,i_item_sk]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact,i_manager_id]
+                                            CometFilter [ss_item_sk,ss_customer_sk,ss_store_sk]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
                               InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (3)
+                                BroadcastExchange #3
+                                  WholeStageCodegen (2)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [c_customer_sk,c_current_addr_sk]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                        CometProject [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact]
+                                          CometFilter [i_manager_id,i_item_sk]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id,i_manufact,i_manager_id]
                           InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (4)
+                            BroadcastExchange #4
+                              WholeStageCodegen (3)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [ca_address_sk,ca_zip]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
+                                    CometFilter [c_customer_sk,c_current_addr_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (5)
+                        BroadcastExchange #5
+                          WholeStageCodegen (4)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [s_zip,s_store_sk]
-                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_zip]
+                                CometFilter [ca_address_sk,ca_zip]
+                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
+                  InputAdapter
+                    BroadcastExchange #6
+                      WholeStageCodegen (5)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [s_zip,s_store_sk]
+                              CometScan parquet spark_catalog.default.store [s_store_sk,s_zip]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt
index 7974fb4eeb..2fea53fa79 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/explain.txt
@@ -1,45 +1,40 @@
 == Physical Plan ==
-* ColumnarToRow (41)
-+- CometSort (40)
-   +- CometColumnarExchange (39)
-      +- RowToColumnar (38)
-         +- * Project (37)
-            +- * BroadcastHashJoin Inner BuildRight (36)
-               :- * Project (24)
-               :  +- * BroadcastHashJoin Inner BuildRight (23)
-               :     :- * ColumnarToRow (17)
-               :     :  +- CometHashAggregate (16)
-               :     :     +- CometColumnarExchange (15)
-               :     :        +- RowToColumnar (14)
-               :     :           +- * HashAggregate (13)
-               :     :              +- * Project (12)
-               :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
-               :     :                    :- * ColumnarToRow (6)
-               :     :                    :  +- CometUnion (5)
-               :     :                    :     :- CometProject (2)
-               :     :                    :     :  +- CometScan parquet spark_catalog.default.web_sales (1)
-               :     :                    :     +- CometProject (4)
-               :     :                    :        +- CometScan parquet spark_catalog.default.catalog_sales (3)
-               :     :                    +- BroadcastExchange (10)
-               :     :                       +- * ColumnarToRow (9)
-               :     :                          +- CometFilter (8)
-               :     :                             +- CometScan parquet spark_catalog.default.date_dim (7)
-               :     +- BroadcastExchange (22)
-               :        +- * ColumnarToRow (21)
-               :           +- CometProject (20)
-               :              +- CometFilter (19)
-               :                 +- CometScan parquet spark_catalog.default.date_dim (18)
-               +- BroadcastExchange (35)
-                  +- * Project (34)
-                     +- * BroadcastHashJoin Inner BuildRight (33)
-                        :- * ColumnarToRow (27)
-                        :  +- CometHashAggregate (26)
-                        :     +- ReusedExchange (25)
-                        +- BroadcastExchange (32)
-                           +- * ColumnarToRow (31)
-                              +- CometProject (30)
-                                 +- CometFilter (29)
-                                    +- CometScan parquet spark_catalog.default.date_dim (28)
+* Sort (36)
++- Exchange (35)
+   +- * Project (34)
+      +- * BroadcastHashJoin Inner BuildRight (33)
+         :- * Project (22)
+         :  +- * BroadcastHashJoin Inner BuildRight (21)
+         :     :- * HashAggregate (15)
+         :     :  +- Exchange (14)
+         :     :     +- * HashAggregate (13)
+         :     :        +- * Project (12)
+         :     :           +- * BroadcastHashJoin Inner BuildRight (11)
+         :     :              :- * ColumnarToRow (6)
+         :     :              :  +- CometUnion (5)
+         :     :              :     :- CometProject (2)
+         :     :              :     :  +- CometScan parquet spark_catalog.default.web_sales (1)
+         :     :              :     +- CometProject (4)
+         :     :              :        +- CometScan parquet spark_catalog.default.catalog_sales (3)
+         :     :              +- BroadcastExchange (10)
+         :     :                 +- * ColumnarToRow (9)
+         :     :                    +- CometFilter (8)
+         :     :                       +- CometScan parquet spark_catalog.default.date_dim (7)
+         :     +- BroadcastExchange (20)
+         :        +- * ColumnarToRow (19)
+         :           +- CometProject (18)
+         :              +- CometFilter (17)
+         :                 +- CometScan parquet spark_catalog.default.date_dim (16)
+         +- BroadcastExchange (32)
+            +- * Project (31)
+               +- * BroadcastHashJoin Inner BuildRight (30)
+                  :- * HashAggregate (24)
+                  :  +- ReusedExchange (23)
+                  +- BroadcastExchange (29)
+                     +- * ColumnarToRow (28)
+                        +- CometProject (27)
+                           +- CometFilter (26)
+                              +- CometScan parquet spark_catalog.default.date_dim (25)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -106,121 +101,110 @@ Functions [7]: [partial_sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   )
 Aggregate Attributes [7]: [sum#12, sum#13, sum#14, sum#15, sum#16, sum#17, sum#18]
 Results [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
 
-(14) RowToColumnar
+(14) Exchange
 Input [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
+Arguments: hashpartitioning(d_week_seq#10, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
-Arguments: hashpartitioning(d_week_seq#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 8]
 Input [8]: [d_week_seq#10, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24, sum#25]
 Keys [1]: [d_week_seq#10]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))]
-
-(17) ColumnarToRow [codegen id : 8]
-Input [8]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32]
+Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32]
+Results [8]: [d_week_seq#10, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26,17,2) AS sun_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27,17,2) AS mon_sales#34, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28,17,2) AS tue_sales#35, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29,17,2) AS wed_sales#36, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30,17,2) AS thu_sales#37, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31,17,2) AS fri_sales#38, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32,17,2) AS sat_sales#39]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_week_seq#33, d_year#34]
+Output [2]: [d_week_seq#40, d_year#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_week_seq:int,d_year:int>
 
-(19) CometFilter
-Input [2]: [d_week_seq#33, d_year#34]
-Condition : ((isnotnull(d_year#34) AND (d_year#34 = 2001)) AND isnotnull(d_week_seq#33))
+(17) CometFilter
+Input [2]: [d_week_seq#40, d_year#41]
+Condition : ((isnotnull(d_year#41) AND (d_year#41 = 2001)) AND isnotnull(d_week_seq#40))
 
-(20) CometProject
-Input [2]: [d_week_seq#33, d_year#34]
-Arguments: [d_week_seq#33], [d_week_seq#33]
+(18) CometProject
+Input [2]: [d_week_seq#40, d_year#41]
+Arguments: [d_week_seq#40], [d_week_seq#40]
 
-(21) ColumnarToRow [codegen id : 3]
-Input [1]: [d_week_seq#33]
+(19) ColumnarToRow [codegen id : 3]
+Input [1]: [d_week_seq#40]
 
-(22) BroadcastExchange
-Input [1]: [d_week_seq#33]
+(20) BroadcastExchange
+Input [1]: [d_week_seq#40]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(23) BroadcastHashJoin [codegen id : 8]
+(21) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [d_week_seq#10]
-Right keys [1]: [d_week_seq#33]
+Right keys [1]: [d_week_seq#40]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 8]
-Output [8]: [d_week_seq#10 AS d_week_seq1#35, sun_sales#26 AS sun_sales1#36, mon_sales#27 AS mon_sales1#37, tue_sales#28 AS tue_sales1#38, wed_sales#29 AS wed_sales1#39, thu_sales#30 AS thu_sales1#40, fri_sales#31 AS fri_sales1#41, sat_sales#32 AS sat_sales1#42]
-Input [9]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32, d_week_seq#33]
+(22) Project [codegen id : 8]
+Output [8]: [d_week_seq#10 AS d_week_seq1#42, sun_sales#33 AS sun_sales1#43, mon_sales#34 AS mon_sales1#44, tue_sales#35 AS tue_sales1#45, wed_sales#36 AS wed_sales1#46, thu_sales#37 AS thu_sales1#47, fri_sales#38 AS fri_sales1#48, sat_sales#39 AS sat_sales1#49]
+Input [9]: [d_week_seq#10, sun_sales#33, mon_sales#34, tue_sales#35, wed_sales#36, thu_sales#37, fri_sales#38, sat_sales#39, d_week_seq#40]
 
-(25) ReusedExchange [Reuses operator id: 15]
-Output [8]: [d_week_seq#10, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
+(23) ReusedExchange [Reuses operator id: 14]
+Output [8]: [d_week_seq#10, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
 
-(26) CometHashAggregate
-Input [8]: [d_week_seq#10, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
+(24) HashAggregate [codegen id : 7]
+Input [8]: [d_week_seq#10, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
 Keys [1]: [d_week_seq#10]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END)), sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))]
-
-(27) ColumnarToRow [codegen id : 7]
-Input [8]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32]
+Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31, sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32]
+Results [8]: [d_week_seq#10, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Sunday   ) THEN sales_price#4 END))#26,17,2) AS sun_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Monday   ) THEN sales_price#4 END))#27,17,2) AS mon_sales#34, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Tuesday  ) THEN sales_price#4 END))#28,17,2) AS tue_sales#35, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Wednesday) THEN sales_price#4 END))#29,17,2) AS wed_sales#36, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Thursday ) THEN sales_price#4 END))#30,17,2) AS thu_sales#37, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Friday   ) THEN sales_price#4 END))#31,17,2) AS fri_sales#38, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#11 = Saturday ) THEN sales_price#4 END))#32,17,2) AS sat_sales#39]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_week_seq#50, d_year#51]
+Output [2]: [d_week_seq#57, d_year#58]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_week_seq:int,d_year:int>
 
-(29) CometFilter
-Input [2]: [d_week_seq#50, d_year#51]
-Condition : ((isnotnull(d_year#51) AND (d_year#51 = 2002)) AND isnotnull(d_week_seq#50))
+(26) CometFilter
+Input [2]: [d_week_seq#57, d_year#58]
+Condition : ((isnotnull(d_year#58) AND (d_year#58 = 2002)) AND isnotnull(d_week_seq#57))
 
-(30) CometProject
-Input [2]: [d_week_seq#50, d_year#51]
-Arguments: [d_week_seq#50], [d_week_seq#50]
+(27) CometProject
+Input [2]: [d_week_seq#57, d_year#58]
+Arguments: [d_week_seq#57], [d_week_seq#57]
 
-(31) ColumnarToRow [codegen id : 6]
-Input [1]: [d_week_seq#50]
+(28) ColumnarToRow [codegen id : 6]
+Input [1]: [d_week_seq#57]
 
-(32) BroadcastExchange
-Input [1]: [d_week_seq#50]
+(29) BroadcastExchange
+Input [1]: [d_week_seq#57]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 7]
+(30) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [d_week_seq#10]
-Right keys [1]: [d_week_seq#50]
+Right keys [1]: [d_week_seq#57]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 7]
-Output [8]: [d_week_seq#10 AS d_week_seq2#52, sun_sales#26 AS sun_sales2#53, mon_sales#27 AS mon_sales2#54, tue_sales#28 AS tue_sales2#55, wed_sales#29 AS wed_sales2#56, thu_sales#30 AS thu_sales2#57, fri_sales#31 AS fri_sales2#58, sat_sales#32 AS sat_sales2#59]
-Input [9]: [d_week_seq#10, sun_sales#26, mon_sales#27, tue_sales#28, wed_sales#29, thu_sales#30, fri_sales#31, sat_sales#32, d_week_seq#50]
+(31) Project [codegen id : 7]
+Output [8]: [d_week_seq#10 AS d_week_seq2#59, sun_sales#33 AS sun_sales2#60, mon_sales#34 AS mon_sales2#61, tue_sales#35 AS tue_sales2#62, wed_sales#36 AS wed_sales2#63, thu_sales#37 AS thu_sales2#64, fri_sales#38 AS fri_sales2#65, sat_sales#39 AS sat_sales2#66]
+Input [9]: [d_week_seq#10, sun_sales#33, mon_sales#34, tue_sales#35, wed_sales#36, thu_sales#37, fri_sales#38, sat_sales#39, d_week_seq#57]
 
-(35) BroadcastExchange
-Input [8]: [d_week_seq2#52, sun_sales2#53, mon_sales2#54, tue_sales2#55, wed_sales2#56, thu_sales2#57, fri_sales2#58, sat_sales2#59]
+(32) BroadcastExchange
+Input [8]: [d_week_seq2#59, sun_sales2#60, mon_sales2#61, tue_sales2#62, wed_sales2#63, thu_sales2#64, fri_sales2#65, sat_sales2#66]
 Arguments: HashedRelationBroadcastMode(List(cast((input[0, int, true] - 53) as bigint)),false), [plan_id=5]
 
-(36) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [d_week_seq1#35]
-Right keys [1]: [(d_week_seq2#52 - 53)]
+(33) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [d_week_seq1#42]
+Right keys [1]: [(d_week_seq2#59 - 53)]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
-Output [8]: [d_week_seq1#35, round((sun_sales1#36 / sun_sales2#53), 2) AS round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1#37 / mon_sales2#54), 2) AS round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1#38 / tue_sales2#55), 2) AS round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1#39 / wed_sales2#56), 2) AS round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1#40 / thu_sales2#57), 2) AS round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1#41 / fri_sales2#58), 2) AS round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1#42 / sat_sales2#59), 2) AS round((sat_sales1 / sat_sales2), 2)#66]
-Input [16]: [d_week_seq1#35, sun_sales1#36, mon_sales1#37, tue_sales1#38, wed_sales1#39, thu_sales1#40, fri_sales1#41, sat_sales1#42, d_week_seq2#52, sun_sales2#53, mon_sales2#54, tue_sales2#55, wed_sales2#56, thu_sales2#57, fri_sales2#58, sat_sales2#59]
-
-(38) RowToColumnar
-Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
-
-(39) CometColumnarExchange
-Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
-Arguments: rangepartitioning(d_week_seq1#35 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(34) Project [codegen id : 8]
+Output [8]: [d_week_seq1#42, round((sun_sales1#43 / sun_sales2#60), 2) AS round((sun_sales1 / sun_sales2), 2)#67, round((mon_sales1#44 / mon_sales2#61), 2) AS round((mon_sales1 / mon_sales2), 2)#68, round((tue_sales1#45 / tue_sales2#62), 2) AS round((tue_sales1 / tue_sales2), 2)#69, round((wed_sales1#46 / wed_sales2#63), 2) AS round((wed_sales1 / wed_sales2), 2)#70, round((thu_sales1#47 / thu_sales2#64), 2) AS round((thu_sales1 / thu_sales2), 2)#71, round((fri_sales1#48 / fri_sales2#65), 2) AS round((fri_sales1 / fri_sales2), 2)#72, round((sat_sales1#49 / sat_sales2#66), 2) AS round((sat_sales1 / sat_sales2), 2)#73]
+Input [16]: [d_week_seq1#42, sun_sales1#43, mon_sales1#44, tue_sales1#45, wed_sales1#46, thu_sales1#47, fri_sales1#48, sat_sales1#49, d_week_seq2#59, sun_sales2#60, mon_sales2#61, tue_sales2#62, wed_sales2#63, thu_sales2#64, fri_sales2#65, sat_sales2#66]
 
-(40) CometSort
-Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
-Arguments: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66], [d_week_seq1#35 ASC NULLS FIRST]
+(35) Exchange
+Input [8]: [d_week_seq1#42, round((sun_sales1 / sun_sales2), 2)#67, round((mon_sales1 / mon_sales2), 2)#68, round((tue_sales1 / tue_sales2), 2)#69, round((wed_sales1 / wed_sales2), 2)#70, round((thu_sales1 / thu_sales2), 2)#71, round((fri_sales1 / fri_sales2), 2)#72, round((sat_sales1 / sat_sales2), 2)#73]
+Arguments: rangepartitioning(d_week_seq1#42 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) ColumnarToRow [codegen id : 9]
-Input [8]: [d_week_seq1#35, round((sun_sales1 / sun_sales2), 2)#60, round((mon_sales1 / mon_sales2), 2)#61, round((tue_sales1 / tue_sales2), 2)#62, round((wed_sales1 / wed_sales2), 2)#63, round((thu_sales1 / thu_sales2), 2)#64, round((fri_sales1 / fri_sales2), 2)#65, round((sat_sales1 / sat_sales2), 2)#66]
+(36) Sort [codegen id : 9]
+Input [8]: [d_week_seq1#42, round((sun_sales1 / sun_sales2), 2)#67, round((mon_sales1 / mon_sales2), 2)#68, round((tue_sales1 / tue_sales2), 2)#69, round((wed_sales1 / wed_sales2), 2)#70, round((thu_sales1 / thu_sales2), 2)#71, round((fri_sales1 / fri_sales2), 2)#72, round((sat_sales1 / sat_sales2), 2)#73]
+Arguments: [d_week_seq1#42 ASC NULLS FIRST], true, 0
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt
index f4b68cfee2..8856ce80d2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q2/simplified.txt
@@ -1,59 +1,54 @@
 WholeStageCodegen (9)
-  ColumnarToRow
+  Sort [d_week_seq1]
     InputAdapter
-      CometSort [d_week_seq1]
-        CometColumnarExchange [d_week_seq1] #1
-          RowToColumnar
-            WholeStageCodegen (8)
-              Project [d_week_seq1,sun_sales1,sun_sales2,mon_sales1,mon_sales2,tue_sales1,tue_sales2,wed_sales1,wed_sales2,thu_sales1,thu_sales2,fri_sales1,fri_sales2,sat_sales1,sat_sales2]
-                BroadcastHashJoin [d_week_seq1,d_week_seq2]
-                  Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
-                    BroadcastHashJoin [d_week_seq,d_week_seq]
-                      ColumnarToRow
-                        InputAdapter
-                          CometHashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum]
-                            CometColumnarExchange [d_week_seq] #2
-                              RowToColumnar
-                                WholeStageCodegen (2)
-                                  HashAggregate [d_week_seq,d_day_name,sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                                    Project [sales_price,d_week_seq,d_day_name]
-                                      BroadcastHashJoin [sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometUnion
-                                              CometProject [ws_sold_date_sk,ws_ext_sales_price] [sold_date_sk,sales_price]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_ext_sales_price,ws_sold_date_sk]
-                                              CometProject [cs_sold_date_sk,cs_ext_sales_price] [sold_date_sk,sales_price]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_ext_sales_price,cs_sold_date_sk]
+      Exchange [d_week_seq1] #1
+        WholeStageCodegen (8)
+          Project [d_week_seq1,sun_sales1,sun_sales2,mon_sales1,mon_sales2,tue_sales1,tue_sales2,wed_sales1,wed_sales2,thu_sales1,thu_sales2,fri_sales1,fri_sales2,sat_sales1,sat_sales2]
+            BroadcastHashJoin [d_week_seq1,d_week_seq2]
+              Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
+                BroadcastHashJoin [d_week_seq,d_week_seq]
+                  HashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
+                    InputAdapter
+                      Exchange [d_week_seq] #2
+                        WholeStageCodegen (2)
+                          HashAggregate [d_week_seq,d_day_name,sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                            Project [sales_price,d_week_seq,d_day_name]
+                              BroadcastHashJoin [sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometUnion
+                                      CometProject [ws_sold_date_sk,ws_ext_sales_price] [sold_date_sk,sales_price]
+                                        CometScan parquet spark_catalog.default.web_sales [ws_ext_sales_price,ws_sold_date_sk]
+                                      CometProject [cs_sold_date_sk,cs_ext_sales_price] [sold_date_sk,sales_price]
+                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ext_sales_price,cs_sold_date_sk]
+                                InputAdapter
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
                                         InputAdapter
-                                          BroadcastExchange #3
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [d_date_sk,d_week_seq]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
-                      InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (3)
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [d_week_seq]
-                                  CometFilter [d_year,d_week_seq]
-                                    CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
+                                          CometFilter [d_date_sk,d_week_seq]
+                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
                   InputAdapter
-                    BroadcastExchange #5
-                      WholeStageCodegen (7)
-                        Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
-                          BroadcastHashJoin [d_week_seq,d_week_seq]
-                            ColumnarToRow
-                              InputAdapter
-                                CometHashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum]
-                                  ReusedExchange [d_week_seq,sum,sum,sum,sum,sum,sum,sum] #2
-                            InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (6)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [d_week_seq]
-                                        CometFilter [d_year,d_week_seq]
-                                          CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
+                    BroadcastExchange #4
+                      WholeStageCodegen (3)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [d_week_seq]
+                              CometFilter [d_year,d_week_seq]
+                                CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
+              InputAdapter
+                BroadcastExchange #5
+                  WholeStageCodegen (7)
+                    Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
+                      BroadcastHashJoin [d_week_seq,d_week_seq]
+                        HashAggregate [d_week_seq,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
+                          InputAdapter
+                            ReusedExchange [d_week_seq,sum,sum,sum,sum,sum,sum,sum] #2
+                        InputAdapter
+                          BroadcastExchange #6
+                            WholeStageCodegen (6)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometProject [d_week_seq]
+                                    CometFilter [d_year,d_week_seq]
+                                      CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt
index 5d279243c5..eedf666dd1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/explain.txt
@@ -1,26 +1,24 @@
 == Physical Plan ==
-TakeOrderedAndProject (22)
-+- * Project (21)
-   +- Window (20)
-      +- * ColumnarToRow (19)
-         +- CometSort (18)
-            +- CometColumnarExchange (17)
-               +- CometHashAggregate (16)
-                  +- CometColumnarExchange (15)
-                     +- RowToColumnar (14)
-                        +- * HashAggregate (13)
-                           +- * Project (12)
-                              +- * BroadcastHashJoin Inner BuildRight (11)
-                                 :- * Project (9)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                 :     :- * ColumnarToRow (3)
-                                 :     :  +- CometFilter (2)
-                                 :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                                 :     +- BroadcastExchange (7)
-                                 :        +- * ColumnarToRow (6)
-                                 :           +- CometFilter (5)
-                                 :              +- CometScan parquet spark_catalog.default.item (4)
-                                 +- ReusedExchange (10)
+TakeOrderedAndProject (20)
++- * Project (19)
+   +- Window (18)
+      +- * Sort (17)
+         +- Exchange (16)
+            +- * HashAggregate (15)
+               +- Exchange (14)
+                  +- * HashAggregate (13)
+                     +- * Project (12)
+                        +- * BroadcastHashJoin Inner BuildRight (11)
+                           :- * Project (9)
+                           :  +- * BroadcastHashJoin Inner BuildRight (8)
+                           :     :- * ColumnarToRow (3)
+                           :     :  +- CometFilter (2)
+                           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                           :     +- BroadcastExchange (7)
+                           :        +- * ColumnarToRow (6)
+                           :           +- CometFilter (5)
+                           :              +- CometScan parquet spark_catalog.default.item (4)
+                           +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -66,7 +64,7 @@ Join condition: None
 Output [7]: [cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [cs_item_sk#1, cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 27]
+(10) ReusedExchange [Reuses operator id: 25]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -86,70 +84,66 @@ Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) RowToColumnar
+(14) Exchange
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#2))#14]
+Results [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS _w0#16, i_item_id#6]
 
-(17) CometColumnarExchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(18) CometSort
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6], [i_class#9 ASC NULLS FIRST]
+(16) Exchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) ColumnarToRow [codegen id : 4]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+(17) Sort [codegen id : 5]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: [i_class#9 ASC NULLS FIRST], false, 0
 
-(20) Window
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
+(18) Window
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
 
-(21) Project [codegen id : 5]
-Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
-Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
+(19) Project [codegen id : 6]
+Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18, i_item_id#6]
+Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6, _we0#17]
 
-(22) TakeOrderedAndProject
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(20) TakeOrderedAndProject
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (25)
++- * ColumnarToRow (24)
+   +- CometProject (23)
+      +- CometFilter (22)
+         +- CometScan parquet spark_catalog.default.date_dim (21)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#18]
+Output [2]: [d_date_sk#11, d_date#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(24) CometFilter
-Input [2]: [d_date_sk#11, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(22) CometFilter
+Input [2]: [d_date_sk#11, d_date#19]
+Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(25) CometProject
-Input [2]: [d_date_sk#11, d_date#18]
+(23) CometProject
+Input [2]: [d_date_sk#11, d_date#19]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(26) ColumnarToRow [codegen id : 1]
+(24) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(27) BroadcastExchange
+(25) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt
index 202a09b6d3..52c42bdf2b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q20/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (5)
+  WholeStageCodegen (6)
     Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (4)
-            ColumnarToRow
+          WholeStageCodegen (5)
+            Sort [i_class]
               InputAdapter
-                CometSort [i_class]
-                  CometColumnarExchange [i_class] #1
-                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
-                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
-                        RowToColumnar
+                Exchange [i_class] #1
+                  WholeStageCodegen (4)
+                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(cs_ext_sales_price)),itemrevenue,_w0,sum]
+                      InputAdapter
+                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,cs_ext_sales_price] [sum,sum]
                               Project [cs_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
index 5c69eb848b..b5625d8e03 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/explain.txt
@@ -1,30 +1,28 @@
 == Physical Plan ==
-* ColumnarToRow (26)
-+- CometTakeOrderedAndProject (25)
-   +- CometFilter (24)
-      +- CometHashAggregate (23)
-         +- CometColumnarExchange (22)
-            +- RowToColumnar (21)
-               +- * HashAggregate (20)
-                  +- * Project (19)
-                     +- * BroadcastHashJoin Inner BuildRight (18)
-                        :- * Project (16)
-                        :  +- * BroadcastHashJoin Inner BuildRight (15)
-                        :     :- * Project (9)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                        :     :     :- * ColumnarToRow (3)
-                        :     :     :  +- CometFilter (2)
-                        :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-                        :     :     +- BroadcastExchange (7)
-                        :     :        +- * ColumnarToRow (6)
-                        :     :           +- CometFilter (5)
-                        :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-                        :     +- BroadcastExchange (14)
-                        :        +- * ColumnarToRow (13)
-                        :           +- CometProject (12)
-                        :              +- CometFilter (11)
-                        :                 +- CometScan parquet spark_catalog.default.item (10)
-                        +- ReusedExchange (17)
+TakeOrderedAndProject (24)
++- * Filter (23)
+   +- * HashAggregate (22)
+      +- Exchange (21)
+         +- * HashAggregate (20)
+            +- * Project (19)
+               +- * BroadcastHashJoin Inner BuildRight (18)
+                  :- * Project (16)
+                  :  +- * BroadcastHashJoin Inner BuildRight (15)
+                  :     :- * Project (9)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :- * ColumnarToRow (3)
+                  :     :     :  +- CometFilter (2)
+                  :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+                  :     :     +- BroadcastExchange (7)
+                  :     :        +- * ColumnarToRow (6)
+                  :     :           +- CometFilter (5)
+                  :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+                  :     +- BroadcastExchange (14)
+                  :        +- * ColumnarToRow (13)
+                  :           +- CometProject (12)
+                  :              +- CometFilter (11)
+                  :                 +- CometScan parquet spark_catalog.default.item (10)
+                  +- ReusedExchange (17)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -102,7 +100,7 @@ Join condition: None
 Output [4]: [inv_quantity_on_hand#3, inv_date_sk#4, w_warehouse_name#7, i_item_id#9]
 Input [6]: [inv_item_sk#1, inv_quantity_on_hand#3, inv_date_sk#4, w_warehouse_name#7, i_item_sk#8, i_item_id#9]
 
-(17) ReusedExchange [Reuses operator id: 30]
+(17) ReusedExchange [Reuses operator id: 28]
 Output [2]: [d_date_sk#11, d_date#12]
 
 (18) BroadcastHashJoin [codegen id : 4]
@@ -122,36 +120,32 @@ Functions [2]: [partial_sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity
 Aggregate Attributes [2]: [sum#13, sum#14]
 Results [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
 
-(21) RowToColumnar
+(21) Exchange
 Input [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
+Arguments: hashpartitioning(w_warehouse_name#7, i_item_id#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) CometColumnarExchange
-Input [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
-Arguments: hashpartitioning(w_warehouse_name#7, i_item_id#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 5]
 Input [4]: [w_warehouse_name#7, i_item_id#9, sum#15, sum#16]
 Keys [2]: [w_warehouse_name#7, i_item_id#9]
 Functions [2]: [sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END), sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)]
+Aggregate Attributes [2]: [sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#17, sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#18]
+Results [4]: [w_warehouse_name#7, i_item_id#9, sum(CASE WHEN (d_date#12 < 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#17 AS inv_before#19, sum(CASE WHEN (d_date#12 >= 2000-03-11) THEN inv_quantity_on_hand#3 ELSE 0 END)#18 AS inv_after#20]
 
-(24) CometFilter
-Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
-Condition : (CASE WHEN (inv_before#17 > 0) THEN ((cast(inv_after#18 as double) / cast(inv_before#17 as double)) >= 0.666667) END AND CASE WHEN (inv_before#17 > 0) THEN ((cast(inv_after#18 as double) / cast(inv_before#17 as double)) <= 1.5) END)
-
-(25) CometTakeOrderedAndProject
-Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[w_warehouse_name#7 ASC NULLS FIRST,i_item_id#9 ASC NULLS FIRST], output=[w_warehouse_name#7,i_item_id#9,inv_before#17,inv_after#18]), 100, [w_warehouse_name#7 ASC NULLS FIRST, i_item_id#9 ASC NULLS FIRST], [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
+(23) Filter [codegen id : 5]
+Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
+Condition : (CASE WHEN (inv_before#19 > 0) THEN ((cast(inv_after#20 as double) / cast(inv_before#19 as double)) >= 0.666667) END AND CASE WHEN (inv_before#19 > 0) THEN ((cast(inv_after#20 as double) / cast(inv_before#19 as double)) <= 1.5) END)
 
-(26) ColumnarToRow [codegen id : 5]
-Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#17, inv_after#18]
+(24) TakeOrderedAndProject
+Input [4]: [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
+Arguments: 100, [w_warehouse_name#7 ASC NULLS FIRST, i_item_id#9 ASC NULLS FIRST], [w_warehouse_name#7, i_item_id#9, inv_before#19, inv_after#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (30)
-+- * ColumnarToRow (29)
-   +- CometFilter (28)
-      +- CometScan parquet spark_catalog.default.date_dim (27)
+BroadcastExchange (28)
++- * ColumnarToRow (27)
+   +- CometFilter (26)
+      +- CometScan parquet spark_catalog.default.date_dim (25)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -161,14 +155,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-10), LessThanOrEqual(d_date,2000-04-10), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(28) CometFilter
+(26) CometFilter
 Input [2]: [d_date_sk#11, d_date#12]
 Condition : (((isnotnull(d_date#12) AND (d_date#12 >= 2000-02-10)) AND (d_date#12 <= 2000-04-10)) AND isnotnull(d_date_sk#11))
 
-(29) ColumnarToRow [codegen id : 1]
+(27) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#11, d_date#12]
 
-(30) BroadcastExchange
+(28) BroadcastExchange
 Input [2]: [d_date_sk#11, d_date#12]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
index 3556650ca1..e20755e12f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q21/simplified.txt
@@ -1,44 +1,42 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [w_warehouse_name,i_item_id,inv_before,inv_after]
-        CometFilter [inv_before,inv_after]
-          CometHashAggregate [w_warehouse_name,i_item_id,sum,sum]
-            CometColumnarExchange [w_warehouse_name,i_item_id] #1
-              RowToColumnar
-                WholeStageCodegen (4)
-                  HashAggregate [w_warehouse_name,i_item_id,d_date,inv_quantity_on_hand] [sum,sum,sum,sum]
-                    Project [inv_quantity_on_hand,w_warehouse_name,i_item_id,d_date]
-                      BroadcastHashJoin [inv_date_sk,d_date_sk]
-                        Project [inv_quantity_on_hand,inv_date_sk,w_warehouse_name,i_item_id]
-                          BroadcastHashJoin [inv_item_sk,i_item_sk]
-                            Project [inv_item_sk,inv_quantity_on_hand,inv_date_sk,w_warehouse_name]
-                              BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [inv_warehouse_sk,inv_item_sk]
-                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [d_date,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [w_warehouse_sk]
-                                            CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+TakeOrderedAndProject [w_warehouse_name,i_item_id,inv_before,inv_after]
+  WholeStageCodegen (5)
+    Filter [inv_before,inv_after]
+      HashAggregate [w_warehouse_name,i_item_id,sum,sum] [sum(CASE WHEN (d_date < 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),sum(CASE WHEN (d_date >= 2000-03-11) THEN inv_quantity_on_hand ELSE 0 END),inv_before,inv_after,sum,sum]
+        InputAdapter
+          Exchange [w_warehouse_name,i_item_id] #1
+            WholeStageCodegen (4)
+              HashAggregate [w_warehouse_name,i_item_id,d_date,inv_quantity_on_hand] [sum,sum,sum,sum]
+                Project [inv_quantity_on_hand,w_warehouse_name,i_item_id,d_date]
+                  BroadcastHashJoin [inv_date_sk,d_date_sk]
+                    Project [inv_quantity_on_hand,inv_date_sk,w_warehouse_name,i_item_id]
+                      BroadcastHashJoin [inv_item_sk,i_item_sk]
+                        Project [inv_item_sk,inv_quantity_on_hand,inv_date_sk,w_warehouse_name]
+                          BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [inv_warehouse_sk,inv_item_sk]
+                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [d_date,d_date_sk]
+                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                             InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (2)
+                              BroadcastExchange #3
+                                WholeStageCodegen (1)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [i_item_sk,i_item_id]
-                                        CometFilter [i_current_price,i_item_sk]
-                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
+                                      CometFilter [w_warehouse_sk]
+                                        CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                         InputAdapter
-                          ReusedExchange [d_date_sk,d_date] #2
+                          BroadcastExchange #4
+                            WholeStageCodegen (2)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometProject [i_item_sk,i_item_id]
+                                    CometFilter [i_current_price,i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
+                    InputAdapter
+                      ReusedExchange [d_date_sk,d_date] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt
index 13689dc21e..7dfa2dc06a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/explain.txt
@@ -1,29 +1,27 @@
 == Physical Plan ==
-* ColumnarToRow (25)
-+- CometTakeOrderedAndProject (24)
-   +- CometHashAggregate (23)
-      +- CometColumnarExchange (22)
-         +- RowToColumnar (21)
-            +- * HashAggregate (20)
-               +- * Expand (19)
-                  +- * Project (18)
-                     +- * BroadcastHashJoin Inner BuildRight (17)
-                        :- * Project (12)
-                        :  +- * BroadcastHashJoin Inner BuildRight (11)
-                        :     :- * Project (6)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                        :     :     :- * ColumnarToRow (3)
-                        :     :     :  +- CometFilter (2)
-                        :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-                        :     :     +- ReusedExchange (4)
-                        :     +- BroadcastExchange (10)
-                        :        +- * ColumnarToRow (9)
-                        :           +- CometFilter (8)
-                        :              +- CometScan parquet spark_catalog.default.item (7)
-                        +- BroadcastExchange (16)
-                           +- * ColumnarToRow (15)
-                              +- CometFilter (14)
-                                 +- CometScan parquet spark_catalog.default.warehouse (13)
+TakeOrderedAndProject (23)
++- * HashAggregate (22)
+   +- Exchange (21)
+      +- * HashAggregate (20)
+         +- * Expand (19)
+            +- * Project (18)
+               +- * BroadcastHashJoin Inner BuildRight (17)
+                  :- * Project (12)
+                  :  +- * BroadcastHashJoin Inner BuildRight (11)
+                  :     :- * Project (6)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                  :     :     :- * ColumnarToRow (3)
+                  :     :     :  +- CometFilter (2)
+                  :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+                  :     :     +- ReusedExchange (4)
+                  :     +- BroadcastExchange (10)
+                  :        +- * ColumnarToRow (9)
+                  :           +- CometFilter (8)
+                  :              +- CometScan parquet spark_catalog.default.item (7)
+                  +- BroadcastExchange (16)
+                     +- * ColumnarToRow (15)
+                        +- CometFilter (14)
+                           +- CometScan parquet spark_catalog.default.warehouse (13)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -41,7 +39,7 @@ Condition : (isnotnull(inv_item_sk#1) AND isnotnull(inv_warehouse_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [4]: [inv_item_sk#1, inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 30]
+(4) ReusedExchange [Reuses operator id: 28]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -121,54 +119,50 @@ Functions [1]: [partial_avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [sum#18, count#19]
 Results [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
 
-(21) RowToColumnar
+(21) Exchange
 Input [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
+Arguments: hashpartitioning(i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) CometColumnarExchange
-Input [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
-Arguments: hashpartitioning(i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 5]
 Input [7]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17, sum#20, count#21]
 Keys [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, spark_grouping_id#17]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#22]
+Results [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, avg(inv_quantity_on_hand#3)#22 AS qoh#23]
 
-(24) CometTakeOrderedAndProject
-Input [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#22]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[qoh#22 ASC NULLS FIRST,i_product_name#13 ASC NULLS FIRST,i_brand#14 ASC NULLS FIRST,i_class#15 ASC NULLS FIRST,i_category#16 ASC NULLS FIRST], output=[i_product_name#13,i_brand#14,i_class#15,i_category#16,qoh#22]), 100, [qoh#22 ASC NULLS FIRST, i_product_name#13 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_category#16 ASC NULLS FIRST], [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#22]
-
-(25) ColumnarToRow [codegen id : 5]
-Input [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#22]
+(23) TakeOrderedAndProject
+Input [5]: [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#23]
+Arguments: 100, [qoh#23 ASC NULLS FIRST, i_product_name#13 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_category#16 ASC NULLS FIRST], [i_product_name#13, i_brand#14, i_class#15, i_category#16, qoh#23]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (30)
-+- * ColumnarToRow (29)
-   +- CometProject (28)
-      +- CometFilter (27)
-         +- CometScan parquet spark_catalog.default.date_dim (26)
+BroadcastExchange (28)
++- * ColumnarToRow (27)
+   +- CometProject (26)
+      +- CometFilter (25)
+         +- CometScan parquet spark_catalog.default.date_dim (24)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_month_seq#23]
+Output [2]: [d_date_sk#6, d_month_seq#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(27) CometFilter
-Input [2]: [d_date_sk#6, d_month_seq#23]
-Condition : (((isnotnull(d_month_seq#23) AND (d_month_seq#23 >= 1200)) AND (d_month_seq#23 <= 1211)) AND isnotnull(d_date_sk#6))
+(25) CometFilter
+Input [2]: [d_date_sk#6, d_month_seq#24]
+Condition : (((isnotnull(d_month_seq#24) AND (d_month_seq#24 >= 1200)) AND (d_month_seq#24 <= 1211)) AND isnotnull(d_date_sk#6))
 
-(28) CometProject
-Input [2]: [d_date_sk#6, d_month_seq#23]
+(26) CometProject
+Input [2]: [d_date_sk#6, d_month_seq#24]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(29) ColumnarToRow [codegen id : 1]
+(27) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(30) BroadcastExchange
+(28) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt
index b0c2728e3a..92714bb02d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q22/simplified.txt
@@ -1,44 +1,42 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
-        CometHashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count]
-          CometColumnarExchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (4)
-                HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
-                  Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                    Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                        Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                          BroadcastHashJoin [inv_item_sk,i_item_sk]
-                            Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
-                              BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [inv_item_sk,inv_warehouse_sk]
-                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_month_seq,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+TakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
+  WholeStageCodegen (5)
+    HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+      InputAdapter
+        Exchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
+          WholeStageCodegen (4)
+            HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
+              Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                  BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                    Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                      BroadcastHashJoin [inv_item_sk,i_item_sk]
+                        Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
+                          BroadcastHashJoin [inv_date_sk,d_date_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [inv_item_sk,inv_warehouse_sk]
+                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_month_seq,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (3)
+                          BroadcastExchange #3
+                            WholeStageCodegen (2)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [w_warehouse_sk]
-                                    CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
+                    InputAdapter
+                      BroadcastExchange #4
+                        WholeStageCodegen (3)
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [w_warehouse_sk]
+                                CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt
index 973532dc28..5ec1794c1b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/explain.txt
@@ -1,79 +1,70 @@
 == Physical Plan ==
-* ColumnarToRow (75)
-+- CometHashAggregate (74)
-   +- CometColumnarExchange (73)
-      +- RowToColumnar (72)
-         +- * HashAggregate (71)
-            +- Union (70)
-               :- * Project (50)
-               :  +- * BroadcastHashJoin Inner BuildRight (49)
-               :     :- * ColumnarToRow (47)
-               :     :  +- CometProject (46)
-               :     :     +- CometSortMergeJoin (45)
-               :     :        :- CometSort (27)
-               :     :        :  +- CometColumnarExchange (26)
-               :     :        :     +- RowToColumnar (25)
-               :     :        :        +- * Project (24)
-               :     :        :           +- * BroadcastHashJoin LeftSemi BuildRight (23)
-               :     :        :              :- * ColumnarToRow (2)
-               :     :        :              :  +- CometScan parquet spark_catalog.default.catalog_sales (1)
-               :     :        :              +- BroadcastExchange (22)
-               :     :        :                 +- * ColumnarToRow (21)
-               :     :        :                    +- CometProject (20)
-               :     :        :                       +- CometFilter (19)
-               :     :        :                          +- CometHashAggregate (18)
-               :     :        :                             +- CometColumnarExchange (17)
-               :     :        :                                +- RowToColumnar (16)
-               :     :        :                                   +- * HashAggregate (15)
-               :     :        :                                      +- * Project (14)
-               :     :        :                                         +- * BroadcastHashJoin Inner BuildRight (13)
-               :     :        :                                            :- * Project (8)
-               :     :        :                                            :  +- * BroadcastHashJoin Inner BuildRight (7)
-               :     :        :                                            :     :- * ColumnarToRow (5)
-               :     :        :                                            :     :  +- CometFilter (4)
-               :     :        :                                            :     :     +- CometScan parquet spark_catalog.default.store_sales (3)
-               :     :        :                                            :     +- ReusedExchange (6)
-               :     :        :                                            +- BroadcastExchange (12)
-               :     :        :                                               +- * ColumnarToRow (11)
-               :     :        :                                                  +- CometFilter (10)
-               :     :        :                                                     +- CometScan parquet spark_catalog.default.item (9)
-               :     :        +- CometSort (44)
-               :     :           +- CometProject (43)
-               :     :              +- CometFilter (42)
-               :     :                 +- CometHashAggregate (41)
-               :     :                    +- CometColumnarExchange (40)
-               :     :                       +- RowToColumnar (39)
-               :     :                          +- * HashAggregate (38)
-               :     :                             +- * Project (37)
-               :     :                                +- * BroadcastHashJoin Inner BuildRight (36)
-               :     :                                   :- * ColumnarToRow (31)
-               :     :                                   :  +- CometProject (30)
-               :     :                                   :     +- CometFilter (29)
-               :     :                                   :        +- CometScan parquet spark_catalog.default.store_sales (28)
-               :     :                                   +- BroadcastExchange (35)
-               :     :                                      +- * ColumnarToRow (34)
-               :     :                                         +- CometFilter (33)
-               :     :                                            +- CometScan parquet spark_catalog.default.customer (32)
-               :     +- ReusedExchange (48)
-               +- * Project (69)
-                  +- * BroadcastHashJoin Inner BuildRight (68)
-                     :- * ColumnarToRow (66)
-                     :  +- CometProject (65)
-                     :     +- CometSortMergeJoin (64)
-                     :        :- CometSort (58)
-                     :        :  +- CometColumnarExchange (57)
-                     :        :     +- RowToColumnar (56)
-                     :        :        +- * Project (55)
-                     :        :           +- * BroadcastHashJoin LeftSemi BuildRight (54)
-                     :        :              :- * ColumnarToRow (52)
-                     :        :              :  +- CometScan parquet spark_catalog.default.web_sales (51)
-                     :        :              +- ReusedExchange (53)
-                     :        +- CometSort (63)
-                     :           +- CometProject (62)
-                     :              +- CometFilter (61)
-                     :                 +- CometHashAggregate (60)
-                     :                    +- ReusedExchange (59)
-                     +- ReusedExchange (67)
+* HashAggregate (66)
++- Exchange (65)
+   +- * HashAggregate (64)
+      +- Union (63)
+         :- * Project (45)
+         :  +- * BroadcastHashJoin Inner BuildRight (44)
+         :     :- * Project (42)
+         :     :  +- * SortMergeJoin LeftSemi (41)
+         :     :     :- * Sort (24)
+         :     :     :  +- Exchange (23)
+         :     :     :     +- * Project (22)
+         :     :     :        +- * BroadcastHashJoin LeftSemi BuildRight (21)
+         :     :     :           :- * ColumnarToRow (2)
+         :     :     :           :  +- CometScan parquet spark_catalog.default.catalog_sales (1)
+         :     :     :           +- BroadcastExchange (20)
+         :     :     :              +- * Project (19)
+         :     :     :                 +- * Filter (18)
+         :     :     :                    +- * HashAggregate (17)
+         :     :     :                       +- Exchange (16)
+         :     :     :                          +- * HashAggregate (15)
+         :     :     :                             +- * Project (14)
+         :     :     :                                +- * BroadcastHashJoin Inner BuildRight (13)
+         :     :     :                                   :- * Project (8)
+         :     :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (7)
+         :     :     :                                   :     :- * ColumnarToRow (5)
+         :     :     :                                   :     :  +- CometFilter (4)
+         :     :     :                                   :     :     +- CometScan parquet spark_catalog.default.store_sales (3)
+         :     :     :                                   :     +- ReusedExchange (6)
+         :     :     :                                   +- BroadcastExchange (12)
+         :     :     :                                      +- * ColumnarToRow (11)
+         :     :     :                                         +- CometFilter (10)
+         :     :     :                                            +- CometScan parquet spark_catalog.default.item (9)
+         :     :     +- * Sort (40)
+         :     :        +- * Project (39)
+         :     :           +- * Filter (38)
+         :     :              +- * HashAggregate (37)
+         :     :                 +- Exchange (36)
+         :     :                    +- * HashAggregate (35)
+         :     :                       +- * Project (34)
+         :     :                          +- * BroadcastHashJoin Inner BuildRight (33)
+         :     :                             :- * ColumnarToRow (28)
+         :     :                             :  +- CometProject (27)
+         :     :                             :     +- CometFilter (26)
+         :     :                             :        +- CometScan parquet spark_catalog.default.store_sales (25)
+         :     :                             +- BroadcastExchange (32)
+         :     :                                +- * ColumnarToRow (31)
+         :     :                                   +- CometFilter (30)
+         :     :                                      +- CometScan parquet spark_catalog.default.customer (29)
+         :     +- ReusedExchange (43)
+         +- * Project (62)
+            +- * BroadcastHashJoin Inner BuildRight (61)
+               :- * Project (59)
+               :  +- * SortMergeJoin LeftSemi (58)
+               :     :- * Sort (52)
+               :     :  +- Exchange (51)
+               :     :     +- * Project (50)
+               :     :        +- * BroadcastHashJoin LeftSemi BuildRight (49)
+               :     :           :- * ColumnarToRow (47)
+               :     :           :  +- CometScan parquet spark_catalog.default.web_sales (46)
+               :     :           +- ReusedExchange (48)
+               :     +- * Sort (57)
+               :        +- * Project (56)
+               :           +- * Filter (55)
+               :              +- * HashAggregate (54)
+               :                 +- ReusedExchange (53)
+               +- ReusedExchange (60)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -101,7 +92,7 @@ Condition : isnotnull(ss_item_sk#7)
 (5) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_item_sk#7, ss_sold_date_sk#8]
 
-(6) ReusedExchange [Reuses operator id: 85]
+(6) ReusedExchange [Reuses operator id: 76]
 Output [2]: [d_date_sk#10, d_date#11]
 
 (7) BroadcastHashJoin [codegen id : 3]
@@ -149,450 +140,431 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#15]
 Results [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 
-(16) RowToColumnar
+(16) Exchange
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
+Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(17) CometColumnarExchange
-Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
-Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(18) CometHashAggregate
+(17) HashAggregate [codegen id : 4]
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 Keys [3]: [_groupingexpression#14, i_item_sk#12, d_date#11]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#17]
+Results [2]: [i_item_sk#12 AS item_sk#18, count(1)#17 AS cnt#19]
 
-(19) CometFilter
-Input [2]: [item_sk#17, cnt#18]
-Condition : (cnt#18 > 4)
+(18) Filter [codegen id : 4]
+Input [2]: [item_sk#18, cnt#19]
+Condition : (cnt#19 > 4)
 
-(20) CometProject
-Input [2]: [item_sk#17, cnt#18]
-Arguments: [item_sk#17], [item_sk#17]
+(19) Project [codegen id : 4]
+Output [1]: [item_sk#18]
+Input [2]: [item_sk#18, cnt#19]
 
-(21) ColumnarToRow [codegen id : 4]
-Input [1]: [item_sk#17]
-
-(22) BroadcastExchange
-Input [1]: [item_sk#17]
+(20) BroadcastExchange
+Input [1]: [item_sk#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(23) BroadcastHashJoin [codegen id : 5]
+(21) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [cs_item_sk#2]
-Right keys [1]: [item_sk#17]
+Right keys [1]: [item_sk#18]
 Join type: LeftSemi
 Join condition: None
 
-(24) Project [codegen id : 5]
+(22) Project [codegen id : 5]
 Output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 Input [5]: [cs_bill_customer_sk#1, cs_item_sk#2, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(25) RowToColumnar
-Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-
-(26) CometColumnarExchange
+(23) Exchange
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(27) CometSort
+(24) Sort [codegen id : 6]
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5], [cs_bill_customer_sk#1 ASC NULLS FIRST]
+Arguments: [cs_bill_customer_sk#1 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
+Output [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(29) CometFilter
-Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
-Condition : isnotnull(ss_customer_sk#19)
+(26) CometFilter
+Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
+Condition : isnotnull(ss_customer_sk#20)
 
-(30) CometProject
-Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
-Arguments: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21], [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
+(27) CometProject
+Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
+Arguments: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22], [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
 
-(31) ColumnarToRow [codegen id : 7]
-Input [3]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
+(28) ColumnarToRow [codegen id : 8]
+Input [3]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [1]: [c_customer_sk#23]
+Output [1]: [c_customer_sk#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int>
 
-(33) CometFilter
-Input [1]: [c_customer_sk#23]
-Condition : isnotnull(c_customer_sk#23)
+(30) CometFilter
+Input [1]: [c_customer_sk#24]
+Condition : isnotnull(c_customer_sk#24)
 
-(34) ColumnarToRow [codegen id : 6]
-Input [1]: [c_customer_sk#23]
+(31) ColumnarToRow [codegen id : 7]
+Input [1]: [c_customer_sk#24]
 
-(35) BroadcastExchange
-Input [1]: [c_customer_sk#23]
+(32) BroadcastExchange
+Input [1]: [c_customer_sk#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(36) BroadcastHashJoin [codegen id : 7]
-Left keys [1]: [ss_customer_sk#19]
-Right keys [1]: [c_customer_sk#23]
+(33) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_customer_sk#20]
+Right keys [1]: [c_customer_sk#24]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 7]
-Output [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
-Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
-
-(38) HashAggregate [codegen id : 7]
-Input [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [partial_sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
-Aggregate Attributes [2]: [sum#24, isEmpty#25]
-Results [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-
-(39) RowToColumnar
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-
-(40) CometColumnarExchange
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Arguments: hashpartitioning(c_customer_sk#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(41) CometHashAggregate
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
-
-(42) CometFilter
-Input [2]: [c_customer_sk#23, ssales#28]
-Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#29, [id=#30])))
-
-(43) CometProject
-Input [2]: [c_customer_sk#23, ssales#28]
-Arguments: [c_customer_sk#23], [c_customer_sk#23]
-
-(44) CometSort
-Input [1]: [c_customer_sk#23]
-Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
-
-(45) CometSortMergeJoin
-Left output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Right output [1]: [c_customer_sk#23]
-Arguments: [cs_bill_customer_sk#1], [c_customer_sk#23], LeftSemi
+(34) Project [codegen id : 8]
+Output [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
+Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
+
+(35) HashAggregate [codegen id : 8]
+Input [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [partial_sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [2]: [sum#25, isEmpty#26]
+Results [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+
+(36) Exchange
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Arguments: hashpartitioning(c_customer_sk#24, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(37) HashAggregate [codegen id : 9]
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
+Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
+
+(38) Filter [codegen id : 9]
+Input [2]: [c_customer_sk#24, ssales#30]
+Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#31, [id=#32])))
+
+(39) Project [codegen id : 9]
+Output [1]: [c_customer_sk#24]
+Input [2]: [c_customer_sk#24, ssales#30]
+
+(40) Sort [codegen id : 9]
+Input [1]: [c_customer_sk#24]
+Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
+
+(41) SortMergeJoin [codegen id : 11]
+Left keys [1]: [cs_bill_customer_sk#1]
+Right keys [1]: [c_customer_sk#24]
+Join type: LeftSemi
+Join condition: None
 
-(46) CometProject
+(42) Project [codegen id : 11]
+Output [3]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5], [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(47) ColumnarToRow [codegen id : 9]
-Input [3]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+(43) ReusedExchange [Reuses operator id: 71]
+Output [1]: [d_date_sk#33]
 
-(48) ReusedExchange [Reuses operator id: 80]
-Output [1]: [d_date_sk#31]
-
-(49) BroadcastHashJoin [codegen id : 9]
+(44) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_sold_date_sk#5]
-Right keys [1]: [d_date_sk#31]
+Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 9]
-Output [1]: [(cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4) AS sales#32]
-Input [4]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, d_date_sk#31]
+(45) Project [codegen id : 11]
+Output [1]: [(cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4) AS sales#34]
+Input [4]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, d_date_sk#33]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#33, ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+Output [5]: [ws_item_sk#35, ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#37), dynamicpruningexpression(ws_sold_date_sk#37 IN dynamicpruning#38)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#39), dynamicpruningexpression(ws_sold_date_sk#39 IN dynamicpruning#40)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(52) ColumnarToRow [codegen id : 14]
-Input [5]: [ws_item_sk#33, ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+(47) ColumnarToRow [codegen id : 16]
+Input [5]: [ws_item_sk#35, ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
 
-(53) ReusedExchange [Reuses operator id: 22]
-Output [1]: [item_sk#17]
+(48) ReusedExchange [Reuses operator id: 20]
+Output [1]: [item_sk#18]
 
-(54) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_item_sk#33]
-Right keys [1]: [item_sk#17]
+(49) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [ws_item_sk#35]
+Right keys [1]: [item_sk#18]
 Join type: LeftSemi
 Join condition: None
 
-(55) Project [codegen id : 14]
-Output [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
-Input [5]: [ws_item_sk#33, ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
-
-(56) RowToColumnar
-Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+(50) Project [codegen id : 16]
+Output [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+Input [5]: [ws_item_sk#35, ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
 
-(57) CometColumnarExchange
-Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
-Arguments: hashpartitioning(ws_bill_customer_sk#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(51) Exchange
+Input [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+Arguments: hashpartitioning(ws_bill_customer_sk#36, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(58) CometSort
-Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
-Arguments: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37], [ws_bill_customer_sk#34 ASC NULLS FIRST]
+(52) Sort [codegen id : 17]
+Input [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+Arguments: [ws_bill_customer_sk#36 ASC NULLS FIRST], false, 0
 
-(59) ReusedExchange [Reuses operator id: 40]
-Output [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+(53) ReusedExchange [Reuses operator id: 36]
+Output [3]: [c_customer_sk#24, sum#27, isEmpty#28]
 
-(60) CometHashAggregate
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+(54) HashAggregate [codegen id : 20]
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
+Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
 
-(61) CometFilter
-Input [2]: [c_customer_sk#23, ssales#28]
-Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#29, [id=#30])))
+(55) Filter [codegen id : 20]
+Input [2]: [c_customer_sk#24, ssales#30]
+Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#31, [id=#32])))
 
-(62) CometProject
-Input [2]: [c_customer_sk#23, ssales#28]
-Arguments: [c_customer_sk#23], [c_customer_sk#23]
+(56) Project [codegen id : 20]
+Output [1]: [c_customer_sk#24]
+Input [2]: [c_customer_sk#24, ssales#30]
 
-(63) CometSort
-Input [1]: [c_customer_sk#23]
-Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+(57) Sort [codegen id : 20]
+Input [1]: [c_customer_sk#24]
+Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
 
-(64) CometSortMergeJoin
-Left output [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
-Right output [1]: [c_customer_sk#23]
-Arguments: [ws_bill_customer_sk#34], [c_customer_sk#23], LeftSemi
-
-(65) CometProject
-Input [4]: [ws_bill_customer_sk#34, ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
-Arguments: [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37], [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+(58) SortMergeJoin [codegen id : 22]
+Left keys [1]: [ws_bill_customer_sk#36]
+Right keys [1]: [c_customer_sk#24]
+Join type: LeftSemi
+Join condition: None
 
-(66) ColumnarToRow [codegen id : 18]
-Input [3]: [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37]
+(59) Project [codegen id : 22]
+Output [3]: [ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
+Input [4]: [ws_bill_customer_sk#36, ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39]
 
-(67) ReusedExchange [Reuses operator id: 80]
-Output [1]: [d_date_sk#39]
+(60) ReusedExchange [Reuses operator id: 71]
+Output [1]: [d_date_sk#41]
 
-(68) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_sold_date_sk#37]
-Right keys [1]: [d_date_sk#39]
+(61) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_sold_date_sk#39]
+Right keys [1]: [d_date_sk#41]
 Join type: Inner
 Join condition: None
 
-(69) Project [codegen id : 18]
-Output [1]: [(cast(ws_quantity#35 as decimal(10,0)) * ws_list_price#36) AS sales#40]
-Input [4]: [ws_quantity#35, ws_list_price#36, ws_sold_date_sk#37, d_date_sk#39]
+(62) Project [codegen id : 22]
+Output [1]: [(cast(ws_quantity#37 as decimal(10,0)) * ws_list_price#38) AS sales#42]
+Input [4]: [ws_quantity#37, ws_list_price#38, ws_sold_date_sk#39, d_date_sk#41]
 
-(70) Union
+(63) Union
 
-(71) HashAggregate [codegen id : 19]
-Input [1]: [sales#32]
+(64) HashAggregate [codegen id : 23]
+Input [1]: [sales#34]
 Keys: []
-Functions [1]: [partial_sum(sales#32)]
-Aggregate Attributes [2]: [sum#41, isEmpty#42]
-Results [2]: [sum#43, isEmpty#44]
-
-(72) RowToColumnar
-Input [2]: [sum#43, isEmpty#44]
+Functions [1]: [partial_sum(sales#34)]
+Aggregate Attributes [2]: [sum#43, isEmpty#44]
+Results [2]: [sum#45, isEmpty#46]
 
-(73) CometColumnarExchange
-Input [2]: [sum#43, isEmpty#44]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(65) Exchange
+Input [2]: [sum#45, isEmpty#46]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=8]
 
-(74) CometHashAggregate
-Input [2]: [sum#43, isEmpty#44]
+(66) HashAggregate [codegen id : 24]
+Input [2]: [sum#45, isEmpty#46]
 Keys: []
-Functions [1]: [sum(sales#32)]
-
-(75) ColumnarToRow [codegen id : 20]
-Input [1]: [sum(sales)#45]
+Functions [1]: [sum(sales#34)]
+Aggregate Attributes [1]: [sum(sales#34)#47]
+Results [1]: [sum(sales#34)#47 AS sum(sales)#48]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (80)
-+- * ColumnarToRow (79)
-   +- CometProject (78)
-      +- CometFilter (77)
-         +- CometScan parquet spark_catalog.default.date_dim (76)
+BroadcastExchange (71)
++- * ColumnarToRow (70)
+   +- CometProject (69)
+      +- CometFilter (68)
+         +- CometScan parquet spark_catalog.default.date_dim (67)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#31, d_year#46, d_moy#47]
+Output [3]: [d_date_sk#33, d_year#49, d_moy#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(77) CometFilter
-Input [3]: [d_date_sk#31, d_year#46, d_moy#47]
-Condition : ((((isnotnull(d_year#46) AND isnotnull(d_moy#47)) AND (d_year#46 = 2000)) AND (d_moy#47 = 2)) AND isnotnull(d_date_sk#31))
+(68) CometFilter
+Input [3]: [d_date_sk#33, d_year#49, d_moy#50]
+Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 2000)) AND (d_moy#50 = 2)) AND isnotnull(d_date_sk#33))
 
-(78) CometProject
-Input [3]: [d_date_sk#31, d_year#46, d_moy#47]
-Arguments: [d_date_sk#31], [d_date_sk#31]
+(69) CometProject
+Input [3]: [d_date_sk#33, d_year#49, d_moy#50]
+Arguments: [d_date_sk#33], [d_date_sk#33]
 
-(79) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#31]
+(70) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#33]
 
-(80) BroadcastExchange
-Input [1]: [d_date_sk#31]
+(71) BroadcastExchange
+Input [1]: [d_date_sk#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
 Subquery:2 Hosting operator id = 3 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (85)
-+- * ColumnarToRow (84)
-   +- CometProject (83)
-      +- CometFilter (82)
-         +- CometScan parquet spark_catalog.default.date_dim (81)
+BroadcastExchange (76)
++- * ColumnarToRow (75)
+   +- CometProject (74)
+      +- CometFilter (73)
+         +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_date#11, d_year#48]
+Output [3]: [d_date_sk#10, d_date#11, d_year#51]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_year:int>
 
-(82) CometFilter
-Input [3]: [d_date_sk#10, d_date#11, d_year#48]
-Condition : (d_year#48 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
+(73) CometFilter
+Input [3]: [d_date_sk#10, d_date#11, d_year#51]
+Condition : (d_year#51 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
 
-(83) CometProject
-Input [3]: [d_date_sk#10, d_date#11, d_year#48]
+(74) CometProject
+Input [3]: [d_date_sk#10, d_date#11, d_year#51]
 Arguments: [d_date_sk#10, d_date#11], [d_date_sk#10, d_date#11]
 
-(84) ColumnarToRow [codegen id : 1]
+(75) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#10, d_date#11]
 
-(85) BroadcastExchange
+(76) BroadcastExchange
 Input [2]: [d_date_sk#10, d_date#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=10]
 
-Subquery:3 Hosting operator id = 42 Hosting Expression = Subquery scalar-subquery#29, [id=#30]
-* ColumnarToRow (102)
-+- CometHashAggregate (101)
-   +- CometColumnarExchange (100)
-      +- CometHashAggregate (99)
-         +- CometHashAggregate (98)
-            +- CometColumnarExchange (97)
-               +- RowToColumnar (96)
-                  +- * HashAggregate (95)
-                     +- * Project (94)
-                        +- * BroadcastHashJoin Inner BuildRight (93)
-                           :- * Project (91)
-                           :  +- * BroadcastHashJoin Inner BuildRight (90)
-                           :     :- * ColumnarToRow (88)
-                           :     :  +- CometFilter (87)
-                           :     :     +- CometScan parquet spark_catalog.default.store_sales (86)
-                           :     +- ReusedExchange (89)
-                           +- ReusedExchange (92)
+Subquery:3 Hosting operator id = 38 Hosting Expression = Subquery scalar-subquery#31, [id=#32]
+* HashAggregate (91)
++- Exchange (90)
+   +- * HashAggregate (89)
+      +- * HashAggregate (88)
+         +- Exchange (87)
+            +- * HashAggregate (86)
+               +- * Project (85)
+                  +- * BroadcastHashJoin Inner BuildRight (84)
+                     :- * Project (82)
+                     :  +- * BroadcastHashJoin Inner BuildRight (81)
+                     :     :- * ColumnarToRow (79)
+                     :     :  +- CometFilter (78)
+                     :     :     +- CometScan parquet spark_catalog.default.store_sales (77)
+                     :     +- ReusedExchange (80)
+                     +- ReusedExchange (83)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52]
+Output [4]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#52), dynamicpruningexpression(ss_sold_date_sk#52 IN dynamicpruning#53)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#55), dynamicpruningexpression(ss_sold_date_sk#55 IN dynamicpruning#56)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(87) CometFilter
-Input [4]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52]
-Condition : isnotnull(ss_customer_sk#49)
+(78) CometFilter
+Input [4]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55]
+Condition : isnotnull(ss_customer_sk#52)
 
-(88) ColumnarToRow [codegen id : 3]
-Input [4]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52]
+(79) ColumnarToRow [codegen id : 3]
+Input [4]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55]
 
-(89) ReusedExchange [Reuses operator id: 35]
-Output [1]: [c_customer_sk#54]
+(80) ReusedExchange [Reuses operator id: 32]
+Output [1]: [c_customer_sk#57]
 
-(90) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_customer_sk#49]
-Right keys [1]: [c_customer_sk#54]
+(81) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_customer_sk#52]
+Right keys [1]: [c_customer_sk#57]
 Join type: Inner
 Join condition: None
 
-(91) Project [codegen id : 3]
-Output [4]: [ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52, c_customer_sk#54]
-Input [5]: [ss_customer_sk#49, ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52, c_customer_sk#54]
+(82) Project [codegen id : 3]
+Output [4]: [ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55, c_customer_sk#57]
+Input [5]: [ss_customer_sk#52, ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55, c_customer_sk#57]
 
-(92) ReusedExchange [Reuses operator id: 107]
-Output [1]: [d_date_sk#55]
+(83) ReusedExchange [Reuses operator id: 96]
+Output [1]: [d_date_sk#58]
 
-(93) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_sold_date_sk#52]
-Right keys [1]: [d_date_sk#55]
+(84) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_sold_date_sk#55]
+Right keys [1]: [d_date_sk#58]
 Join type: Inner
 Join condition: None
 
-(94) Project [codegen id : 3]
-Output [3]: [ss_quantity#50, ss_sales_price#51, c_customer_sk#54]
-Input [5]: [ss_quantity#50, ss_sales_price#51, ss_sold_date_sk#52, c_customer_sk#54, d_date_sk#55]
-
-(95) HashAggregate [codegen id : 3]
-Input [3]: [ss_quantity#50, ss_sales_price#51, c_customer_sk#54]
-Keys [1]: [c_customer_sk#54]
-Functions [1]: [partial_sum((cast(ss_quantity#50 as decimal(10,0)) * ss_sales_price#51))]
-Aggregate Attributes [2]: [sum#56, isEmpty#57]
-Results [3]: [c_customer_sk#54, sum#58, isEmpty#59]
-
-(96) RowToColumnar
-Input [3]: [c_customer_sk#54, sum#58, isEmpty#59]
-
-(97) CometColumnarExchange
-Input [3]: [c_customer_sk#54, sum#58, isEmpty#59]
-Arguments: hashpartitioning(c_customer_sk#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
-
-(98) CometHashAggregate
-Input [3]: [c_customer_sk#54, sum#58, isEmpty#59]
-Keys [1]: [c_customer_sk#54]
-Functions [1]: [sum((cast(ss_quantity#50 as decimal(10,0)) * ss_sales_price#51))]
-
-(99) CometHashAggregate
-Input [1]: [csales#60]
+(85) Project [codegen id : 3]
+Output [3]: [ss_quantity#53, ss_sales_price#54, c_customer_sk#57]
+Input [5]: [ss_quantity#53, ss_sales_price#54, ss_sold_date_sk#55, c_customer_sk#57, d_date_sk#58]
+
+(86) HashAggregate [codegen id : 3]
+Input [3]: [ss_quantity#53, ss_sales_price#54, c_customer_sk#57]
+Keys [1]: [c_customer_sk#57]
+Functions [1]: [partial_sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))]
+Aggregate Attributes [2]: [sum#59, isEmpty#60]
+Results [3]: [c_customer_sk#57, sum#61, isEmpty#62]
+
+(87) Exchange
+Input [3]: [c_customer_sk#57, sum#61, isEmpty#62]
+Arguments: hashpartitioning(c_customer_sk#57, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+
+(88) HashAggregate [codegen id : 4]
+Input [3]: [c_customer_sk#57, sum#61, isEmpty#62]
+Keys [1]: [c_customer_sk#57]
+Functions [1]: [sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))#63]
+Results [1]: [sum((cast(ss_quantity#53 as decimal(10,0)) * ss_sales_price#54))#63 AS csales#64]
+
+(89) HashAggregate [codegen id : 4]
+Input [1]: [csales#64]
 Keys: []
-Functions [1]: [partial_max(csales#60)]
+Functions [1]: [partial_max(csales#64)]
+Aggregate Attributes [1]: [max#65]
+Results [1]: [max#66]
 
-(100) CometColumnarExchange
-Input [1]: [max#61]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(90) Exchange
+Input [1]: [max#66]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
 
-(101) CometHashAggregate
-Input [1]: [max#61]
+(91) HashAggregate [codegen id : 5]
+Input [1]: [max#66]
 Keys: []
-Functions [1]: [max(csales#60)]
-
-(102) ColumnarToRow [codegen id : 4]
-Input [1]: [tpcds_cmax#62]
+Functions [1]: [max(csales#64)]
+Aggregate Attributes [1]: [max(csales#64)#67]
+Results [1]: [max(csales#64)#67 AS tpcds_cmax#68]
 
-Subquery:4 Hosting operator id = 86 Hosting Expression = ss_sold_date_sk#52 IN dynamicpruning#53
-BroadcastExchange (107)
-+- * ColumnarToRow (106)
-   +- CometProject (105)
-      +- CometFilter (104)
-         +- CometScan parquet spark_catalog.default.date_dim (103)
+Subquery:4 Hosting operator id = 77 Hosting Expression = ss_sold_date_sk#55 IN dynamicpruning#56
+BroadcastExchange (96)
++- * ColumnarToRow (95)
+   +- CometProject (94)
+      +- CometFilter (93)
+         +- CometScan parquet spark_catalog.default.date_dim (92)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#55, d_year#63]
+Output [2]: [d_date_sk#58, d_year#69]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(104) CometFilter
-Input [2]: [d_date_sk#55, d_year#63]
-Condition : (d_year#63 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#55))
+(93) CometFilter
+Input [2]: [d_date_sk#58, d_year#69]
+Condition : (d_year#69 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#58))
 
-(105) CometProject
-Input [2]: [d_date_sk#55, d_year#63]
-Arguments: [d_date_sk#55], [d_date_sk#55]
+(94) CometProject
+Input [2]: [d_date_sk#58, d_year#69]
+Arguments: [d_date_sk#58], [d_date_sk#58]
 
-(106) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#55]
+(95) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#58]
 
-(107) BroadcastExchange
-Input [1]: [d_date_sk#55]
+(96) BroadcastExchange
+Input [1]: [d_date_sk#58]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:5 Hosting operator id = 51 Hosting Expression = ws_sold_date_sk#37 IN dynamicpruning#6
+Subquery:5 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#39 IN dynamicpruning#6
 
-Subquery:6 Hosting operator id = 61 Hosting Expression = ReusedSubquery Subquery scalar-subquery#29, [id=#30]
+Subquery:6 Hosting operator id = 55 Hosting Expression = ReusedSubquery Subquery scalar-subquery#31, [id=#32]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt
index 51a411e3c9..0ec56d0e72 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23a/simplified.txt
@@ -1,154 +1,155 @@
-WholeStageCodegen (20)
-  ColumnarToRow
+WholeStageCodegen (24)
+  HashAggregate [sum,isEmpty] [sum(sales),sum(sales),sum,isEmpty]
     InputAdapter
-      CometHashAggregate [sum,isEmpty]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (19)
-              HashAggregate [sales] [sum,isEmpty,sum,isEmpty]
-                InputAdapter
-                  Union
-                    WholeStageCodegen (9)
-                      Project [cs_quantity,cs_list_price]
-                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                CometSortMergeJoin [cs_bill_customer_sk,c_customer_sk]
-                                  CometSort [cs_bill_customer_sk]
-                                    CometColumnarExchange [cs_bill_customer_sk] #2
-                                      RowToColumnar
-                                        WholeStageCodegen (5)
-                                          Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                            BroadcastHashJoin [cs_item_sk,item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #4
-                                                  WholeStageCodegen (4)
-                                                    ColumnarToRow
+      Exchange #1
+        WholeStageCodegen (23)
+          HashAggregate [sales] [sum,isEmpty,sum,isEmpty]
+            InputAdapter
+              Union
+                WholeStageCodegen (11)
+                  Project [cs_quantity,cs_list_price]
+                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                      Project [cs_quantity,cs_list_price,cs_sold_date_sk]
+                        SortMergeJoin [cs_bill_customer_sk,c_customer_sk]
+                          InputAdapter
+                            WholeStageCodegen (6)
+                              Sort [cs_bill_customer_sk]
+                                InputAdapter
+                                  Exchange [cs_bill_customer_sk] #2
+                                    WholeStageCodegen (5)
+                                      Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                        BroadcastHashJoin [cs_item_sk,item_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                          InputAdapter
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (4)
+                                                Project [item_sk]
+                                                  Filter [cnt]
+                                                    HashAggregate [_groupingexpression,i_item_sk,d_date,count] [count(1),item_sk,cnt,count]
                                                       InputAdapter
-                                                        CometProject [item_sk]
-                                                          CometFilter [cnt]
-                                                            CometHashAggregate [_groupingexpression,i_item_sk,d_date,count]
-                                                              CometColumnarExchange [_groupingexpression,i_item_sk,d_date] #5
-                                                                RowToColumnar
-                                                                  WholeStageCodegen (3)
-                                                                    HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
-                                                                      Project [d_date,i_item_sk,i_item_desc]
-                                                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                          Project [ss_item_sk,d_date]
-                                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometFilter [ss_item_sk]
-                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                                      SubqueryBroadcast [d_date_sk] #2
-                                                                                        BroadcastExchange #6
-                                                                                          WholeStageCodegen (1)
-                                                                                            ColumnarToRow
-                                                                                              InputAdapter
-                                                                                                CometProject [d_date_sk,d_date]
-                                                                                                  CometFilter [d_year,d_date_sk]
-                                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
-                                                                              InputAdapter
-                                                                                ReusedExchange [d_date_sk,d_date] #6
-                                                                          InputAdapter
-                                                                            BroadcastExchange #7
-                                                                              WholeStageCodegen (2)
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometFilter [i_item_sk]
-                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
-                                  CometSort [c_customer_sk]
-                                    CometProject [c_customer_sk]
-                                      CometFilter [ssales]
-                                        Subquery #3
-                                          WholeStageCodegen (4)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometHashAggregate [max]
-                                                  CometColumnarExchange #10
-                                                    CometHashAggregate [csales]
-                                                      CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                                        CometColumnarExchange [c_customer_sk] #11
-                                                          RowToColumnar
-                                                            WholeStageCodegen (3)
-                                                              HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                                                Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
-                                                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                        Exchange [_groupingexpression,i_item_sk,d_date] #5
+                                                          WholeStageCodegen (3)
+                                                            HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
+                                                              Project [d_date,i_item_sk,i_item_desc]
+                                                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                  Project [ss_item_sk,d_date]
+                                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometFilter [ss_item_sk]
+                                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                              SubqueryBroadcast [d_date_sk] #2
+                                                                                BroadcastExchange #6
+                                                                                  WholeStageCodegen (1)
+                                                                                    ColumnarToRow
+                                                                                      InputAdapter
+                                                                                        CometProject [d_date_sk,d_date]
+                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
+                                                                      InputAdapter
+                                                                        ReusedExchange [d_date_sk,d_date] #6
+                                                                  InputAdapter
+                                                                    BroadcastExchange #7
+                                                                      WholeStageCodegen (2)
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [ss_customer_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #4
-                                                                                  BroadcastExchange #12
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometProject [d_date_sk]
-                                                                                            CometFilter [d_year,d_date_sk]
-                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          ReusedExchange [c_customer_sk] #9
+                                                                            CometFilter [i_item_sk]
+                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                          InputAdapter
+                            WholeStageCodegen (9)
+                              Sort [c_customer_sk]
+                                Project [c_customer_sk]
+                                  Filter [ssales]
+                                    Subquery #3
+                                      WholeStageCodegen (5)
+                                        HashAggregate [max] [max(csales),tpcds_cmax,max]
+                                          InputAdapter
+                                            Exchange #10
+                                              WholeStageCodegen (4)
+                                                HashAggregate [csales] [max,max]
+                                                  HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),csales,sum,isEmpty]
+                                                    InputAdapter
+                                                      Exchange [c_customer_sk] #11
+                                                        WholeStageCodegen (3)
+                                                          HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                                            Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
+                                                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometFilter [ss_customer_sk]
+                                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                                            SubqueryBroadcast [d_date_sk] #4
+                                                                              BroadcastExchange #12
+                                                                                WholeStageCodegen (1)
+                                                                                  ColumnarToRow
+                                                                                    InputAdapter
+                                                                                      CometProject [d_date_sk]
+                                                                                        CometFilter [d_year,d_date_sk]
+                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                     InputAdapter
-                                                                      ReusedExchange [d_date_sk] #12
-                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                          CometColumnarExchange [c_customer_sk] #8
-                                            RowToColumnar
-                                              WholeStageCodegen (7)
-                                                HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                                  Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                    BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
-                                                            CometFilter [ss_customer_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                      InputAdapter
-                                                        BroadcastExchange #9
-                                                          WholeStageCodegen (6)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [c_customer_sk]
-                                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk]
+                                                                      ReusedExchange [c_customer_sk] #9
+                                                                InputAdapter
+                                                                  ReusedExchange [d_date_sk] #12
+                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [c_customer_sk] #8
+                                          WholeStageCodegen (8)
+                                            HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                              Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
+                                                        CometFilter [ss_customer_sk]
+                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                  InputAdapter
+                                                    BroadcastExchange #9
+                                                      WholeStageCodegen (7)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [c_customer_sk]
+                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk]
+                      InputAdapter
+                        ReusedExchange [d_date_sk] #3
+                WholeStageCodegen (22)
+                  Project [ws_quantity,ws_list_price]
+                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                      Project [ws_quantity,ws_list_price,ws_sold_date_sk]
+                        SortMergeJoin [ws_bill_customer_sk,c_customer_sk]
                           InputAdapter
-                            ReusedExchange [d_date_sk] #3
-                    WholeStageCodegen (18)
-                      Project [ws_quantity,ws_list_price]
-                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                CometSortMergeJoin [ws_bill_customer_sk,c_customer_sk]
-                                  CometSort [ws_bill_customer_sk]
-                                    CometColumnarExchange [ws_bill_customer_sk] #13
-                                      RowToColumnar
-                                        WholeStageCodegen (14)
-                                          Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                            BroadcastHashJoin [ws_item_sk,item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [item_sk] #4
-                                  CometSort [c_customer_sk]
-                                    CometProject [c_customer_sk]
-                                      CometFilter [ssales]
-                                        ReusedSubquery [tpcds_cmax] #3
-                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                          ReusedExchange [c_customer_sk,sum,isEmpty] #8
+                            WholeStageCodegen (17)
+                              Sort [ws_bill_customer_sk]
+                                InputAdapter
+                                  Exchange [ws_bill_customer_sk] #13
+                                    WholeStageCodegen (16)
+                                      Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                        BroadcastHashJoin [ws_item_sk,item_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [item_sk] #4
                           InputAdapter
-                            ReusedExchange [d_date_sk] #3
+                            WholeStageCodegen (20)
+                              Sort [c_customer_sk]
+                                Project [c_customer_sk]
+                                  Filter [ssales]
+                                    ReusedSubquery [tpcds_cmax] #3
+                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
+                                      InputAdapter
+                                        ReusedExchange [c_customer_sk,sum,isEmpty] #8
+                      InputAdapter
+                        ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt
index 5d9f6a6715..86227b8324 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/explain.txt
@@ -1,101 +1,91 @@
 == Physical Plan ==
-* ColumnarToRow (97)
-+- CometTakeOrderedAndProject (96)
-   +- CometUnion (95)
-      :- CometHashAggregate (68)
-      :  +- CometColumnarExchange (67)
-      :     +- RowToColumnar (66)
-      :        +- * HashAggregate (65)
-      :           +- * Project (64)
-      :              +- * BroadcastHashJoin Inner BuildRight (63)
-      :                 :- * Project (61)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (60)
-      :                 :     :- * ColumnarToRow (47)
-      :                 :     :  +- CometSortMergeJoin (46)
-      :                 :     :     :- CometSort (28)
-      :                 :     :     :  +- CometColumnarExchange (27)
-      :                 :     :     :     +- RowToColumnar (26)
-      :                 :     :     :        +- * Project (25)
-      :                 :     :     :           +- * BroadcastHashJoin LeftSemi BuildRight (24)
-      :                 :     :     :              :- * ColumnarToRow (3)
-      :                 :     :     :              :  +- CometFilter (2)
-      :                 :     :     :              :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-      :                 :     :     :              +- BroadcastExchange (23)
-      :                 :     :     :                 +- * ColumnarToRow (22)
-      :                 :     :     :                    +- CometProject (21)
-      :                 :     :     :                       +- CometFilter (20)
-      :                 :     :     :                          +- CometHashAggregate (19)
-      :                 :     :     :                             +- CometColumnarExchange (18)
-      :                 :     :     :                                +- RowToColumnar (17)
-      :                 :     :     :                                   +- * HashAggregate (16)
-      :                 :     :     :                                      +- * Project (15)
-      :                 :     :     :                                         +- * BroadcastHashJoin Inner BuildRight (14)
-      :                 :     :     :                                            :- * Project (9)
-      :                 :     :     :                                            :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :                 :     :     :                                            :     :- * ColumnarToRow (6)
-      :                 :     :     :                                            :     :  +- CometFilter (5)
-      :                 :     :     :                                            :     :     +- CometScan parquet spark_catalog.default.store_sales (4)
-      :                 :     :     :                                            :     +- ReusedExchange (7)
-      :                 :     :     :                                            +- BroadcastExchange (13)
-      :                 :     :     :                                               +- * ColumnarToRow (12)
-      :                 :     :     :                                                  +- CometFilter (11)
-      :                 :     :     :                                                     +- CometScan parquet spark_catalog.default.item (10)
-      :                 :     :     +- CometSort (45)
-      :                 :     :        +- CometProject (44)
-      :                 :     :           +- CometFilter (43)
-      :                 :     :              +- CometHashAggregate (42)
-      :                 :     :                 +- CometColumnarExchange (41)
-      :                 :     :                    +- RowToColumnar (40)
-      :                 :     :                       +- * HashAggregate (39)
-      :                 :     :                          +- * Project (38)
-      :                 :     :                             +- * BroadcastHashJoin Inner BuildRight (37)
-      :                 :     :                                :- * ColumnarToRow (32)
-      :                 :     :                                :  +- CometProject (31)
-      :                 :     :                                :     +- CometFilter (30)
-      :                 :     :                                :        +- CometScan parquet spark_catalog.default.store_sales (29)
-      :                 :     :                                +- BroadcastExchange (36)
-      :                 :     :                                   +- * ColumnarToRow (35)
-      :                 :     :                                      +- CometFilter (34)
-      :                 :     :                                         +- CometScan parquet spark_catalog.default.customer (33)
-      :                 :     +- BroadcastExchange (59)
-      :                 :        +- * ColumnarToRow (58)
-      :                 :           +- CometSortMergeJoin (57)
-      :                 :              :- CometSort (51)
-      :                 :              :  +- CometColumnarExchange (50)
-      :                 :              :     +- CometFilter (49)
-      :                 :              :        +- CometScan parquet spark_catalog.default.customer (48)
-      :                 :              +- CometSort (56)
-      :                 :                 +- CometProject (55)
-      :                 :                    +- CometFilter (54)
-      :                 :                       +- CometHashAggregate (53)
-      :                 :                          +- ReusedExchange (52)
-      :                 +- ReusedExchange (62)
-      +- CometHashAggregate (94)
-         +- CometColumnarExchange (93)
-            +- RowToColumnar (92)
-               +- * HashAggregate (91)
-                  +- * Project (90)
-                     +- * BroadcastHashJoin Inner BuildRight (89)
-                        :- * Project (87)
-                        :  +- * BroadcastHashJoin Inner BuildRight (86)
-                        :     :- * ColumnarToRow (84)
-                        :     :  +- CometSortMergeJoin (83)
-                        :     :     :- CometSort (77)
-                        :     :     :  +- CometColumnarExchange (76)
-                        :     :     :     +- RowToColumnar (75)
-                        :     :     :        +- * Project (74)
-                        :     :     :           +- * BroadcastHashJoin LeftSemi BuildRight (73)
-                        :     :     :              :- * ColumnarToRow (71)
-                        :     :     :              :  +- CometFilter (70)
-                        :     :     :              :     +- CometScan parquet spark_catalog.default.web_sales (69)
-                        :     :     :              +- ReusedExchange (72)
-                        :     :     +- CometSort (82)
-                        :     :        +- CometProject (81)
-                        :     :           +- CometFilter (80)
-                        :     :              +- CometHashAggregate (79)
-                        :     :                 +- ReusedExchange (78)
-                        :     +- ReusedExchange (85)
-                        +- ReusedExchange (88)
+TakeOrderedAndProject (87)
++- Union (86)
+   :- * HashAggregate (62)
+   :  +- Exchange (61)
+   :     +- * HashAggregate (60)
+   :        +- * Project (59)
+   :           +- * BroadcastHashJoin Inner BuildRight (58)
+   :              :- * Project (56)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (55)
+   :              :     :- * SortMergeJoin LeftSemi (42)
+   :              :     :  :- * Sort (25)
+   :              :     :  :  +- Exchange (24)
+   :              :     :  :     +- * Project (23)
+   :              :     :  :        +- * BroadcastHashJoin LeftSemi BuildRight (22)
+   :              :     :  :           :- * ColumnarToRow (3)
+   :              :     :  :           :  +- CometFilter (2)
+   :              :     :  :           :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+   :              :     :  :           +- BroadcastExchange (21)
+   :              :     :  :              +- * Project (20)
+   :              :     :  :                 +- * Filter (19)
+   :              :     :  :                    +- * HashAggregate (18)
+   :              :     :  :                       +- Exchange (17)
+   :              :     :  :                          +- * HashAggregate (16)
+   :              :     :  :                             +- * Project (15)
+   :              :     :  :                                +- * BroadcastHashJoin Inner BuildRight (14)
+   :              :     :  :                                   :- * Project (9)
+   :              :     :  :                                   :  +- * BroadcastHashJoin Inner BuildRight (8)
+   :              :     :  :                                   :     :- * ColumnarToRow (6)
+   :              :     :  :                                   :     :  +- CometFilter (5)
+   :              :     :  :                                   :     :     +- CometScan parquet spark_catalog.default.store_sales (4)
+   :              :     :  :                                   :     +- ReusedExchange (7)
+   :              :     :  :                                   +- BroadcastExchange (13)
+   :              :     :  :                                      +- * ColumnarToRow (12)
+   :              :     :  :                                         +- CometFilter (11)
+   :              :     :  :                                            +- CometScan parquet spark_catalog.default.item (10)
+   :              :     :  +- * Sort (41)
+   :              :     :     +- * Project (40)
+   :              :     :        +- * Filter (39)
+   :              :     :           +- * HashAggregate (38)
+   :              :     :              +- Exchange (37)
+   :              :     :                 +- * HashAggregate (36)
+   :              :     :                    +- * Project (35)
+   :              :     :                       +- * BroadcastHashJoin Inner BuildRight (34)
+   :              :     :                          :- * ColumnarToRow (29)
+   :              :     :                          :  +- CometProject (28)
+   :              :     :                          :     +- CometFilter (27)
+   :              :     :                          :        +- CometScan parquet spark_catalog.default.store_sales (26)
+   :              :     :                          +- BroadcastExchange (33)
+   :              :     :                             +- * ColumnarToRow (32)
+   :              :     :                                +- CometFilter (31)
+   :              :     :                                   +- CometScan parquet spark_catalog.default.customer (30)
+   :              :     +- BroadcastExchange (54)
+   :              :        +- * SortMergeJoin LeftSemi (53)
+   :              :           :- * ColumnarToRow (47)
+   :              :           :  +- CometSort (46)
+   :              :           :     +- CometExchange (45)
+   :              :           :        +- CometFilter (44)
+   :              :           :           +- CometScan parquet spark_catalog.default.customer (43)
+   :              :           +- * Sort (52)
+   :              :              +- * Project (51)
+   :              :                 +- * Filter (50)
+   :              :                    +- * HashAggregate (49)
+   :              :                       +- ReusedExchange (48)
+   :              +- ReusedExchange (57)
+   +- * HashAggregate (85)
+      +- Exchange (84)
+         +- * HashAggregate (83)
+            +- * Project (82)
+               +- * BroadcastHashJoin Inner BuildRight (81)
+                  :- * Project (79)
+                  :  +- * BroadcastHashJoin Inner BuildRight (78)
+                  :     :- * SortMergeJoin LeftSemi (76)
+                  :     :  :- * Sort (70)
+                  :     :  :  +- Exchange (69)
+                  :     :  :     +- * Project (68)
+                  :     :  :        +- * BroadcastHashJoin LeftSemi BuildRight (67)
+                  :     :  :           :- * ColumnarToRow (65)
+                  :     :  :           :  +- CometFilter (64)
+                  :     :  :           :     +- CometScan parquet spark_catalog.default.web_sales (63)
+                  :     :  :           +- ReusedExchange (66)
+                  :     :  +- * Sort (75)
+                  :     :     +- * Project (74)
+                  :     :        +- * Filter (73)
+                  :     :           +- * HashAggregate (72)
+                  :     :              +- ReusedExchange (71)
+                  :     +- ReusedExchange (77)
+                  +- ReusedExchange (80)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -128,7 +118,7 @@ Condition : isnotnull(ss_item_sk#7)
 (6) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_item_sk#7, ss_sold_date_sk#8]
 
-(7) ReusedExchange [Reuses operator id: 107]
+(7) ReusedExchange [Reuses operator id: 97]
 Output [2]: [d_date_sk#10, d_date#11]
 
 (8) BroadcastHashJoin [codegen id : 3]
@@ -176,548 +166,529 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#15]
 Results [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 
-(17) RowToColumnar
+(17) Exchange
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
+Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(18) CometColumnarExchange
-Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
-Arguments: hashpartitioning(_groupingexpression#14, i_item_sk#12, d_date#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(19) CometHashAggregate
+(18) HashAggregate [codegen id : 4]
 Input [4]: [_groupingexpression#14, i_item_sk#12, d_date#11, count#16]
 Keys [3]: [_groupingexpression#14, i_item_sk#12, d_date#11]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#17]
+Results [2]: [i_item_sk#12 AS item_sk#18, count(1)#17 AS cnt#19]
 
-(20) CometFilter
-Input [2]: [item_sk#17, cnt#18]
-Condition : (cnt#18 > 4)
-
-(21) CometProject
-Input [2]: [item_sk#17, cnt#18]
-Arguments: [item_sk#17], [item_sk#17]
+(19) Filter [codegen id : 4]
+Input [2]: [item_sk#18, cnt#19]
+Condition : (cnt#19 > 4)
 
-(22) ColumnarToRow [codegen id : 4]
-Input [1]: [item_sk#17]
+(20) Project [codegen id : 4]
+Output [1]: [item_sk#18]
+Input [2]: [item_sk#18, cnt#19]
 
-(23) BroadcastExchange
-Input [1]: [item_sk#17]
+(21) BroadcastExchange
+Input [1]: [item_sk#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 5]
+(22) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [cs_item_sk#2]
-Right keys [1]: [item_sk#17]
+Right keys [1]: [item_sk#18]
 Join type: LeftSemi
 Join condition: None
 
-(25) Project [codegen id : 5]
+(23) Project [codegen id : 5]
 Output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 Input [5]: [cs_bill_customer_sk#1, cs_item_sk#2, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
 
-(26) RowToColumnar
-Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-
-(27) CometColumnarExchange
+(24) Exchange
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(cs_bill_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometSort
+(25) Sort [codegen id : 6]
 Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Arguments: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5], [cs_bill_customer_sk#1 ASC NULLS FIRST]
+Arguments: [cs_bill_customer_sk#1 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
+Output [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(30) CometFilter
-Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
-Condition : isnotnull(ss_customer_sk#19)
+(27) CometFilter
+Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
+Condition : isnotnull(ss_customer_sk#20)
 
-(31) CometProject
-Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, ss_sold_date_sk#22]
-Arguments: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21], [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
+(28) CometProject
+Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, ss_sold_date_sk#23]
+Arguments: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22], [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
 
-(32) ColumnarToRow [codegen id : 7]
-Input [3]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21]
+(29) ColumnarToRow [codegen id : 8]
+Input [3]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [1]: [c_customer_sk#23]
+Output [1]: [c_customer_sk#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int>
 
-(34) CometFilter
-Input [1]: [c_customer_sk#23]
-Condition : isnotnull(c_customer_sk#23)
+(31) CometFilter
+Input [1]: [c_customer_sk#24]
+Condition : isnotnull(c_customer_sk#24)
 
-(35) ColumnarToRow [codegen id : 6]
-Input [1]: [c_customer_sk#23]
+(32) ColumnarToRow [codegen id : 7]
+Input [1]: [c_customer_sk#24]
 
-(36) BroadcastExchange
-Input [1]: [c_customer_sk#23]
+(33) BroadcastExchange
+Input [1]: [c_customer_sk#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(37) BroadcastHashJoin [codegen id : 7]
-Left keys [1]: [ss_customer_sk#19]
-Right keys [1]: [c_customer_sk#23]
+(34) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_customer_sk#20]
+Right keys [1]: [c_customer_sk#24]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 7]
-Output [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
-Input [4]: [ss_customer_sk#19, ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
-
-(39) HashAggregate [codegen id : 7]
-Input [3]: [ss_quantity#20, ss_sales_price#21, c_customer_sk#23]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [partial_sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
-Aggregate Attributes [2]: [sum#24, isEmpty#25]
-Results [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-
-(40) RowToColumnar
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-
-(41) CometColumnarExchange
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Arguments: hashpartitioning(c_customer_sk#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometHashAggregate
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
-
-(43) CometFilter
-Input [2]: [c_customer_sk#23, ssales#28]
-Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#29, [id=#30])))
-
-(44) CometProject
-Input [2]: [c_customer_sk#23, ssales#28]
-Arguments: [c_customer_sk#23], [c_customer_sk#23]
-
-(45) CometSort
-Input [1]: [c_customer_sk#23]
-Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
-
-(46) CometSortMergeJoin
-Left output [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
-Right output [1]: [c_customer_sk#23]
-Arguments: [cs_bill_customer_sk#1], [c_customer_sk#23], LeftSemi
-
-(47) ColumnarToRow [codegen id : 12]
-Input [4]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5]
+(35) Project [codegen id : 8]
+Output [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
+Input [4]: [ss_customer_sk#20, ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
+
+(36) HashAggregate [codegen id : 8]
+Input [3]: [ss_quantity#21, ss_sales_price#22, c_customer_sk#24]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [partial_sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [2]: [sum#25, isEmpty#26]
+Results [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+
+(37) Exchange
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Arguments: hashpartitioning(c_customer_sk#24, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(38) HashAggregate [codegen id : 9]
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
+Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
+
+(39) Filter [codegen id : 9]
+Input [2]: [c_customer_sk#24, ssales#30]
+Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * Subquery scalar-subquery#31, [id=#32])))
+
+(40) Project [codegen id : 9]
+Output [1]: [c_customer_sk#24]
+Input [2]: [c_customer_sk#24, ssales#30]
+
+(41) Sort [codegen id : 9]
+Input [1]: [c_customer_sk#24]
+Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
+
+(42) SortMergeJoin [codegen id : 16]
+Left keys [1]: [cs_bill_customer_sk#1]
+Right keys [1]: [c_customer_sk#24]
+Join type: LeftSemi
+Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+Output [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_first_name:string,c_last_name:string>
 
-(49) CometFilter
-Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
-Condition : isnotnull(c_customer_sk#31)
+(44) CometFilter
+Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
+Condition : isnotnull(c_customer_sk#33)
 
-(50) CometColumnarExchange
-Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
-Arguments: hashpartitioning(c_customer_sk#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(45) CometExchange
+Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
+Arguments: hashpartitioning(c_customer_sk#33, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(51) CometSort
-Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
-Arguments: [c_customer_sk#31, c_first_name#32, c_last_name#33], [c_customer_sk#31 ASC NULLS FIRST]
+(46) CometSort
+Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
+Arguments: [c_customer_sk#33, c_first_name#34, c_last_name#35], [c_customer_sk#33 ASC NULLS FIRST]
 
-(52) ReusedExchange [Reuses operator id: 41]
-Output [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+(47) ColumnarToRow [codegen id : 10]
+Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
 
-(53) CometHashAggregate
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+(48) ReusedExchange [Reuses operator id: 37]
+Output [3]: [c_customer_sk#24, sum#27, isEmpty#28]
 
-(54) CometFilter
-Input [2]: [c_customer_sk#23, ssales#28]
-Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#29, [id=#30])))
+(49) HashAggregate [codegen id : 13]
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
+Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
 
-(55) CometProject
-Input [2]: [c_customer_sk#23, ssales#28]
-Arguments: [c_customer_sk#23], [c_customer_sk#23]
+(50) Filter [codegen id : 13]
+Input [2]: [c_customer_sk#24, ssales#30]
+Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#31, [id=#32])))
 
-(56) CometSort
-Input [1]: [c_customer_sk#23]
-Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+(51) Project [codegen id : 13]
+Output [1]: [c_customer_sk#24]
+Input [2]: [c_customer_sk#24, ssales#30]
 
-(57) CometSortMergeJoin
-Left output [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
-Right output [1]: [c_customer_sk#23]
-Arguments: [c_customer_sk#31], [c_customer_sk#23], LeftSemi
+(52) Sort [codegen id : 13]
+Input [1]: [c_customer_sk#24]
+Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
 
-(58) ColumnarToRow [codegen id : 10]
-Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+(53) SortMergeJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#33]
+Right keys [1]: [c_customer_sk#24]
+Join type: LeftSemi
+Join condition: None
 
-(59) BroadcastExchange
-Input [3]: [c_customer_sk#31, c_first_name#32, c_last_name#33]
+(54) BroadcastExchange
+Input [3]: [c_customer_sk#33, c_first_name#34, c_last_name#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 12]
+(55) BroadcastHashJoin [codegen id : 16]
 Left keys [1]: [cs_bill_customer_sk#1]
-Right keys [1]: [c_customer_sk#31]
+Right keys [1]: [c_customer_sk#33]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 12]
-Output [5]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#32, c_last_name#33]
-Input [7]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_customer_sk#31, c_first_name#32, c_last_name#33]
+(56) Project [codegen id : 16]
+Output [5]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#34, c_last_name#35]
+Input [7]: [cs_bill_customer_sk#1, cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_customer_sk#33, c_first_name#34, c_last_name#35]
 
-(62) ReusedExchange [Reuses operator id: 102]
-Output [1]: [d_date_sk#34]
+(57) ReusedExchange [Reuses operator id: 92]
+Output [1]: [d_date_sk#36]
 
-(63) BroadcastHashJoin [codegen id : 12]
+(58) BroadcastHashJoin [codegen id : 16]
 Left keys [1]: [cs_sold_date_sk#5]
-Right keys [1]: [d_date_sk#34]
+Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 12]
-Output [4]: [cs_quantity#3, cs_list_price#4, c_first_name#32, c_last_name#33]
-Input [6]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#32, c_last_name#33, d_date_sk#34]
+(59) Project [codegen id : 16]
+Output [4]: [cs_quantity#3, cs_list_price#4, c_first_name#34, c_last_name#35]
+Input [6]: [cs_quantity#3, cs_list_price#4, cs_sold_date_sk#5, c_first_name#34, c_last_name#35, d_date_sk#36]
 
-(65) HashAggregate [codegen id : 12]
-Input [4]: [cs_quantity#3, cs_list_price#4, c_first_name#32, c_last_name#33]
-Keys [2]: [c_last_name#33, c_first_name#32]
+(60) HashAggregate [codegen id : 16]
+Input [4]: [cs_quantity#3, cs_list_price#4, c_first_name#34, c_last_name#35]
+Keys [2]: [c_last_name#35, c_first_name#34]
 Functions [1]: [partial_sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))]
-Aggregate Attributes [2]: [sum#35, isEmpty#36]
-Results [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
+Aggregate Attributes [2]: [sum#37, isEmpty#38]
+Results [4]: [c_last_name#35, c_first_name#34, sum#39, isEmpty#40]
 
-(66) RowToColumnar
-Input [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
+(61) Exchange
+Input [4]: [c_last_name#35, c_first_name#34, sum#39, isEmpty#40]
+Arguments: hashpartitioning(c_last_name#35, c_first_name#34, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(67) CometColumnarExchange
-Input [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
-Arguments: hashpartitioning(c_last_name#33, c_first_name#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(68) CometHashAggregate
-Input [4]: [c_last_name#33, c_first_name#32, sum#37, isEmpty#38]
-Keys [2]: [c_last_name#33, c_first_name#32]
+(62) HashAggregate [codegen id : 17]
+Input [4]: [c_last_name#35, c_first_name#34, sum#39, isEmpty#40]
+Keys [2]: [c_last_name#35, c_first_name#34]
 Functions [1]: [sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))]
+Aggregate Attributes [1]: [sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))#41]
+Results [3]: [c_last_name#35, c_first_name#34, sum((cast(cs_quantity#3 as decimal(10,0)) * cs_list_price#4))#41 AS sales#42]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+Output [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#43), dynamicpruningexpression(ws_sold_date_sk#43 IN dynamicpruning#44)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#47), dynamicpruningexpression(ws_sold_date_sk#47 IN dynamicpruning#48)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(70) CometFilter
-Input [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
-Condition : isnotnull(ws_bill_customer_sk#40)
+(64) CometFilter
+Input [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+Condition : isnotnull(ws_bill_customer_sk#44)
 
-(71) ColumnarToRow [codegen id : 17]
-Input [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+(65) ColumnarToRow [codegen id : 22]
+Input [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
 
-(72) ReusedExchange [Reuses operator id: 23]
-Output [1]: [item_sk#17]
+(66) ReusedExchange [Reuses operator id: 21]
+Output [1]: [item_sk#18]
 
-(73) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_item_sk#39]
-Right keys [1]: [item_sk#17]
+(67) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_item_sk#43]
+Right keys [1]: [item_sk#18]
 Join type: LeftSemi
 Join condition: None
 
-(74) Project [codegen id : 17]
-Output [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
-Input [5]: [ws_item_sk#39, ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
-
-(75) RowToColumnar
-Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+(68) Project [codegen id : 22]
+Output [4]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+Input [5]: [ws_item_sk#43, ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
 
-(76) CometColumnarExchange
-Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
-Arguments: hashpartitioning(ws_bill_customer_sk#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(69) Exchange
+Input [4]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+Arguments: hashpartitioning(ws_bill_customer_sk#44, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(77) CometSort
-Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
-Arguments: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43], [ws_bill_customer_sk#40 ASC NULLS FIRST]
+(70) Sort [codegen id : 23]
+Input [4]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47]
+Arguments: [ws_bill_customer_sk#44 ASC NULLS FIRST], false, 0
 
-(78) ReusedExchange [Reuses operator id: 41]
-Output [3]: [c_customer_sk#23, sum#26, isEmpty#27]
+(71) ReusedExchange [Reuses operator id: 37]
+Output [3]: [c_customer_sk#24, sum#27, isEmpty#28]
 
-(79) CometHashAggregate
-Input [3]: [c_customer_sk#23, sum#26, isEmpty#27]
-Keys [1]: [c_customer_sk#23]
-Functions [1]: [sum((cast(ss_quantity#20 as decimal(10,0)) * ss_sales_price#21))]
+(72) HashAggregate [codegen id : 26]
+Input [3]: [c_customer_sk#24, sum#27, isEmpty#28]
+Keys [1]: [c_customer_sk#24]
+Functions [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29]
+Results [2]: [c_customer_sk#24, sum((cast(ss_quantity#21 as decimal(10,0)) * ss_sales_price#22))#29 AS ssales#30]
 
-(80) CometFilter
-Input [2]: [c_customer_sk#23, ssales#28]
-Condition : (isnotnull(ssales#28) AND (cast(ssales#28 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#29, [id=#30])))
+(73) Filter [codegen id : 26]
+Input [2]: [c_customer_sk#24, ssales#30]
+Condition : (isnotnull(ssales#30) AND (cast(ssales#30 as decimal(38,8)) > (0.500000 * ReusedSubquery Subquery scalar-subquery#31, [id=#32])))
 
-(81) CometProject
-Input [2]: [c_customer_sk#23, ssales#28]
-Arguments: [c_customer_sk#23], [c_customer_sk#23]
+(74) Project [codegen id : 26]
+Output [1]: [c_customer_sk#24]
+Input [2]: [c_customer_sk#24, ssales#30]
 
-(82) CometSort
-Input [1]: [c_customer_sk#23]
-Arguments: [c_customer_sk#23], [c_customer_sk#23 ASC NULLS FIRST]
+(75) Sort [codegen id : 26]
+Input [1]: [c_customer_sk#24]
+Arguments: [c_customer_sk#24 ASC NULLS FIRST], false, 0
 
-(83) CometSortMergeJoin
-Left output [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
-Right output [1]: [c_customer_sk#23]
-Arguments: [ws_bill_customer_sk#40], [c_customer_sk#23], LeftSemi
-
-(84) ColumnarToRow [codegen id : 24]
-Input [4]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43]
+(76) SortMergeJoin [codegen id : 33]
+Left keys [1]: [ws_bill_customer_sk#44]
+Right keys [1]: [c_customer_sk#24]
+Join type: LeftSemi
+Join condition: None
 
-(85) ReusedExchange [Reuses operator id: 59]
-Output [3]: [c_customer_sk#45, c_first_name#46, c_last_name#47]
+(77) ReusedExchange [Reuses operator id: 54]
+Output [3]: [c_customer_sk#49, c_first_name#50, c_last_name#51]
 
-(86) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ws_bill_customer_sk#40]
-Right keys [1]: [c_customer_sk#45]
+(78) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ws_bill_customer_sk#44]
+Right keys [1]: [c_customer_sk#49]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 24]
-Output [5]: [ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43, c_first_name#46, c_last_name#47]
-Input [7]: [ws_bill_customer_sk#40, ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43, c_customer_sk#45, c_first_name#46, c_last_name#47]
+(79) Project [codegen id : 33]
+Output [5]: [ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47, c_first_name#50, c_last_name#51]
+Input [7]: [ws_bill_customer_sk#44, ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47, c_customer_sk#49, c_first_name#50, c_last_name#51]
 
-(88) ReusedExchange [Reuses operator id: 102]
-Output [1]: [d_date_sk#48]
+(80) ReusedExchange [Reuses operator id: 92]
+Output [1]: [d_date_sk#52]
 
-(89) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ws_sold_date_sk#43]
-Right keys [1]: [d_date_sk#48]
+(81) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ws_sold_date_sk#47]
+Right keys [1]: [d_date_sk#52]
 Join type: Inner
 Join condition: None
 
-(90) Project [codegen id : 24]
-Output [4]: [ws_quantity#41, ws_list_price#42, c_first_name#46, c_last_name#47]
-Input [6]: [ws_quantity#41, ws_list_price#42, ws_sold_date_sk#43, c_first_name#46, c_last_name#47, d_date_sk#48]
-
-(91) HashAggregate [codegen id : 24]
-Input [4]: [ws_quantity#41, ws_list_price#42, c_first_name#46, c_last_name#47]
-Keys [2]: [c_last_name#47, c_first_name#46]
-Functions [1]: [partial_sum((cast(ws_quantity#41 as decimal(10,0)) * ws_list_price#42))]
-Aggregate Attributes [2]: [sum#49, isEmpty#50]
-Results [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
+(82) Project [codegen id : 33]
+Output [4]: [ws_quantity#45, ws_list_price#46, c_first_name#50, c_last_name#51]
+Input [6]: [ws_quantity#45, ws_list_price#46, ws_sold_date_sk#47, c_first_name#50, c_last_name#51, d_date_sk#52]
 
-(92) RowToColumnar
-Input [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
+(83) HashAggregate [codegen id : 33]
+Input [4]: [ws_quantity#45, ws_list_price#46, c_first_name#50, c_last_name#51]
+Keys [2]: [c_last_name#51, c_first_name#50]
+Functions [1]: [partial_sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))]
+Aggregate Attributes [2]: [sum#53, isEmpty#54]
+Results [4]: [c_last_name#51, c_first_name#50, sum#55, isEmpty#56]
 
-(93) CometColumnarExchange
-Input [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
-Arguments: hashpartitioning(c_last_name#47, c_first_name#46, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(84) Exchange
+Input [4]: [c_last_name#51, c_first_name#50, sum#55, isEmpty#56]
+Arguments: hashpartitioning(c_last_name#51, c_first_name#50, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(94) CometHashAggregate
-Input [4]: [c_last_name#47, c_first_name#46, sum#51, isEmpty#52]
-Keys [2]: [c_last_name#47, c_first_name#46]
-Functions [1]: [sum((cast(ws_quantity#41 as decimal(10,0)) * ws_list_price#42))]
+(85) HashAggregate [codegen id : 34]
+Input [4]: [c_last_name#51, c_first_name#50, sum#55, isEmpty#56]
+Keys [2]: [c_last_name#51, c_first_name#50]
+Functions [1]: [sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))]
+Aggregate Attributes [1]: [sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))#57]
+Results [3]: [c_last_name#51, c_first_name#50, sum((cast(ws_quantity#45 as decimal(10,0)) * ws_list_price#46))#57 AS sales#58]
 
-(95) CometUnion
-Child 0 Input [3]: [c_last_name#33, c_first_name#32, sales#53]
-Child 1 Input [3]: [c_last_name#47, c_first_name#46, sales#54]
+(86) Union
 
-(96) CometTakeOrderedAndProject
-Input [3]: [c_last_name#33, c_first_name#32, sales#53]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[c_last_name#33 ASC NULLS FIRST,c_first_name#32 ASC NULLS FIRST,sales#53 ASC NULLS FIRST], output=[c_last_name#33,c_first_name#32,sales#53]), 100, [c_last_name#33 ASC NULLS FIRST, c_first_name#32 ASC NULLS FIRST, sales#53 ASC NULLS FIRST], [c_last_name#33, c_first_name#32, sales#53]
-
-(97) ColumnarToRow [codegen id : 25]
-Input [3]: [c_last_name#33, c_first_name#32, sales#53]
+(87) TakeOrderedAndProject
+Input [3]: [c_last_name#35, c_first_name#34, sales#42]
+Arguments: 100, [c_last_name#35 ASC NULLS FIRST, c_first_name#34 ASC NULLS FIRST, sales#42 ASC NULLS FIRST], [c_last_name#35, c_first_name#34, sales#42]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (102)
-+- * ColumnarToRow (101)
-   +- CometProject (100)
-      +- CometFilter (99)
-         +- CometScan parquet spark_catalog.default.date_dim (98)
+BroadcastExchange (92)
++- * ColumnarToRow (91)
+   +- CometProject (90)
+      +- CometFilter (89)
+         +- CometScan parquet spark_catalog.default.date_dim (88)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#34, d_year#55, d_moy#56]
+Output [3]: [d_date_sk#36, d_year#59, d_moy#60]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(99) CometFilter
-Input [3]: [d_date_sk#34, d_year#55, d_moy#56]
-Condition : ((((isnotnull(d_year#55) AND isnotnull(d_moy#56)) AND (d_year#55 = 2000)) AND (d_moy#56 = 2)) AND isnotnull(d_date_sk#34))
+(89) CometFilter
+Input [3]: [d_date_sk#36, d_year#59, d_moy#60]
+Condition : ((((isnotnull(d_year#59) AND isnotnull(d_moy#60)) AND (d_year#59 = 2000)) AND (d_moy#60 = 2)) AND isnotnull(d_date_sk#36))
 
-(100) CometProject
-Input [3]: [d_date_sk#34, d_year#55, d_moy#56]
-Arguments: [d_date_sk#34], [d_date_sk#34]
+(90) CometProject
+Input [3]: [d_date_sk#36, d_year#59, d_moy#60]
+Arguments: [d_date_sk#36], [d_date_sk#36]
 
-(101) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#34]
+(91) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#36]
 
-(102) BroadcastExchange
-Input [1]: [d_date_sk#34]
+(92) BroadcastExchange
+Input [1]: [d_date_sk#36]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (107)
-+- * ColumnarToRow (106)
-   +- CometProject (105)
-      +- CometFilter (104)
-         +- CometScan parquet spark_catalog.default.date_dim (103)
+BroadcastExchange (97)
++- * ColumnarToRow (96)
+   +- CometProject (95)
+      +- CometFilter (94)
+         +- CometScan parquet spark_catalog.default.date_dim (93)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_date#11, d_year#57]
+Output [3]: [d_date_sk#10, d_date#11, d_year#61]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_year:int>
 
-(104) CometFilter
-Input [3]: [d_date_sk#10, d_date#11, d_year#57]
-Condition : (d_year#57 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
+(94) CometFilter
+Input [3]: [d_date_sk#10, d_date#11, d_year#61]
+Condition : (d_year#61 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#10))
 
-(105) CometProject
-Input [3]: [d_date_sk#10, d_date#11, d_year#57]
+(95) CometProject
+Input [3]: [d_date_sk#10, d_date#11, d_year#61]
 Arguments: [d_date_sk#10, d_date#11], [d_date_sk#10, d_date#11]
 
-(106) ColumnarToRow [codegen id : 1]
+(96) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#10, d_date#11]
 
-(107) BroadcastExchange
+(97) BroadcastExchange
 Input [2]: [d_date_sk#10, d_date#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 43 Hosting Expression = Subquery scalar-subquery#29, [id=#30]
-* ColumnarToRow (124)
-+- CometHashAggregate (123)
-   +- CometColumnarExchange (122)
-      +- CometHashAggregate (121)
-         +- CometHashAggregate (120)
-            +- CometColumnarExchange (119)
-               +- RowToColumnar (118)
-                  +- * HashAggregate (117)
-                     +- * Project (116)
-                        +- * BroadcastHashJoin Inner BuildRight (115)
-                           :- * Project (113)
-                           :  +- * BroadcastHashJoin Inner BuildRight (112)
-                           :     :- * ColumnarToRow (110)
-                           :     :  +- CometFilter (109)
-                           :     :     +- CometScan parquet spark_catalog.default.store_sales (108)
-                           :     +- ReusedExchange (111)
-                           +- ReusedExchange (114)
+Subquery:3 Hosting operator id = 39 Hosting Expression = Subquery scalar-subquery#31, [id=#32]
+* HashAggregate (112)
++- Exchange (111)
+   +- * HashAggregate (110)
+      +- * HashAggregate (109)
+         +- Exchange (108)
+            +- * HashAggregate (107)
+               +- * Project (106)
+                  +- * BroadcastHashJoin Inner BuildRight (105)
+                     :- * Project (103)
+                     :  +- * BroadcastHashJoin Inner BuildRight (102)
+                     :     :- * ColumnarToRow (100)
+                     :     :  +- CometFilter (99)
+                     :     :     +- CometScan parquet spark_catalog.default.store_sales (98)
+                     :     +- ReusedExchange (101)
+                     +- ReusedExchange (104)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61]
+Output [4]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#61), dynamicpruningexpression(ss_sold_date_sk#61 IN dynamicpruning#62)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#65), dynamicpruningexpression(ss_sold_date_sk#65 IN dynamicpruning#66)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_quantity:int,ss_sales_price:decimal(7,2)>
 
-(109) CometFilter
-Input [4]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61]
-Condition : isnotnull(ss_customer_sk#58)
+(99) CometFilter
+Input [4]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65]
+Condition : isnotnull(ss_customer_sk#62)
 
-(110) ColumnarToRow [codegen id : 3]
-Input [4]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61]
+(100) ColumnarToRow [codegen id : 3]
+Input [4]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65]
 
-(111) ReusedExchange [Reuses operator id: 36]
-Output [1]: [c_customer_sk#63]
+(101) ReusedExchange [Reuses operator id: 33]
+Output [1]: [c_customer_sk#67]
 
-(112) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_customer_sk#58]
-Right keys [1]: [c_customer_sk#63]
+(102) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_customer_sk#62]
+Right keys [1]: [c_customer_sk#67]
 Join type: Inner
 Join condition: None
 
-(113) Project [codegen id : 3]
-Output [4]: [ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61, c_customer_sk#63]
-Input [5]: [ss_customer_sk#58, ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61, c_customer_sk#63]
+(103) Project [codegen id : 3]
+Output [4]: [ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65, c_customer_sk#67]
+Input [5]: [ss_customer_sk#62, ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65, c_customer_sk#67]
 
-(114) ReusedExchange [Reuses operator id: 129]
-Output [1]: [d_date_sk#64]
+(104) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#68]
 
-(115) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [ss_sold_date_sk#61]
-Right keys [1]: [d_date_sk#64]
+(105) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [ss_sold_date_sk#65]
+Right keys [1]: [d_date_sk#68]
 Join type: Inner
 Join condition: None
 
-(116) Project [codegen id : 3]
-Output [3]: [ss_quantity#59, ss_sales_price#60, c_customer_sk#63]
-Input [5]: [ss_quantity#59, ss_sales_price#60, ss_sold_date_sk#61, c_customer_sk#63, d_date_sk#64]
-
-(117) HashAggregate [codegen id : 3]
-Input [3]: [ss_quantity#59, ss_sales_price#60, c_customer_sk#63]
-Keys [1]: [c_customer_sk#63]
-Functions [1]: [partial_sum((cast(ss_quantity#59 as decimal(10,0)) * ss_sales_price#60))]
-Aggregate Attributes [2]: [sum#65, isEmpty#66]
-Results [3]: [c_customer_sk#63, sum#67, isEmpty#68]
-
-(118) RowToColumnar
-Input [3]: [c_customer_sk#63, sum#67, isEmpty#68]
-
-(119) CometColumnarExchange
-Input [3]: [c_customer_sk#63, sum#67, isEmpty#68]
-Arguments: hashpartitioning(c_customer_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
-
-(120) CometHashAggregate
-Input [3]: [c_customer_sk#63, sum#67, isEmpty#68]
-Keys [1]: [c_customer_sk#63]
-Functions [1]: [sum((cast(ss_quantity#59 as decimal(10,0)) * ss_sales_price#60))]
-
-(121) CometHashAggregate
-Input [1]: [csales#69]
+(106) Project [codegen id : 3]
+Output [3]: [ss_quantity#63, ss_sales_price#64, c_customer_sk#67]
+Input [5]: [ss_quantity#63, ss_sales_price#64, ss_sold_date_sk#65, c_customer_sk#67, d_date_sk#68]
+
+(107) HashAggregate [codegen id : 3]
+Input [3]: [ss_quantity#63, ss_sales_price#64, c_customer_sk#67]
+Keys [1]: [c_customer_sk#67]
+Functions [1]: [partial_sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))]
+Aggregate Attributes [2]: [sum#69, isEmpty#70]
+Results [3]: [c_customer_sk#67, sum#71, isEmpty#72]
+
+(108) Exchange
+Input [3]: [c_customer_sk#67, sum#71, isEmpty#72]
+Arguments: hashpartitioning(c_customer_sk#67, 5), ENSURE_REQUIREMENTS, [plan_id=14]
+
+(109) HashAggregate [codegen id : 4]
+Input [3]: [c_customer_sk#67, sum#71, isEmpty#72]
+Keys [1]: [c_customer_sk#67]
+Functions [1]: [sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))]
+Aggregate Attributes [1]: [sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))#73]
+Results [1]: [sum((cast(ss_quantity#63 as decimal(10,0)) * ss_sales_price#64))#73 AS csales#74]
+
+(110) HashAggregate [codegen id : 4]
+Input [1]: [csales#74]
 Keys: []
-Functions [1]: [partial_max(csales#69)]
+Functions [1]: [partial_max(csales#74)]
+Aggregate Attributes [1]: [max#75]
+Results [1]: [max#76]
 
-(122) CometColumnarExchange
-Input [1]: [max#70]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+(111) Exchange
+Input [1]: [max#76]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=15]
 
-(123) CometHashAggregate
-Input [1]: [max#70]
+(112) HashAggregate [codegen id : 5]
+Input [1]: [max#76]
 Keys: []
-Functions [1]: [max(csales#69)]
-
-(124) ColumnarToRow [codegen id : 4]
-Input [1]: [tpcds_cmax#71]
+Functions [1]: [max(csales#74)]
+Aggregate Attributes [1]: [max(csales#74)#77]
+Results [1]: [max(csales#74)#77 AS tpcds_cmax#78]
 
-Subquery:4 Hosting operator id = 108 Hosting Expression = ss_sold_date_sk#61 IN dynamicpruning#62
-BroadcastExchange (129)
-+- * ColumnarToRow (128)
-   +- CometProject (127)
-      +- CometFilter (126)
-         +- CometScan parquet spark_catalog.default.date_dim (125)
+Subquery:4 Hosting operator id = 98 Hosting Expression = ss_sold_date_sk#65 IN dynamicpruning#66
+BroadcastExchange (117)
++- * ColumnarToRow (116)
+   +- CometProject (115)
+      +- CometFilter (114)
+         +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#64, d_year#72]
+Output [2]: [d_date_sk#68, d_year#79]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [2000,2001,2002,2003]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(126) CometFilter
-Input [2]: [d_date_sk#64, d_year#72]
-Condition : (d_year#72 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#64))
+(114) CometFilter
+Input [2]: [d_date_sk#68, d_year#79]
+Condition : (d_year#79 IN (2000,2001,2002,2003) AND isnotnull(d_date_sk#68))
 
-(127) CometProject
-Input [2]: [d_date_sk#64, d_year#72]
-Arguments: [d_date_sk#64], [d_date_sk#64]
+(115) CometProject
+Input [2]: [d_date_sk#68, d_year#79]
+Arguments: [d_date_sk#68], [d_date_sk#68]
 
-(128) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#64]
+(116) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#68]
 
-(129) BroadcastExchange
-Input [1]: [d_date_sk#64]
+(117) BroadcastExchange
+Input [1]: [d_date_sk#68]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=16]
 
-Subquery:5 Hosting operator id = 54 Hosting Expression = ReusedSubquery Subquery scalar-subquery#29, [id=#30]
+Subquery:5 Hosting operator id = 50 Hosting Expression = ReusedSubquery Subquery scalar-subquery#31, [id=#32]
 
-Subquery:6 Hosting operator id = 69 Hosting Expression = ws_sold_date_sk#43 IN dynamicpruning#6
+Subquery:6 Hosting operator id = 63 Hosting Expression = ws_sold_date_sk#47 IN dynamicpruning#6
 
-Subquery:7 Hosting operator id = 80 Hosting Expression = ReusedSubquery Subquery scalar-subquery#29, [id=#30]
+Subquery:7 Hosting operator id = 73 Hosting Expression = ReusedSubquery Subquery scalar-subquery#31, [id=#32]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt
index 2dd7ddf4af..9cbb568a9a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q23b/simplified.txt
@@ -1,179 +1,186 @@
-WholeStageCodegen (25)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [c_last_name,c_first_name,sales]
-        CometUnion
-          CometHashAggregate [c_last_name,c_first_name,sum,isEmpty]
-            CometColumnarExchange [c_last_name,c_first_name] #1
-              RowToColumnar
-                WholeStageCodegen (12)
-                  HashAggregate [c_last_name,c_first_name,cs_quantity,cs_list_price] [sum,isEmpty,sum,isEmpty]
-                    Project [cs_quantity,cs_list_price,c_first_name,c_last_name]
-                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                        Project [cs_quantity,cs_list_price,cs_sold_date_sk,c_first_name,c_last_name]
-                          BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometSortMergeJoin [cs_bill_customer_sk,c_customer_sk]
-                                  CometSort [cs_bill_customer_sk]
-                                    CometColumnarExchange [cs_bill_customer_sk] #2
-                                      RowToColumnar
-                                        WholeStageCodegen (5)
-                                          Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                            BroadcastHashJoin [cs_item_sk,item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [cs_bill_customer_sk]
-                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_year,d_moy,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #4
-                                                  WholeStageCodegen (4)
-                                                    ColumnarToRow
+TakeOrderedAndProject [c_last_name,c_first_name,sales]
+  Union
+    WholeStageCodegen (17)
+      HashAggregate [c_last_name,c_first_name,sum,isEmpty] [sum((cast(cs_quantity as decimal(10,0)) * cs_list_price)),sales,sum,isEmpty]
+        InputAdapter
+          Exchange [c_last_name,c_first_name] #1
+            WholeStageCodegen (16)
+              HashAggregate [c_last_name,c_first_name,cs_quantity,cs_list_price] [sum,isEmpty,sum,isEmpty]
+                Project [cs_quantity,cs_list_price,c_first_name,c_last_name]
+                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                    Project [cs_quantity,cs_list_price,cs_sold_date_sk,c_first_name,c_last_name]
+                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                        SortMergeJoin [cs_bill_customer_sk,c_customer_sk]
+                          InputAdapter
+                            WholeStageCodegen (6)
+                              Sort [cs_bill_customer_sk]
+                                InputAdapter
+                                  Exchange [cs_bill_customer_sk] #2
+                                    WholeStageCodegen (5)
+                                      Project [cs_bill_customer_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                        BroadcastHashJoin [cs_item_sk,item_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                          InputAdapter
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (4)
+                                                Project [item_sk]
+                                                  Filter [cnt]
+                                                    HashAggregate [_groupingexpression,i_item_sk,d_date,count] [count(1),item_sk,cnt,count]
                                                       InputAdapter
-                                                        CometProject [item_sk]
-                                                          CometFilter [cnt]
-                                                            CometHashAggregate [_groupingexpression,i_item_sk,d_date,count]
-                                                              CometColumnarExchange [_groupingexpression,i_item_sk,d_date] #5
-                                                                RowToColumnar
-                                                                  WholeStageCodegen (3)
-                                                                    HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
-                                                                      Project [d_date,i_item_sk,i_item_desc]
-                                                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                          Project [ss_item_sk,d_date]
-                                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometFilter [ss_item_sk]
-                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                                      SubqueryBroadcast [d_date_sk] #2
-                                                                                        BroadcastExchange #6
-                                                                                          WholeStageCodegen (1)
-                                                                                            ColumnarToRow
-                                                                                              InputAdapter
-                                                                                                CometProject [d_date_sk,d_date]
-                                                                                                  CometFilter [d_year,d_date_sk]
-                                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
-                                                                              InputAdapter
-                                                                                ReusedExchange [d_date_sk,d_date] #6
-                                                                          InputAdapter
-                                                                            BroadcastExchange #7
-                                                                              WholeStageCodegen (2)
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometFilter [i_item_sk]
-                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
-                                  CometSort [c_customer_sk]
-                                    CometProject [c_customer_sk]
-                                      CometFilter [ssales]
-                                        Subquery #3
-                                          WholeStageCodegen (4)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometHashAggregate [max]
-                                                  CometColumnarExchange #10
-                                                    CometHashAggregate [csales]
-                                                      CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                                        CometColumnarExchange [c_customer_sk] #11
-                                                          RowToColumnar
-                                                            WholeStageCodegen (3)
-                                                              HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                                                Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
-                                                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                        Exchange [_groupingexpression,i_item_sk,d_date] #5
+                                                          WholeStageCodegen (3)
+                                                            HashAggregate [_groupingexpression,i_item_sk,d_date] [count,count]
+                                                              Project [d_date,i_item_sk,i_item_desc]
+                                                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                  Project [ss_item_sk,d_date]
+                                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometFilter [ss_item_sk]
+                                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                              SubqueryBroadcast [d_date_sk] #2
+                                                                                BroadcastExchange #6
+                                                                                  WholeStageCodegen (1)
+                                                                                    ColumnarToRow
+                                                                                      InputAdapter
+                                                                                        CometProject [d_date_sk,d_date]
+                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_year]
+                                                                      InputAdapter
+                                                                        ReusedExchange [d_date_sk,d_date] #6
+                                                                  InputAdapter
+                                                                    BroadcastExchange #7
+                                                                      WholeStageCodegen (2)
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [ss_customer_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #4
-                                                                                  BroadcastExchange #12
-                                                                                    WholeStageCodegen (1)
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometProject [d_date_sk]
-                                                                                            CometFilter [d_year,d_date_sk]
-                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          ReusedExchange [c_customer_sk] #9
+                                                                            CometFilter [i_item_sk]
+                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                          InputAdapter
+                            WholeStageCodegen (9)
+                              Sort [c_customer_sk]
+                                Project [c_customer_sk]
+                                  Filter [ssales]
+                                    Subquery #3
+                                      WholeStageCodegen (5)
+                                        HashAggregate [max] [max(csales),tpcds_cmax,max]
+                                          InputAdapter
+                                            Exchange #10
+                                              WholeStageCodegen (4)
+                                                HashAggregate [csales] [max,max]
+                                                  HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),csales,sum,isEmpty]
+                                                    InputAdapter
+                                                      Exchange [c_customer_sk] #11
+                                                        WholeStageCodegen (3)
+                                                          HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                                            Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                Project [ss_quantity,ss_sales_price,ss_sold_date_sk,c_customer_sk]
+                                                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometFilter [ss_customer_sk]
+                                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                                            SubqueryBroadcast [d_date_sk] #4
+                                                                              BroadcastExchange #12
+                                                                                WholeStageCodegen (1)
+                                                                                  ColumnarToRow
+                                                                                    InputAdapter
+                                                                                      CometProject [d_date_sk]
+                                                                                        CometFilter [d_year,d_date_sk]
+                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                     InputAdapter
-                                                                      ReusedExchange [d_date_sk] #12
-                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                          CometColumnarExchange [c_customer_sk] #8
-                                            RowToColumnar
-                                              WholeStageCodegen (7)
-                                                HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
-                                                  Project [ss_quantity,ss_sales_price,c_customer_sk]
-                                                    BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
-                                                            CometFilter [ss_customer_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                                                      InputAdapter
-                                                        BroadcastExchange #9
-                                                          WholeStageCodegen (6)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometFilter [c_customer_sk]
-                                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk]
-                            InputAdapter
-                              BroadcastExchange #13
-                                WholeStageCodegen (10)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometSortMergeJoin [c_customer_sk,c_customer_sk]
+                                                                      ReusedExchange [c_customer_sk] #9
+                                                                InputAdapter
+                                                                  ReusedExchange [d_date_sk] #12
+                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [c_customer_sk] #8
+                                          WholeStageCodegen (8)
+                                            HashAggregate [c_customer_sk,ss_quantity,ss_sales_price] [sum,isEmpty,sum,isEmpty]
+                                              Project [ss_quantity,ss_sales_price,c_customer_sk]
+                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [ss_customer_sk,ss_quantity,ss_sales_price]
+                                                        CometFilter [ss_customer_sk]
+                                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                                                  InputAdapter
+                                                    BroadcastExchange #9
+                                                      WholeStageCodegen (7)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [c_customer_sk]
+                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk]
+                        InputAdapter
+                          BroadcastExchange #13
+                            WholeStageCodegen (14)
+                              SortMergeJoin [c_customer_sk,c_customer_sk]
+                                InputAdapter
+                                  WholeStageCodegen (10)
+                                    ColumnarToRow
+                                      InputAdapter
                                         CometSort [c_customer_sk]
-                                          CometColumnarExchange [c_customer_sk] #14
+                                          CometExchange [c_customer_sk] #14
                                             CometFilter [c_customer_sk]
                                               CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
-                                        CometSort [c_customer_sk]
-                                          CometProject [c_customer_sk]
-                                            CometFilter [ssales]
-                                              ReusedSubquery [tpcds_cmax] #3
-                                              CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                                ReusedExchange [c_customer_sk,sum,isEmpty] #8
-                        InputAdapter
-                          ReusedExchange [d_date_sk] #3
-          CometHashAggregate [c_last_name,c_first_name,sum,isEmpty]
-            CometColumnarExchange [c_last_name,c_first_name] #15
-              RowToColumnar
-                WholeStageCodegen (24)
-                  HashAggregate [c_last_name,c_first_name,ws_quantity,ws_list_price] [sum,isEmpty,sum,isEmpty]
-                    Project [ws_quantity,ws_list_price,c_first_name,c_last_name]
-                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                        Project [ws_quantity,ws_list_price,ws_sold_date_sk,c_first_name,c_last_name]
-                          BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometSortMergeJoin [ws_bill_customer_sk,c_customer_sk]
-                                  CometSort [ws_bill_customer_sk]
-                                    CometColumnarExchange [ws_bill_customer_sk] #16
-                                      RowToColumnar
-                                        WholeStageCodegen (17)
-                                          Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                            BroadcastHashJoin [ws_item_sk,item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ws_bill_customer_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [item_sk] #4
-                                  CometSort [c_customer_sk]
-                                    CometProject [c_customer_sk]
-                                      CometFilter [ssales]
-                                        ReusedSubquery [tpcds_cmax] #3
-                                        CometHashAggregate [c_customer_sk,sum,isEmpty]
-                                          ReusedExchange [c_customer_sk,sum,isEmpty] #8
-                            InputAdapter
-                              ReusedExchange [c_customer_sk,c_first_name,c_last_name] #13
+                                InputAdapter
+                                  WholeStageCodegen (13)
+                                    Sort [c_customer_sk]
+                                      Project [c_customer_sk]
+                                        Filter [ssales]
+                                          ReusedSubquery [tpcds_cmax] #3
+                                          HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
+                                            InputAdapter
+                                              ReusedExchange [c_customer_sk,sum,isEmpty] #8
+                    InputAdapter
+                      ReusedExchange [d_date_sk] #3
+    WholeStageCodegen (34)
+      HashAggregate [c_last_name,c_first_name,sum,isEmpty] [sum((cast(ws_quantity as decimal(10,0)) * ws_list_price)),sales,sum,isEmpty]
+        InputAdapter
+          Exchange [c_last_name,c_first_name] #15
+            WholeStageCodegen (33)
+              HashAggregate [c_last_name,c_first_name,ws_quantity,ws_list_price] [sum,isEmpty,sum,isEmpty]
+                Project [ws_quantity,ws_list_price,c_first_name,c_last_name]
+                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                    Project [ws_quantity,ws_list_price,ws_sold_date_sk,c_first_name,c_last_name]
+                      BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                        SortMergeJoin [ws_bill_customer_sk,c_customer_sk]
+                          InputAdapter
+                            WholeStageCodegen (23)
+                              Sort [ws_bill_customer_sk]
+                                InputAdapter
+                                  Exchange [ws_bill_customer_sk] #16
+                                    WholeStageCodegen (22)
+                                      Project [ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                        BroadcastHashJoin [ws_item_sk,item_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [item_sk] #4
+                          InputAdapter
+                            WholeStageCodegen (26)
+                              Sort [c_customer_sk]
+                                Project [c_customer_sk]
+                                  Filter [ssales]
+                                    ReusedSubquery [tpcds_cmax] #3
+                                    HashAggregate [c_customer_sk,sum,isEmpty] [sum((cast(ss_quantity as decimal(10,0)) * ss_sales_price)),ssales,sum,isEmpty]
+                                      InputAdapter
+                                        ReusedExchange [c_customer_sk,sum,isEmpty] #8
                         InputAdapter
-                          ReusedExchange [d_date_sk] #3
+                          ReusedExchange [c_customer_sk,c_first_name,c_last_name] #13
+                    InputAdapter
+                      ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt
index a7ccfef3ab..6e03148d53 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-* ColumnarToRow (47)
-+- CometFilter (46)
-   +- CometHashAggregate (45)
-      +- CometColumnarExchange (44)
-         +- CometHashAggregate (43)
-            +- CometHashAggregate (42)
-               +- CometColumnarExchange (41)
-                  +- RowToColumnar (40)
-                     +- * HashAggregate (39)
-                        +- * Project (38)
-                           +- * BroadcastHashJoin Inner BuildRight (37)
-                              :- * Project (32)
-                              :  +- * BroadcastHashJoin Inner BuildRight (31)
-                              :     :- * Project (26)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                              :     :     :- * Project (20)
-                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-                              :     :     :     :- * ColumnarToRow (13)
-                              :     :     :     :  +- CometProject (12)
-                              :     :     :     :     +- CometSortMergeJoin (11)
-                              :     :     :     :        :- CometSort (5)
-                              :     :     :     :        :  +- CometColumnarExchange (4)
-                              :     :     :     :        :     +- CometProject (3)
-                              :     :     :     :        :        +- CometFilter (2)
-                              :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     :     :     :        +- CometSort (10)
-                              :     :     :     :           +- CometColumnarExchange (9)
-                              :     :     :     :              +- CometProject (8)
-                              :     :     :     :                 +- CometFilter (7)
-                              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
-                              :     :     :     +- BroadcastExchange (18)
-                              :     :     :        +- * ColumnarToRow (17)
-                              :     :     :           +- CometProject (16)
-                              :     :     :              +- CometFilter (15)
-                              :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
-                              :     :     +- BroadcastExchange (24)
-                              :     :        +- * ColumnarToRow (23)
-                              :     :           +- CometFilter (22)
-                              :     :              +- CometScan parquet spark_catalog.default.item (21)
-                              :     +- BroadcastExchange (30)
-                              :        +- * ColumnarToRow (29)
-                              :           +- CometFilter (28)
-                              :              +- CometScan parquet spark_catalog.default.customer (27)
-                              +- BroadcastExchange (36)
-                                 +- * ColumnarToRow (35)
-                                    +- CometFilter (34)
-                                       +- CometScan parquet spark_catalog.default.customer_address (33)
+* Filter (45)
++- * HashAggregate (44)
+   +- Exchange (43)
+      +- * HashAggregate (42)
+         +- * HashAggregate (41)
+            +- Exchange (40)
+               +- * HashAggregate (39)
+                  +- * Project (38)
+                     +- * BroadcastHashJoin Inner BuildRight (37)
+                        :- * Project (32)
+                        :  +- * BroadcastHashJoin Inner BuildRight (31)
+                        :     :- * Project (26)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                        :     :     :- * Project (20)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+                        :     :     :     :- * ColumnarToRow (13)
+                        :     :     :     :  +- CometProject (12)
+                        :     :     :     :     +- CometSortMergeJoin (11)
+                        :     :     :     :        :- CometSort (5)
+                        :     :     :     :        :  +- CometExchange (4)
+                        :     :     :     :        :     +- CometProject (3)
+                        :     :     :     :        :        +- CometFilter (2)
+                        :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
+                        :     :     :     :        +- CometSort (10)
+                        :     :     :     :           +- CometExchange (9)
+                        :     :     :     :              +- CometProject (8)
+                        :     :     :     :                 +- CometFilter (7)
+                        :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
+                        :     :     :     +- BroadcastExchange (18)
+                        :     :     :        +- * ColumnarToRow (17)
+                        :     :     :           +- CometProject (16)
+                        :     :     :              +- CometFilter (15)
+                        :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
+                        :     :     +- BroadcastExchange (24)
+                        :     :        +- * ColumnarToRow (23)
+                        :     :           +- CometFilter (22)
+                        :     :              +- CometScan parquet spark_catalog.default.item (21)
+                        :     +- BroadcastExchange (30)
+                        :        +- * ColumnarToRow (29)
+                        :           +- CometFilter (28)
+                        :              +- CometScan parquet spark_catalog.default.customer (27)
+                        +- BroadcastExchange (36)
+                           +- * ColumnarToRow (35)
+                              +- CometFilter (34)
+                                 +- CometScan parquet spark_catalog.default.customer_address (33)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -63,9 +61,9 @@ Condition : (((isnotnull(ss_ticket_number#4) AND isnotnull(ss_item_sk#1)) AND is
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(4) CometColumnarExchange
+(4) CometExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (5) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
@@ -86,9 +84,9 @@ Condition : (isnotnull(sr_ticket_number#8) AND isnotnull(sr_item_sk#7))
 Input [3]: [sr_item_sk#7, sr_ticket_number#8, sr_returned_date_sk#9]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_item_sk#7, sr_ticket_number#8]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
-Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
@@ -229,110 +227,108 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
 Aggregate Attributes [1]: [sum#28]
 Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 
-(40) RowToColumnar
+(40) Exchange
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) CometColumnarExchange
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 6]
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
+Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(43) CometHashAggregate
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#30]
+(42) HashAggregate [codegen id : 6]
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#31]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [partial_sum(netpaid#30)]
+Functions [1]: [partial_sum(netpaid#31)]
+Aggregate Attributes [2]: [sum#32, isEmpty#33]
+Results [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
 
-(44) CometColumnarExchange
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(43) Exchange
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(45) CometHashAggregate
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
+(44) HashAggregate [codegen id : 7]
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [sum(netpaid#30)]
+Functions [1]: [sum(netpaid#31)]
+Aggregate Attributes [1]: [sum(netpaid#31)#36]
+Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, sum(netpaid#31)#36 AS paid#37]
 
-(46) CometFilter
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
-Condition : (isnotnull(paid#33) AND (cast(paid#33 as decimal(33,8)) > cast(Subquery scalar-subquery#34, [id=#35] as decimal(33,8))))
-
-(47) ColumnarToRow [codegen id : 6]
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
+(45) Filter [codegen id : 7]
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#37]
+Condition : (isnotnull(paid#37) AND (cast(paid#37 as decimal(33,8)) > cast(Subquery scalar-subquery#38, [id=#39] as decimal(33,8))))
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 46 Hosting Expression = Subquery scalar-subquery#34, [id=#35]
-* ColumnarToRow (77)
-+- CometHashAggregate (76)
-   +- CometColumnarExchange (75)
-      +- CometHashAggregate (74)
-         +- CometHashAggregate (73)
-            +- CometColumnarExchange (72)
-               +- RowToColumnar (71)
-                  +- * HashAggregate (70)
-                     +- * Project (69)
-                        +- * BroadcastHashJoin Inner BuildRight (68)
-                           :- * Project (66)
-                           :  +- * BroadcastHashJoin Inner BuildRight (65)
-                           :     :- * Project (63)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (62)
-                           :     :     :- * Project (57)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-                           :     :     :     :- * ColumnarToRow (54)
-                           :     :     :     :  +- CometProject (53)
-                           :     :     :     :     +- CometSortMergeJoin (52)
-                           :     :     :     :        :- CometSort (49)
-                           :     :     :     :        :  +- ReusedExchange (48)
-                           :     :     :     :        +- CometSort (51)
-                           :     :     :     :           +- ReusedExchange (50)
-                           :     :     :     +- ReusedExchange (55)
-                           :     :     +- BroadcastExchange (61)
-                           :     :        +- * ColumnarToRow (60)
-                           :     :           +- CometFilter (59)
-                           :     :              +- CometScan parquet spark_catalog.default.item (58)
-                           :     +- ReusedExchange (64)
-                           +- ReusedExchange (67)
-
-
-(48) ReusedExchange [Reuses operator id: 4]
+Subquery:1 Hosting operator id = 45 Hosting Expression = Subquery scalar-subquery#38, [id=#39]
+* HashAggregate (73)
++- Exchange (72)
+   +- * HashAggregate (71)
+      +- * HashAggregate (70)
+         +- Exchange (69)
+            +- * HashAggregate (68)
+               +- * Project (67)
+                  +- * BroadcastHashJoin Inner BuildRight (66)
+                     :- * Project (64)
+                     :  +- * BroadcastHashJoin Inner BuildRight (63)
+                     :     :- * Project (61)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (60)
+                     :     :     :- * Project (55)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+                     :     :     :     :- * ColumnarToRow (52)
+                     :     :     :     :  +- CometProject (51)
+                     :     :     :     :     +- CometSortMergeJoin (50)
+                     :     :     :     :        :- CometSort (47)
+                     :     :     :     :        :  +- ReusedExchange (46)
+                     :     :     :     :        +- CometSort (49)
+                     :     :     :     :           +- ReusedExchange (48)
+                     :     :     :     +- ReusedExchange (53)
+                     :     :     +- BroadcastExchange (59)
+                     :     :        +- * ColumnarToRow (58)
+                     :     :           +- CometFilter (57)
+                     :     :              +- CometScan parquet spark_catalog.default.item (56)
+                     :     +- ReusedExchange (62)
+                     +- ReusedExchange (65)
+
+
+(46) ReusedExchange [Reuses operator id: 4]
 Output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(49) CometSort
+(47) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_ticket_number#4 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST]
 
-(50) ReusedExchange [Reuses operator id: 9]
+(48) ReusedExchange [Reuses operator id: 9]
 Output [2]: [sr_item_sk#7, sr_ticket_number#8]
 
-(51) CometSort
+(49) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_ticket_number#8 ASC NULLS FIRST, sr_item_sk#7 ASC NULLS FIRST]
 
-(52) CometSortMergeJoin
+(50) CometSortMergeJoin
 Left output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Right output [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_ticket_number#4, ss_item_sk#1], [sr_ticket_number#8, sr_item_sk#7], Inner
 
-(53) CometProject
+(51) CometProject
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(54) ColumnarToRow [codegen id : 5]
+(52) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(55) ReusedExchange [Reuses operator id: 18]
+(53) ReusedExchange [Reuses operator id: 18]
 Output [4]: [s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
-(56) BroadcastHashJoin [codegen id : 5]
+(54) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#10]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 5]
+(55) Project [codegen id : 5]
 Output [6]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14]
 Input [8]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5, s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
@@ -343,87 +339,87 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_size:string,i_color:string,i_units:string,i_manager_id:int>
 
-(59) CometFilter
+(57) CometFilter
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Condition : isnotnull(i_item_sk#15)
 
-(60) ColumnarToRow [codegen id : 2]
+(58) ColumnarToRow [codegen id : 2]
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(61) BroadcastExchange
+(59) BroadcastExchange
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(62) BroadcastHashJoin [codegen id : 5]
+(60) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#15]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 5]
+(61) Project [codegen id : 5]
 Output [10]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(64) ReusedExchange [Reuses operator id: 30]
+(62) ReusedExchange [Reuses operator id: 30]
 Output [4]: [c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(65) BroadcastHashJoin [codegen id : 5]
+(63) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(66) Project [codegen id : 5]
+(64) Project [codegen id : 5]
 Output [12]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24]
 Input [14]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(67) ReusedExchange [Reuses operator id: 36]
+(65) ReusedExchange [Reuses operator id: 36]
 Output [3]: [ca_state#25, ca_zip#26, ca_country#27]
 
-(68) BroadcastHashJoin [codegen id : 5]
+(66) BroadcastHashJoin [codegen id : 5]
 Left keys [2]: [c_birth_country#24, s_zip#14]
 Right keys [2]: [upper(ca_country#27), ca_zip#26]
 Join type: Inner
 Join condition: None
 
-(69) Project [codegen id : 5]
+(67) Project [codegen id : 5]
 Output [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Input [15]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24, ca_state#25, ca_zip#26, ca_country#27]
 
-(70) HashAggregate [codegen id : 5]
+(68) HashAggregate [codegen id : 5]
 Input [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum#36]
-Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
-
-(71) RowToColumnar
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+Aggregate Attributes [1]: [sum#40]
+Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
 
-(72) CometColumnarExchange
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(69) Exchange
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(73) CometHashAggregate
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+(70) HashAggregate [codegen id : 6]
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(74) CometHashAggregate
-Input [1]: [netpaid#30]
+(71) HashAggregate [codegen id : 6]
+Input [1]: [netpaid#31]
 Keys: []
-Functions [1]: [partial_avg(netpaid#30)]
+Functions [1]: [partial_avg(netpaid#31)]
+Aggregate Attributes [2]: [sum#42, count#43]
+Results [2]: [sum#44, count#45]
 
-(75) CometColumnarExchange
-Input [2]: [sum#38, count#39]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(72) Exchange
+Input [2]: [sum#44, count#45]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=11]
 
-(76) CometHashAggregate
-Input [2]: [sum#38, count#39]
+(73) HashAggregate [codegen id : 7]
+Input [2]: [sum#44, count#45]
 Keys: []
-Functions [1]: [avg(netpaid#30)]
-
-(77) ColumnarToRow [codegen id : 6]
-Input [1]: [(0.05 * avg(netpaid))#40]
+Functions [1]: [avg(netpaid#31)]
+Aggregate Attributes [1]: [avg(netpaid#31)#46]
+Results [1]: [(0.05 * avg(netpaid#31)#46) AS (0.05 * avg(netpaid))#47]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt
index 558a960ab1..a4b8fef5d3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/simplified.txt
@@ -1,54 +1,54 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometFilter [paid]
-        Subquery #1
-          WholeStageCodegen (6)
-            ColumnarToRow
-              InputAdapter
-                CometHashAggregate [sum,count]
-                  CometColumnarExchange #9
-                    CometHashAggregate [netpaid]
-                      CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
-                        CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
-                          RowToColumnar
-                            WholeStageCodegen (5)
-                              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
-                                Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
-                                  BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
-                                    Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
-                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                        Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
-                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                            Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
-                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
-                                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                        CometSort [ss_ticket_number,ss_item_sk]
-                                                          ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
-                                                        CometSort [sr_ticket_number,sr_item_sk]
-                                                          ReusedExchange [sr_item_sk,sr_ticket_number] #4
-                                                InputAdapter
-                                                  ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
+WholeStageCodegen (7)
+  Filter [paid]
+    Subquery #1
+      WholeStageCodegen (7)
+        HashAggregate [sum,count] [avg(netpaid),(0.05 * avg(netpaid)),sum,count]
+          InputAdapter
+            Exchange #9
+              WholeStageCodegen (6)
+                HashAggregate [netpaid] [sum,count,sum,count]
+                  HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
+                    InputAdapter
+                      Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
+                        WholeStageCodegen (5)
+                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
+                            Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
+                              BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
+                                Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
+                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                    Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                        Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
+                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
+                                                  CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                    CometSort [ss_ticket_number,ss_item_sk]
+                                                      ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
+                                                    CometSort [sr_ticket_number,sr_item_sk]
+                                                      ReusedExchange [sr_item_sk,sr_ticket_number] #4
                                             InputAdapter
-                                              BroadcastExchange #11
-                                                WholeStageCodegen (2)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [i_item_sk]
-                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                              ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
                                         InputAdapter
-                                          ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
+                                          BroadcastExchange #11
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [i_item_sk]
+                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
                                     InputAdapter
-                                      ReusedExchange [ca_state,ca_zip,ca_country] #8
-        CometHashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty]
-          CometColumnarExchange [c_last_name,c_first_name,s_store_name] #1
-            CometHashAggregate [c_last_name,c_first_name,s_store_name,netpaid]
-              CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
-                CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
-                  RowToColumnar
+                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
+                                InputAdapter
+                                  ReusedExchange [ca_state,ca_zip,ca_country] #8
+    HashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty] [sum(netpaid),paid,sum,isEmpty]
+      InputAdapter
+        Exchange [c_last_name,c_first_name,s_store_name] #1
+          WholeStageCodegen (6)
+            HashAggregate [c_last_name,c_first_name,s_store_name,netpaid] [sum,isEmpty,sum,isEmpty]
+              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
+                InputAdapter
+                  Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
                     WholeStageCodegen (5)
                       HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
                         Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
@@ -64,12 +64,12 @@ WholeStageCodegen (6)
                                             CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
                                               CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                 CometSort [ss_ticket_number,ss_item_sk]
-                                                  CometColumnarExchange [ss_ticket_number,ss_item_sk] #3
+                                                  CometExchange [ss_ticket_number,ss_item_sk] #3
                                                     CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
                                                       CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
                                                         CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
                                                 CometSort [sr_ticket_number,sr_item_sk]
-                                                  CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
+                                                  CometExchange [sr_ticket_number,sr_item_sk] #4
                                                     CometProject [sr_item_sk,sr_ticket_number]
                                                       CometFilter [sr_ticket_number,sr_item_sk]
                                                         CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt
index 17f27af6ac..fb3113df00 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-* ColumnarToRow (47)
-+- CometFilter (46)
-   +- CometHashAggregate (45)
-      +- CometColumnarExchange (44)
-         +- CometHashAggregate (43)
-            +- CometHashAggregate (42)
-               +- CometColumnarExchange (41)
-                  +- RowToColumnar (40)
-                     +- * HashAggregate (39)
-                        +- * Project (38)
-                           +- * BroadcastHashJoin Inner BuildRight (37)
-                              :- * Project (32)
-                              :  +- * BroadcastHashJoin Inner BuildRight (31)
-                              :     :- * Project (26)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                              :     :     :- * Project (20)
-                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-                              :     :     :     :- * ColumnarToRow (13)
-                              :     :     :     :  +- CometProject (12)
-                              :     :     :     :     +- CometSortMergeJoin (11)
-                              :     :     :     :        :- CometSort (5)
-                              :     :     :     :        :  +- CometColumnarExchange (4)
-                              :     :     :     :        :     +- CometProject (3)
-                              :     :     :     :        :        +- CometFilter (2)
-                              :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
-                              :     :     :     :        +- CometSort (10)
-                              :     :     :     :           +- CometColumnarExchange (9)
-                              :     :     :     :              +- CometProject (8)
-                              :     :     :     :                 +- CometFilter (7)
-                              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
-                              :     :     :     +- BroadcastExchange (18)
-                              :     :     :        +- * ColumnarToRow (17)
-                              :     :     :           +- CometProject (16)
-                              :     :     :              +- CometFilter (15)
-                              :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
-                              :     :     +- BroadcastExchange (24)
-                              :     :        +- * ColumnarToRow (23)
-                              :     :           +- CometFilter (22)
-                              :     :              +- CometScan parquet spark_catalog.default.item (21)
-                              :     +- BroadcastExchange (30)
-                              :        +- * ColumnarToRow (29)
-                              :           +- CometFilter (28)
-                              :              +- CometScan parquet spark_catalog.default.customer (27)
-                              +- BroadcastExchange (36)
-                                 +- * ColumnarToRow (35)
-                                    +- CometFilter (34)
-                                       +- CometScan parquet spark_catalog.default.customer_address (33)
+* Filter (45)
++- * HashAggregate (44)
+   +- Exchange (43)
+      +- * HashAggregate (42)
+         +- * HashAggregate (41)
+            +- Exchange (40)
+               +- * HashAggregate (39)
+                  +- * Project (38)
+                     +- * BroadcastHashJoin Inner BuildRight (37)
+                        :- * Project (32)
+                        :  +- * BroadcastHashJoin Inner BuildRight (31)
+                        :     :- * Project (26)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                        :     :     :- * Project (20)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+                        :     :     :     :- * ColumnarToRow (13)
+                        :     :     :     :  +- CometProject (12)
+                        :     :     :     :     +- CometSortMergeJoin (11)
+                        :     :     :     :        :- CometSort (5)
+                        :     :     :     :        :  +- CometExchange (4)
+                        :     :     :     :        :     +- CometProject (3)
+                        :     :     :     :        :        +- CometFilter (2)
+                        :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
+                        :     :     :     :        +- CometSort (10)
+                        :     :     :     :           +- CometExchange (9)
+                        :     :     :     :              +- CometProject (8)
+                        :     :     :     :                 +- CometFilter (7)
+                        :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
+                        :     :     :     +- BroadcastExchange (18)
+                        :     :     :        +- * ColumnarToRow (17)
+                        :     :     :           +- CometProject (16)
+                        :     :     :              +- CometFilter (15)
+                        :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
+                        :     :     +- BroadcastExchange (24)
+                        :     :        +- * ColumnarToRow (23)
+                        :     :           +- CometFilter (22)
+                        :     :              +- CometScan parquet spark_catalog.default.item (21)
+                        :     +- BroadcastExchange (30)
+                        :        +- * ColumnarToRow (29)
+                        :           +- CometFilter (28)
+                        :              +- CometScan parquet spark_catalog.default.customer (27)
+                        +- BroadcastExchange (36)
+                           +- * ColumnarToRow (35)
+                              +- CometFilter (34)
+                                 +- CometScan parquet spark_catalog.default.customer_address (33)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -63,9 +61,9 @@ Condition : (((isnotnull(ss_ticket_number#4) AND isnotnull(ss_item_sk#1)) AND is
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(4) CometColumnarExchange
+(4) CometExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (5) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
@@ -86,9 +84,9 @@ Condition : (isnotnull(sr_ticket_number#8) AND isnotnull(sr_item_sk#7))
 Input [3]: [sr_item_sk#7, sr_ticket_number#8, sr_returned_date_sk#9]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_item_sk#7, sr_ticket_number#8]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
-Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
@@ -229,110 +227,108 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
 Aggregate Attributes [1]: [sum#28]
 Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 
-(40) RowToColumnar
+(40) Exchange
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) CometColumnarExchange
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 6]
 Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#29]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
+Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(43) CometHashAggregate
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#30]
+(42) HashAggregate [codegen id : 6]
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, netpaid#31]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [partial_sum(netpaid#30)]
+Functions [1]: [partial_sum(netpaid#31)]
+Aggregate Attributes [2]: [sum#32, isEmpty#33]
+Results [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
 
-(44) CometColumnarExchange
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(43) Exchange
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(45) CometHashAggregate
-Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#31, isEmpty#32]
+(44) HashAggregate [codegen id : 7]
+Input [5]: [c_last_name#23, c_first_name#22, s_store_name#11, sum#34, isEmpty#35]
 Keys [3]: [c_last_name#23, c_first_name#22, s_store_name#11]
-Functions [1]: [sum(netpaid#30)]
+Functions [1]: [sum(netpaid#31)]
+Aggregate Attributes [1]: [sum(netpaid#31)#36]
+Results [4]: [c_last_name#23, c_first_name#22, s_store_name#11, sum(netpaid#31)#36 AS paid#37]
 
-(46) CometFilter
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
-Condition : (isnotnull(paid#33) AND (cast(paid#33 as decimal(33,8)) > cast(Subquery scalar-subquery#34, [id=#35] as decimal(33,8))))
-
-(47) ColumnarToRow [codegen id : 6]
-Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#33]
+(45) Filter [codegen id : 7]
+Input [4]: [c_last_name#23, c_first_name#22, s_store_name#11, paid#37]
+Condition : (isnotnull(paid#37) AND (cast(paid#37 as decimal(33,8)) > cast(Subquery scalar-subquery#38, [id=#39] as decimal(33,8))))
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 46 Hosting Expression = Subquery scalar-subquery#34, [id=#35]
-* ColumnarToRow (77)
-+- CometHashAggregate (76)
-   +- CometColumnarExchange (75)
-      +- CometHashAggregate (74)
-         +- CometHashAggregate (73)
-            +- CometColumnarExchange (72)
-               +- RowToColumnar (71)
-                  +- * HashAggregate (70)
-                     +- * Project (69)
-                        +- * BroadcastHashJoin Inner BuildRight (68)
-                           :- * Project (66)
-                           :  +- * BroadcastHashJoin Inner BuildRight (65)
-                           :     :- * Project (63)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (62)
-                           :     :     :- * Project (57)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-                           :     :     :     :- * ColumnarToRow (54)
-                           :     :     :     :  +- CometProject (53)
-                           :     :     :     :     +- CometSortMergeJoin (52)
-                           :     :     :     :        :- CometSort (49)
-                           :     :     :     :        :  +- ReusedExchange (48)
-                           :     :     :     :        +- CometSort (51)
-                           :     :     :     :           +- ReusedExchange (50)
-                           :     :     :     +- ReusedExchange (55)
-                           :     :     +- BroadcastExchange (61)
-                           :     :        +- * ColumnarToRow (60)
-                           :     :           +- CometFilter (59)
-                           :     :              +- CometScan parquet spark_catalog.default.item (58)
-                           :     +- ReusedExchange (64)
-                           +- ReusedExchange (67)
-
-
-(48) ReusedExchange [Reuses operator id: 4]
+Subquery:1 Hosting operator id = 45 Hosting Expression = Subquery scalar-subquery#38, [id=#39]
+* HashAggregate (73)
++- Exchange (72)
+   +- * HashAggregate (71)
+      +- * HashAggregate (70)
+         +- Exchange (69)
+            +- * HashAggregate (68)
+               +- * Project (67)
+                  +- * BroadcastHashJoin Inner BuildRight (66)
+                     :- * Project (64)
+                     :  +- * BroadcastHashJoin Inner BuildRight (63)
+                     :     :- * Project (61)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (60)
+                     :     :     :- * Project (55)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+                     :     :     :     :- * ColumnarToRow (52)
+                     :     :     :     :  +- CometProject (51)
+                     :     :     :     :     +- CometSortMergeJoin (50)
+                     :     :     :     :        :- CometSort (47)
+                     :     :     :     :        :  +- ReusedExchange (46)
+                     :     :     :     :        +- CometSort (49)
+                     :     :     :     :           +- ReusedExchange (48)
+                     :     :     :     +- ReusedExchange (53)
+                     :     :     +- BroadcastExchange (59)
+                     :     :        +- * ColumnarToRow (58)
+                     :     :           +- CometFilter (57)
+                     :     :              +- CometScan parquet spark_catalog.default.item (56)
+                     :     +- ReusedExchange (62)
+                     +- ReusedExchange (65)
+
+
+(46) ReusedExchange [Reuses operator id: 4]
 Output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(49) CometSort
+(47) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_ticket_number#4 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST]
 
-(50) ReusedExchange [Reuses operator id: 9]
+(48) ReusedExchange [Reuses operator id: 9]
 Output [2]: [sr_item_sk#7, sr_ticket_number#8]
 
-(51) CometSort
+(49) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_ticket_number#8 ASC NULLS FIRST, sr_item_sk#7 ASC NULLS FIRST]
 
-(52) CometSortMergeJoin
+(50) CometSortMergeJoin
 Left output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Right output [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_ticket_number#4, ss_item_sk#1], [sr_ticket_number#8, sr_item_sk#7], Inner
 
-(53) CometProject
+(51) CometProject
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(54) ColumnarToRow [codegen id : 5]
+(52) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(55) ReusedExchange [Reuses operator id: 18]
+(53) ReusedExchange [Reuses operator id: 18]
 Output [4]: [s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
-(56) BroadcastHashJoin [codegen id : 5]
+(54) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#10]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 5]
+(55) Project [codegen id : 5]
 Output [6]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14]
 Input [8]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5, s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
@@ -343,87 +339,87 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_size:string,i_color:string,i_units:string,i_manager_id:int>
 
-(59) CometFilter
+(57) CometFilter
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Condition : isnotnull(i_item_sk#15)
 
-(60) ColumnarToRow [codegen id : 2]
+(58) ColumnarToRow [codegen id : 2]
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(61) BroadcastExchange
+(59) BroadcastExchange
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(62) BroadcastHashJoin [codegen id : 5]
+(60) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#15]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 5]
+(61) Project [codegen id : 5]
 Output [10]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(64) ReusedExchange [Reuses operator id: 30]
+(62) ReusedExchange [Reuses operator id: 30]
 Output [4]: [c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(65) BroadcastHashJoin [codegen id : 5]
+(63) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(66) Project [codegen id : 5]
+(64) Project [codegen id : 5]
 Output [12]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24]
 Input [14]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_customer_sk#21, c_first_name#22, c_last_name#23, c_birth_country#24]
 
-(67) ReusedExchange [Reuses operator id: 36]
+(65) ReusedExchange [Reuses operator id: 36]
 Output [3]: [ca_state#25, ca_zip#26, ca_country#27]
 
-(68) BroadcastHashJoin [codegen id : 5]
+(66) BroadcastHashJoin [codegen id : 5]
 Left keys [2]: [c_birth_country#24, s_zip#14]
 Right keys [2]: [upper(ca_country#27), ca_zip#26]
 Join type: Inner
 Join condition: None
 
-(69) Project [codegen id : 5]
+(67) Project [codegen id : 5]
 Output [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Input [15]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, c_birth_country#24, ca_state#25, ca_zip#26, ca_country#27]
 
-(70) HashAggregate [codegen id : 5]
+(68) HashAggregate [codegen id : 5]
 Input [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#22, c_last_name#23, ca_state#25]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum#36]
-Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
-
-(71) RowToColumnar
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+Aggregate Attributes [1]: [sum#40]
+Results [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
 
-(72) CometColumnarExchange
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
-Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(69) Exchange
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
+Arguments: hashpartitioning(c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(73) CometHashAggregate
-Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#37]
+(70) HashAggregate [codegen id : 6]
+Input [11]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#41]
 Keys [10]: [c_last_name#23, c_first_name#22, s_store_name#11, ca_state#25, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#30]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#30,17,2) AS netpaid#31]
 
-(74) CometHashAggregate
-Input [1]: [netpaid#30]
+(71) HashAggregate [codegen id : 6]
+Input [1]: [netpaid#31]
 Keys: []
-Functions [1]: [partial_avg(netpaid#30)]
+Functions [1]: [partial_avg(netpaid#31)]
+Aggregate Attributes [2]: [sum#42, count#43]
+Results [2]: [sum#44, count#45]
 
-(75) CometColumnarExchange
-Input [2]: [sum#38, count#39]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(72) Exchange
+Input [2]: [sum#44, count#45]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=11]
 
-(76) CometHashAggregate
-Input [2]: [sum#38, count#39]
+(73) HashAggregate [codegen id : 7]
+Input [2]: [sum#44, count#45]
 Keys: []
-Functions [1]: [avg(netpaid#30)]
-
-(77) ColumnarToRow [codegen id : 6]
-Input [1]: [(0.05 * avg(netpaid))#40]
+Functions [1]: [avg(netpaid#31)]
+Aggregate Attributes [1]: [avg(netpaid#31)#46]
+Results [1]: [(0.05 * avg(netpaid#31)#46) AS (0.05 * avg(netpaid))#47]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt
index 558a960ab1..a4b8fef5d3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/simplified.txt
@@ -1,54 +1,54 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometFilter [paid]
-        Subquery #1
-          WholeStageCodegen (6)
-            ColumnarToRow
-              InputAdapter
-                CometHashAggregate [sum,count]
-                  CometColumnarExchange #9
-                    CometHashAggregate [netpaid]
-                      CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
-                        CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
-                          RowToColumnar
-                            WholeStageCodegen (5)
-                              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
-                                Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
-                                  BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
-                                    Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
-                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                        Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
-                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                            Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
-                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
-                                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                        CometSort [ss_ticket_number,ss_item_sk]
-                                                          ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
-                                                        CometSort [sr_ticket_number,sr_item_sk]
-                                                          ReusedExchange [sr_item_sk,sr_ticket_number] #4
-                                                InputAdapter
-                                                  ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
+WholeStageCodegen (7)
+  Filter [paid]
+    Subquery #1
+      WholeStageCodegen (7)
+        HashAggregate [sum,count] [avg(netpaid),(0.05 * avg(netpaid)),sum,count]
+          InputAdapter
+            Exchange #9
+              WholeStageCodegen (6)
+                HashAggregate [netpaid] [sum,count,sum,count]
+                  HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
+                    InputAdapter
+                      Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #10
+                        WholeStageCodegen (5)
+                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
+                            Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
+                              BroadcastHashJoin [c_birth_country,s_zip,ca_country,ca_zip]
+                                Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,c_birth_country]
+                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                    Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                        Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
+                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
+                                                  CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                    CometSort [ss_ticket_number,ss_item_sk]
+                                                      ReusedExchange [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid] #3
+                                                    CometSort [sr_ticket_number,sr_item_sk]
+                                                      ReusedExchange [sr_item_sk,sr_ticket_number] #4
                                             InputAdapter
-                                              BroadcastExchange #11
-                                                WholeStageCodegen (2)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [i_item_sk]
-                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                              ReusedExchange [s_store_sk,s_store_name,s_state,s_zip] #5
                                         InputAdapter
-                                          ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
+                                          BroadcastExchange #11
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [i_item_sk]
+                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
                                     InputAdapter
-                                      ReusedExchange [ca_state,ca_zip,ca_country] #8
-        CometHashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty]
-          CometColumnarExchange [c_last_name,c_first_name,s_store_name] #1
-            CometHashAggregate [c_last_name,c_first_name,s_store_name,netpaid]
-              CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
-                CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
-                  RowToColumnar
+                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name,c_birth_country] #7
+                                InputAdapter
+                                  ReusedExchange [ca_state,ca_zip,ca_country] #8
+    HashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty] [sum(netpaid),paid,sum,isEmpty]
+      InputAdapter
+        Exchange [c_last_name,c_first_name,s_store_name] #1
+          WholeStageCodegen (6)
+            HashAggregate [c_last_name,c_first_name,s_store_name,netpaid] [sum,isEmpty,sum,isEmpty]
+              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
+                InputAdapter
+                  Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #2
                     WholeStageCodegen (5)
                       HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
                         Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
@@ -64,12 +64,12 @@ WholeStageCodegen (6)
                                             CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
                                               CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                 CometSort [ss_ticket_number,ss_item_sk]
-                                                  CometColumnarExchange [ss_ticket_number,ss_item_sk] #3
+                                                  CometExchange [ss_ticket_number,ss_item_sk] #3
                                                     CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
                                                       CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
                                                         CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
                                                 CometSort [sr_ticket_number,sr_item_sk]
-                                                  CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
+                                                  CometExchange [sr_ticket_number,sr_item_sk] #4
                                                     CometProject [sr_item_sk,sr_ticket_number]
                                                       CometFilter [sr_ticket_number,sr_item_sk]
                                                         CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt
index 6b203e283f..7eb30b6fb4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/explain.txt
@@ -1,46 +1,44 @@
 == Physical Plan ==
-* ColumnarToRow (42)
-+- CometTakeOrderedAndProject (41)
-   +- CometHashAggregate (40)
-      +- CometColumnarExchange (39)
-         +- RowToColumnar (38)
-            +- * HashAggregate (37)
-               +- * Project (36)
-                  +- * BroadcastHashJoin Inner BuildRight (35)
-                     :- * Project (30)
-                     :  +- * BroadcastHashJoin Inner BuildRight (29)
-                     :     :- * Project (24)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (23)
-                     :     :     :- * Project (21)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :     :     :     :- * Project (18)
-                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                     :     :     :     :     :- * Project (15)
-                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :     :     :     :- * Project (9)
-                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :     :     :     :     :     +- BroadcastExchange (7)
-                     :     :     :     :     :     :        +- * ColumnarToRow (6)
-                     :     :     :     :     :     :           +- CometFilter (5)
-                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-                     :     :     :     :     :     +- BroadcastExchange (13)
-                     :     :     :     :     :        +- * ColumnarToRow (12)
-                     :     :     :     :     :           +- CometFilter (11)
-                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
-                     :     :     :     :     +- ReusedExchange (16)
-                     :     :     :     +- ReusedExchange (19)
-                     :     :     +- ReusedExchange (22)
-                     :     +- BroadcastExchange (28)
-                     :        +- * ColumnarToRow (27)
-                     :           +- CometFilter (26)
-                     :              +- CometScan parquet spark_catalog.default.store (25)
-                     +- BroadcastExchange (34)
-                        +- * ColumnarToRow (33)
-                           +- CometFilter (32)
-                              +- CometScan parquet spark_catalog.default.item (31)
+TakeOrderedAndProject (40)
++- * HashAggregate (39)
+   +- Exchange (38)
+      +- * HashAggregate (37)
+         +- * Project (36)
+            +- * BroadcastHashJoin Inner BuildRight (35)
+               :- * Project (30)
+               :  +- * BroadcastHashJoin Inner BuildRight (29)
+               :     :- * Project (24)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (23)
+               :     :     :- * Project (21)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :     :     :     :- * Project (18)
+               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+               :     :     :     :     :- * Project (15)
+               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :     :     :     :- * Project (9)
+               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :     :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :     :     :     :  +- CometFilter (2)
+               :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :     :     :     :     :     +- BroadcastExchange (7)
+               :     :     :     :     :     :        +- * ColumnarToRow (6)
+               :     :     :     :     :     :           +- CometFilter (5)
+               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+               :     :     :     :     :     +- BroadcastExchange (13)
+               :     :     :     :     :        +- * ColumnarToRow (12)
+               :     :     :     :     :           +- CometFilter (11)
+               :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
+               :     :     :     :     +- ReusedExchange (16)
+               :     :     :     +- ReusedExchange (19)
+               :     :     +- ReusedExchange (22)
+               :     +- BroadcastExchange (28)
+               :        +- * ColumnarToRow (27)
+               :           +- CometFilter (26)
+               :              +- CometScan parquet spark_catalog.default.store (25)
+               +- BroadcastExchange (34)
+                  +- * ColumnarToRow (33)
+                     +- CometFilter (32)
+                        +- CometScan parquet spark_catalog.default.item (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -116,7 +114,7 @@ Join condition: None
 Output [8]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, ss_sold_date_sk#6, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17]
 Input [12]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, ss_sold_date_sk#6, sr_item_sk#8, sr_customer_sk#9, sr_net_loss#11, sr_returned_date_sk#12, cs_bill_customer_sk#14, cs_item_sk#15, cs_net_profit#16, cs_sold_date_sk#17]
 
-(16) ReusedExchange [Reuses operator id: 47]
+(16) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#19]
 
 (17) BroadcastHashJoin [codegen id : 8]
@@ -129,7 +127,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17]
 Input [9]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, ss_sold_date_sk#6, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17, d_date_sk#19]
 
-(19) ReusedExchange [Reuses operator id: 52]
+(19) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#20]
 
 (20) BroadcastHashJoin [codegen id : 8]
@@ -142,7 +140,7 @@ Join condition: None
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, sr_net_loss#11, cs_net_profit#16, cs_sold_date_sk#17]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_net_profit#5, sr_net_loss#11, sr_returned_date_sk#12, cs_net_profit#16, cs_sold_date_sk#17, d_date_sk#20]
 
-(22) ReusedExchange [Reuses operator id: 52]
+(22) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#21]
 
 (23) BroadcastHashJoin [codegen id : 8]
@@ -218,84 +216,80 @@ Functions [3]: [partial_sum(UnscaledValue(ss_net_profit#5)), partial_sum(Unscale
 Aggregate Attributes [3]: [sum#28, sum#29, sum#30]
 Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 
-(38) RowToColumnar
+(38) Exchange
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
+Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) CometColumnarExchange
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
-Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(40) CometHashAggregate
+(39) HashAggregate [codegen id : 9]
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 Keys [4]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24]
 Functions [3]: [sum(UnscaledValue(ss_net_profit#5)), sum(UnscaledValue(sr_net_loss#11)), sum(UnscaledValue(cs_net_profit#16))]
+Aggregate Attributes [3]: [sum(UnscaledValue(ss_net_profit#5))#34, sum(UnscaledValue(sr_net_loss#11))#35, sum(UnscaledValue(cs_net_profit#16))#36]
+Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, MakeDecimal(sum(UnscaledValue(ss_net_profit#5))#34,17,2) AS store_sales_profit#37, MakeDecimal(sum(UnscaledValue(sr_net_loss#11))#35,17,2) AS store_returns_loss#38, MakeDecimal(sum(UnscaledValue(cs_net_profit#16))#36,17,2) AS catalog_sales_profit#39]
 
-(41) CometTakeOrderedAndProject
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#34, store_returns_loss#35, catalog_sales_profit#36]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#26 ASC NULLS FIRST,i_item_desc#27 ASC NULLS FIRST,s_store_id#23 ASC NULLS FIRST,s_store_name#24 ASC NULLS FIRST], output=[i_item_id#26,i_item_desc#27,s_store_id#23,s_store_name#24,store_sales_profit#34,store_returns_loss#35,catalog_sales_profit#36]), 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#34, store_returns_loss#35, catalog_sales_profit#36]
-
-(42) ColumnarToRow [codegen id : 9]
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#34, store_returns_loss#35, catalog_sales_profit#36]
+(40) TakeOrderedAndProject
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#37, store_returns_loss#38, catalog_sales_profit#39]
+Arguments: 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_profit#37, store_returns_loss#38, catalog_sales_profit#39]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (45)
++- * ColumnarToRow (44)
+   +- CometProject (43)
+      +- CometFilter (42)
+         +- CometScan parquet spark_catalog.default.date_dim (41)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#19, d_year#37, d_moy#38]
+Output [3]: [d_date_sk#19, d_year#40, d_moy#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,4), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(44) CometFilter
-Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
-Condition : ((((isnotnull(d_moy#38) AND isnotnull(d_year#37)) AND (d_moy#38 = 4)) AND (d_year#37 = 2001)) AND isnotnull(d_date_sk#19))
+(42) CometFilter
+Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
+Condition : ((((isnotnull(d_moy#41) AND isnotnull(d_year#40)) AND (d_moy#41 = 4)) AND (d_year#40 = 2001)) AND isnotnull(d_date_sk#19))
 
-(45) CometProject
-Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
+(43) CometProject
+Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
 Arguments: [d_date_sk#19], [d_date_sk#19]
 
-(46) ColumnarToRow [codegen id : 1]
+(44) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#19]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [1]: [d_date_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (52)
-+- * ColumnarToRow (51)
-   +- CometProject (50)
-      +- CometFilter (49)
-         +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#20, d_year#39, d_moy#40]
+Output [3]: [d_date_sk#20, d_year#42, d_moy#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,10), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(49) CometFilter
-Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
-Condition : (((((isnotnull(d_moy#40) AND isnotnull(d_year#39)) AND (d_moy#40 >= 4)) AND (d_moy#40 <= 10)) AND (d_year#39 = 2001)) AND isnotnull(d_date_sk#20))
+(47) CometFilter
+Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
+Condition : (((((isnotnull(d_moy#43) AND isnotnull(d_year#42)) AND (d_moy#43 >= 4)) AND (d_moy#43 <= 10)) AND (d_year#42 = 2001)) AND isnotnull(d_date_sk#20))
 
-(50) CometProject
-Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
+(48) CometProject
+Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
 Arguments: [d_date_sk#20], [d_date_sk#20]
 
-(51) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#20]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt
index 9d8f0b4415..eda7f6b64d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q25/simplified.txt
@@ -1,78 +1,76 @@
-WholeStageCodegen (9)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_profit,store_returns_loss,catalog_sales_profit]
-        CometHashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum]
-          CometColumnarExchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
-            RowToColumnar
-              WholeStageCodegen (8)
-                HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_net_profit,sr_net_loss,cs_net_profit] [sum,sum,sum,sum,sum,sum]
-                  Project [ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name,i_item_id,i_item_desc]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [ss_item_sk,ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name]
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit]
-                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit,cs_sold_date_sk]
-                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                  Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
-                                        BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
-                                          Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_net_loss,sr_returned_date_sk]
-                                            BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_profit,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #2
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_moy,d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_net_loss,sr_returned_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #2
-                                                              BroadcastExchange #4
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_moy,d_year,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+TakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_profit,store_returns_loss,catalog_sales_profit]
+  WholeStageCodegen (9)
+    HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(sr_net_loss)),sum(UnscaledValue(cs_net_profit)),store_sales_profit,store_returns_loss,catalog_sales_profit,sum,sum,sum]
+      InputAdapter
+        Exchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
+          WholeStageCodegen (8)
+            HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_net_profit,sr_net_loss,cs_net_profit] [sum,sum,sum,sum,sum,sum]
+              Project [ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name,i_item_id,i_item_desc]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [ss_item_sk,ss_net_profit,sr_net_loss,cs_net_profit,s_store_id,s_store_name]
+                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                      Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit]
+                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                          Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,cs_net_profit,cs_sold_date_sk]
+                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_store_sk,ss_net_profit,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
+                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_net_loss,sr_returned_date_sk,cs_net_profit,cs_sold_date_sk]
+                                    BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
+                                      Project [ss_item_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_net_loss,sr_returned_date_sk]
+                                        BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_profit,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #2
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_moy,d_year,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (2)
+                                            BroadcastExchange #3
+                                              WholeStageCodegen (1)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [cs_bill_customer_sk,cs_item_sk]
-                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_net_profit,cs_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #2
+                                                    CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_net_loss,sr_returned_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #2
+                                                          BroadcastExchange #4
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometProject [d_date_sk]
+                                                                    CometFilter [d_moy,d_year,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #2
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (2)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #2
                                   InputAdapter
-                                    ReusedExchange [d_date_sk] #4
+                                    ReusedExchange [d_date_sk] #2
                               InputAdapter
                                 ReusedExchange [d_date_sk] #4
                           InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (6)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [s_store_sk]
-                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
+                            ReusedExchange [d_date_sk] #4
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (7)
+                        BroadcastExchange #6
+                          WholeStageCodegen (6)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
+                                CometFilter [s_store_sk]
+                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
+                  InputAdapter
+                    BroadcastExchange #7
+                      WholeStageCodegen (7)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [i_item_sk]
+                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt
index cdb47fded7..55bae9c8c3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/explain.txt
@@ -1,36 +1,34 @@
 == Physical Plan ==
-* ColumnarToRow (32)
-+- CometTakeOrderedAndProject (31)
-   +- CometHashAggregate (30)
-      +- CometColumnarExchange (29)
-         +- RowToColumnar (28)
-            +- * HashAggregate (27)
-               +- * Project (26)
-                  +- * BroadcastHashJoin Inner BuildRight (25)
-                     :- * Project (19)
-                     :  +- * BroadcastHashJoin Inner BuildRight (18)
-                     :     :- * Project (13)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-                     :     :     :- * Project (10)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                     :     :     :     +- BroadcastExchange (8)
-                     :     :     :        +- * ColumnarToRow (7)
-                     :     :     :           +- CometProject (6)
-                     :     :     :              +- CometFilter (5)
-                     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-                     :     :     +- ReusedExchange (11)
-                     :     +- BroadcastExchange (17)
-                     :        +- * ColumnarToRow (16)
-                     :           +- CometFilter (15)
-                     :              +- CometScan parquet spark_catalog.default.item (14)
-                     +- BroadcastExchange (24)
-                        +- * ColumnarToRow (23)
-                           +- CometProject (22)
-                              +- CometFilter (21)
-                                 +- CometScan parquet spark_catalog.default.promotion (20)
+TakeOrderedAndProject (30)
++- * HashAggregate (29)
+   +- Exchange (28)
+      +- * HashAggregate (27)
+         +- * Project (26)
+            +- * BroadcastHashJoin Inner BuildRight (25)
+               :- * Project (19)
+               :  +- * BroadcastHashJoin Inner BuildRight (18)
+               :     :- * Project (13)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :     :     :- * Project (10)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :  +- CometFilter (2)
+               :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :     :     :     +- BroadcastExchange (8)
+               :     :     :        +- * ColumnarToRow (7)
+               :     :     :           +- CometProject (6)
+               :     :     :              +- CometFilter (5)
+               :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+               :     :     +- ReusedExchange (11)
+               :     +- BroadcastExchange (17)
+               :        +- * ColumnarToRow (16)
+               :           +- CometFilter (15)
+               :              +- CometScan parquet spark_catalog.default.item (14)
+               +- BroadcastExchange (24)
+                  +- * ColumnarToRow (23)
+                     +- CometProject (22)
+                        +- CometFilter (21)
+                           +- CometScan parquet spark_catalog.default.promotion (20)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -80,7 +78,7 @@ Join condition: None
 Output [7]: [cs_item_sk#2, cs_promo_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_sold_date_sk#8]
 Input [9]: [cs_bill_cdemo_sk#1, cs_item_sk#2, cs_promo_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 37]
+(11) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -160,54 +158,50 @@ Functions [4]: [partial_avg(cs_quantity#4), partial_avg(UnscaledValue(cs_list_pr
 Aggregate Attributes [8]: [sum#20, count#21, sum#22, count#23, sum#24, count#25, sum#26, count#27]
 Results [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 
-(28) RowToColumnar
+(28) Exchange
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
+Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometColumnarExchange
-Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
-Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 6]
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 Keys [1]: [i_item_id#16]
 Functions [4]: [avg(cs_quantity#4), avg(UnscaledValue(cs_list_price#5)), avg(UnscaledValue(cs_coupon_amt#7)), avg(UnscaledValue(cs_sales_price#6))]
+Aggregate Attributes [4]: [avg(cs_quantity#4)#36, avg(UnscaledValue(cs_list_price#5))#37, avg(UnscaledValue(cs_coupon_amt#7))#38, avg(UnscaledValue(cs_sales_price#6))#39]
+Results [5]: [i_item_id#16, avg(cs_quantity#4)#36 AS agg1#40, cast((avg(UnscaledValue(cs_list_price#5))#37 / 100.0) as decimal(11,6)) AS agg2#41, cast((avg(UnscaledValue(cs_coupon_amt#7))#38 / 100.0) as decimal(11,6)) AS agg3#42, cast((avg(UnscaledValue(cs_sales_price#6))#39 / 100.0) as decimal(11,6)) AS agg4#43]
 
-(31) CometTakeOrderedAndProject
-Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#16 ASC NULLS FIRST], output=[i_item_id#16,agg1#36,agg2#37,agg3#38,agg4#39]), 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
-
-(32) ColumnarToRow [codegen id : 6]
-Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
+(30) TakeOrderedAndProject
+Input [5]: [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
+Arguments: 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#40]
+Output [2]: [d_date_sk#14, d_year#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(34) CometFilter
-Input [2]: [d_date_sk#14, d_year#40]
-Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2000)) AND isnotnull(d_date_sk#14))
+(32) CometFilter
+Input [2]: [d_date_sk#14, d_year#44]
+Condition : ((isnotnull(d_year#44) AND (d_year#44 = 2000)) AND isnotnull(d_date_sk#14))
 
-(35) CometProject
-Input [2]: [d_date_sk#14, d_year#40]
+(33) CometProject
+Input [2]: [d_date_sk#14, d_year#44]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(36) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(37) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt
index 1d9e320882..7d38936244 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q26/simplified.txt
@@ -1,54 +1,52 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
-        CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count]
-          CometColumnarExchange [i_item_id] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                HashAggregate [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                  Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
-                    BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                      Project [cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
-                        BroadcastHashJoin [cs_item_sk,i_item_sk]
-                          Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt]
-                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                              Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
-                                BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk]
-                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_year,d_date_sk]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                  InputAdapter
-                                    BroadcastExchange #3
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [cd_demo_sk]
-                                              CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+TakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
+  WholeStageCodegen (6)
+    HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count] [avg(cs_quantity),avg(UnscaledValue(cs_list_price)),avg(UnscaledValue(cs_coupon_amt)),avg(UnscaledValue(cs_sales_price)),agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
+      InputAdapter
+        Exchange [i_item_id] #1
+          WholeStageCodegen (5)
+            HashAggregate [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+              Project [cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
+                BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                  Project [cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,i_item_id]
+                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                      Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt]
+                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                          Project [cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
+                            BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk]
+                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_cdemo_sk,cs_item_sk,cs_promo_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_sold_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [d_date_sk]
+                                                  CometFilter [d_year,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                               InputAdapter
-                                ReusedExchange [d_date_sk] #2
+                                BroadcastExchange #3
+                                  WholeStageCodegen (1)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [cd_demo_sk]
+                                          CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (3)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                            ReusedExchange [d_date_sk] #2
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (4)
+                        BroadcastExchange #4
+                          WholeStageCodegen (3)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [p_promo_sk]
-                                  CometFilter [p_channel_email,p_channel_event,p_promo_sk]
-                                    CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
+                                CometFilter [i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                  InputAdapter
+                    BroadcastExchange #5
+                      WholeStageCodegen (4)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [p_promo_sk]
+                              CometFilter [p_channel_email,p_channel_event,p_promo_sk]
+                                CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt
index 7a4a7aaf9b..eca71fb097 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/explain.txt
@@ -1,36 +1,34 @@
 == Physical Plan ==
-* ColumnarToRow (32)
-+- CometTakeOrderedAndProject (31)
-   +- CometHashAggregate (30)
-      +- CometColumnarExchange (29)
-         +- RowToColumnar (28)
-            +- * HashAggregate (27)
-               +- * Expand (26)
-                  +- * Project (25)
-                     +- * BroadcastHashJoin Inner BuildRight (24)
-                        :- * Project (19)
-                        :  +- * BroadcastHashJoin Inner BuildRight (18)
-                        :     :- * Project (13)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-                        :     :     :- * Project (10)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                        :     :     :     :- * ColumnarToRow (3)
-                        :     :     :     :  +- CometFilter (2)
-                        :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                        :     :     :     +- BroadcastExchange (8)
-                        :     :     :        +- * ColumnarToRow (7)
-                        :     :     :           +- CometProject (6)
-                        :     :     :              +- CometFilter (5)
-                        :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-                        :     :     +- ReusedExchange (11)
-                        :     +- BroadcastExchange (17)
-                        :        +- * ColumnarToRow (16)
-                        :           +- CometFilter (15)
-                        :              +- CometScan parquet spark_catalog.default.store (14)
-                        +- BroadcastExchange (23)
-                           +- * ColumnarToRow (22)
-                              +- CometFilter (21)
-                                 +- CometScan parquet spark_catalog.default.item (20)
+TakeOrderedAndProject (30)
++- * HashAggregate (29)
+   +- Exchange (28)
+      +- * HashAggregate (27)
+         +- * Expand (26)
+            +- * Project (25)
+               +- * BroadcastHashJoin Inner BuildRight (24)
+                  :- * Project (19)
+                  :  +- * BroadcastHashJoin Inner BuildRight (18)
+                  :     :- * Project (13)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+                  :     :     :- * Project (10)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                  :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                  :     :     :     +- BroadcastExchange (8)
+                  :     :     :        +- * ColumnarToRow (7)
+                  :     :     :           +- CometProject (6)
+                  :     :     :              +- CometFilter (5)
+                  :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+                  :     :     +- ReusedExchange (11)
+                  :     +- BroadcastExchange (17)
+                  :        +- * ColumnarToRow (16)
+                  :           +- CometFilter (15)
+                  :              +- CometScan parquet spark_catalog.default.store (14)
+                  +- BroadcastExchange (23)
+                     +- * ColumnarToRow (22)
+                        +- CometFilter (21)
+                           +- CometScan parquet spark_catalog.default.item (20)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -80,7 +78,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 37]
+(11) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -160,54 +158,50 @@ Functions [4]: [partial_avg(ss_quantity#4), partial_avg(UnscaledValue(ss_list_pr
 Aggregate Attributes [8]: [sum#22, count#23, sum#24, count#25, sum#26, count#27, sum#28, count#29]
 Results [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
 
-(28) RowToColumnar
+(28) Exchange
 Input [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
+Arguments: hashpartitioning(i_item_id#19, s_state#20, spark_grouping_id#21, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometColumnarExchange
-Input [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
-Arguments: hashpartitioning(i_item_id#19, s_state#20, spark_grouping_id#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 6]
 Input [11]: [i_item_id#19, s_state#20, spark_grouping_id#21, sum#30, count#31, sum#32, count#33, sum#34, count#35, sum#36, count#37]
 Keys [3]: [i_item_id#19, s_state#20, spark_grouping_id#21]
 Functions [4]: [avg(ss_quantity#4), avg(UnscaledValue(ss_list_price#5)), avg(UnscaledValue(ss_coupon_amt#7)), avg(UnscaledValue(ss_sales_price#6))]
+Aggregate Attributes [4]: [avg(ss_quantity#4)#38, avg(UnscaledValue(ss_list_price#5))#39, avg(UnscaledValue(ss_coupon_amt#7))#40, avg(UnscaledValue(ss_sales_price#6))#41]
+Results [7]: [i_item_id#19, s_state#20, cast((shiftright(spark_grouping_id#21, 0) & 1) as tinyint) AS g_state#42, avg(ss_quantity#4)#38 AS agg1#43, cast((avg(UnscaledValue(ss_list_price#5))#39 / 100.0) as decimal(11,6)) AS agg2#44, cast((avg(UnscaledValue(ss_coupon_amt#7))#40 / 100.0) as decimal(11,6)) AS agg3#45, cast((avg(UnscaledValue(ss_sales_price#6))#41 / 100.0) as decimal(11,6)) AS agg4#46]
 
-(31) CometTakeOrderedAndProject
-Input [7]: [i_item_id#19, s_state#20, g_state#38, agg1#39, agg2#40, agg3#41, agg4#42]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#19 ASC NULLS FIRST,s_state#20 ASC NULLS FIRST], output=[i_item_id#19,s_state#20,g_state#38,agg1#39,agg2#40,agg3#41,agg4#42]), 100, [i_item_id#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST], [i_item_id#19, s_state#20, g_state#38, agg1#39, agg2#40, agg3#41, agg4#42]
-
-(32) ColumnarToRow [codegen id : 6]
-Input [7]: [i_item_id#19, s_state#20, g_state#38, agg1#39, agg2#40, agg3#41, agg4#42]
+(30) TakeOrderedAndProject
+Input [7]: [i_item_id#19, s_state#20, g_state#42, agg1#43, agg2#44, agg3#45, agg4#46]
+Arguments: 100, [i_item_id#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST], [i_item_id#19, s_state#20, g_state#42, agg1#43, agg2#44, agg3#45, agg4#46]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#43]
+Output [2]: [d_date_sk#14, d_year#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(34) CometFilter
-Input [2]: [d_date_sk#14, d_year#43]
-Condition : ((isnotnull(d_year#43) AND (d_year#43 = 2002)) AND isnotnull(d_date_sk#14))
+(32) CometFilter
+Input [2]: [d_date_sk#14, d_year#47]
+Condition : ((isnotnull(d_year#47) AND (d_year#47 = 2002)) AND isnotnull(d_date_sk#14))
 
-(35) CometProject
-Input [2]: [d_date_sk#14, d_year#43]
+(33) CometProject
+Input [2]: [d_date_sk#14, d_year#47]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(36) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(37) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt
index 191ff0322c..9d073ff67c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q27/simplified.txt
@@ -1,54 +1,52 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
-        CometHashAggregate [i_item_id,s_state,spark_grouping_id,sum,count,sum,count,sum,count,sum,count]
-          CometColumnarExchange [i_item_id,s_state,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                HashAggregate [i_item_id,s_state,spark_grouping_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                  Expand [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
-                    Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
-                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                    InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [cd_demo_sk]
-                                                CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+TakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
+  WholeStageCodegen (6)
+    HashAggregate [i_item_id,s_state,spark_grouping_id,sum,count,sum,count,sum,count,sum,count] [avg(ss_quantity),avg(UnscaledValue(ss_list_price)),avg(UnscaledValue(ss_coupon_amt)),avg(UnscaledValue(ss_sales_price)),g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
+      InputAdapter
+        Exchange [i_item_id,s_state,spark_grouping_id] #1
+          WholeStageCodegen (5)
+            HashAggregate [i_item_id,s_state,spark_grouping_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+              Expand [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
+                Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id,s_state]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
+                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_year,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [cd_demo_sk]
+                                            CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                             InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (3)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [s_state,s_store_sk]
-                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          BroadcastExchange #5
-                            WholeStageCodegen (4)
+                          BroadcastExchange #4
+                            WholeStageCodegen (3)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                  CometFilter [s_state,s_store_sk]
+                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                    InputAdapter
+                      BroadcastExchange #5
+                        WholeStageCodegen (4)
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt
index 16063ddeac..db6d112e64 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/explain.txt
@@ -1,86 +1,74 @@
 == Physical Plan ==
-* BroadcastNestedLoopJoin Inner BuildRight (82)
-:- * BroadcastNestedLoopJoin Inner BuildRight (68)
-:  :- * BroadcastNestedLoopJoin Inner BuildRight (54)
-:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (40)
-:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (26)
-:  :  :  :  :- * ColumnarToRow (12)
-:  :  :  :  :  +- CometHashAggregate (11)
-:  :  :  :  :     +- CometColumnarExchange (10)
-:  :  :  :  :        +- RowToColumnar (9)
-:  :  :  :  :           +- * HashAggregate (8)
-:  :  :  :  :              +- * HashAggregate (7)
-:  :  :  :  :                 +- * ColumnarToRow (6)
-:  :  :  :  :                    +- CometColumnarExchange (5)
-:  :  :  :  :                       +- CometHashAggregate (4)
-:  :  :  :  :                          +- CometProject (3)
-:  :  :  :  :                             +- CometFilter (2)
-:  :  :  :  :                                +- CometScan parquet spark_catalog.default.store_sales (1)
-:  :  :  :  +- BroadcastExchange (25)
-:  :  :  :     +- * ColumnarToRow (24)
-:  :  :  :        +- CometHashAggregate (23)
-:  :  :  :           +- CometColumnarExchange (22)
-:  :  :  :              +- RowToColumnar (21)
-:  :  :  :                 +- * HashAggregate (20)
-:  :  :  :                    +- * HashAggregate (19)
-:  :  :  :                       +- * ColumnarToRow (18)
-:  :  :  :                          +- CometColumnarExchange (17)
-:  :  :  :                             +- CometHashAggregate (16)
-:  :  :  :                                +- CometProject (15)
-:  :  :  :                                   +- CometFilter (14)
-:  :  :  :                                      +- CometScan parquet spark_catalog.default.store_sales (13)
-:  :  :  +- BroadcastExchange (39)
-:  :  :     +- * ColumnarToRow (38)
-:  :  :        +- CometHashAggregate (37)
-:  :  :           +- CometColumnarExchange (36)
-:  :  :              +- RowToColumnar (35)
-:  :  :                 +- * HashAggregate (34)
-:  :  :                    +- * HashAggregate (33)
-:  :  :                       +- * ColumnarToRow (32)
-:  :  :                          +- CometColumnarExchange (31)
-:  :  :                             +- CometHashAggregate (30)
-:  :  :                                +- CometProject (29)
-:  :  :                                   +- CometFilter (28)
-:  :  :                                      +- CometScan parquet spark_catalog.default.store_sales (27)
-:  :  +- BroadcastExchange (53)
-:  :     +- * ColumnarToRow (52)
-:  :        +- CometHashAggregate (51)
-:  :           +- CometColumnarExchange (50)
-:  :              +- RowToColumnar (49)
-:  :                 +- * HashAggregate (48)
-:  :                    +- * HashAggregate (47)
-:  :                       +- * ColumnarToRow (46)
-:  :                          +- CometColumnarExchange (45)
-:  :                             +- CometHashAggregate (44)
-:  :                                +- CometProject (43)
-:  :                                   +- CometFilter (42)
-:  :                                      +- CometScan parquet spark_catalog.default.store_sales (41)
-:  +- BroadcastExchange (67)
-:     +- * ColumnarToRow (66)
-:        +- CometHashAggregate (65)
-:           +- CometColumnarExchange (64)
-:              +- RowToColumnar (63)
-:                 +- * HashAggregate (62)
-:                    +- * HashAggregate (61)
-:                       +- * ColumnarToRow (60)
-:                          +- CometColumnarExchange (59)
-:                             +- CometHashAggregate (58)
-:                                +- CometProject (57)
-:                                   +- CometFilter (56)
-:                                      +- CometScan parquet spark_catalog.default.store_sales (55)
-+- BroadcastExchange (81)
-   +- * ColumnarToRow (80)
-      +- CometHashAggregate (79)
-         +- CometColumnarExchange (78)
-            +- RowToColumnar (77)
-               +- * HashAggregate (76)
-                  +- * HashAggregate (75)
-                     +- * ColumnarToRow (74)
-                        +- CometColumnarExchange (73)
-                           +- CometHashAggregate (72)
-                              +- CometProject (71)
-                                 +- CometFilter (70)
-                                    +- CometScan parquet spark_catalog.default.store_sales (69)
+* BroadcastNestedLoopJoin Inner BuildRight (70)
+:- * BroadcastNestedLoopJoin Inner BuildRight (58)
+:  :- * BroadcastNestedLoopJoin Inner BuildRight (46)
+:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (34)
+:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (22)
+:  :  :  :  :- * HashAggregate (10)
+:  :  :  :  :  +- Exchange (9)
+:  :  :  :  :     +- * HashAggregate (8)
+:  :  :  :  :        +- * HashAggregate (7)
+:  :  :  :  :           +- * ColumnarToRow (6)
+:  :  :  :  :              +- CometExchange (5)
+:  :  :  :  :                 +- CometHashAggregate (4)
+:  :  :  :  :                    +- CometProject (3)
+:  :  :  :  :                       +- CometFilter (2)
+:  :  :  :  :                          +- CometScan parquet spark_catalog.default.store_sales (1)
+:  :  :  :  +- BroadcastExchange (21)
+:  :  :  :     +- * HashAggregate (20)
+:  :  :  :        +- Exchange (19)
+:  :  :  :           +- * HashAggregate (18)
+:  :  :  :              +- * HashAggregate (17)
+:  :  :  :                 +- * ColumnarToRow (16)
+:  :  :  :                    +- CometExchange (15)
+:  :  :  :                       +- CometHashAggregate (14)
+:  :  :  :                          +- CometProject (13)
+:  :  :  :                             +- CometFilter (12)
+:  :  :  :                                +- CometScan parquet spark_catalog.default.store_sales (11)
+:  :  :  +- BroadcastExchange (33)
+:  :  :     +- * HashAggregate (32)
+:  :  :        +- Exchange (31)
+:  :  :           +- * HashAggregate (30)
+:  :  :              +- * HashAggregate (29)
+:  :  :                 +- * ColumnarToRow (28)
+:  :  :                    +- CometExchange (27)
+:  :  :                       +- CometHashAggregate (26)
+:  :  :                          +- CometProject (25)
+:  :  :                             +- CometFilter (24)
+:  :  :                                +- CometScan parquet spark_catalog.default.store_sales (23)
+:  :  +- BroadcastExchange (45)
+:  :     +- * HashAggregate (44)
+:  :        +- Exchange (43)
+:  :           +- * HashAggregate (42)
+:  :              +- * HashAggregate (41)
+:  :                 +- * ColumnarToRow (40)
+:  :                    +- CometExchange (39)
+:  :                       +- CometHashAggregate (38)
+:  :                          +- CometProject (37)
+:  :                             +- CometFilter (36)
+:  :                                +- CometScan parquet spark_catalog.default.store_sales (35)
+:  +- BroadcastExchange (57)
+:     +- * HashAggregate (56)
+:        +- Exchange (55)
+:           +- * HashAggregate (54)
+:              +- * HashAggregate (53)
+:                 +- * ColumnarToRow (52)
+:                    +- CometExchange (51)
+:                       +- CometHashAggregate (50)
+:                          +- CometProject (49)
+:                             +- CometFilter (48)
+:                                +- CometScan parquet spark_catalog.default.store_sales (47)
++- BroadcastExchange (69)
+   +- * HashAggregate (68)
+      +- Exchange (67)
+         +- * HashAggregate (66)
+            +- * HashAggregate (65)
+               +- * ColumnarToRow (64)
+                  +- CometExchange (63)
+                     +- CometHashAggregate (62)
+                        +- CometProject (61)
+                           +- CometFilter (60)
+                              +- CometScan parquet spark_catalog.default.store_sales (59)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -103,9 +91,9 @@ Input [1]: [ss_list_price#3]
 Keys [1]: [ss_list_price#3]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#3)), partial_count(ss_list_price#3)]
 
-(5) CometColumnarExchange
+(5) CometExchange
 Input [4]: [ss_list_price#3, sum#6, count#7, count#8]
-Arguments: hashpartitioning(ss_list_price#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_list_price#3, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (6) ColumnarToRow [codegen id : 1]
 Input [4]: [ss_list_price#3, sum#6, count#7, count#8]
@@ -124,20 +112,16 @@ Functions [3]: [merge_avg(UnscaledValue(ss_list_price#3)), merge_count(ss_list_p
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#3))#9, count(ss_list_price#3)#10, count(ss_list_price#3)#11]
 Results [4]: [sum#6, count#7, count#8, count#12]
 
-(9) RowToColumnar
+(9) Exchange
 Input [4]: [sum#6, count#7, count#8, count#12]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=2]
 
-(10) CometColumnarExchange
-Input [4]: [sum#6, count#7, count#8, count#12]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(11) CometHashAggregate
+(10) HashAggregate [codegen id : 12]
 Input [4]: [sum#6, count#7, count#8, count#12]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#3)), count(ss_list_price#3), count(distinct ss_list_price#3)]
-
-(12) ColumnarToRow [codegen id : 12]
-Input [3]: [B1_LP#13, B1_CNT#14, B1_CNTD#15]
+Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#3))#9, count(ss_list_price#3)#10, count(ss_list_price#3)#11]
+Results [3]: [cast((avg(UnscaledValue(ss_list_price#3))#9 / 100.0) as decimal(11,6)) AS B1_LP#13, count(ss_list_price#3)#10 AS B1_CNT#14, count(ss_list_price#3)#11 AS B1_CNTD#15]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
@@ -146,60 +130,56 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,6), LessThanOrEqual(ss_quantity,10), Or(Or(And(GreaterThanOrEqual(ss_list_price,90.00),LessThanOrEqual(ss_list_price,100.00)),And(GreaterThanOrEqual(ss_coupon_amt,2323.00),LessThanOrEqual(ss_coupon_amt,3323.00))),And(GreaterThanOrEqual(ss_wholesale_cost,31.00),LessThanOrEqual(ss_wholesale_cost,51.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(14) CometFilter
+(12) CometFilter
 Input [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
 Condition : (((isnotnull(ss_quantity#16) AND (ss_quantity#16 >= 6)) AND (ss_quantity#16 <= 10)) AND ((((ss_list_price#18 >= 90.00) AND (ss_list_price#18 <= 100.00)) OR ((ss_coupon_amt#19 >= 2323.00) AND (ss_coupon_amt#19 <= 3323.00))) OR ((ss_wholesale_cost#17 >= 31.00) AND (ss_wholesale_cost#17 <= 51.00))))
 
-(15) CometProject
+(13) CometProject
 Input [5]: [ss_quantity#16, ss_wholesale_cost#17, ss_list_price#18, ss_coupon_amt#19, ss_sold_date_sk#20]
 Arguments: [ss_list_price#18], [ss_list_price#18]
 
-(16) CometHashAggregate
+(14) CometHashAggregate
 Input [1]: [ss_list_price#18]
 Keys [1]: [ss_list_price#18]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#18)), partial_count(ss_list_price#18)]
 
-(17) CometColumnarExchange
+(15) CometExchange
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
-Arguments: hashpartitioning(ss_list_price#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(ss_list_price#18, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
-(18) ColumnarToRow [codegen id : 2]
+(16) ColumnarToRow [codegen id : 2]
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
 
-(19) HashAggregate [codegen id : 2]
+(17) HashAggregate [codegen id : 2]
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
 Keys [1]: [ss_list_price#18]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#18)), merge_count(ss_list_price#18)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25]
 Results [4]: [ss_list_price#18, sum#21, count#22, count#23]
 
-(20) HashAggregate [codegen id : 2]
+(18) HashAggregate [codegen id : 2]
 Input [4]: [ss_list_price#18, sum#21, count#22, count#23]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#18)), merge_count(ss_list_price#18), partial_count(distinct ss_list_price#18)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25, count(ss_list_price#18)#26]
 Results [4]: [sum#21, count#22, count#23, count#27]
 
-(21) RowToColumnar
+(19) Exchange
 Input [4]: [sum#21, count#22, count#23, count#27]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(22) CometColumnarExchange
-Input [4]: [sum#21, count#22, count#23, count#27]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(23) CometHashAggregate
+(20) HashAggregate [codegen id : 3]
 Input [4]: [sum#21, count#22, count#23, count#27]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#18)), count(ss_list_price#18), count(distinct ss_list_price#18)]
+Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#18))#24, count(ss_list_price#18)#25, count(ss_list_price#18)#26]
+Results [3]: [cast((avg(UnscaledValue(ss_list_price#18))#24 / 100.0) as decimal(11,6)) AS B2_LP#28, count(ss_list_price#18)#25 AS B2_CNT#29, count(ss_list_price#18)#26 AS B2_CNTD#30]
 
-(24) ColumnarToRow [codegen id : 3]
-Input [3]: [B2_LP#28, B2_CNT#29, B2_CNTD#30]
-
-(25) BroadcastExchange
+(21) BroadcastExchange
 Input [3]: [B2_LP#28, B2_CNT#29, B2_CNTD#30]
 Arguments: IdentityBroadcastMode, [plan_id=5]
 
-(26) BroadcastNestedLoopJoin [codegen id : 12]
+(22) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -210,60 +190,56 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,11), LessThanOrEqual(ss_quantity,15), Or(Or(And(GreaterThanOrEqual(ss_list_price,142.00),LessThanOrEqual(ss_list_price,152.00)),And(GreaterThanOrEqual(ss_coupon_amt,12214.00),LessThanOrEqual(ss_coupon_amt,13214.00))),And(GreaterThanOrEqual(ss_wholesale_cost,79.00),LessThanOrEqual(ss_wholesale_cost,99.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(28) CometFilter
+(24) CometFilter
 Input [5]: [ss_quantity#31, ss_wholesale_cost#32, ss_list_price#33, ss_coupon_amt#34, ss_sold_date_sk#35]
 Condition : (((isnotnull(ss_quantity#31) AND (ss_quantity#31 >= 11)) AND (ss_quantity#31 <= 15)) AND ((((ss_list_price#33 >= 142.00) AND (ss_list_price#33 <= 152.00)) OR ((ss_coupon_amt#34 >= 12214.00) AND (ss_coupon_amt#34 <= 13214.00))) OR ((ss_wholesale_cost#32 >= 79.00) AND (ss_wholesale_cost#32 <= 99.00))))
 
-(29) CometProject
+(25) CometProject
 Input [5]: [ss_quantity#31, ss_wholesale_cost#32, ss_list_price#33, ss_coupon_amt#34, ss_sold_date_sk#35]
 Arguments: [ss_list_price#33], [ss_list_price#33]
 
-(30) CometHashAggregate
+(26) CometHashAggregate
 Input [1]: [ss_list_price#33]
 Keys [1]: [ss_list_price#33]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#33)), partial_count(ss_list_price#33)]
 
-(31) CometColumnarExchange
+(27) CometExchange
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
-Arguments: hashpartitioning(ss_list_price#33, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+Arguments: hashpartitioning(ss_list_price#33, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=6]
 
-(32) ColumnarToRow [codegen id : 4]
+(28) ColumnarToRow [codegen id : 4]
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
 
-(33) HashAggregate [codegen id : 4]
+(29) HashAggregate [codegen id : 4]
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
 Keys [1]: [ss_list_price#33]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#33)), merge_count(ss_list_price#33)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40]
 Results [4]: [ss_list_price#33, sum#36, count#37, count#38]
 
-(34) HashAggregate [codegen id : 4]
+(30) HashAggregate [codegen id : 4]
 Input [4]: [ss_list_price#33, sum#36, count#37, count#38]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#33)), merge_count(ss_list_price#33), partial_count(distinct ss_list_price#33)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40, count(ss_list_price#33)#41]
 Results [4]: [sum#36, count#37, count#38, count#42]
 
-(35) RowToColumnar
-Input [4]: [sum#36, count#37, count#38, count#42]
-
-(36) CometColumnarExchange
+(31) Exchange
 Input [4]: [sum#36, count#37, count#38, count#42]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(37) CometHashAggregate
+(32) HashAggregate [codegen id : 5]
 Input [4]: [sum#36, count#37, count#38, count#42]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#33)), count(ss_list_price#33), count(distinct ss_list_price#33)]
+Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#33))#39, count(ss_list_price#33)#40, count(ss_list_price#33)#41]
+Results [3]: [cast((avg(UnscaledValue(ss_list_price#33))#39 / 100.0) as decimal(11,6)) AS B3_LP#43, count(ss_list_price#33)#40 AS B3_CNT#44, count(ss_list_price#33)#41 AS B3_CNTD#45]
 
-(38) ColumnarToRow [codegen id : 5]
-Input [3]: [B3_LP#43, B3_CNT#44, B3_CNTD#45]
-
-(39) BroadcastExchange
+(33) BroadcastExchange
 Input [3]: [B3_LP#43, B3_CNT#44, B3_CNTD#45]
 Arguments: IdentityBroadcastMode, [plan_id=8]
 
-(40) BroadcastNestedLoopJoin [codegen id : 12]
+(34) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -274,60 +250,56 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,16), LessThanOrEqual(ss_quantity,20), Or(Or(And(GreaterThanOrEqual(ss_list_price,135.00),LessThanOrEqual(ss_list_price,145.00)),And(GreaterThanOrEqual(ss_coupon_amt,6071.00),LessThanOrEqual(ss_coupon_amt,7071.00))),And(GreaterThanOrEqual(ss_wholesale_cost,38.00),LessThanOrEqual(ss_wholesale_cost,58.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(42) CometFilter
+(36) CometFilter
 Input [5]: [ss_quantity#46, ss_wholesale_cost#47, ss_list_price#48, ss_coupon_amt#49, ss_sold_date_sk#50]
 Condition : (((isnotnull(ss_quantity#46) AND (ss_quantity#46 >= 16)) AND (ss_quantity#46 <= 20)) AND ((((ss_list_price#48 >= 135.00) AND (ss_list_price#48 <= 145.00)) OR ((ss_coupon_amt#49 >= 6071.00) AND (ss_coupon_amt#49 <= 7071.00))) OR ((ss_wholesale_cost#47 >= 38.00) AND (ss_wholesale_cost#47 <= 58.00))))
 
-(43) CometProject
+(37) CometProject
 Input [5]: [ss_quantity#46, ss_wholesale_cost#47, ss_list_price#48, ss_coupon_amt#49, ss_sold_date_sk#50]
 Arguments: [ss_list_price#48], [ss_list_price#48]
 
-(44) CometHashAggregate
+(38) CometHashAggregate
 Input [1]: [ss_list_price#48]
 Keys [1]: [ss_list_price#48]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#48)), partial_count(ss_list_price#48)]
 
-(45) CometColumnarExchange
+(39) CometExchange
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
-Arguments: hashpartitioning(ss_list_price#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+Arguments: hashpartitioning(ss_list_price#48, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=9]
 
-(46) ColumnarToRow [codegen id : 6]
+(40) ColumnarToRow [codegen id : 6]
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
 
-(47) HashAggregate [codegen id : 6]
+(41) HashAggregate [codegen id : 6]
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
 Keys [1]: [ss_list_price#48]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#48)), merge_count(ss_list_price#48)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55]
 Results [4]: [ss_list_price#48, sum#51, count#52, count#53]
 
-(48) HashAggregate [codegen id : 6]
+(42) HashAggregate [codegen id : 6]
 Input [4]: [ss_list_price#48, sum#51, count#52, count#53]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#48)), merge_count(ss_list_price#48), partial_count(distinct ss_list_price#48)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55, count(ss_list_price#48)#56]
 Results [4]: [sum#51, count#52, count#53, count#57]
 
-(49) RowToColumnar
+(43) Exchange
 Input [4]: [sum#51, count#52, count#53, count#57]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=10]
 
-(50) CometColumnarExchange
-Input [4]: [sum#51, count#52, count#53, count#57]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(51) CometHashAggregate
+(44) HashAggregate [codegen id : 7]
 Input [4]: [sum#51, count#52, count#53, count#57]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#48)), count(ss_list_price#48), count(distinct ss_list_price#48)]
+Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#48))#54, count(ss_list_price#48)#55, count(ss_list_price#48)#56]
+Results [3]: [cast((avg(UnscaledValue(ss_list_price#48))#54 / 100.0) as decimal(11,6)) AS B4_LP#58, count(ss_list_price#48)#55 AS B4_CNT#59, count(ss_list_price#48)#56 AS B4_CNTD#60]
 
-(52) ColumnarToRow [codegen id : 7]
-Input [3]: [B4_LP#58, B4_CNT#59, B4_CNTD#60]
-
-(53) BroadcastExchange
+(45) BroadcastExchange
 Input [3]: [B4_LP#58, B4_CNT#59, B4_CNTD#60]
 Arguments: IdentityBroadcastMode, [plan_id=11]
 
-(54) BroadcastNestedLoopJoin [codegen id : 12]
+(46) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -338,60 +310,56 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,21), LessThanOrEqual(ss_quantity,25), Or(Or(And(GreaterThanOrEqual(ss_list_price,122.00),LessThanOrEqual(ss_list_price,132.00)),And(GreaterThanOrEqual(ss_coupon_amt,836.00),LessThanOrEqual(ss_coupon_amt,1836.00))),And(GreaterThanOrEqual(ss_wholesale_cost,17.00),LessThanOrEqual(ss_wholesale_cost,37.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(56) CometFilter
+(48) CometFilter
 Input [5]: [ss_quantity#61, ss_wholesale_cost#62, ss_list_price#63, ss_coupon_amt#64, ss_sold_date_sk#65]
 Condition : (((isnotnull(ss_quantity#61) AND (ss_quantity#61 >= 21)) AND (ss_quantity#61 <= 25)) AND ((((ss_list_price#63 >= 122.00) AND (ss_list_price#63 <= 132.00)) OR ((ss_coupon_amt#64 >= 836.00) AND (ss_coupon_amt#64 <= 1836.00))) OR ((ss_wholesale_cost#62 >= 17.00) AND (ss_wholesale_cost#62 <= 37.00))))
 
-(57) CometProject
+(49) CometProject
 Input [5]: [ss_quantity#61, ss_wholesale_cost#62, ss_list_price#63, ss_coupon_amt#64, ss_sold_date_sk#65]
 Arguments: [ss_list_price#63], [ss_list_price#63]
 
-(58) CometHashAggregate
+(50) CometHashAggregate
 Input [1]: [ss_list_price#63]
 Keys [1]: [ss_list_price#63]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#63)), partial_count(ss_list_price#63)]
 
-(59) CometColumnarExchange
+(51) CometExchange
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
-Arguments: hashpartitioning(ss_list_price#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+Arguments: hashpartitioning(ss_list_price#63, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
 
-(60) ColumnarToRow [codegen id : 8]
+(52) ColumnarToRow [codegen id : 8]
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
 
-(61) HashAggregate [codegen id : 8]
+(53) HashAggregate [codegen id : 8]
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
 Keys [1]: [ss_list_price#63]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#63)), merge_count(ss_list_price#63)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70]
 Results [4]: [ss_list_price#63, sum#66, count#67, count#68]
 
-(62) HashAggregate [codegen id : 8]
+(54) HashAggregate [codegen id : 8]
 Input [4]: [ss_list_price#63, sum#66, count#67, count#68]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#63)), merge_count(ss_list_price#63), partial_count(distinct ss_list_price#63)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70, count(ss_list_price#63)#71]
 Results [4]: [sum#66, count#67, count#68, count#72]
 
-(63) RowToColumnar
+(55) Exchange
 Input [4]: [sum#66, count#67, count#68, count#72]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=13]
 
-(64) CometColumnarExchange
-Input [4]: [sum#66, count#67, count#68, count#72]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
-
-(65) CometHashAggregate
+(56) HashAggregate [codegen id : 9]
 Input [4]: [sum#66, count#67, count#68, count#72]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#63)), count(ss_list_price#63), count(distinct ss_list_price#63)]
+Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#63))#69, count(ss_list_price#63)#70, count(ss_list_price#63)#71]
+Results [3]: [cast((avg(UnscaledValue(ss_list_price#63))#69 / 100.0) as decimal(11,6)) AS B5_LP#73, count(ss_list_price#63)#70 AS B5_CNT#74, count(ss_list_price#63)#71 AS B5_CNTD#75]
 
-(66) ColumnarToRow [codegen id : 9]
-Input [3]: [B5_LP#73, B5_CNT#74, B5_CNTD#75]
-
-(67) BroadcastExchange
+(57) BroadcastExchange
 Input [3]: [B5_LP#73, B5_CNT#74, B5_CNTD#75]
 Arguments: IdentityBroadcastMode, [plan_id=14]
 
-(68) BroadcastNestedLoopJoin [codegen id : 12]
+(58) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
@@ -402,60 +370,56 @@ Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_quantity), GreaterThanOrEqual(ss_quantity,26), LessThanOrEqual(ss_quantity,30), Or(Or(And(GreaterThanOrEqual(ss_list_price,154.00),LessThanOrEqual(ss_list_price,164.00)),And(GreaterThanOrEqual(ss_coupon_amt,7326.00),LessThanOrEqual(ss_coupon_amt,8326.00))),And(GreaterThanOrEqual(ss_wholesale_cost,7.00),LessThanOrEqual(ss_wholesale_cost,27.00)))]
 ReadSchema: struct<ss_quantity:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(70) CometFilter
+(60) CometFilter
 Input [5]: [ss_quantity#76, ss_wholesale_cost#77, ss_list_price#78, ss_coupon_amt#79, ss_sold_date_sk#80]
 Condition : (((isnotnull(ss_quantity#76) AND (ss_quantity#76 >= 26)) AND (ss_quantity#76 <= 30)) AND ((((ss_list_price#78 >= 154.00) AND (ss_list_price#78 <= 164.00)) OR ((ss_coupon_amt#79 >= 7326.00) AND (ss_coupon_amt#79 <= 8326.00))) OR ((ss_wholesale_cost#77 >= 7.00) AND (ss_wholesale_cost#77 <= 27.00))))
 
-(71) CometProject
+(61) CometProject
 Input [5]: [ss_quantity#76, ss_wholesale_cost#77, ss_list_price#78, ss_coupon_amt#79, ss_sold_date_sk#80]
 Arguments: [ss_list_price#78], [ss_list_price#78]
 
-(72) CometHashAggregate
+(62) CometHashAggregate
 Input [1]: [ss_list_price#78]
 Keys [1]: [ss_list_price#78]
 Functions [2]: [partial_avg(UnscaledValue(ss_list_price#78)), partial_count(ss_list_price#78)]
 
-(73) CometColumnarExchange
+(63) CometExchange
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
-Arguments: hashpartitioning(ss_list_price#78, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+Arguments: hashpartitioning(ss_list_price#78, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=15]
 
-(74) ColumnarToRow [codegen id : 10]
+(64) ColumnarToRow [codegen id : 10]
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
 
-(75) HashAggregate [codegen id : 10]
+(65) HashAggregate [codegen id : 10]
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
 Keys [1]: [ss_list_price#78]
 Functions [2]: [merge_avg(UnscaledValue(ss_list_price#78)), merge_count(ss_list_price#78)]
 Aggregate Attributes [2]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85]
 Results [4]: [ss_list_price#78, sum#81, count#82, count#83]
 
-(76) HashAggregate [codegen id : 10]
+(66) HashAggregate [codegen id : 10]
 Input [4]: [ss_list_price#78, sum#81, count#82, count#83]
 Keys: []
 Functions [3]: [merge_avg(UnscaledValue(ss_list_price#78)), merge_count(ss_list_price#78), partial_count(distinct ss_list_price#78)]
 Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85, count(ss_list_price#78)#86]
 Results [4]: [sum#81, count#82, count#83, count#87]
 
-(77) RowToColumnar
-Input [4]: [sum#81, count#82, count#83, count#87]
-
-(78) CometColumnarExchange
+(67) Exchange
 Input [4]: [sum#81, count#82, count#83, count#87]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=16]
 
-(79) CometHashAggregate
+(68) HashAggregate [codegen id : 11]
 Input [4]: [sum#81, count#82, count#83, count#87]
 Keys: []
 Functions [3]: [avg(UnscaledValue(ss_list_price#78)), count(ss_list_price#78), count(distinct ss_list_price#78)]
+Aggregate Attributes [3]: [avg(UnscaledValue(ss_list_price#78))#84, count(ss_list_price#78)#85, count(ss_list_price#78)#86]
+Results [3]: [cast((avg(UnscaledValue(ss_list_price#78))#84 / 100.0) as decimal(11,6)) AS B6_LP#88, count(ss_list_price#78)#85 AS B6_CNT#89, count(ss_list_price#78)#86 AS B6_CNTD#90]
 
-(80) ColumnarToRow [codegen id : 11]
-Input [3]: [B6_LP#88, B6_CNT#89, B6_CNTD#90]
-
-(81) BroadcastExchange
+(69) BroadcastExchange
 Input [3]: [B6_LP#88, B6_CNT#89, B6_CNTD#90]
 Arguments: IdentityBroadcastMode, [plan_id=17]
 
-(82) BroadcastNestedLoopJoin [codegen id : 12]
+(70) BroadcastNestedLoopJoin [codegen id : 12]
 Join type: Inner
 Join condition: None
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt
index e84abd7c1f..2f9802ab65 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q28/simplified.txt
@@ -4,108 +4,96 @@ WholeStageCodegen (12)
       BroadcastNestedLoopJoin
         BroadcastNestedLoopJoin
           BroadcastNestedLoopJoin
-            ColumnarToRow
+            HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B1_LP,B1_CNT,B1_CNTD,sum,count,count,count]
               InputAdapter
-                CometHashAggregate [sum,count,count,count]
-                  CometColumnarExchange #1
-                    RowToColumnar
-                      WholeStageCodegen (1)
-                        HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
-                          HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [ss_list_price] #2
-                                  CometHashAggregate [ss_list_price]
-                                    CometProject [ss_list_price]
-                                      CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                Exchange #1
+                  WholeStageCodegen (1)
+                    HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
+                      HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
+                        ColumnarToRow
+                          InputAdapter
+                            CometExchange [ss_list_price] #2
+                              CometHashAggregate [ss_list_price]
+                                CometProject [ss_list_price]
+                                  CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
             InputAdapter
               BroadcastExchange #3
                 WholeStageCodegen (3)
-                  ColumnarToRow
+                  HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B2_LP,B2_CNT,B2_CNTD,sum,count,count,count]
                     InputAdapter
-                      CometHashAggregate [sum,count,count,count]
-                        CometColumnarExchange #4
-                          RowToColumnar
-                            WholeStageCodegen (2)
-                              HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
-                                HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [ss_list_price] #5
-                                        CometHashAggregate [ss_list_price]
-                                          CometProject [ss_list_price]
-                                            CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
-                                              CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-          InputAdapter
-            BroadcastExchange #6
-              WholeStageCodegen (5)
-                ColumnarToRow
-                  InputAdapter
-                    CometHashAggregate [sum,count,count,count]
-                      CometColumnarExchange #7
-                        RowToColumnar
-                          WholeStageCodegen (4)
-                            HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
-                              HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometColumnarExchange [ss_list_price] #8
-                                      CometHashAggregate [ss_list_price]
-                                        CometProject [ss_list_price]
-                                          CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-        InputAdapter
-          BroadcastExchange #9
-            WholeStageCodegen (7)
-              ColumnarToRow
-                InputAdapter
-                  CometHashAggregate [sum,count,count,count]
-                    CometColumnarExchange #10
-                      RowToColumnar
-                        WholeStageCodegen (6)
+                      Exchange #4
+                        WholeStageCodegen (2)
                           HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
                             HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
                               ColumnarToRow
                                 InputAdapter
-                                  CometColumnarExchange [ss_list_price] #11
+                                  CometExchange [ss_list_price] #5
                                     CometHashAggregate [ss_list_price]
                                       CometProject [ss_list_price]
                                         CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
                                           CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-      InputAdapter
-        BroadcastExchange #12
-          WholeStageCodegen (9)
-            ColumnarToRow
-              InputAdapter
-                CometHashAggregate [sum,count,count,count]
-                  CometColumnarExchange #13
-                    RowToColumnar
-                      WholeStageCodegen (8)
+          InputAdapter
+            BroadcastExchange #6
+              WholeStageCodegen (5)
+                HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B3_LP,B3_CNT,B3_CNTD,sum,count,count,count]
+                  InputAdapter
+                    Exchange #7
+                      WholeStageCodegen (4)
                         HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
                           HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
                             ColumnarToRow
                               InputAdapter
-                                CometColumnarExchange [ss_list_price] #14
+                                CometExchange [ss_list_price] #8
                                   CometHashAggregate [ss_list_price]
                                     CometProject [ss_list_price]
                                       CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
                                         CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-    InputAdapter
-      BroadcastExchange #15
-        WholeStageCodegen (11)
-          ColumnarToRow
-            InputAdapter
-              CometHashAggregate [sum,count,count,count]
-                CometColumnarExchange #16
-                  RowToColumnar
-                    WholeStageCodegen (10)
+        InputAdapter
+          BroadcastExchange #9
+            WholeStageCodegen (7)
+              HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B4_LP,B4_CNT,B4_CNTD,sum,count,count,count]
+                InputAdapter
+                  Exchange #10
+                    WholeStageCodegen (6)
                       HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
                         HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
                           ColumnarToRow
                             InputAdapter
-                              CometColumnarExchange [ss_list_price] #17
+                              CometExchange [ss_list_price] #11
                                 CometHashAggregate [ss_list_price]
                                   CometProject [ss_list_price]
                                     CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
                                       CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+      InputAdapter
+        BroadcastExchange #12
+          WholeStageCodegen (9)
+            HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B5_LP,B5_CNT,B5_CNTD,sum,count,count,count]
+              InputAdapter
+                Exchange #13
+                  WholeStageCodegen (8)
+                    HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
+                      HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
+                        ColumnarToRow
+                          InputAdapter
+                            CometExchange [ss_list_price] #14
+                              CometHashAggregate [ss_list_price]
+                                CometProject [ss_list_price]
+                                  CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+    InputAdapter
+      BroadcastExchange #15
+        WholeStageCodegen (11)
+          HashAggregate [sum,count,count,count] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),B6_LP,B6_CNT,B6_CNTD,sum,count,count,count]
+            InputAdapter
+              Exchange #16
+                WholeStageCodegen (10)
+                  HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),count(ss_list_price),sum,count,count,count,sum,count,count,count]
+                    HashAggregate [ss_list_price] [avg(UnscaledValue(ss_list_price)),count(ss_list_price),sum,count,count,sum,count,count]
+                      ColumnarToRow
+                        InputAdapter
+                          CometExchange [ss_list_price] #17
+                            CometHashAggregate [ss_list_price]
+                              CometProject [ss_list_price]
+                                CometFilter [ss_quantity,ss_list_price,ss_coupon_amt,ss_wholesale_cost]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt
index 69e36471f3..e74f10d25a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/explain.txt
@@ -1,46 +1,44 @@
 == Physical Plan ==
-* ColumnarToRow (42)
-+- CometTakeOrderedAndProject (41)
-   +- CometHashAggregate (40)
-      +- CometColumnarExchange (39)
-         +- RowToColumnar (38)
-            +- * HashAggregate (37)
-               +- * Project (36)
-                  +- * BroadcastHashJoin Inner BuildRight (35)
-                     :- * Project (30)
-                     :  +- * BroadcastHashJoin Inner BuildRight (29)
-                     :     :- * Project (24)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (23)
-                     :     :     :- * Project (21)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :     :     :     :- * Project (18)
-                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                     :     :     :     :     :- * Project (15)
-                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :     :     :     :- * Project (9)
-                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :     :     :     :     :     +- BroadcastExchange (7)
-                     :     :     :     :     :     :        +- * ColumnarToRow (6)
-                     :     :     :     :     :     :           +- CometFilter (5)
-                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-                     :     :     :     :     :     +- BroadcastExchange (13)
-                     :     :     :     :     :        +- * ColumnarToRow (12)
-                     :     :     :     :     :           +- CometFilter (11)
-                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
-                     :     :     :     :     +- ReusedExchange (16)
-                     :     :     :     +- ReusedExchange (19)
-                     :     :     +- ReusedExchange (22)
-                     :     +- BroadcastExchange (28)
-                     :        +- * ColumnarToRow (27)
-                     :           +- CometFilter (26)
-                     :              +- CometScan parquet spark_catalog.default.store (25)
-                     +- BroadcastExchange (34)
-                        +- * ColumnarToRow (33)
-                           +- CometFilter (32)
-                              +- CometScan parquet spark_catalog.default.item (31)
+TakeOrderedAndProject (40)
++- * HashAggregate (39)
+   +- Exchange (38)
+      +- * HashAggregate (37)
+         +- * Project (36)
+            +- * BroadcastHashJoin Inner BuildRight (35)
+               :- * Project (30)
+               :  +- * BroadcastHashJoin Inner BuildRight (29)
+               :     :- * Project (24)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (23)
+               :     :     :- * Project (21)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :     :     :     :- * Project (18)
+               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+               :     :     :     :     :- * Project (15)
+               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :     :     :     :- * Project (9)
+               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :     :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :     :     :     :  +- CometFilter (2)
+               :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :     :     :     :     :     +- BroadcastExchange (7)
+               :     :     :     :     :     :        +- * ColumnarToRow (6)
+               :     :     :     :     :     :           +- CometFilter (5)
+               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+               :     :     :     :     :     +- BroadcastExchange (13)
+               :     :     :     :     :        +- * ColumnarToRow (12)
+               :     :     :     :     :           +- CometFilter (11)
+               :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_sales (10)
+               :     :     :     :     +- ReusedExchange (16)
+               :     :     :     +- ReusedExchange (19)
+               :     :     +- ReusedExchange (22)
+               :     +- BroadcastExchange (28)
+               :        +- * ColumnarToRow (27)
+               :           +- CometFilter (26)
+               :              +- CometScan parquet spark_catalog.default.store (25)
+               +- BroadcastExchange (34)
+                  +- * ColumnarToRow (33)
+                     +- CometFilter (32)
+                        +- CometScan parquet spark_catalog.default.item (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -116,7 +114,7 @@ Join condition: None
 Output [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [12]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_item_sk#8, sr_customer_sk#9, sr_return_quantity#11, sr_returned_date_sk#12, cs_bill_customer_sk#14, cs_item_sk#15, cs_quantity#16, cs_sold_date_sk#17]
 
-(16) ReusedExchange [Reuses operator id: 47]
+(16) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#19]
 
 (17) BroadcastHashJoin [codegen id : 8]
@@ -129,7 +127,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17]
 Input [9]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, ss_sold_date_sk#6, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#19]
 
-(19) ReusedExchange [Reuses operator id: 52]
+(19) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#20]
 
 (20) BroadcastHashJoin [codegen id : 8]
@@ -142,7 +140,7 @@ Join condition: None
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, cs_quantity#16, cs_sold_date_sk#17]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#5, sr_return_quantity#11, sr_returned_date_sk#12, cs_quantity#16, cs_sold_date_sk#17, d_date_sk#20]
 
-(22) ReusedExchange [Reuses operator id: 57]
+(22) ReusedExchange [Reuses operator id: 55]
 Output [1]: [d_date_sk#21]
 
 (23) BroadcastHashJoin [codegen id : 8]
@@ -218,114 +216,110 @@ Functions [3]: [partial_sum(ss_quantity#5), partial_sum(sr_return_quantity#11),
 Aggregate Attributes [3]: [sum#28, sum#29, sum#30]
 Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 
-(38) RowToColumnar
+(38) Exchange
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
+Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) CometColumnarExchange
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
-Arguments: hashpartitioning(i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(40) CometHashAggregate
+(39) HashAggregate [codegen id : 9]
 Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum#31, sum#32, sum#33]
 Keys [4]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24]
 Functions [3]: [sum(ss_quantity#5), sum(sr_return_quantity#11), sum(cs_quantity#16)]
+Aggregate Attributes [3]: [sum(ss_quantity#5)#34, sum(sr_return_quantity#11)#35, sum(cs_quantity#16)#36]
+Results [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, sum(ss_quantity#5)#34 AS store_sales_quantity#37, sum(sr_return_quantity#11)#35 AS store_returns_quantity#38, sum(cs_quantity#16)#36 AS catalog_sales_quantity#39]
 
-(41) CometTakeOrderedAndProject
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#34, store_returns_quantity#35, catalog_sales_quantity#36]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#26 ASC NULLS FIRST,i_item_desc#27 ASC NULLS FIRST,s_store_id#23 ASC NULLS FIRST,s_store_name#24 ASC NULLS FIRST], output=[i_item_id#26,i_item_desc#27,s_store_id#23,s_store_name#24,store_sales_quantity#34,store_returns_quantity#35,catalog_sales_quantity#36]), 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#34, store_returns_quantity#35, catalog_sales_quantity#36]
-
-(42) ColumnarToRow [codegen id : 9]
-Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#34, store_returns_quantity#35, catalog_sales_quantity#36]
+(40) TakeOrderedAndProject
+Input [7]: [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#37, store_returns_quantity#38, catalog_sales_quantity#39]
+Arguments: 100, [i_item_id#26 ASC NULLS FIRST, i_item_desc#27 ASC NULLS FIRST, s_store_id#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST], [i_item_id#26, i_item_desc#27, s_store_id#23, s_store_name#24, store_sales_quantity#37, store_returns_quantity#38, catalog_sales_quantity#39]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (45)
++- * ColumnarToRow (44)
+   +- CometProject (43)
+      +- CometFilter (42)
+         +- CometScan parquet spark_catalog.default.date_dim (41)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#19, d_year#37, d_moy#38]
+Output [3]: [d_date_sk#19, d_year#40, d_moy#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,9), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(44) CometFilter
-Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
-Condition : ((((isnotnull(d_moy#38) AND isnotnull(d_year#37)) AND (d_moy#38 = 9)) AND (d_year#37 = 1999)) AND isnotnull(d_date_sk#19))
+(42) CometFilter
+Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
+Condition : ((((isnotnull(d_moy#41) AND isnotnull(d_year#40)) AND (d_moy#41 = 9)) AND (d_year#40 = 1999)) AND isnotnull(d_date_sk#19))
 
-(45) CometProject
-Input [3]: [d_date_sk#19, d_year#37, d_moy#38]
+(43) CometProject
+Input [3]: [d_date_sk#19, d_year#40, d_moy#41]
 Arguments: [d_date_sk#19], [d_date_sk#19]
 
-(46) ColumnarToRow [codegen id : 1]
+(44) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#19]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [1]: [d_date_sk#19]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (52)
-+- * ColumnarToRow (51)
-   +- CometProject (50)
-      +- CometFilter (49)
-         +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#20, d_year#39, d_moy#40]
+Output [3]: [d_date_sk#20, d_year#42, d_moy#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), GreaterThanOrEqual(d_moy,9), LessThanOrEqual(d_moy,12), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(49) CometFilter
-Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
-Condition : (((((isnotnull(d_moy#40) AND isnotnull(d_year#39)) AND (d_moy#40 >= 9)) AND (d_moy#40 <= 12)) AND (d_year#39 = 1999)) AND isnotnull(d_date_sk#20))
+(47) CometFilter
+Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
+Condition : (((((isnotnull(d_moy#43) AND isnotnull(d_year#42)) AND (d_moy#43 >= 9)) AND (d_moy#43 <= 12)) AND (d_year#42 = 1999)) AND isnotnull(d_date_sk#20))
 
-(50) CometProject
-Input [3]: [d_date_sk#20, d_year#39, d_moy#40]
+(48) CometProject
+Input [3]: [d_date_sk#20, d_year#42, d_moy#43]
 Arguments: [d_date_sk#20], [d_date_sk#20]
 
-(51) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#20]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
 Subquery:3 Hosting operator id = 10 Hosting Expression = cs_sold_date_sk#17 IN dynamicpruning#18
-BroadcastExchange (57)
-+- * ColumnarToRow (56)
-   +- CometProject (55)
-      +- CometFilter (54)
-         +- CometScan parquet spark_catalog.default.date_dim (53)
+BroadcastExchange (55)
++- * ColumnarToRow (54)
+   +- CometProject (53)
+      +- CometFilter (52)
+         +- CometScan parquet spark_catalog.default.date_dim (51)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#21, d_year#41]
+Output [2]: [d_date_sk#21, d_year#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(54) CometFilter
-Input [2]: [d_date_sk#21, d_year#41]
-Condition : (d_year#41 IN (1999,2000,2001) AND isnotnull(d_date_sk#21))
+(52) CometFilter
+Input [2]: [d_date_sk#21, d_year#44]
+Condition : (d_year#44 IN (1999,2000,2001) AND isnotnull(d_date_sk#21))
 
-(55) CometProject
-Input [2]: [d_date_sk#21, d_year#41]
+(53) CometProject
+Input [2]: [d_date_sk#21, d_year#44]
 Arguments: [d_date_sk#21], [d_date_sk#21]
 
-(56) ColumnarToRow [codegen id : 1]
+(54) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#21]
 
-(57) BroadcastExchange
+(55) BroadcastExchange
 Input [1]: [d_date_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt
index 753b11f806..68a127d357 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q29/simplified.txt
@@ -1,85 +1,83 @@
-WholeStageCodegen (9)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_quantity,store_returns_quantity,catalog_sales_quantity]
-        CometHashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum]
-          CometColumnarExchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
-            RowToColumnar
-              WholeStageCodegen (8)
-                HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_quantity,sr_return_quantity,cs_quantity] [sum,sum,sum,sum,sum,sum]
-                  Project [ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name,i_item_id,i_item_desc]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name]
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
-                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
-                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                                  Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
-                                        BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
-                                          Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
-                                            BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #2
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_moy,d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
-                                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #2
-                                                              BroadcastExchange #4
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_moy,d_year,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+TakeOrderedAndProject [i_item_id,i_item_desc,s_store_id,s_store_name,store_sales_quantity,store_returns_quantity,catalog_sales_quantity]
+  WholeStageCodegen (9)
+    HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,sum,sum,sum] [sum(ss_quantity),sum(sr_return_quantity),sum(cs_quantity),store_sales_quantity,store_returns_quantity,catalog_sales_quantity,sum,sum,sum]
+      InputAdapter
+        Exchange [i_item_id,i_item_desc,s_store_id,s_store_name] #1
+          WholeStageCodegen (8)
+            HashAggregate [i_item_id,i_item_desc,s_store_id,s_store_name,ss_quantity,sr_return_quantity,cs_quantity] [sum,sum,sum,sum,sum,sum]
+              Project [ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name,i_item_id,i_item_desc]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [ss_item_sk,ss_quantity,sr_return_quantity,cs_quantity,s_store_id,s_store_name]
+                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                      Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity]
+                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                          Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,cs_quantity,cs_sold_date_sk]
+                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                              Project [ss_item_sk,ss_store_sk,ss_quantity,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                  Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_return_quantity,sr_returned_date_sk,cs_quantity,cs_sold_date_sk]
+                                    BroadcastHashJoin [sr_customer_sk,sr_item_sk,cs_bill_customer_sk,cs_item_sk]
+                                      Project [ss_item_sk,ss_store_sk,ss_quantity,ss_sold_date_sk,sr_item_sk,sr_customer_sk,sr_return_quantity,sr_returned_date_sk]
+                                        BroadcastHashJoin [ss_customer_sk,ss_item_sk,ss_ticket_number,sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_customer_sk,ss_item_sk,ss_ticket_number,ss_store_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_quantity,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #2
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_moy,d_year,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (2)
+                                            BroadcastExchange #3
+                                              WholeStageCodegen (1)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [cs_bill_customer_sk,cs_item_sk]
-                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #3
-                                                          BroadcastExchange #6
+                                                    CometFilter [sr_customer_sk,sr_item_sk,sr_ticket_number]
+                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #2
+                                                          BroadcastExchange #4
                                                             WholeStageCodegen (1)
                                                               ColumnarToRow
                                                                 InputAdapter
                                                                   CometProject [d_date_sk]
-                                                                    CometFilter [d_year,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                    CometFilter [d_moy,d_year,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #2
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (2)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [cs_bill_customer_sk,cs_item_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #3
+                                                      BroadcastExchange #6
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_year,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk] #4
+                                    ReusedExchange [d_date_sk] #2
                               InputAdapter
-                                ReusedExchange [d_date_sk] #6
+                                ReusedExchange [d_date_sk] #4
                           InputAdapter
-                            BroadcastExchange #7
-                              WholeStageCodegen (6)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [s_store_sk]
-                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
+                            ReusedExchange [d_date_sk] #6
                       InputAdapter
-                        BroadcastExchange #8
-                          WholeStageCodegen (7)
+                        BroadcastExchange #7
+                          WholeStageCodegen (6)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [i_item_sk]
-                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
+                                CometFilter [s_store_sk]
+                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name]
+                  InputAdapter
+                    BroadcastExchange #8
+                      WholeStageCodegen (7)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [i_item_sk]
+                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt
index 2baeadfd8b..22b8681f2a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/explain.txt
@@ -1,27 +1,25 @@
 == Physical Plan ==
-* ColumnarToRow (23)
-+- CometTakeOrderedAndProject (22)
-   +- CometHashAggregate (21)
-      +- CometColumnarExchange (20)
-         +- RowToColumnar (19)
-            +- * HashAggregate (18)
-               +- * Project (17)
-                  +- * BroadcastHashJoin Inner BuildRight (16)
-                     :- * Project (10)
-                     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :- * ColumnarToRow (4)
-                     :     :  +- CometProject (3)
-                     :     :     +- CometFilter (2)
-                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-                     :     +- BroadcastExchange (8)
-                     :        +- * ColumnarToRow (7)
-                     :           +- CometFilter (6)
-                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                     +- BroadcastExchange (15)
-                        +- * ColumnarToRow (14)
-                           +- CometProject (13)
-                              +- CometFilter (12)
-                                 +- CometScan parquet spark_catalog.default.item (11)
+TakeOrderedAndProject (21)
++- * HashAggregate (20)
+   +- Exchange (19)
+      +- * HashAggregate (18)
+         +- * Project (17)
+            +- * BroadcastHashJoin Inner BuildRight (16)
+               :- * Project (10)
+               :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :- * ColumnarToRow (4)
+               :     :  +- CometProject (3)
+               :     :     +- CometFilter (2)
+               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+               :     +- BroadcastExchange (8)
+               :        +- * ColumnarToRow (7)
+               :           +- CometFilter (6)
+               :              +- CometScan parquet spark_catalog.default.store_sales (5)
+               +- BroadcastExchange (15)
+                  +- * ColumnarToRow (14)
+                     +- CometProject (13)
+                        +- CometFilter (12)
+                           +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -110,22 +108,18 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 
-(19) RowToColumnar
+(19) Exchange
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
+Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) CometColumnarExchange
-Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
-Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(21) CometHashAggregate
+(20) HashAggregate [codegen id : 4]
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 Keys [3]: [d_year#2, i_brand#9, i_brand_id#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
+Results [4]: [d_year#2, i_brand_id#8 AS brand_id#14, i_brand#9 AS brand#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS sum_agg#16]
 
-(22) CometTakeOrderedAndProject
-Input [4]: [d_year#2, brand_id#13, brand#14, sum_agg#15]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[d_year#2 ASC NULLS FIRST,sum_agg#15 DESC NULLS LAST,brand_id#13 ASC NULLS FIRST], output=[d_year#2,brand_id#13,brand#14,sum_agg#15]), 100, [d_year#2 ASC NULLS FIRST, sum_agg#15 DESC NULLS LAST, brand_id#13 ASC NULLS FIRST], [d_year#2, brand_id#13, brand#14, sum_agg#15]
-
-(23) ColumnarToRow [codegen id : 4]
-Input [4]: [d_year#2, brand_id#13, brand#14, sum_agg#15]
+(21) TakeOrderedAndProject
+Input [4]: [d_year#2, brand_id#14, brand#15, sum_agg#16]
+Arguments: 100, [d_year#2 ASC NULLS FIRST, sum_agg#16 DESC NULLS LAST, brand_id#14 ASC NULLS FIRST], [d_year#2, brand_id#14, brand#15, sum_agg#16]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt
index a627b6b25e..3946c0cd8f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q3/simplified.txt
@@ -1,33 +1,31 @@
-WholeStageCodegen (4)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [d_year,sum_agg,brand_id,brand]
-        CometHashAggregate [d_year,i_brand,i_brand_id,sum]
-          CometColumnarExchange [d_year,i_brand,i_brand_id] #1
-            RowToColumnar
-              WholeStageCodegen (3)
-                HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
-                  Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [d_year,ss_item_sk,ss_ext_sales_price]
-                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [d_date_sk,d_year]
-                                CometFilter [d_moy,d_date_sk]
-                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                          InputAdapter
-                            BroadcastExchange #2
-                              WholeStageCodegen (1)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+TakeOrderedAndProject [d_year,sum_agg,brand_id,brand]
+  WholeStageCodegen (4)
+    HashAggregate [d_year,i_brand,i_brand_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,sum_agg,sum]
+      InputAdapter
+        Exchange [d_year,i_brand,i_brand_id] #1
+          WholeStageCodegen (3)
+            HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
+              Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [d_year,ss_item_sk,ss_ext_sales_price]
+                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [d_date_sk,d_year]
+                            CometFilter [d_moy,d_date_sk]
+                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                       InputAdapter
-                        BroadcastExchange #3
-                          WholeStageCodegen (2)
+                        BroadcastExchange #2
+                          WholeStageCodegen (1)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [i_item_sk,i_brand_id,i_brand]
-                                  CometFilter [i_manufact_id,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id]
+                                CometFilter [ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                  InputAdapter
+                    BroadcastExchange #3
+                      WholeStageCodegen (2)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [i_item_sk,i_brand_id,i_brand]
+                              CometFilter [i_manufact_id,i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manufact_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt
index 13d06f87c1..5da800fe40 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/explain.txt
@@ -1,57 +1,53 @@
 == Physical Plan ==
-TakeOrderedAndProject (53)
-+- * Project (52)
-   +- * BroadcastHashJoin Inner BuildRight (51)
-      :- * Project (45)
-      :  +- * BroadcastHashJoin Inner BuildRight (44)
-      :     :- * Project (39)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (38)
-      :     :     :- * ColumnarToRow (18)
-      :     :     :  +- CometFilter (17)
-      :     :     :     +- CometHashAggregate (16)
-      :     :     :        +- CometColumnarExchange (15)
-      :     :     :           +- RowToColumnar (14)
-      :     :     :              +- * HashAggregate (13)
-      :     :     :                 +- * Project (12)
-      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :                       :- * Project (6)
-      :     :     :                       :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :     :                       :     :- * ColumnarToRow (3)
-      :     :     :                       :     :  +- CometFilter (2)
-      :     :     :                       :     :     +- CometScan parquet spark_catalog.default.web_returns (1)
-      :     :     :                       :     +- ReusedExchange (4)
-      :     :     :                       +- BroadcastExchange (10)
-      :     :     :                          +- * ColumnarToRow (9)
-      :     :     :                             +- CometFilter (8)
-      :     :     :                                +- CometScan parquet spark_catalog.default.customer_address (7)
-      :     :     +- BroadcastExchange (37)
-      :     :        +- * ColumnarToRow (36)
-      :     :           +- CometFilter (35)
-      :     :              +- CometHashAggregate (34)
-      :     :                 +- CometColumnarExchange (33)
-      :     :                    +- CometHashAggregate (32)
-      :     :                       +- CometHashAggregate (31)
-      :     :                          +- CometColumnarExchange (30)
-      :     :                             +- RowToColumnar (29)
-      :     :                                +- * HashAggregate (28)
-      :     :                                   +- * Project (27)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :                                         :- * Project (24)
-      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (23)
-      :     :                                         :     :- * ColumnarToRow (21)
-      :     :                                         :     :  +- CometFilter (20)
-      :     :                                         :     :     +- CometScan parquet spark_catalog.default.web_returns (19)
-      :     :                                         :     +- ReusedExchange (22)
-      :     :                                         +- ReusedExchange (25)
-      :     +- BroadcastExchange (43)
-      :        +- * ColumnarToRow (42)
-      :           +- CometFilter (41)
-      :              +- CometScan parquet spark_catalog.default.customer (40)
-      +- BroadcastExchange (50)
-         +- * ColumnarToRow (49)
-            +- CometProject (48)
-               +- CometFilter (47)
-                  +- CometScan parquet spark_catalog.default.customer_address (46)
+TakeOrderedAndProject (49)
++- * Project (48)
+   +- * BroadcastHashJoin Inner BuildRight (47)
+      :- * Project (41)
+      :  +- * BroadcastHashJoin Inner BuildRight (40)
+      :     :- * Project (35)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+      :     :     :- * Filter (16)
+      :     :     :  +- * HashAggregate (15)
+      :     :     :     +- Exchange (14)
+      :     :     :        +- * HashAggregate (13)
+      :     :     :           +- * Project (12)
+      :     :     :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :                 :- * Project (6)
+      :     :     :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :     :                 :     :- * ColumnarToRow (3)
+      :     :     :                 :     :  +- CometFilter (2)
+      :     :     :                 :     :     +- CometScan parquet spark_catalog.default.web_returns (1)
+      :     :     :                 :     +- ReusedExchange (4)
+      :     :     :                 +- BroadcastExchange (10)
+      :     :     :                    +- * ColumnarToRow (9)
+      :     :     :                       +- CometFilter (8)
+      :     :     :                          +- CometScan parquet spark_catalog.default.customer_address (7)
+      :     :     +- BroadcastExchange (33)
+      :     :        +- * Filter (32)
+      :     :           +- * HashAggregate (31)
+      :     :              +- Exchange (30)
+      :     :                 +- * HashAggregate (29)
+      :     :                    +- * HashAggregate (28)
+      :     :                       +- Exchange (27)
+      :     :                          +- * HashAggregate (26)
+      :     :                             +- * Project (25)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :                                   :- * Project (22)
+      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (21)
+      :     :                                   :     :- * ColumnarToRow (19)
+      :     :                                   :     :  +- CometFilter (18)
+      :     :                                   :     :     +- CometScan parquet spark_catalog.default.web_returns (17)
+      :     :                                   :     +- ReusedExchange (20)
+      :     :                                   +- ReusedExchange (23)
+      :     +- BroadcastExchange (39)
+      :        +- * ColumnarToRow (38)
+      :           +- CometFilter (37)
+      :              +- CometScan parquet spark_catalog.default.customer (36)
+      +- BroadcastExchange (46)
+         +- * ColumnarToRow (45)
+            +- CometProject (44)
+               +- CometFilter (43)
+                  +- CometScan parquet spark_catalog.default.customer_address (42)
 
 
 (unknown) Scan parquet spark_catalog.default.web_returns
@@ -69,7 +65,7 @@ Condition : (isnotnull(wr_returning_addr_sk#2) AND isnotnull(wr_returning_custom
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 58]
+(4) ReusedExchange [Reuses operator id: 54]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -117,216 +113,212 @@ Functions [1]: [partial_sum(UnscaledValue(wr_return_amt#3))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
+Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
-Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 11]
 Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#10]
 Keys [2]: [wr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(wr_return_amt#3))]
+Aggregate Attributes [1]: [sum(UnscaledValue(wr_return_amt#3))#11]
+Results [3]: [wr_returning_customer_sk#1 AS ctr_customer_sk#12, ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(wr_return_amt#3))#11,17,2) AS ctr_total_return#14]
 
-(17) CometFilter
-Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
-Condition : isnotnull(ctr_total_return#13)
-
-(18) ColumnarToRow [codegen id : 10]
-Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
+(16) Filter [codegen id : 11]
+Input [3]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14]
+Condition : isnotnull(ctr_total_return#14)
 
 (unknown) Scan parquet spark_catalog.default.web_returns
 Output [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#4), dynamicpruningexpression(wr_returned_date_sk#4 IN dynamicpruning#14)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#4), dynamicpruningexpression(wr_returned_date_sk#4 IN dynamicpruning#15)]
 PushedFilters: [IsNotNull(wr_returning_addr_sk)]
 ReadSchema: struct<wr_returning_customer_sk:int,wr_returning_addr_sk:int,wr_return_amt:decimal(7,2)>
 
-(20) CometFilter
+(18) CometFilter
 Input [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 Condition : isnotnull(wr_returning_addr_sk#2)
 
-(21) ColumnarToRow [codegen id : 6]
+(19) ColumnarToRow [codegen id : 6]
 Input [4]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4]
 
-(22) ReusedExchange [Reuses operator id: 58]
+(20) ReusedExchange [Reuses operator id: 54]
 Output [1]: [d_date_sk#6]
 
-(23) BroadcastHashJoin [codegen id : 6]
+(21) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [wr_returned_date_sk#4]
 Right keys [1]: [d_date_sk#6]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
+(22) Project [codegen id : 6]
 Output [3]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3]
 Input [5]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, wr_returned_date_sk#4, d_date_sk#6]
 
-(25) ReusedExchange [Reuses operator id: 10]
+(23) ReusedExchange [Reuses operator id: 10]
 Output [2]: [ca_address_sk#7, ca_state#8]
 
-(26) BroadcastHashJoin [codegen id : 6]
+(24) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [wr_returning_addr_sk#2]
 Right keys [1]: [ca_address_sk#7]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
+(25) Project [codegen id : 6]
 Output [3]: [wr_returning_customer_sk#1, wr_return_amt#3, ca_state#8]
 Input [5]: [wr_returning_customer_sk#1, wr_returning_addr_sk#2, wr_return_amt#3, ca_address_sk#7, ca_state#8]
 
-(28) HashAggregate [codegen id : 6]
+(26) HashAggregate [codegen id : 6]
 Input [3]: [wr_returning_customer_sk#1, wr_return_amt#3, ca_state#8]
 Keys [2]: [wr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [partial_sum(UnscaledValue(wr_return_amt#3))]
-Aggregate Attributes [1]: [sum#15]
-Results [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
+Aggregate Attributes [1]: [sum#16]
+Results [3]: [wr_returning_customer_sk#1, ca_state#8, sum#17]
 
-(29) RowToColumnar
-Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
+(27) Exchange
+Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#17]
+Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(30) CometColumnarExchange
-Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
-Arguments: hashpartitioning(wr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(31) CometHashAggregate
-Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#16]
+(28) HashAggregate [codegen id : 7]
+Input [3]: [wr_returning_customer_sk#1, ca_state#8, sum#17]
 Keys [2]: [wr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(wr_return_amt#3))]
-
-(32) CometHashAggregate
-Input [2]: [ctr_state#12, ctr_total_return#13]
-Keys [1]: [ctr_state#12]
-Functions [1]: [partial_avg(ctr_total_return#13)]
-
-(33) CometColumnarExchange
-Input [3]: [ctr_state#12, sum#17, count#18]
-Arguments: hashpartitioning(ctr_state#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [3]: [ctr_state#12, sum#17, count#18]
-Keys [1]: [ctr_state#12]
-Functions [1]: [avg(ctr_total_return#13)]
-
-(35) CometFilter
-Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
-Condition : isnotnull((avg(ctr_total_return) * 1.2)#19)
-
-(36) ColumnarToRow [codegen id : 7]
-Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
-
-(37) BroadcastExchange
-Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+Aggregate Attributes [1]: [sum(UnscaledValue(wr_return_amt#3))#11]
+Results [2]: [ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(wr_return_amt#3))#11,17,2) AS ctr_total_return#14]
+
+(29) HashAggregate [codegen id : 7]
+Input [2]: [ctr_state#13, ctr_total_return#14]
+Keys [1]: [ctr_state#13]
+Functions [1]: [partial_avg(ctr_total_return#14)]
+Aggregate Attributes [2]: [sum#18, count#19]
+Results [3]: [ctr_state#13, sum#20, count#21]
+
+(30) Exchange
+Input [3]: [ctr_state#13, sum#20, count#21]
+Arguments: hashpartitioning(ctr_state#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 8]
+Input [3]: [ctr_state#13, sum#20, count#21]
+Keys [1]: [ctr_state#13]
+Functions [1]: [avg(ctr_total_return#14)]
+Aggregate Attributes [1]: [avg(ctr_total_return#14)#22]
+Results [2]: [(avg(ctr_total_return#14)#22 * 1.2) AS (avg(ctr_total_return) * 1.2)#23, ctr_state#13 AS ctr_state#13#24]
+
+(32) Filter [codegen id : 8]
+Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
+Condition : isnotnull((avg(ctr_total_return) * 1.2)#23)
+
+(33) BroadcastExchange
+Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
 Arguments: HashedRelationBroadcastMode(List(input[1, string, true]),false), [plan_id=5]
 
-(38) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ctr_state#12]
-Right keys [1]: [ctr_state#12#20]
+(34) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [ctr_state#13]
+Right keys [1]: [ctr_state#13#24]
 Join type: Inner
-Join condition: (cast(ctr_total_return#13 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#19)
+Join condition: (cast(ctr_total_return#14 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#23)
 
-(39) Project [codegen id : 10]
-Output [2]: [ctr_customer_sk#11, ctr_total_return#13]
-Input [5]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13, (avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+(35) Project [codegen id : 11]
+Output [2]: [ctr_customer_sk#12, ctr_total_return#14]
+Input [5]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14, (avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
+Output [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_current_addr_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_day:int,c_birth_month:int,c_birth_year:int,c_birth_country:string,c_login:string,c_email_address:string,c_last_review_date:int>
 
-(41) CometFilter
-Input [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
-Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_current_addr_sk#23))
+(37) CometFilter
+Input [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
+Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_current_addr_sk#27))
 
-(42) ColumnarToRow [codegen id : 8]
-Input [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
+(38) ColumnarToRow [codegen id : 9]
+Input [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
 
-(43) BroadcastExchange
-Input [14]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
+(39) BroadcastExchange
+Input [14]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ctr_customer_sk#11]
-Right keys [1]: [c_customer_sk#21]
+(40) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [ctr_customer_sk#12]
+Right keys [1]: [c_customer_sk#25]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [14]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
-Input [16]: [ctr_customer_sk#11, ctr_total_return#13, c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34]
+(41) Project [codegen id : 11]
+Output [14]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
+Input [16]: [ctr_customer_sk#12, ctr_total_return#14, c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38]
 
 (unknown) Scan parquet spark_catalog.default.customer_address
-Output [2]: [ca_address_sk#35, ca_state#36]
+Output [2]: [ca_address_sk#39, ca_state#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_state), EqualTo(ca_state,GA), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string>
 
-(47) CometFilter
-Input [2]: [ca_address_sk#35, ca_state#36]
-Condition : ((isnotnull(ca_state#36) AND (ca_state#36 = GA)) AND isnotnull(ca_address_sk#35))
+(43) CometFilter
+Input [2]: [ca_address_sk#39, ca_state#40]
+Condition : ((isnotnull(ca_state#40) AND (ca_state#40 = GA)) AND isnotnull(ca_address_sk#39))
 
-(48) CometProject
-Input [2]: [ca_address_sk#35, ca_state#36]
-Arguments: [ca_address_sk#35], [ca_address_sk#35]
+(44) CometProject
+Input [2]: [ca_address_sk#39, ca_state#40]
+Arguments: [ca_address_sk#39], [ca_address_sk#39]
 
-(49) ColumnarToRow [codegen id : 9]
-Input [1]: [ca_address_sk#35]
+(45) ColumnarToRow [codegen id : 10]
+Input [1]: [ca_address_sk#39]
 
-(50) BroadcastExchange
-Input [1]: [ca_address_sk#35]
+(46) BroadcastExchange
+Input [1]: [ca_address_sk#39]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(51) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_current_addr_sk#23]
-Right keys [1]: [ca_address_sk#35]
+(47) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [c_current_addr_sk#27]
+Right keys [1]: [ca_address_sk#39]
 Join type: Inner
 Join condition: None
 
-(52) Project [codegen id : 10]
-Output [13]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ctr_total_return#13]
-Input [15]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ca_address_sk#35]
+(48) Project [codegen id : 11]
+Output [13]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ctr_total_return#14]
+Input [15]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ca_address_sk#39]
 
-(53) TakeOrderedAndProject
-Input [13]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ctr_total_return#13]
-Arguments: 100, [c_customer_id#22 ASC NULLS FIRST, c_salutation#24 ASC NULLS FIRST, c_first_name#25 ASC NULLS FIRST, c_last_name#26 ASC NULLS FIRST, c_preferred_cust_flag#27 ASC NULLS FIRST, c_birth_day#28 ASC NULLS FIRST, c_birth_month#29 ASC NULLS FIRST, c_birth_year#30 ASC NULLS FIRST, c_birth_country#31 ASC NULLS FIRST, c_login#32 ASC NULLS FIRST, c_email_address#33 ASC NULLS FIRST, c_last_review_date#34 ASC NULLS FIRST, ctr_total_return#13 ASC NULLS FIRST], [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, c_preferred_cust_flag#27, c_birth_day#28, c_birth_month#29, c_birth_year#30, c_birth_country#31, c_login#32, c_email_address#33, c_last_review_date#34, ctr_total_return#13]
+(49) TakeOrderedAndProject
+Input [13]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ctr_total_return#14]
+Arguments: 100, [c_customer_id#26 ASC NULLS FIRST, c_salutation#28 ASC NULLS FIRST, c_first_name#29 ASC NULLS FIRST, c_last_name#30 ASC NULLS FIRST, c_preferred_cust_flag#31 ASC NULLS FIRST, c_birth_day#32 ASC NULLS FIRST, c_birth_month#33 ASC NULLS FIRST, c_birth_year#34 ASC NULLS FIRST, c_birth_country#35 ASC NULLS FIRST, c_login#36 ASC NULLS FIRST, c_email_address#37 ASC NULLS FIRST, c_last_review_date#38 ASC NULLS FIRST, ctr_total_return#14 ASC NULLS FIRST], [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, c_preferred_cust_flag#31, c_birth_day#32, c_birth_month#33, c_birth_year#34, c_birth_country#35, c_login#36, c_email_address#37, c_last_review_date#38, ctr_total_return#14]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = wr_returned_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (58)
-+- * ColumnarToRow (57)
-   +- CometProject (56)
-      +- CometFilter (55)
-         +- CometScan parquet spark_catalog.default.date_dim (54)
+BroadcastExchange (54)
++- * ColumnarToRow (53)
+   +- CometProject (52)
+      +- CometFilter (51)
+         +- CometScan parquet spark_catalog.default.date_dim (50)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_year#37]
+Output [2]: [d_date_sk#6, d_year#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(55) CometFilter
-Input [2]: [d_date_sk#6, d_year#37]
-Condition : ((isnotnull(d_year#37) AND (d_year#37 = 2002)) AND isnotnull(d_date_sk#6))
+(51) CometFilter
+Input [2]: [d_date_sk#6, d_year#41]
+Condition : ((isnotnull(d_year#41) AND (d_year#41 = 2002)) AND isnotnull(d_date_sk#6))
 
-(56) CometProject
-Input [2]: [d_date_sk#6, d_year#37]
+(52) CometProject
+Input [2]: [d_date_sk#6, d_year#41]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(57) ColumnarToRow [codegen id : 1]
+(53) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(58) BroadcastExchange
+(54) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 19 Hosting Expression = wr_returned_date_sk#4 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 17 Hosting Expression = wr_returned_date_sk#4 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt
index a883ad9d96..c70f33da33 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q30/simplified.txt
@@ -1,56 +1,54 @@
 TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date,ctr_total_return]
-  WholeStageCodegen (10)
+  WholeStageCodegen (11)
     Project [c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date,ctr_total_return]
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
         Project [ctr_total_return,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date]
           BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
             Project [ctr_customer_sk,ctr_total_return]
               BroadcastHashJoin [ctr_state,ctr_state,ctr_total_return,(avg(ctr_total_return) * 1.2)]
-                ColumnarToRow
-                  InputAdapter
-                    CometFilter [ctr_total_return]
-                      CometHashAggregate [wr_returning_customer_sk,ca_state,sum]
-                        CometColumnarExchange [wr_returning_customer_sk,ca_state] #1
-                          RowToColumnar
-                            WholeStageCodegen (3)
-                              HashAggregate [wr_returning_customer_sk,ca_state,wr_return_amt] [sum,sum]
-                                Project [wr_returning_customer_sk,wr_return_amt,ca_state]
-                                  BroadcastHashJoin [wr_returning_addr_sk,ca_address_sk]
-                                    Project [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt]
-                                      BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [wr_returning_addr_sk,wr_returning_customer_sk]
-                                              CometScan parquet spark_catalog.default.web_returns [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt,wr_returned_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #2
+                Filter [ctr_total_return]
+                  HashAggregate [wr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(wr_return_amt)),ctr_customer_sk,ctr_state,ctr_total_return,sum]
+                    InputAdapter
+                      Exchange [wr_returning_customer_sk,ca_state] #1
+                        WholeStageCodegen (3)
+                          HashAggregate [wr_returning_customer_sk,ca_state,wr_return_amt] [sum,sum]
+                            Project [wr_returning_customer_sk,wr_return_amt,ca_state]
+                              BroadcastHashJoin [wr_returning_addr_sk,ca_address_sk]
+                                Project [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt]
+                                  BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [wr_returning_addr_sk,wr_returning_customer_sk]
+                                          CometScan parquet spark_catalog.default.web_returns [wr_returning_customer_sk,wr_returning_addr_sk,wr_return_amt,wr_returned_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                     InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (2)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ca_address_sk,ca_state]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                      ReusedExchange [d_date_sk] #2
+                                InputAdapter
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (2)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ca_address_sk,ca_state]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                 InputAdapter
                   BroadcastExchange #4
-                    WholeStageCodegen (7)
-                      ColumnarToRow
-                        InputAdapter
-                          CometFilter [(avg(ctr_total_return) * 1.2)]
-                            CometHashAggregate [ctr_state,sum,count]
-                              CometColumnarExchange [ctr_state] #5
-                                CometHashAggregate [ctr_state,ctr_total_return]
-                                  CometHashAggregate [wr_returning_customer_sk,ca_state,sum]
-                                    CometColumnarExchange [wr_returning_customer_sk,ca_state] #6
-                                      RowToColumnar
+                    WholeStageCodegen (8)
+                      Filter [(avg(ctr_total_return) * 1.2)]
+                        HashAggregate [ctr_state,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),ctr_state,sum,count]
+                          InputAdapter
+                            Exchange [ctr_state] #5
+                              WholeStageCodegen (7)
+                                HashAggregate [ctr_state,ctr_total_return] [sum,count,sum,count]
+                                  HashAggregate [wr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(wr_return_amt)),ctr_state,ctr_total_return,sum]
+                                    InputAdapter
+                                      Exchange [wr_returning_customer_sk,ca_state] #6
                                         WholeStageCodegen (6)
                                           HashAggregate [wr_returning_customer_sk,ca_state,wr_return_amt] [sum,sum]
                                             Project [wr_returning_customer_sk,wr_return_amt,ca_state]
@@ -68,14 +66,14 @@ TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,c_pre
                                                   ReusedExchange [ca_address_sk,ca_state] #3
             InputAdapter
               BroadcastExchange #7
-                WholeStageCodegen (8)
+                WholeStageCodegen (9)
                   ColumnarToRow
                     InputAdapter
                       CometFilter [c_customer_sk,c_current_addr_sk]
                         CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date]
         InputAdapter
           BroadcastExchange #8
-            WholeStageCodegen (9)
+            WholeStageCodegen (10)
               ColumnarToRow
                 InputAdapter
                   CometProject [ca_address_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt
index ccfa5eb025..7b1f7bb5db 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/explain.txt
@@ -1,108 +1,94 @@
 == Physical Plan ==
-* ColumnarToRow (104)
-+- CometSort (103)
-   +- CometColumnarExchange (102)
-      +- RowToColumnar (101)
-         +- * Project (100)
-            +- * BroadcastHashJoin Inner BuildRight (99)
-               :- * Project (83)
-               :  +- * BroadcastHashJoin Inner BuildRight (82)
-               :     :- * BroadcastHashJoin Inner BuildRight (66)
-               :     :  :- * Project (50)
-               :     :  :  +- * BroadcastHashJoin Inner BuildRight (49)
-               :     :  :     :- * BroadcastHashJoin Inner BuildRight (33)
-               :     :  :     :  :- * ColumnarToRow (17)
-               :     :  :     :  :  +- CometHashAggregate (16)
-               :     :  :     :  :     +- CometColumnarExchange (15)
-               :     :  :     :  :        +- RowToColumnar (14)
-               :     :  :     :  :           +- * HashAggregate (13)
-               :     :  :     :  :              +- * Project (12)
-               :     :  :     :  :                 +- * BroadcastHashJoin Inner BuildRight (11)
-               :     :  :     :  :                    :- * Project (6)
-               :     :  :     :  :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :     :  :     :  :                    :     :- * ColumnarToRow (3)
-               :     :  :     :  :                    :     :  +- CometFilter (2)
-               :     :  :     :  :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :     :  :     :  :                    :     +- ReusedExchange (4)
-               :     :  :     :  :                    +- BroadcastExchange (10)
-               :     :  :     :  :                       +- * ColumnarToRow (9)
-               :     :  :     :  :                          +- CometFilter (8)
-               :     :  :     :  :                             +- CometScan parquet spark_catalog.default.customer_address (7)
-               :     :  :     :  +- BroadcastExchange (32)
-               :     :  :     :     +- * ColumnarToRow (31)
-               :     :  :     :        +- CometHashAggregate (30)
-               :     :  :     :           +- CometColumnarExchange (29)
-               :     :  :     :              +- RowToColumnar (28)
-               :     :  :     :                 +- * HashAggregate (27)
-               :     :  :     :                    +- * Project (26)
-               :     :  :     :                       +- * BroadcastHashJoin Inner BuildRight (25)
-               :     :  :     :                          :- * Project (23)
-               :     :  :     :                          :  +- * BroadcastHashJoin Inner BuildRight (22)
-               :     :  :     :                          :     :- * ColumnarToRow (20)
-               :     :  :     :                          :     :  +- CometFilter (19)
-               :     :  :     :                          :     :     +- CometScan parquet spark_catalog.default.store_sales (18)
-               :     :  :     :                          :     +- ReusedExchange (21)
-               :     :  :     :                          +- ReusedExchange (24)
-               :     :  :     +- BroadcastExchange (48)
-               :     :  :        +- * ColumnarToRow (47)
-               :     :  :           +- CometHashAggregate (46)
-               :     :  :              +- CometColumnarExchange (45)
-               :     :  :                 +- RowToColumnar (44)
-               :     :  :                    +- * HashAggregate (43)
-               :     :  :                       +- * Project (42)
-               :     :  :                          +- * BroadcastHashJoin Inner BuildRight (41)
-               :     :  :                             :- * Project (39)
-               :     :  :                             :  +- * BroadcastHashJoin Inner BuildRight (38)
-               :     :  :                             :     :- * ColumnarToRow (36)
-               :     :  :                             :     :  +- CometFilter (35)
-               :     :  :                             :     :     +- CometScan parquet spark_catalog.default.store_sales (34)
-               :     :  :                             :     +- ReusedExchange (37)
-               :     :  :                             +- ReusedExchange (40)
-               :     :  +- BroadcastExchange (65)
-               :     :     +- * ColumnarToRow (64)
-               :     :        +- CometHashAggregate (63)
-               :     :           +- CometColumnarExchange (62)
-               :     :              +- RowToColumnar (61)
-               :     :                 +- * HashAggregate (60)
-               :     :                    +- * Project (59)
-               :     :                       +- * BroadcastHashJoin Inner BuildRight (58)
-               :     :                          :- * Project (56)
-               :     :                          :  +- * BroadcastHashJoin Inner BuildRight (55)
-               :     :                          :     :- * ColumnarToRow (53)
-               :     :                          :     :  +- CometFilter (52)
-               :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (51)
-               :     :                          :     +- ReusedExchange (54)
-               :     :                          +- ReusedExchange (57)
-               :     +- BroadcastExchange (81)
-               :        +- * ColumnarToRow (80)
-               :           +- CometHashAggregate (79)
-               :              +- CometColumnarExchange (78)
-               :                 +- RowToColumnar (77)
-               :                    +- * HashAggregate (76)
-               :                       +- * Project (75)
-               :                          +- * BroadcastHashJoin Inner BuildRight (74)
-               :                             :- * Project (72)
-               :                             :  +- * BroadcastHashJoin Inner BuildRight (71)
-               :                             :     :- * ColumnarToRow (69)
-               :                             :     :  +- CometFilter (68)
-               :                             :     :     +- CometScan parquet spark_catalog.default.web_sales (67)
-               :                             :     +- ReusedExchange (70)
-               :                             +- ReusedExchange (73)
-               +- BroadcastExchange (98)
-                  +- * ColumnarToRow (97)
-                     +- CometHashAggregate (96)
-                        +- CometColumnarExchange (95)
-                           +- RowToColumnar (94)
-                              +- * HashAggregate (93)
-                                 +- * Project (92)
-                                    +- * BroadcastHashJoin Inner BuildRight (91)
-                                       :- * Project (89)
-                                       :  +- * BroadcastHashJoin Inner BuildRight (88)
-                                       :     :- * ColumnarToRow (86)
-                                       :     :  +- CometFilter (85)
-                                       :     :     +- CometScan parquet spark_catalog.default.web_sales (84)
-                                       :     +- ReusedExchange (87)
-                                       +- ReusedExchange (90)
+* Sort (90)
++- Exchange (89)
+   +- * Project (88)
+      +- * BroadcastHashJoin Inner BuildRight (87)
+         :- * Project (73)
+         :  +- * BroadcastHashJoin Inner BuildRight (72)
+         :     :- * BroadcastHashJoin Inner BuildRight (58)
+         :     :  :- * Project (44)
+         :     :  :  +- * BroadcastHashJoin Inner BuildRight (43)
+         :     :  :     :- * BroadcastHashJoin Inner BuildRight (29)
+         :     :  :     :  :- * HashAggregate (15)
+         :     :  :     :  :  +- Exchange (14)
+         :     :  :     :  :     +- * HashAggregate (13)
+         :     :  :     :  :        +- * Project (12)
+         :     :  :     :  :           +- * BroadcastHashJoin Inner BuildRight (11)
+         :     :  :     :  :              :- * Project (6)
+         :     :  :     :  :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+         :     :  :     :  :              :     :- * ColumnarToRow (3)
+         :     :  :     :  :              :     :  +- CometFilter (2)
+         :     :  :     :  :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+         :     :  :     :  :              :     +- ReusedExchange (4)
+         :     :  :     :  :              +- BroadcastExchange (10)
+         :     :  :     :  :                 +- * ColumnarToRow (9)
+         :     :  :     :  :                    +- CometFilter (8)
+         :     :  :     :  :                       +- CometScan parquet spark_catalog.default.customer_address (7)
+         :     :  :     :  +- BroadcastExchange (28)
+         :     :  :     :     +- * HashAggregate (27)
+         :     :  :     :        +- Exchange (26)
+         :     :  :     :           +- * HashAggregate (25)
+         :     :  :     :              +- * Project (24)
+         :     :  :     :                 +- * BroadcastHashJoin Inner BuildRight (23)
+         :     :  :     :                    :- * Project (21)
+         :     :  :     :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+         :     :  :     :                    :     :- * ColumnarToRow (18)
+         :     :  :     :                    :     :  +- CometFilter (17)
+         :     :  :     :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (16)
+         :     :  :     :                    :     +- ReusedExchange (19)
+         :     :  :     :                    +- ReusedExchange (22)
+         :     :  :     +- BroadcastExchange (42)
+         :     :  :        +- * HashAggregate (41)
+         :     :  :           +- Exchange (40)
+         :     :  :              +- * HashAggregate (39)
+         :     :  :                 +- * Project (38)
+         :     :  :                    +- * BroadcastHashJoin Inner BuildRight (37)
+         :     :  :                       :- * Project (35)
+         :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (34)
+         :     :  :                       :     :- * ColumnarToRow (32)
+         :     :  :                       :     :  +- CometFilter (31)
+         :     :  :                       :     :     +- CometScan parquet spark_catalog.default.store_sales (30)
+         :     :  :                       :     +- ReusedExchange (33)
+         :     :  :                       +- ReusedExchange (36)
+         :     :  +- BroadcastExchange (57)
+         :     :     +- * HashAggregate (56)
+         :     :        +- Exchange (55)
+         :     :           +- * HashAggregate (54)
+         :     :              +- * Project (53)
+         :     :                 +- * BroadcastHashJoin Inner BuildRight (52)
+         :     :                    :- * Project (50)
+         :     :                    :  +- * BroadcastHashJoin Inner BuildRight (49)
+         :     :                    :     :- * ColumnarToRow (47)
+         :     :                    :     :  +- CometFilter (46)
+         :     :                    :     :     +- CometScan parquet spark_catalog.default.web_sales (45)
+         :     :                    :     +- ReusedExchange (48)
+         :     :                    +- ReusedExchange (51)
+         :     +- BroadcastExchange (71)
+         :        +- * HashAggregate (70)
+         :           +- Exchange (69)
+         :              +- * HashAggregate (68)
+         :                 +- * Project (67)
+         :                    +- * BroadcastHashJoin Inner BuildRight (66)
+         :                       :- * Project (64)
+         :                       :  +- * BroadcastHashJoin Inner BuildRight (63)
+         :                       :     :- * ColumnarToRow (61)
+         :                       :     :  +- CometFilter (60)
+         :                       :     :     +- CometScan parquet spark_catalog.default.web_sales (59)
+         :                       :     +- ReusedExchange (62)
+         :                       +- ReusedExchange (65)
+         +- BroadcastExchange (86)
+            +- * HashAggregate (85)
+               +- Exchange (84)
+                  +- * HashAggregate (83)
+                     +- * Project (82)
+                        +- * BroadcastHashJoin Inner BuildRight (81)
+                           :- * Project (79)
+                           :  +- * BroadcastHashJoin Inner BuildRight (78)
+                           :     :- * ColumnarToRow (76)
+                           :     :  +- CometFilter (75)
+                           :     :     +- CometScan parquet spark_catalog.default.web_sales (74)
+                           :     +- ReusedExchange (77)
+                           +- ReusedExchange (80)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -120,7 +106,7 @@ Condition : isnotnull(ss_addr_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [3]: [ss_addr_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 108]
+(4) ReusedExchange [Reuses operator id: 94]
 Output [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -168,419 +154,389 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#10]
 Results [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
 
-(14) RowToColumnar
+(14) Exchange
 Input [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
+Arguments: hashpartitioning(ca_county#9, d_qoy#7, d_year#6, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
-Arguments: hashpartitioning(ca_county#9, d_qoy#7, d_year#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 24]
 Input [4]: [ca_county#9, d_qoy#7, d_year#6, sum#11]
 Keys [3]: [ca_county#9, d_qoy#7, d_year#6]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
-
-(17) ColumnarToRow [codegen id : 24]
-Input [3]: [ca_county#9, d_year#6, store_sales#12]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#12]
+Results [3]: [ca_county#9, d_year#6, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#12,17,2) AS store_sales#13]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15]
+Output [3]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#15), dynamicpruningexpression(ss_sold_date_sk#15 IN dynamicpruning#16)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#16), dynamicpruningexpression(ss_sold_date_sk#16 IN dynamicpruning#17)]
 PushedFilters: [IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_addr_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(19) CometFilter
-Input [3]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15]
-Condition : isnotnull(ss_addr_sk#13)
+(17) CometFilter
+Input [3]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16]
+Condition : isnotnull(ss_addr_sk#14)
 
-(20) ColumnarToRow [codegen id : 6]
-Input [3]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15]
+(18) ColumnarToRow [codegen id : 6]
+Input [3]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16]
 
-(21) ReusedExchange [Reuses operator id: 112]
-Output [3]: [d_date_sk#17, d_year#18, d_qoy#19]
+(19) ReusedExchange [Reuses operator id: 98]
+Output [3]: [d_date_sk#18, d_year#19, d_qoy#20]
 
-(22) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#15]
-Right keys [1]: [d_date_sk#17]
+(20) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#16]
+Right keys [1]: [d_date_sk#18]
 Join type: Inner
 Join condition: None
 
-(23) Project [codegen id : 6]
-Output [4]: [ss_addr_sk#13, ss_ext_sales_price#14, d_year#18, d_qoy#19]
-Input [6]: [ss_addr_sk#13, ss_ext_sales_price#14, ss_sold_date_sk#15, d_date_sk#17, d_year#18, d_qoy#19]
+(21) Project [codegen id : 6]
+Output [4]: [ss_addr_sk#14, ss_ext_sales_price#15, d_year#19, d_qoy#20]
+Input [6]: [ss_addr_sk#14, ss_ext_sales_price#15, ss_sold_date_sk#16, d_date_sk#18, d_year#19, d_qoy#20]
 
-(24) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#20, ca_county#21]
+(22) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#21, ca_county#22]
 
-(25) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_addr_sk#13]
-Right keys [1]: [ca_address_sk#20]
+(23) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_addr_sk#14]
+Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
-Output [4]: [ss_ext_sales_price#14, d_year#18, d_qoy#19, ca_county#21]
-Input [6]: [ss_addr_sk#13, ss_ext_sales_price#14, d_year#18, d_qoy#19, ca_address_sk#20, ca_county#21]
-
-(27) HashAggregate [codegen id : 6]
-Input [4]: [ss_ext_sales_price#14, d_year#18, d_qoy#19, ca_county#21]
-Keys [3]: [ca_county#21, d_qoy#19, d_year#18]
-Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#14))]
-Aggregate Attributes [1]: [sum#22]
-Results [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
-
-(28) RowToColumnar
-Input [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
-
-(29) CometColumnarExchange
-Input [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
-Arguments: hashpartitioning(ca_county#21, d_qoy#19, d_year#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
-Input [4]: [ca_county#21, d_qoy#19, d_year#18, sum#23]
-Keys [3]: [ca_county#21, d_qoy#19, d_year#18]
-Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#14))]
-
-(31) ColumnarToRow [codegen id : 7]
-Input [2]: [ca_county#21, store_sales#24]
-
-(32) BroadcastExchange
-Input [2]: [ca_county#21, store_sales#24]
+(24) Project [codegen id : 6]
+Output [4]: [ss_ext_sales_price#15, d_year#19, d_qoy#20, ca_county#22]
+Input [6]: [ss_addr_sk#14, ss_ext_sales_price#15, d_year#19, d_qoy#20, ca_address_sk#21, ca_county#22]
+
+(25) HashAggregate [codegen id : 6]
+Input [4]: [ss_ext_sales_price#15, d_year#19, d_qoy#20, ca_county#22]
+Keys [3]: [ca_county#22, d_qoy#20, d_year#19]
+Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#15))]
+Aggregate Attributes [1]: [sum#23]
+Results [4]: [ca_county#22, d_qoy#20, d_year#19, sum#24]
+
+(26) Exchange
+Input [4]: [ca_county#22, d_qoy#20, d_year#19, sum#24]
+Arguments: hashpartitioning(ca_county#22, d_qoy#20, d_year#19, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+
+(27) HashAggregate [codegen id : 7]
+Input [4]: [ca_county#22, d_qoy#20, d_year#19, sum#24]
+Keys [3]: [ca_county#22, d_qoy#20, d_year#19]
+Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#15))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#15))#12]
+Results [2]: [ca_county#22, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#15))#12,17,2) AS store_sales#25]
+
+(28) BroadcastExchange
+Input [2]: [ca_county#22, store_sales#25]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 24]
+(29) BroadcastHashJoin [codegen id : 24]
 Left keys [1]: [ca_county#9]
-Right keys [1]: [ca_county#21]
+Right keys [1]: [ca_county#22]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27]
+Output [3]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#27), dynamicpruningexpression(ss_sold_date_sk#27 IN dynamicpruning#28)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#28), dynamicpruningexpression(ss_sold_date_sk#28 IN dynamicpruning#29)]
 PushedFilters: [IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_addr_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(35) CometFilter
-Input [3]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27]
-Condition : isnotnull(ss_addr_sk#25)
+(31) CometFilter
+Input [3]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
+Condition : isnotnull(ss_addr_sk#26)
 
-(36) ColumnarToRow [codegen id : 10]
-Input [3]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27]
+(32) ColumnarToRow [codegen id : 10]
+Input [3]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
 
-(37) ReusedExchange [Reuses operator id: 116]
-Output [3]: [d_date_sk#29, d_year#30, d_qoy#31]
+(33) ReusedExchange [Reuses operator id: 102]
+Output [3]: [d_date_sk#30, d_year#31, d_qoy#32]
 
-(38) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ss_sold_date_sk#27]
-Right keys [1]: [d_date_sk#29]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ss_sold_date_sk#28]
+Right keys [1]: [d_date_sk#30]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 10]
-Output [4]: [ss_addr_sk#25, ss_ext_sales_price#26, d_year#30, d_qoy#31]
-Input [6]: [ss_addr_sk#25, ss_ext_sales_price#26, ss_sold_date_sk#27, d_date_sk#29, d_year#30, d_qoy#31]
+(35) Project [codegen id : 10]
+Output [4]: [ss_addr_sk#26, ss_ext_sales_price#27, d_year#31, d_qoy#32]
+Input [6]: [ss_addr_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28, d_date_sk#30, d_year#31, d_qoy#32]
 
-(40) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#32, ca_county#33]
+(36) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#33, ca_county#34]
 
-(41) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ss_addr_sk#25]
-Right keys [1]: [ca_address_sk#32]
+(37) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ss_addr_sk#26]
+Right keys [1]: [ca_address_sk#33]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
-Output [4]: [ss_ext_sales_price#26, d_year#30, d_qoy#31, ca_county#33]
-Input [6]: [ss_addr_sk#25, ss_ext_sales_price#26, d_year#30, d_qoy#31, ca_address_sk#32, ca_county#33]
-
-(43) HashAggregate [codegen id : 10]
-Input [4]: [ss_ext_sales_price#26, d_year#30, d_qoy#31, ca_county#33]
-Keys [3]: [ca_county#33, d_qoy#31, d_year#30]
-Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#26))]
-Aggregate Attributes [1]: [sum#34]
-Results [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
-
-(44) RowToColumnar
-Input [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
-
-(45) CometColumnarExchange
-Input [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
-Arguments: hashpartitioning(ca_county#33, d_qoy#31, d_year#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(46) CometHashAggregate
-Input [4]: [ca_county#33, d_qoy#31, d_year#30, sum#35]
-Keys [3]: [ca_county#33, d_qoy#31, d_year#30]
-Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#26))]
-
-(47) ColumnarToRow [codegen id : 11]
-Input [2]: [ca_county#33, store_sales#36]
-
-(48) BroadcastExchange
-Input [2]: [ca_county#33, store_sales#36]
+(38) Project [codegen id : 10]
+Output [4]: [ss_ext_sales_price#27, d_year#31, d_qoy#32, ca_county#34]
+Input [6]: [ss_addr_sk#26, ss_ext_sales_price#27, d_year#31, d_qoy#32, ca_address_sk#33, ca_county#34]
+
+(39) HashAggregate [codegen id : 10]
+Input [4]: [ss_ext_sales_price#27, d_year#31, d_qoy#32, ca_county#34]
+Keys [3]: [ca_county#34, d_qoy#32, d_year#31]
+Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#27))]
+Aggregate Attributes [1]: [sum#35]
+Results [4]: [ca_county#34, d_qoy#32, d_year#31, sum#36]
+
+(40) Exchange
+Input [4]: [ca_county#34, d_qoy#32, d_year#31, sum#36]
+Arguments: hashpartitioning(ca_county#34, d_qoy#32, d_year#31, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(41) HashAggregate [codegen id : 11]
+Input [4]: [ca_county#34, d_qoy#32, d_year#31, sum#36]
+Keys [3]: [ca_county#34, d_qoy#32, d_year#31]
+Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#27))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#27))#12]
+Results [2]: [ca_county#34, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#27))#12,17,2) AS store_sales#37]
+
+(42) BroadcastExchange
+Input [2]: [ca_county#34, store_sales#37]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=6]
 
-(49) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ca_county#21]
-Right keys [1]: [ca_county#33]
+(43) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ca_county#22]
+Right keys [1]: [ca_county#34]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 24]
-Output [5]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36]
-Input [7]: [ca_county#9, d_year#6, store_sales#12, ca_county#21, store_sales#24, ca_county#33, store_sales#36]
+(44) Project [codegen id : 24]
+Output [5]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37]
+Input [7]: [ca_county#9, d_year#6, store_sales#13, ca_county#22, store_sales#25, ca_county#34, store_sales#37]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39]
+Output [3]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#39), dynamicpruningexpression(ws_sold_date_sk#39 IN dynamicpruning#40)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#40), dynamicpruningexpression(ws_sold_date_sk#40 IN dynamicpruning#41)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk)]
 ReadSchema: struct<ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(52) CometFilter
-Input [3]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39]
-Condition : isnotnull(ws_bill_addr_sk#37)
+(46) CometFilter
+Input [3]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40]
+Condition : isnotnull(ws_bill_addr_sk#38)
 
-(53) ColumnarToRow [codegen id : 14]
-Input [3]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39]
+(47) ColumnarToRow [codegen id : 14]
+Input [3]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40]
 
-(54) ReusedExchange [Reuses operator id: 108]
-Output [3]: [d_date_sk#41, d_year#42, d_qoy#43]
+(48) ReusedExchange [Reuses operator id: 94]
+Output [3]: [d_date_sk#42, d_year#43, d_qoy#44]
 
-(55) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#39]
-Right keys [1]: [d_date_sk#41]
+(49) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#40]
+Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(56) Project [codegen id : 14]
-Output [4]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, d_year#42, d_qoy#43]
-Input [6]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, ws_sold_date_sk#39, d_date_sk#41, d_year#42, d_qoy#43]
+(50) Project [codegen id : 14]
+Output [4]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, d_year#43, d_qoy#44]
+Input [6]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, ws_sold_date_sk#40, d_date_sk#42, d_year#43, d_qoy#44]
 
-(57) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#44, ca_county#45]
+(51) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#45, ca_county#46]
 
-(58) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_bill_addr_sk#37]
-Right keys [1]: [ca_address_sk#44]
+(52) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_bill_addr_sk#38]
+Right keys [1]: [ca_address_sk#45]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 14]
-Output [4]: [ws_ext_sales_price#38, d_year#42, d_qoy#43, ca_county#45]
-Input [6]: [ws_bill_addr_sk#37, ws_ext_sales_price#38, d_year#42, d_qoy#43, ca_address_sk#44, ca_county#45]
-
-(60) HashAggregate [codegen id : 14]
-Input [4]: [ws_ext_sales_price#38, d_year#42, d_qoy#43, ca_county#45]
-Keys [3]: [ca_county#45, d_qoy#43, d_year#42]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#38))]
-Aggregate Attributes [1]: [sum#46]
-Results [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
-
-(61) RowToColumnar
-Input [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
-
-(62) CometColumnarExchange
-Input [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
-Arguments: hashpartitioning(ca_county#45, d_qoy#43, d_year#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(63) CometHashAggregate
-Input [4]: [ca_county#45, d_qoy#43, d_year#42, sum#47]
-Keys [3]: [ca_county#45, d_qoy#43, d_year#42]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#38))]
-
-(64) ColumnarToRow [codegen id : 15]
-Input [2]: [ca_county#45, web_sales#48]
-
-(65) BroadcastExchange
-Input [2]: [ca_county#45, web_sales#48]
+(53) Project [codegen id : 14]
+Output [4]: [ws_ext_sales_price#39, d_year#43, d_qoy#44, ca_county#46]
+Input [6]: [ws_bill_addr_sk#38, ws_ext_sales_price#39, d_year#43, d_qoy#44, ca_address_sk#45, ca_county#46]
+
+(54) HashAggregate [codegen id : 14]
+Input [4]: [ws_ext_sales_price#39, d_year#43, d_qoy#44, ca_county#46]
+Keys [3]: [ca_county#46, d_qoy#44, d_year#43]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#39))]
+Aggregate Attributes [1]: [sum#47]
+Results [4]: [ca_county#46, d_qoy#44, d_year#43, sum#48]
+
+(55) Exchange
+Input [4]: [ca_county#46, d_qoy#44, d_year#43, sum#48]
+Arguments: hashpartitioning(ca_county#46, d_qoy#44, d_year#43, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(56) HashAggregate [codegen id : 15]
+Input [4]: [ca_county#46, d_qoy#44, d_year#43, sum#48]
+Keys [3]: [ca_county#46, d_qoy#44, d_year#43]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#39))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#39))#49]
+Results [2]: [ca_county#46, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#39))#49,17,2) AS web_sales#50]
+
+(57) BroadcastExchange
+Input [2]: [ca_county#46, web_sales#50]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(66) BroadcastHashJoin [codegen id : 24]
+(58) BroadcastHashJoin [codegen id : 24]
 Left keys [1]: [ca_county#9]
-Right keys [1]: [ca_county#45]
+Right keys [1]: [ca_county#46]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51]
+Output [3]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk)]
 ReadSchema: struct<ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(68) CometFilter
-Input [3]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51]
-Condition : isnotnull(ws_bill_addr_sk#49)
+(60) CometFilter
+Input [3]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53]
+Condition : isnotnull(ws_bill_addr_sk#51)
 
-(69) ColumnarToRow [codegen id : 18]
-Input [3]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51]
+(61) ColumnarToRow [codegen id : 18]
+Input [3]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53]
 
-(70) ReusedExchange [Reuses operator id: 112]
-Output [3]: [d_date_sk#53, d_year#54, d_qoy#55]
+(62) ReusedExchange [Reuses operator id: 98]
+Output [3]: [d_date_sk#55, d_year#56, d_qoy#57]
 
-(71) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_sold_date_sk#51]
-Right keys [1]: [d_date_sk#53]
+(63) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_sold_date_sk#53]
+Right keys [1]: [d_date_sk#55]
 Join type: Inner
 Join condition: None
 
-(72) Project [codegen id : 18]
-Output [4]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, d_year#54, d_qoy#55]
-Input [6]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54, d_qoy#55]
+(64) Project [codegen id : 18]
+Output [4]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, d_year#56, d_qoy#57]
+Input [6]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56, d_qoy#57]
 
-(73) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#56, ca_county#57]
+(65) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#58, ca_county#59]
 
-(74) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_bill_addr_sk#49]
-Right keys [1]: [ca_address_sk#56]
+(66) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_bill_addr_sk#51]
+Right keys [1]: [ca_address_sk#58]
 Join type: Inner
 Join condition: None
 
-(75) Project [codegen id : 18]
-Output [4]: [ws_ext_sales_price#50, d_year#54, d_qoy#55, ca_county#57]
-Input [6]: [ws_bill_addr_sk#49, ws_ext_sales_price#50, d_year#54, d_qoy#55, ca_address_sk#56, ca_county#57]
-
-(76) HashAggregate [codegen id : 18]
-Input [4]: [ws_ext_sales_price#50, d_year#54, d_qoy#55, ca_county#57]
-Keys [3]: [ca_county#57, d_qoy#55, d_year#54]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#50))]
-Aggregate Attributes [1]: [sum#58]
-Results [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
-
-(77) RowToColumnar
-Input [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
-
-(78) CometColumnarExchange
-Input [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
-Arguments: hashpartitioning(ca_county#57, d_qoy#55, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(79) CometHashAggregate
-Input [4]: [ca_county#57, d_qoy#55, d_year#54, sum#59]
-Keys [3]: [ca_county#57, d_qoy#55, d_year#54]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#50))]
-
-(80) ColumnarToRow [codegen id : 19]
-Input [2]: [ca_county#57, web_sales#60]
-
-(81) BroadcastExchange
-Input [2]: [ca_county#57, web_sales#60]
+(67) Project [codegen id : 18]
+Output [4]: [ws_ext_sales_price#52, d_year#56, d_qoy#57, ca_county#59]
+Input [6]: [ws_bill_addr_sk#51, ws_ext_sales_price#52, d_year#56, d_qoy#57, ca_address_sk#58, ca_county#59]
+
+(68) HashAggregate [codegen id : 18]
+Input [4]: [ws_ext_sales_price#52, d_year#56, d_qoy#57, ca_county#59]
+Keys [3]: [ca_county#59, d_qoy#57, d_year#56]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#52))]
+Aggregate Attributes [1]: [sum#60]
+Results [4]: [ca_county#59, d_qoy#57, d_year#56, sum#61]
+
+(69) Exchange
+Input [4]: [ca_county#59, d_qoy#57, d_year#56, sum#61]
+Arguments: hashpartitioning(ca_county#59, d_qoy#57, d_year#56, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+
+(70) HashAggregate [codegen id : 19]
+Input [4]: [ca_county#59, d_qoy#57, d_year#56, sum#61]
+Keys [3]: [ca_county#59, d_qoy#57, d_year#56]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#52))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#52))#49]
+Results [2]: [ca_county#59, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#52))#49,17,2) AS web_sales#62]
+
+(71) BroadcastExchange
+Input [2]: [ca_county#59, web_sales#62]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=10]
 
-(82) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ca_county#45]
-Right keys [1]: [ca_county#57]
+(72) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ca_county#46]
+Right keys [1]: [ca_county#59]
 Join type: Inner
-Join condition: (CASE WHEN (web_sales#48 > 0.00) THEN (web_sales#60 / web_sales#48) END > CASE WHEN (store_sales#12 > 0.00) THEN (store_sales#24 / store_sales#12) END)
+Join condition: (CASE WHEN (web_sales#50 > 0.00) THEN (web_sales#62 / web_sales#50) END > CASE WHEN (store_sales#13 > 0.00) THEN (store_sales#25 / store_sales#13) END)
 
-(83) Project [codegen id : 24]
-Output [8]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36, ca_county#45, web_sales#48, web_sales#60]
-Input [9]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36, ca_county#45, web_sales#48, ca_county#57, web_sales#60]
+(73) Project [codegen id : 24]
+Output [8]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37, ca_county#46, web_sales#50, web_sales#62]
+Input [9]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37, ca_county#46, web_sales#50, ca_county#59, web_sales#62]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63]
+Output [3]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#63), dynamicpruningexpression(ws_sold_date_sk#63 IN dynamicpruning#64)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#65), dynamicpruningexpression(ws_sold_date_sk#65 IN dynamicpruning#66)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk)]
 ReadSchema: struct<ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(85) CometFilter
-Input [3]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63]
-Condition : isnotnull(ws_bill_addr_sk#61)
+(75) CometFilter
+Input [3]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65]
+Condition : isnotnull(ws_bill_addr_sk#63)
 
-(86) ColumnarToRow [codegen id : 22]
-Input [3]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63]
+(76) ColumnarToRow [codegen id : 22]
+Input [3]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65]
 
-(87) ReusedExchange [Reuses operator id: 116]
-Output [3]: [d_date_sk#65, d_year#66, d_qoy#67]
+(77) ReusedExchange [Reuses operator id: 102]
+Output [3]: [d_date_sk#67, d_year#68, d_qoy#69]
 
-(88) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_sold_date_sk#63]
-Right keys [1]: [d_date_sk#65]
+(78) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_sold_date_sk#65]
+Right keys [1]: [d_date_sk#67]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 22]
-Output [4]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, d_year#66, d_qoy#67]
-Input [6]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, ws_sold_date_sk#63, d_date_sk#65, d_year#66, d_qoy#67]
+(79) Project [codegen id : 22]
+Output [4]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, d_year#68, d_qoy#69]
+Input [6]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, ws_sold_date_sk#65, d_date_sk#67, d_year#68, d_qoy#69]
 
-(90) ReusedExchange [Reuses operator id: 10]
-Output [2]: [ca_address_sk#68, ca_county#69]
+(80) ReusedExchange [Reuses operator id: 10]
+Output [2]: [ca_address_sk#70, ca_county#71]
 
-(91) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_bill_addr_sk#61]
-Right keys [1]: [ca_address_sk#68]
+(81) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_bill_addr_sk#63]
+Right keys [1]: [ca_address_sk#70]
 Join type: Inner
 Join condition: None
 
-(92) Project [codegen id : 22]
-Output [4]: [ws_ext_sales_price#62, d_year#66, d_qoy#67, ca_county#69]
-Input [6]: [ws_bill_addr_sk#61, ws_ext_sales_price#62, d_year#66, d_qoy#67, ca_address_sk#68, ca_county#69]
-
-(93) HashAggregate [codegen id : 22]
-Input [4]: [ws_ext_sales_price#62, d_year#66, d_qoy#67, ca_county#69]
-Keys [3]: [ca_county#69, d_qoy#67, d_year#66]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#62))]
-Aggregate Attributes [1]: [sum#70]
-Results [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
-
-(94) RowToColumnar
-Input [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
-
-(95) CometColumnarExchange
-Input [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
-Arguments: hashpartitioning(ca_county#69, d_qoy#67, d_year#66, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
-
-(96) CometHashAggregate
-Input [4]: [ca_county#69, d_qoy#67, d_year#66, sum#71]
-Keys [3]: [ca_county#69, d_qoy#67, d_year#66]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#62))]
-
-(97) ColumnarToRow [codegen id : 23]
-Input [2]: [ca_county#69, web_sales#72]
-
-(98) BroadcastExchange
-Input [2]: [ca_county#69, web_sales#72]
+(82) Project [codegen id : 22]
+Output [4]: [ws_ext_sales_price#64, d_year#68, d_qoy#69, ca_county#71]
+Input [6]: [ws_bill_addr_sk#63, ws_ext_sales_price#64, d_year#68, d_qoy#69, ca_address_sk#70, ca_county#71]
+
+(83) HashAggregate [codegen id : 22]
+Input [4]: [ws_ext_sales_price#64, d_year#68, d_qoy#69, ca_county#71]
+Keys [3]: [ca_county#71, d_qoy#69, d_year#68]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#64))]
+Aggregate Attributes [1]: [sum#72]
+Results [4]: [ca_county#71, d_qoy#69, d_year#68, sum#73]
+
+(84) Exchange
+Input [4]: [ca_county#71, d_qoy#69, d_year#68, sum#73]
+Arguments: hashpartitioning(ca_county#71, d_qoy#69, d_year#68, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+
+(85) HashAggregate [codegen id : 23]
+Input [4]: [ca_county#71, d_qoy#69, d_year#68, sum#73]
+Keys [3]: [ca_county#71, d_qoy#69, d_year#68]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#64))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#64))#49]
+Results [2]: [ca_county#71, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#64))#49,17,2) AS web_sales#74]
+
+(86) BroadcastExchange
+Input [2]: [ca_county#71, web_sales#74]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=12]
 
-(99) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [ca_county#45]
-Right keys [1]: [ca_county#69]
+(87) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [ca_county#46]
+Right keys [1]: [ca_county#71]
 Join type: Inner
-Join condition: (CASE WHEN (web_sales#60 > 0.00) THEN (web_sales#72 / web_sales#60) END > CASE WHEN (store_sales#24 > 0.00) THEN (store_sales#36 / store_sales#24) END)
-
-(100) Project [codegen id : 24]
-Output [6]: [ca_county#9, d_year#6, (web_sales#60 / web_sales#48) AS web_q1_q2_increase#73, (store_sales#24 / store_sales#12) AS store_q1_q2_increase#74, (web_sales#72 / web_sales#60) AS web_q2_q3_increase#75, (store_sales#36 / store_sales#24) AS store_q2_q3_increase#76]
-Input [10]: [ca_county#9, d_year#6, store_sales#12, store_sales#24, store_sales#36, ca_county#45, web_sales#48, web_sales#60, ca_county#69, web_sales#72]
+Join condition: (CASE WHEN (web_sales#62 > 0.00) THEN (web_sales#74 / web_sales#62) END > CASE WHEN (store_sales#25 > 0.00) THEN (store_sales#37 / store_sales#25) END)
 
-(101) RowToColumnar
-Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
+(88) Project [codegen id : 24]
+Output [6]: [ca_county#9, d_year#6, (web_sales#62 / web_sales#50) AS web_q1_q2_increase#75, (store_sales#25 / store_sales#13) AS store_q1_q2_increase#76, (web_sales#74 / web_sales#62) AS web_q2_q3_increase#77, (store_sales#37 / store_sales#25) AS store_q2_q3_increase#78]
+Input [10]: [ca_county#9, d_year#6, store_sales#13, store_sales#25, store_sales#37, ca_county#46, web_sales#50, web_sales#62, ca_county#71, web_sales#74]
 
-(102) CometColumnarExchange
-Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
-Arguments: rangepartitioning(ca_county#9 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+(89) Exchange
+Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#75, store_q1_q2_increase#76, web_q2_q3_increase#77, store_q2_q3_increase#78]
+Arguments: rangepartitioning(ca_county#9 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=13]
 
-(103) CometSort
-Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
-Arguments: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76], [ca_county#9 ASC NULLS FIRST]
-
-(104) ColumnarToRow [codegen id : 25]
-Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#73, store_q1_q2_increase#74, web_q2_q3_increase#75, store_q2_q3_increase#76]
+(90) Sort [codegen id : 25]
+Input [6]: [ca_county#9, d_year#6, web_q1_q2_increase#75, store_q1_q2_increase#76, web_q2_q3_increase#77, store_q2_q3_increase#78]
+Arguments: [ca_county#9 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (108)
-+- * ColumnarToRow (107)
-   +- CometFilter (106)
-      +- CometScan parquet spark_catalog.default.date_dim (105)
+BroadcastExchange (94)
++- * ColumnarToRow (93)
+   +- CometFilter (92)
+      +- CometScan parquet spark_catalog.default.date_dim (91)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -590,71 +546,71 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,1), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(106) CometFilter
+(92) CometFilter
 Input [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 Condition : ((((isnotnull(d_qoy#7) AND isnotnull(d_year#6)) AND (d_qoy#7 = 1)) AND (d_year#6 = 2000)) AND isnotnull(d_date_sk#5))
 
-(107) ColumnarToRow [codegen id : 1]
+(93) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 
-(108) BroadcastExchange
+(94) BroadcastExchange
 Input [3]: [d_date_sk#5, d_year#6, d_qoy#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=14]
 
-Subquery:2 Hosting operator id = 18 Hosting Expression = ss_sold_date_sk#15 IN dynamicpruning#16
-BroadcastExchange (112)
-+- * ColumnarToRow (111)
-   +- CometFilter (110)
-      +- CometScan parquet spark_catalog.default.date_dim (109)
+Subquery:2 Hosting operator id = 16 Hosting Expression = ss_sold_date_sk#16 IN dynamicpruning#17
+BroadcastExchange (98)
++- * ColumnarToRow (97)
+   +- CometFilter (96)
+      +- CometScan parquet spark_catalog.default.date_dim (95)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#17, d_year#18, d_qoy#19]
+Output [3]: [d_date_sk#18, d_year#19, d_qoy#20]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(110) CometFilter
-Input [3]: [d_date_sk#17, d_year#18, d_qoy#19]
-Condition : ((((isnotnull(d_qoy#19) AND isnotnull(d_year#18)) AND (d_qoy#19 = 2)) AND (d_year#18 = 2000)) AND isnotnull(d_date_sk#17))
+(96) CometFilter
+Input [3]: [d_date_sk#18, d_year#19, d_qoy#20]
+Condition : ((((isnotnull(d_qoy#20) AND isnotnull(d_year#19)) AND (d_qoy#20 = 2)) AND (d_year#19 = 2000)) AND isnotnull(d_date_sk#18))
 
-(111) ColumnarToRow [codegen id : 1]
-Input [3]: [d_date_sk#17, d_year#18, d_qoy#19]
+(97) ColumnarToRow [codegen id : 1]
+Input [3]: [d_date_sk#18, d_year#19, d_qoy#20]
 
-(112) BroadcastExchange
-Input [3]: [d_date_sk#17, d_year#18, d_qoy#19]
+(98) BroadcastExchange
+Input [3]: [d_date_sk#18, d_year#19, d_qoy#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=15]
 
-Subquery:3 Hosting operator id = 34 Hosting Expression = ss_sold_date_sk#27 IN dynamicpruning#28
-BroadcastExchange (116)
-+- * ColumnarToRow (115)
-   +- CometFilter (114)
-      +- CometScan parquet spark_catalog.default.date_dim (113)
+Subquery:3 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#28 IN dynamicpruning#29
+BroadcastExchange (102)
++- * ColumnarToRow (101)
+   +- CometFilter (100)
+      +- CometScan parquet spark_catalog.default.date_dim (99)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#29, d_year#30, d_qoy#31]
+Output [3]: [d_date_sk#30, d_year#31, d_qoy#32]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,3), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(114) CometFilter
-Input [3]: [d_date_sk#29, d_year#30, d_qoy#31]
-Condition : ((((isnotnull(d_qoy#31) AND isnotnull(d_year#30)) AND (d_qoy#31 = 3)) AND (d_year#30 = 2000)) AND isnotnull(d_date_sk#29))
+(100) CometFilter
+Input [3]: [d_date_sk#30, d_year#31, d_qoy#32]
+Condition : ((((isnotnull(d_qoy#32) AND isnotnull(d_year#31)) AND (d_qoy#32 = 3)) AND (d_year#31 = 2000)) AND isnotnull(d_date_sk#30))
 
-(115) ColumnarToRow [codegen id : 1]
-Input [3]: [d_date_sk#29, d_year#30, d_qoy#31]
+(101) ColumnarToRow [codegen id : 1]
+Input [3]: [d_date_sk#30, d_year#31, d_qoy#32]
 
-(116) BroadcastExchange
-Input [3]: [d_date_sk#29, d_year#30, d_qoy#31]
+(102) BroadcastExchange
+Input [3]: [d_date_sk#30, d_year#31, d_qoy#32]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=16]
 
-Subquery:4 Hosting operator id = 51 Hosting Expression = ws_sold_date_sk#39 IN dynamicpruning#4
+Subquery:4 Hosting operator id = 45 Hosting Expression = ws_sold_date_sk#40 IN dynamicpruning#4
 
-Subquery:5 Hosting operator id = 67 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#16
+Subquery:5 Hosting operator id = 59 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#17
 
-Subquery:6 Hosting operator id = 84 Hosting Expression = ws_sold_date_sk#63 IN dynamicpruning#28
+Subquery:6 Hosting operator id = 74 Hosting Expression = ws_sold_date_sk#65 IN dynamicpruning#29
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt
index 925a4a7f30..f4bf6a89d0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q31/simplified.txt
@@ -1,173 +1,159 @@
 WholeStageCodegen (25)
-  ColumnarToRow
+  Sort [ca_county]
     InputAdapter
-      CometSort [ca_county]
-        CometColumnarExchange [ca_county] #1
-          RowToColumnar
-            WholeStageCodegen (24)
-              Project [ca_county,d_year,web_sales,web_sales,store_sales,store_sales,web_sales,store_sales]
+      Exchange [ca_county] #1
+        WholeStageCodegen (24)
+          Project [ca_county,d_year,web_sales,web_sales,store_sales,store_sales,web_sales,store_sales]
+            BroadcastHashJoin [ca_county,ca_county,web_sales,web_sales,store_sales,store_sales]
+              Project [ca_county,d_year,store_sales,store_sales,store_sales,ca_county,web_sales,web_sales]
                 BroadcastHashJoin [ca_county,ca_county,web_sales,web_sales,store_sales,store_sales]
-                  Project [ca_county,d_year,store_sales,store_sales,store_sales,ca_county,web_sales,web_sales]
-                    BroadcastHashJoin [ca_county,ca_county,web_sales,web_sales,store_sales,store_sales]
+                  BroadcastHashJoin [ca_county,ca_county]
+                    Project [ca_county,d_year,store_sales,store_sales,store_sales]
                       BroadcastHashJoin [ca_county,ca_county]
-                        Project [ca_county,d_year,store_sales,store_sales,store_sales]
-                          BroadcastHashJoin [ca_county,ca_county]
-                            BroadcastHashJoin [ca_county,ca_county]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometHashAggregate [ca_county,d_qoy,d_year,sum]
-                                    CometColumnarExchange [ca_county,d_qoy,d_year] #2
-                                      RowToColumnar
-                                        WholeStageCodegen (3)
-                                          HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
-                                            Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
-                                              BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [ss_addr_sk]
-                                                          CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #1
-                                                              BroadcastExchange #3
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometFilter [d_qoy,d_year,d_date_sk]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                                    InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year,d_qoy] #3
-                                                InputAdapter
-                                                  BroadcastExchange #4
-                                                    WholeStageCodegen (2)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [ca_address_sk,ca_county]
-                                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (7)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [ca_county,d_qoy,d_year,sum]
-                                          CometColumnarExchange [ca_county,d_qoy,d_year] #6
-                                            RowToColumnar
-                                              WholeStageCodegen (6)
-                                                HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
-                                                  Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
-                                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                      Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
-                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                        BroadcastHashJoin [ca_county,ca_county]
+                          HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ss_ext_sales_price)),store_sales,sum]
+                            InputAdapter
+                              Exchange [ca_county,d_qoy,d_year] #2
+                                WholeStageCodegen (3)
+                                  HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
+                                    Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
+                                      BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                        Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
+                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_addr_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
-                                                              CometFilter [ss_addr_sk]
-                                                                CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                                  SubqueryBroadcast [d_date_sk] #2
-                                                                    BroadcastExchange #7
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [d_qoy,d_year,d_date_sk]
-                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                                          InputAdapter
-                                                            ReusedExchange [d_date_sk,d_year,d_qoy] #7
-                                                      InputAdapter
-                                                        ReusedExchange [ca_address_sk,ca_county] #4
-                            InputAdapter
-                              BroadcastExchange #8
-                                WholeStageCodegen (11)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometHashAggregate [ca_county,d_qoy,d_year,sum]
-                                        CometColumnarExchange [ca_county,d_qoy,d_year] #9
-                                          RowToColumnar
-                                            WholeStageCodegen (10)
-                                              HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
-                                                Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
-                                                  BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                    Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
-                                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [ss_addr_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #3
-                                                                  BroadcastExchange #10
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometFilter [d_qoy,d_year,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                                        InputAdapter
-                                                          ReusedExchange [d_date_sk,d_year,d_qoy] #10
-                                                    InputAdapter
-                                                      ReusedExchange [ca_address_sk,ca_county] #4
-                        InputAdapter
-                          BroadcastExchange #11
-                            WholeStageCodegen (15)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometHashAggregate [ca_county,d_qoy,d_year,sum]
-                                    CometColumnarExchange [ca_county,d_qoy,d_year] #12
-                                      RowToColumnar
-                                        WholeStageCodegen (14)
-                                          HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
-                                            Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
-                                              BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                                Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [ws_bill_addr_sk]
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
-                                                    InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                                                              CometFilter [d_qoy,d_year,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                                        InputAdapter
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
                                                 InputAdapter
-                                                  ReusedExchange [ca_address_sk,ca_county] #4
-                      InputAdapter
-                        BroadcastExchange #13
-                          WholeStageCodegen (19)
-                            ColumnarToRow
-                              InputAdapter
-                                CometHashAggregate [ca_county,d_qoy,d_year,sum]
-                                  CometColumnarExchange [ca_county,d_qoy,d_year] #14
-                                    RowToColumnar
-                                      WholeStageCodegen (18)
-                                        HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
-                                          Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
-                                            BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                              Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
-                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                  CometFilter [ca_address_sk,ca_county]
+                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
+                          InputAdapter
+                            BroadcastExchange #5
+                              WholeStageCodegen (7)
+                                HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ss_ext_sales_price)),store_sales,sum]
+                                  InputAdapter
+                                    Exchange [ca_county,d_qoy,d_year] #6
+                                      WholeStageCodegen (6)
+                                        HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
+                                          Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
+                                            BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                              Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
+                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [ws_bill_addr_sk]
-                                                        CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #2
+                                                      CometFilter [ss_addr_sk]
+                                                        CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                          SubqueryBroadcast [d_date_sk] #2
+                                                            BroadcastExchange #7
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [d_qoy,d_year,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                                                   InputAdapter
                                                     ReusedExchange [d_date_sk,d_year,d_qoy] #7
                                               InputAdapter
                                                 ReusedExchange [ca_address_sk,ca_county] #4
-                  InputAdapter
-                    BroadcastExchange #15
-                      WholeStageCodegen (23)
-                        ColumnarToRow
-                          InputAdapter
-                            CometHashAggregate [ca_county,d_qoy,d_year,sum]
-                              CometColumnarExchange [ca_county,d_qoy,d_year] #16
-                                RowToColumnar
-                                  WholeStageCodegen (22)
-                                    HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
-                                      Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
-                                        BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                          Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
-                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
+                        InputAdapter
+                          BroadcastExchange #8
+                            WholeStageCodegen (11)
+                              HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ss_ext_sales_price)),store_sales,sum]
+                                InputAdapter
+                                  Exchange [ca_county,d_qoy,d_year] #9
+                                    WholeStageCodegen (10)
+                                      HashAggregate [ca_county,d_qoy,d_year,ss_ext_sales_price] [sum,sum]
+                                        Project [ss_ext_sales_price,d_year,d_qoy,ca_county]
+                                          BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                            Project [ss_addr_sk,ss_ext_sales_price,d_year,d_qoy]
+                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ss_addr_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #3
+                                                          BroadcastExchange #10
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [d_qoy,d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                                                 InputAdapter
-                                                  CometFilter [ws_bill_addr_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #3
+                                                  ReusedExchange [d_date_sk,d_year,d_qoy] #10
+                                            InputAdapter
+                                              ReusedExchange [ca_address_sk,ca_county] #4
+                    InputAdapter
+                      BroadcastExchange #11
+                        WholeStageCodegen (15)
+                          HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ws_ext_sales_price)),web_sales,sum]
+                            InputAdapter
+                              Exchange [ca_county,d_qoy,d_year] #12
+                                WholeStageCodegen (14)
+                                  HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
+                                    Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
+                                      BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                        Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
+                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
                                               InputAdapter
-                                                ReusedExchange [d_date_sk,d_year,d_qoy] #10
+                                                CometFilter [ws_bill_addr_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                                        InputAdapter
+                                          ReusedExchange [ca_address_sk,ca_county] #4
+                  InputAdapter
+                    BroadcastExchange #13
+                      WholeStageCodegen (19)
+                        HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ws_ext_sales_price)),web_sales,sum]
+                          InputAdapter
+                            Exchange [ca_county,d_qoy,d_year] #14
+                              WholeStageCodegen (18)
+                                HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
+                                  Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
+                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                      Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_addr_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #2
                                           InputAdapter
-                                            ReusedExchange [ca_address_sk,ca_county] #4
+                                            ReusedExchange [d_date_sk,d_year,d_qoy] #7
+                                      InputAdapter
+                                        ReusedExchange [ca_address_sk,ca_county] #4
+              InputAdapter
+                BroadcastExchange #15
+                  WholeStageCodegen (23)
+                    HashAggregate [ca_county,d_qoy,d_year,sum] [sum(UnscaledValue(ws_ext_sales_price)),web_sales,sum]
+                      InputAdapter
+                        Exchange [ca_county,d_qoy,d_year] #16
+                          WholeStageCodegen (22)
+                            HashAggregate [ca_county,d_qoy,d_year,ws_ext_sales_price] [sum,sum]
+                              Project [ws_ext_sales_price,d_year,d_qoy,ca_county]
+                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                  Project [ws_bill_addr_sk,ws_ext_sales_price,d_year,d_qoy]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_addr_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #3
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year,d_qoy] #10
+                                  InputAdapter
+                                    ReusedExchange [ca_address_sk,ca_county] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt
index c9ff159239..e3c659e278 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/explain.txt
@@ -1,37 +1,33 @@
 == Physical Plan ==
-* ColumnarToRow (33)
-+- CometHashAggregate (32)
-   +- CometColumnarExchange (31)
-      +- RowToColumnar (30)
-         +- * HashAggregate (29)
-            +- * Project (28)
-               +- * BroadcastHashJoin Inner BuildRight (27)
-                  :- * Project (25)
-                  :  +- * BroadcastHashJoin Inner BuildRight (24)
-                  :     :- * Project (10)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                  :     :     :- * ColumnarToRow (3)
-                  :     :     :  +- CometFilter (2)
-                  :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                  :     :     +- BroadcastExchange (8)
-                  :     :        +- * ColumnarToRow (7)
-                  :     :           +- CometProject (6)
-                  :     :              +- CometFilter (5)
-                  :     :                 +- CometScan parquet spark_catalog.default.item (4)
-                  :     +- BroadcastExchange (23)
-                  :        +- * ColumnarToRow (22)
-                  :           +- CometFilter (21)
-                  :              +- CometHashAggregate (20)
-                  :                 +- CometColumnarExchange (19)
-                  :                    +- RowToColumnar (18)
-                  :                       +- * HashAggregate (17)
-                  :                          +- * Project (16)
-                  :                             +- * BroadcastHashJoin Inner BuildRight (15)
-                  :                                :- * ColumnarToRow (13)
-                  :                                :  +- CometFilter (12)
-                  :                                :     +- CometScan parquet spark_catalog.default.catalog_sales (11)
-                  :                                +- ReusedExchange (14)
-                  +- ReusedExchange (26)
+* HashAggregate (29)
++- Exchange (28)
+   +- * HashAggregate (27)
+      +- * Project (26)
+         +- * BroadcastHashJoin Inner BuildRight (25)
+            :- * Project (23)
+            :  +- * BroadcastHashJoin Inner BuildRight (22)
+            :     :- * Project (10)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+            :     :     :- * ColumnarToRow (3)
+            :     :     :  +- CometFilter (2)
+            :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+            :     :     +- BroadcastExchange (8)
+            :     :        +- * ColumnarToRow (7)
+            :     :           +- CometProject (6)
+            :     :              +- CometFilter (5)
+            :     :                 +- CometScan parquet spark_catalog.default.item (4)
+            :     +- BroadcastExchange (21)
+            :        +- * Filter (20)
+            :           +- * HashAggregate (19)
+            :              +- Exchange (18)
+            :                 +- * HashAggregate (17)
+            :                    +- * Project (16)
+            :                       +- * BroadcastHashJoin Inner BuildRight (15)
+            :                          :- * ColumnarToRow (13)
+            :                          :  +- CometFilter (12)
+            :                          :     +- CometScan parquet spark_catalog.default.catalog_sales (11)
+            :                          +- ReusedExchange (14)
+            +- ReusedExchange (24)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -96,7 +92,7 @@ Condition : isnotnull(cs_item_sk#7)
 (13) ColumnarToRow [codegen id : 3]
 Input [3]: [cs_item_sk#7, cs_ext_discount_amt#8, cs_sold_date_sk#9]
 
-(14) ReusedExchange [Reuses operator id: 38]
+(14) ReusedExchange [Reuses operator id: 34]
 Output [1]: [d_date_sk#11]
 
 (15) BroadcastHashJoin [codegen id : 3]
@@ -116,104 +112,96 @@ Functions [1]: [partial_avg(UnscaledValue(cs_ext_discount_amt#8))]
 Aggregate Attributes [2]: [sum#12, count#13]
 Results [3]: [cs_item_sk#7, sum#14, count#15]
 
-(18) RowToColumnar
+(18) Exchange
 Input [3]: [cs_item_sk#7, sum#14, count#15]
+Arguments: hashpartitioning(cs_item_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(19) CometColumnarExchange
-Input [3]: [cs_item_sk#7, sum#14, count#15]
-Arguments: hashpartitioning(cs_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(20) CometHashAggregate
+(19) HashAggregate [codegen id : 4]
 Input [3]: [cs_item_sk#7, sum#14, count#15]
 Keys [1]: [cs_item_sk#7]
 Functions [1]: [avg(UnscaledValue(cs_ext_discount_amt#8))]
+Aggregate Attributes [1]: [avg(UnscaledValue(cs_ext_discount_amt#8))#16]
+Results [2]: [(1.3 * cast((avg(UnscaledValue(cs_ext_discount_amt#8))#16 / 100.0) as decimal(11,6))) AS (1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
 
-(21) CometFilter
-Input [2]: [(1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
-Condition : isnotnull((1.3 * avg(cs_ext_discount_amt))#16)
-
-(22) ColumnarToRow [codegen id : 4]
-Input [2]: [(1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
+(20) Filter [codegen id : 4]
+Input [2]: [(1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
+Condition : isnotnull((1.3 * avg(cs_ext_discount_amt))#17)
 
-(23) BroadcastExchange
-Input [2]: [(1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
+(21) BroadcastExchange
+Input [2]: [(1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
+(22) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [i_item_sk#5]
 Right keys [1]: [cs_item_sk#7]
 Join type: Inner
-Join condition: (cast(cs_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(cs_ext_discount_amt))#16)
+Join condition: (cast(cs_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(cs_ext_discount_amt))#17)
 
-(25) Project [codegen id : 6]
+(23) Project [codegen id : 6]
 Output [2]: [cs_ext_discount_amt#2, cs_sold_date_sk#3]
-Input [5]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, i_item_sk#5, (1.3 * avg(cs_ext_discount_amt))#16, cs_item_sk#7]
+Input [5]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, i_item_sk#5, (1.3 * avg(cs_ext_discount_amt))#17, cs_item_sk#7]
 
-(26) ReusedExchange [Reuses operator id: 38]
-Output [1]: [d_date_sk#17]
+(24) ReusedExchange [Reuses operator id: 34]
+Output [1]: [d_date_sk#18]
 
-(27) BroadcastHashJoin [codegen id : 6]
+(25) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_sold_date_sk#3]
-Right keys [1]: [d_date_sk#17]
+Right keys [1]: [d_date_sk#18]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
+(26) Project [codegen id : 6]
 Output [1]: [cs_ext_discount_amt#2]
-Input [3]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, d_date_sk#17]
+Input [3]: [cs_ext_discount_amt#2, cs_sold_date_sk#3, d_date_sk#18]
 
-(29) HashAggregate [codegen id : 6]
+(27) HashAggregate [codegen id : 6]
 Input [1]: [cs_ext_discount_amt#2]
 Keys: []
 Functions [1]: [partial_sum(UnscaledValue(cs_ext_discount_amt#2))]
-Aggregate Attributes [1]: [sum#18]
-Results [1]: [sum#19]
+Aggregate Attributes [1]: [sum#19]
+Results [1]: [sum#20]
 
-(30) RowToColumnar
-Input [1]: [sum#19]
+(28) Exchange
+Input [1]: [sum#20]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(31) CometColumnarExchange
-Input [1]: [sum#19]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(32) CometHashAggregate
-Input [1]: [sum#19]
+(29) HashAggregate [codegen id : 7]
+Input [1]: [sum#20]
 Keys: []
 Functions [1]: [sum(UnscaledValue(cs_ext_discount_amt#2))]
-
-(33) ColumnarToRow [codegen id : 7]
-Input [1]: [excess discount amount#20]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_discount_amt#2))#21]
+Results [1]: [MakeDecimal(sum(UnscaledValue(cs_ext_discount_amt#2))#21,17,2) AS excess discount amount#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (38)
-+- * ColumnarToRow (37)
-   +- CometProject (36)
-      +- CometFilter (35)
-         +- CometScan parquet spark_catalog.default.date_dim (34)
+BroadcastExchange (34)
++- * ColumnarToRow (33)
+   +- CometProject (32)
+      +- CometFilter (31)
+         +- CometScan parquet spark_catalog.default.date_dim (30)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#17, d_date#21]
+Output [2]: [d_date_sk#18, d_date#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), LessThanOrEqual(d_date,2000-04-26), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(35) CometFilter
-Input [2]: [d_date_sk#17, d_date#21]
-Condition : (((isnotnull(d_date#21) AND (d_date#21 >= 2000-01-27)) AND (d_date#21 <= 2000-04-26)) AND isnotnull(d_date_sk#17))
+(31) CometFilter
+Input [2]: [d_date_sk#18, d_date#23]
+Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2000-01-27)) AND (d_date#23 <= 2000-04-26)) AND isnotnull(d_date_sk#18))
 
-(36) CometProject
-Input [2]: [d_date_sk#17, d_date#21]
-Arguments: [d_date_sk#17], [d_date_sk#17]
+(32) CometProject
+Input [2]: [d_date_sk#18, d_date#23]
+Arguments: [d_date_sk#18], [d_date_sk#18]
 
-(37) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#17]
+(33) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#18]
 
-(38) BroadcastExchange
-Input [1]: [d_date_sk#17]
+(34) BroadcastExchange
+Input [1]: [d_date_sk#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
 Subquery:2 Hosting operator id = 11 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt
index 035779c3f6..146a33fdd2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q32/simplified.txt
@@ -1,56 +1,52 @@
 WholeStageCodegen (7)
-  ColumnarToRow
+  HashAggregate [sum] [sum(UnscaledValue(cs_ext_discount_amt)),excess discount amount,sum]
     InputAdapter
-      CometHashAggregate [sum]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (6)
-              HashAggregate [cs_ext_discount_amt] [sum,sum]
-                Project [cs_ext_discount_amt]
-                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                    Project [cs_ext_discount_amt,cs_sold_date_sk]
-                      BroadcastHashJoin [i_item_sk,cs_item_sk,cs_ext_discount_amt,(1.3 * avg(cs_ext_discount_amt))]
-                        Project [cs_ext_discount_amt,cs_sold_date_sk,i_item_sk]
-                          BroadcastHashJoin [cs_item_sk,i_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [cs_item_sk,cs_ext_discount_amt]
-                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_date,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                            InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (1)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [i_item_sk]
-                                        CometFilter [i_manufact_id,i_item_sk]
-                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
+      Exchange #1
+        WholeStageCodegen (6)
+          HashAggregate [cs_ext_discount_amt] [sum,sum]
+            Project [cs_ext_discount_amt]
+              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                Project [cs_ext_discount_amt,cs_sold_date_sk]
+                  BroadcastHashJoin [i_item_sk,cs_item_sk,cs_ext_discount_amt,(1.3 * avg(cs_ext_discount_amt))]
+                    Project [cs_ext_discount_amt,cs_sold_date_sk,i_item_sk]
+                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cs_item_sk,cs_ext_discount_amt]
+                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
+                                SubqueryBroadcast [d_date_sk] #1
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [d_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (4)
+                          BroadcastExchange #3
+                            WholeStageCodegen (1)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [(1.3 * avg(cs_ext_discount_amt))]
-                                    CometHashAggregate [cs_item_sk,sum,count]
-                                      CometColumnarExchange [cs_item_sk] #5
-                                        RowToColumnar
-                                          WholeStageCodegen (3)
-                                            HashAggregate [cs_item_sk,cs_ext_discount_amt] [sum,count,sum,count]
-                                              Project [cs_item_sk,cs_ext_discount_amt]
-                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [cs_item_sk]
-                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
-                                                  InputAdapter
-                                                    ReusedExchange [d_date_sk] #2
+                                  CometProject [i_item_sk]
+                                    CometFilter [i_manufact_id,i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
                     InputAdapter
-                      ReusedExchange [d_date_sk] #2
+                      BroadcastExchange #4
+                        WholeStageCodegen (4)
+                          Filter [(1.3 * avg(cs_ext_discount_amt))]
+                            HashAggregate [cs_item_sk,sum,count] [avg(UnscaledValue(cs_ext_discount_amt)),(1.3 * avg(cs_ext_discount_amt)),sum,count]
+                              InputAdapter
+                                Exchange [cs_item_sk] #5
+                                  WholeStageCodegen (3)
+                                    HashAggregate [cs_item_sk,cs_ext_discount_amt] [sum,count,sum,count]
+                                      Project [cs_item_sk,cs_ext_discount_amt]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_discount_amt,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #2
+                InputAdapter
+                  ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
index 3249f9fa01..d7dda8078a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/explain.txt
@@ -1,71 +1,67 @@
 == Physical Plan ==
-* ColumnarToRow (67)
-+- CometTakeOrderedAndProject (66)
-   +- CometHashAggregate (65)
-      +- CometColumnarExchange (64)
-         +- CometHashAggregate (63)
-            +- CometUnion (62)
-               :- CometHashAggregate (29)
-               :  +- CometColumnarExchange (28)
-               :     +- RowToColumnar (27)
-               :        +- * HashAggregate (26)
-               :           +- * Project (25)
-               :              +- * BroadcastHashJoin Inner BuildRight (24)
-               :                 :- * Project (13)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :                 :     :- * Project (6)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :                 :     :     :- * ColumnarToRow (3)
-               :                 :     :     :  +- CometFilter (2)
-               :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                 :     :     +- ReusedExchange (4)
-               :                 :     +- BroadcastExchange (11)
-               :                 :        +- * ColumnarToRow (10)
-               :                 :           +- CometProject (9)
-               :                 :              +- CometFilter (8)
-               :                 :                 +- CometScan parquet spark_catalog.default.customer_address (7)
-               :                 +- BroadcastExchange (23)
-               :                    +- * BroadcastHashJoin LeftSemi BuildRight (22)
-               :                       :- * ColumnarToRow (16)
-               :                       :  +- CometFilter (15)
-               :                       :     +- CometScan parquet spark_catalog.default.item (14)
-               :                       +- BroadcastExchange (21)
-               :                          +- * ColumnarToRow (20)
-               :                             +- CometProject (19)
-               :                                +- CometFilter (18)
-               :                                   +- CometScan parquet spark_catalog.default.item (17)
-               :- CometHashAggregate (45)
-               :  +- CometColumnarExchange (44)
-               :     +- RowToColumnar (43)
-               :        +- * HashAggregate (42)
-               :           +- * Project (41)
-               :              +- * BroadcastHashJoin Inner BuildRight (40)
-               :                 :- * Project (38)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (37)
-               :                 :     :- * Project (35)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-               :                 :     :     :- * ColumnarToRow (32)
-               :                 :     :     :  +- CometFilter (31)
-               :                 :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
-               :                 :     :     +- ReusedExchange (33)
-               :                 :     +- ReusedExchange (36)
-               :                 +- ReusedExchange (39)
-               +- CometHashAggregate (61)
-                  +- CometColumnarExchange (60)
-                     +- RowToColumnar (59)
-                        +- * HashAggregate (58)
-                           +- * Project (57)
-                              +- * BroadcastHashJoin Inner BuildRight (56)
-                                 :- * Project (54)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (53)
-                                 :     :- * Project (51)
-                                 :     :  +- * BroadcastHashJoin Inner BuildRight (50)
-                                 :     :     :- * ColumnarToRow (48)
-                                 :     :     :  +- CometFilter (47)
-                                 :     :     :     +- CometScan parquet spark_catalog.default.web_sales (46)
-                                 :     :     +- ReusedExchange (49)
-                                 :     +- ReusedExchange (52)
-                                 +- ReusedExchange (55)
+TakeOrderedAndProject (63)
++- * HashAggregate (62)
+   +- Exchange (61)
+      +- * HashAggregate (60)
+         +- Union (59)
+            :- * HashAggregate (28)
+            :  +- Exchange (27)
+            :     +- * HashAggregate (26)
+            :        +- * Project (25)
+            :           +- * BroadcastHashJoin Inner BuildRight (24)
+            :              :- * Project (13)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (12)
+            :              :     :- * Project (6)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+            :              :     :     :- * ColumnarToRow (3)
+            :              :     :     :  +- CometFilter (2)
+            :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :              :     :     +- ReusedExchange (4)
+            :              :     +- BroadcastExchange (11)
+            :              :        +- * ColumnarToRow (10)
+            :              :           +- CometProject (9)
+            :              :              +- CometFilter (8)
+            :              :                 +- CometScan parquet spark_catalog.default.customer_address (7)
+            :              +- BroadcastExchange (23)
+            :                 +- * BroadcastHashJoin LeftSemi BuildRight (22)
+            :                    :- * ColumnarToRow (16)
+            :                    :  +- CometFilter (15)
+            :                    :     +- CometScan parquet spark_catalog.default.item (14)
+            :                    +- BroadcastExchange (21)
+            :                       +- * ColumnarToRow (20)
+            :                          +- CometProject (19)
+            :                             +- CometFilter (18)
+            :                                +- CometScan parquet spark_catalog.default.item (17)
+            :- * HashAggregate (43)
+            :  +- Exchange (42)
+            :     +- * HashAggregate (41)
+            :        +- * Project (40)
+            :           +- * BroadcastHashJoin Inner BuildRight (39)
+            :              :- * Project (37)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (36)
+            :              :     :- * Project (34)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (33)
+            :              :     :     :- * ColumnarToRow (31)
+            :              :     :     :  +- CometFilter (30)
+            :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (29)
+            :              :     :     +- ReusedExchange (32)
+            :              :     +- ReusedExchange (35)
+            :              +- ReusedExchange (38)
+            +- * HashAggregate (58)
+               +- Exchange (57)
+                  +- * HashAggregate (56)
+                     +- * Project (55)
+                        +- * BroadcastHashJoin Inner BuildRight (54)
+                           :- * Project (52)
+                           :  +- * BroadcastHashJoin Inner BuildRight (51)
+                           :     :- * Project (49)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (48)
+                           :     :     :- * ColumnarToRow (46)
+                           :     :     :  +- CometFilter (45)
+                           :     :     :     +- CometScan parquet spark_catalog.default.web_sales (44)
+                           :     :     +- ReusedExchange (47)
+                           :     +- ReusedExchange (50)
+                           +- ReusedExchange (53)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -83,7 +79,7 @@ Condition : (isnotnull(ss_addr_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_addr_sk#2, ss_ext_sales_price#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 72]
+(4) ReusedExchange [Reuses operator id: 68]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -191,224 +187,219 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#3))]
 Aggregate Attributes [1]: [sum#13]
 Results [2]: [i_manufact_id#10, sum#14]
 
-(27) RowToColumnar
+(27) Exchange
 Input [2]: [i_manufact_id#10, sum#14]
+Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [2]: [i_manufact_id#10, sum#14]
-Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 6]
 Input [2]: [i_manufact_id#10, sum#14]
 Keys [1]: [i_manufact_id#10]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#3))#15]
+Results [2]: [i_manufact_id#10, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#15,17,2) AS total_sales#16]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+Output [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#18), dynamicpruningexpression(cs_sold_date_sk#18 IN dynamicpruning#19)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#20), dynamicpruningexpression(cs_sold_date_sk#20 IN dynamicpruning#21)]
 PushedFilters: [IsNotNull(cs_bill_addr_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_addr_sk:int,cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(31) CometFilter
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
-Condition : (isnotnull(cs_bill_addr_sk#15) AND isnotnull(cs_item_sk#16))
+(30) CometFilter
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+Condition : (isnotnull(cs_bill_addr_sk#17) AND isnotnull(cs_item_sk#18))
 
-(32) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+(31) ColumnarToRow [codegen id : 11]
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
 
-(33) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#20]
+(32) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#22]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#18]
-Right keys [1]: [d_date_sk#20]
+(33) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_sold_date_sk#20]
+Right keys [1]: [d_date_sk#22]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [3]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17]
-Input [5]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18, d_date_sk#20]
+(34) Project [codegen id : 11]
+Output [3]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19]
+Input [5]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20, d_date_sk#22]
 
-(36) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#21]
+(35) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#23]
 
-(37) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_bill_addr_sk#15]
-Right keys [1]: [ca_address_sk#21]
+(36) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_bill_addr_sk#17]
+Right keys [1]: [ca_address_sk#23]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
-Output [2]: [cs_item_sk#16, cs_ext_sales_price#17]
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, ca_address_sk#21]
+(37) Project [codegen id : 11]
+Output [2]: [cs_item_sk#18, cs_ext_sales_price#19]
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, ca_address_sk#23]
 
-(39) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#22, i_manufact_id#23]
+(38) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#24, i_manufact_id#25]
 
-(40) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_item_sk#16]
-Right keys [1]: [i_item_sk#22]
+(39) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_item_sk#18]
+Right keys [1]: [i_item_sk#24]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 10]
-Output [2]: [cs_ext_sales_price#17, i_manufact_id#23]
-Input [4]: [cs_item_sk#16, cs_ext_sales_price#17, i_item_sk#22, i_manufact_id#23]
-
-(42) HashAggregate [codegen id : 10]
-Input [2]: [cs_ext_sales_price#17, i_manufact_id#23]
-Keys [1]: [i_manufact_id#23]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#17))]
-Aggregate Attributes [1]: [sum#24]
-Results [2]: [i_manufact_id#23, sum#25]
+(40) Project [codegen id : 11]
+Output [2]: [cs_ext_sales_price#19, i_manufact_id#25]
+Input [4]: [cs_item_sk#18, cs_ext_sales_price#19, i_item_sk#24, i_manufact_id#25]
 
-(43) RowToColumnar
-Input [2]: [i_manufact_id#23, sum#25]
+(41) HashAggregate [codegen id : 11]
+Input [2]: [cs_ext_sales_price#19, i_manufact_id#25]
+Keys [1]: [i_manufact_id#25]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#19))]
+Aggregate Attributes [1]: [sum#26]
+Results [2]: [i_manufact_id#25, sum#27]
 
-(44) CometColumnarExchange
-Input [2]: [i_manufact_id#23, sum#25]
-Arguments: hashpartitioning(i_manufact_id#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(42) Exchange
+Input [2]: [i_manufact_id#25, sum#27]
+Arguments: hashpartitioning(i_manufact_id#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(45) CometHashAggregate
-Input [2]: [i_manufact_id#23, sum#25]
-Keys [1]: [i_manufact_id#23]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#17))]
+(43) HashAggregate [codegen id : 12]
+Input [2]: [i_manufact_id#25, sum#27]
+Keys [1]: [i_manufact_id#25]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#19))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#19))#28]
+Results [2]: [i_manufact_id#25, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#19))#28,17,2) AS total_sales#29]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+Output [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#29), dynamicpruningexpression(ws_sold_date_sk#29 IN dynamicpruning#30)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk), IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(47) CometFilter
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
-Condition : (isnotnull(ws_bill_addr_sk#27) AND isnotnull(ws_item_sk#26))
+(45) CometFilter
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+Condition : (isnotnull(ws_bill_addr_sk#31) AND isnotnull(ws_item_sk#30))
 
-(48) ColumnarToRow [codegen id : 15]
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+(46) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
 
-(49) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#31]
+(47) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#35]
 
-(50) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_sold_date_sk#29]
-Right keys [1]: [d_date_sk#31]
+(48) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#33]
+Right keys [1]: [d_date_sk#35]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 15]
-Output [3]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28]
-Input [5]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29, d_date_sk#31]
+(49) Project [codegen id : 17]
+Output [3]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32]
+Input [5]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33, d_date_sk#35]
 
-(52) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#32]
+(50) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#36]
 
-(53) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_bill_addr_sk#27]
-Right keys [1]: [ca_address_sk#32]
+(51) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_bill_addr_sk#31]
+Right keys [1]: [ca_address_sk#36]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 15]
-Output [2]: [ws_item_sk#26, ws_ext_sales_price#28]
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ca_address_sk#32]
+(52) Project [codegen id : 17]
+Output [2]: [ws_item_sk#30, ws_ext_sales_price#32]
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ca_address_sk#36]
 
-(55) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#33, i_manufact_id#34]
+(53) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#37, i_manufact_id#38]
 
-(56) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_item_sk#26]
-Right keys [1]: [i_item_sk#33]
+(54) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_item_sk#30]
+Right keys [1]: [i_item_sk#37]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 15]
-Output [2]: [ws_ext_sales_price#28, i_manufact_id#34]
-Input [4]: [ws_item_sk#26, ws_ext_sales_price#28, i_item_sk#33, i_manufact_id#34]
+(55) Project [codegen id : 17]
+Output [2]: [ws_ext_sales_price#32, i_manufact_id#38]
+Input [4]: [ws_item_sk#30, ws_ext_sales_price#32, i_item_sk#37, i_manufact_id#38]
 
-(58) HashAggregate [codegen id : 15]
-Input [2]: [ws_ext_sales_price#28, i_manufact_id#34]
-Keys [1]: [i_manufact_id#34]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#28))]
-Aggregate Attributes [1]: [sum#35]
-Results [2]: [i_manufact_id#34, sum#36]
+(56) HashAggregate [codegen id : 17]
+Input [2]: [ws_ext_sales_price#32, i_manufact_id#38]
+Keys [1]: [i_manufact_id#38]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#32))]
+Aggregate Attributes [1]: [sum#39]
+Results [2]: [i_manufact_id#38, sum#40]
 
-(59) RowToColumnar
-Input [2]: [i_manufact_id#34, sum#36]
+(57) Exchange
+Input [2]: [i_manufact_id#38, sum#40]
+Arguments: hashpartitioning(i_manufact_id#38, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(60) CometColumnarExchange
-Input [2]: [i_manufact_id#34, sum#36]
-Arguments: hashpartitioning(i_manufact_id#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(58) HashAggregate [codegen id : 18]
+Input [2]: [i_manufact_id#38, sum#40]
+Keys [1]: [i_manufact_id#38]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#32))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#32))#41]
+Results [2]: [i_manufact_id#38, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#32))#41,17,2) AS total_sales#42]
 
-(61) CometHashAggregate
-Input [2]: [i_manufact_id#34, sum#36]
-Keys [1]: [i_manufact_id#34]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#28))]
+(59) Union
 
-(62) CometUnion
-Child 0 Input [2]: [i_manufact_id#10, total_sales#37]
-Child 1 Input [2]: [i_manufact_id#23, total_sales#38]
-Child 2 Input [2]: [i_manufact_id#34, total_sales#39]
-
-(63) CometHashAggregate
-Input [2]: [i_manufact_id#10, total_sales#37]
+(60) HashAggregate [codegen id : 19]
+Input [2]: [i_manufact_id#10, total_sales#16]
 Keys [1]: [i_manufact_id#10]
-Functions [1]: [partial_sum(total_sales#37)]
+Functions [1]: [partial_sum(total_sales#16)]
+Aggregate Attributes [2]: [sum#43, isEmpty#44]
+Results [3]: [i_manufact_id#10, sum#45, isEmpty#46]
 
-(64) CometColumnarExchange
-Input [3]: [i_manufact_id#10, sum#40, isEmpty#41]
-Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(61) Exchange
+Input [3]: [i_manufact_id#10, sum#45, isEmpty#46]
+Arguments: hashpartitioning(i_manufact_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(65) CometHashAggregate
-Input [3]: [i_manufact_id#10, sum#40, isEmpty#41]
+(62) HashAggregate [codegen id : 20]
+Input [3]: [i_manufact_id#10, sum#45, isEmpty#46]
 Keys [1]: [i_manufact_id#10]
-Functions [1]: [sum(total_sales#37)]
-
-(66) CometTakeOrderedAndProject
-Input [2]: [i_manufact_id#10, total_sales#42]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_sales#42 ASC NULLS FIRST], output=[i_manufact_id#10,total_sales#42]), 100, [total_sales#42 ASC NULLS FIRST], [i_manufact_id#10, total_sales#42]
+Functions [1]: [sum(total_sales#16)]
+Aggregate Attributes [1]: [sum(total_sales#16)#47]
+Results [2]: [i_manufact_id#10, sum(total_sales#16)#47 AS total_sales#48]
 
-(67) ColumnarToRow [codegen id : 16]
-Input [2]: [i_manufact_id#10, total_sales#42]
+(63) TakeOrderedAndProject
+Input [2]: [i_manufact_id#10, total_sales#48]
+Arguments: 100, [total_sales#48 ASC NULLS FIRST], [i_manufact_id#10, total_sales#48]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (72)
-+- * ColumnarToRow (71)
-   +- CometProject (70)
-      +- CometFilter (69)
-         +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (68)
++- * ColumnarToRow (67)
+   +- CometProject (66)
+      +- CometFilter (65)
+         +- CometScan parquet spark_catalog.default.date_dim (64)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#6, d_year#43, d_moy#44]
+Output [3]: [d_date_sk#6, d_year#49, d_moy#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,5), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(69) CometFilter
-Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
-Condition : ((((isnotnull(d_year#43) AND isnotnull(d_moy#44)) AND (d_year#43 = 1998)) AND (d_moy#44 = 5)) AND isnotnull(d_date_sk#6))
+(65) CometFilter
+Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
+Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 1998)) AND (d_moy#50 = 5)) AND isnotnull(d_date_sk#6))
 
-(70) CometProject
-Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
+(66) CometProject
+Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(71) ColumnarToRow [codegen id : 1]
+(67) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(72) BroadcastExchange
+(68) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 29 Hosting Expression = cs_sold_date_sk#20 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#29 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 44 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt
index 9dd28b41bf..4ab82379ff 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q33/simplified.txt
@@ -1,101 +1,105 @@
-WholeStageCodegen (16)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [total_sales,i_manufact_id]
-        CometHashAggregate [i_manufact_id,sum,isEmpty]
-          CometColumnarExchange [i_manufact_id] #1
-            CometHashAggregate [i_manufact_id,total_sales]
-              CometUnion
-                CometHashAggregate [i_manufact_id,sum]
-                  CometColumnarExchange [i_manufact_id] #2
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [i_manufact_id,ss_ext_sales_price] [sum,sum]
-                          Project [ss_ext_sales_price,i_manufact_id]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              Project [ss_item_sk,ss_ext_sales_price]
-                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                  Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_addr_sk,ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_year,d_moy,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                  InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+TakeOrderedAndProject [total_sales,i_manufact_id]
+  WholeStageCodegen (20)
+    HashAggregate [i_manufact_id,sum,isEmpty] [sum(total_sales),total_sales,sum,isEmpty]
+      InputAdapter
+        Exchange [i_manufact_id] #1
+          WholeStageCodegen (19)
+            HashAggregate [i_manufact_id,total_sales] [sum,isEmpty,sum,isEmpty]
+              InputAdapter
+                Union
+                  WholeStageCodegen (6)
+                    HashAggregate [i_manufact_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_manufact_id] #2
+                          WholeStageCodegen (5)
+                            HashAggregate [i_manufact_id,ss_ext_sales_price] [sum,sum]
+                              Project [ss_ext_sales_price,i_manufact_id]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                      Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_addr_sk,ss_item_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            CometProject [ca_address_sk]
-                                              CometFilter [ca_gmt_offset,ca_address_sk]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (4)
-                                    BroadcastHashJoin [i_manufact_id,i_manufact_id]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        BroadcastExchange #6
-                                          WholeStageCodegen (3)
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (2)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [i_manufact_id]
-                                                  CometFilter [i_category]
-                                                    CometScan parquet spark_catalog.default.item [i_category,i_manufact_id]
-                CometHashAggregate [i_manufact_id,sum]
-                  CometColumnarExchange [i_manufact_id] #7
-                    RowToColumnar
-                      WholeStageCodegen (10)
-                        HashAggregate [i_manufact_id,cs_ext_sales_price] [sum,sum]
-                          Project [cs_ext_sales_price,i_manufact_id]
-                            BroadcastHashJoin [cs_item_sk,i_item_sk]
-                              Project [cs_item_sk,cs_ext_sales_price]
-                                BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
-                                  Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [cs_bill_addr_sk,cs_item_sk]
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                                CometProject [ca_address_sk]
+                                                  CometFilter [ca_gmt_offset,ca_address_sk]
+                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                                  InputAdapter
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (4)
+                                        BroadcastHashJoin [i_manufact_id,i_manufact_id]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [i_item_sk]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (3)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [i_manufact_id]
+                                                      CometFilter [i_category]
+                                                        CometScan parquet spark_catalog.default.item [i_category,i_manufact_id]
+                  WholeStageCodegen (12)
+                    HashAggregate [i_manufact_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_manufact_id] #7
+                          WholeStageCodegen (11)
+                            HashAggregate [i_manufact_id,cs_ext_sales_price] [sum,sum]
+                              Project [cs_ext_sales_price,i_manufact_id]
+                                BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                  Project [cs_item_sk,cs_ext_sales_price]
+                                    BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
+                                      Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_bill_addr_sk,cs_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                        ReusedExchange [ca_address_sk] #4
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #4
-                              InputAdapter
-                                ReusedExchange [i_item_sk,i_manufact_id] #5
-                CometHashAggregate [i_manufact_id,sum]
-                  CometColumnarExchange [i_manufact_id] #8
-                    RowToColumnar
-                      WholeStageCodegen (15)
-                        HashAggregate [i_manufact_id,ws_ext_sales_price] [sum,sum]
-                          Project [ws_ext_sales_price,i_manufact_id]
-                            BroadcastHashJoin [ws_item_sk,i_item_sk]
-                              Project [ws_item_sk,ws_ext_sales_price]
-                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                  Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_addr_sk,ws_item_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                    ReusedExchange [i_item_sk,i_manufact_id] #5
+                  WholeStageCodegen (18)
+                    HashAggregate [i_manufact_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_manufact_id] #8
+                          WholeStageCodegen (17)
+                            HashAggregate [i_manufact_id,ws_ext_sales_price] [sum,sum]
+                              Project [ws_ext_sales_price,i_manufact_id]
+                                BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                  Project [ws_item_sk,ws_ext_sales_price]
+                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                      Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_addr_sk,ws_item_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                        ReusedExchange [ca_address_sk] #4
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #4
-                              InputAdapter
-                                ReusedExchange [i_item_sk,i_manufact_id] #5
+                                    ReusedExchange [i_item_sk,i_manufact_id] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt
index d2ff5ebe98..64f2b3c312 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/explain.txt
@@ -1,40 +1,36 @@
 == Physical Plan ==
-* ColumnarToRow (36)
-+- CometSort (35)
-   +- CometColumnarExchange (34)
-      +- RowToColumnar (33)
-         +- * Project (32)
-            +- * BroadcastHashJoin Inner BuildRight (31)
-               :- * ColumnarToRow (26)
-               :  +- CometFilter (25)
-               :     +- CometHashAggregate (24)
-               :        +- CometColumnarExchange (23)
-               :           +- RowToColumnar (22)
-               :              +- * HashAggregate (21)
-               :                 +- * Project (20)
-               :                    +- * BroadcastHashJoin Inner BuildRight (19)
-               :                       :- * Project (13)
-               :                       :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :                       :     :- * Project (6)
-               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :                       :     :     :- * ColumnarToRow (3)
-               :                       :     :     :  +- CometFilter (2)
-               :                       :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                       :     :     +- ReusedExchange (4)
-               :                       :     +- BroadcastExchange (11)
-               :                       :        +- * ColumnarToRow (10)
-               :                       :           +- CometProject (9)
-               :                       :              +- CometFilter (8)
-               :                       :                 +- CometScan parquet spark_catalog.default.store (7)
-               :                       +- BroadcastExchange (18)
-               :                          +- * ColumnarToRow (17)
-               :                             +- CometProject (16)
-               :                                +- CometFilter (15)
-               :                                   +- CometScan parquet spark_catalog.default.household_demographics (14)
-               +- BroadcastExchange (30)
-                  +- * ColumnarToRow (29)
-                     +- CometFilter (28)
-                        +- CometScan parquet spark_catalog.default.customer (27)
+* Sort (32)
++- Exchange (31)
+   +- * Project (30)
+      +- * BroadcastHashJoin Inner BuildRight (29)
+         :- * Filter (24)
+         :  +- * HashAggregate (23)
+         :     +- Exchange (22)
+         :        +- * HashAggregate (21)
+         :           +- * Project (20)
+         :              +- * BroadcastHashJoin Inner BuildRight (19)
+         :                 :- * Project (13)
+         :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
+         :                 :     :- * Project (6)
+         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+         :                 :     :     :- * ColumnarToRow (3)
+         :                 :     :     :  +- CometFilter (2)
+         :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+         :                 :     :     +- ReusedExchange (4)
+         :                 :     +- BroadcastExchange (11)
+         :                 :        +- * ColumnarToRow (10)
+         :                 :           +- CometProject (9)
+         :                 :              +- CometFilter (8)
+         :                 :                 +- CometScan parquet spark_catalog.default.store (7)
+         :                 +- BroadcastExchange (18)
+         :                    +- * ColumnarToRow (17)
+         :                       +- CometProject (16)
+         :                          +- CometFilter (15)
+         :                             +- CometScan parquet spark_catalog.default.household_demographics (14)
+         +- BroadcastExchange (28)
+            +- * ColumnarToRow (27)
+               +- CometFilter (26)
+                  +- CometScan parquet spark_catalog.default.customer (25)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -52,7 +48,7 @@ Condition : ((isnotnull(ss_store_sk#3) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 41]
+(4) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -136,96 +132,86 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#14]
 Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 
-(22) RowToColumnar
+(22) Exchange
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) CometColumnarExchange
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(24) CometHashAggregate
+(23) HashAggregate [codegen id : 6]
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 Keys [2]: [ss_ticket_number#4, ss_customer_sk#1]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#16]
+Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count(1)#16 AS cnt#17]
 
-(25) CometFilter
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
-Condition : ((cnt#16 >= 15) AND (cnt#16 <= 20))
-
-(26) ColumnarToRow [codegen id : 6]
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
+(24) Filter [codegen id : 6]
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17]
+Condition : ((cnt#17 >= 15) AND (cnt#17 <= 20))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+Output [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string>
 
-(28) CometFilter
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
-Condition : isnotnull(c_customer_sk#17)
+(26) CometFilter
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+Condition : isnotnull(c_customer_sk#18)
 
-(29) ColumnarToRow [codegen id : 5]
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+(27) ColumnarToRow [codegen id : 5]
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 
-(30) BroadcastExchange
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+(28) BroadcastExchange
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(31) BroadcastHashJoin [codegen id : 6]
+(29) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#17]
+Right keys [1]: [c_customer_sk#18]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 6]
-Output [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16, c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
-
-(33) RowToColumnar
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-
-(34) CometColumnarExchange
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Arguments: rangepartitioning(c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(30) Project [codegen id : 6]
+Output [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17, c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 
-(35) CometSort
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Arguments: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16], [c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST]
+(31) Exchange
+Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Arguments: rangepartitioning(c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(36) ColumnarToRow [codegen id : 7]
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+(32) Sort [codegen id : 7]
+Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Arguments: [c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (41)
-+- * ColumnarToRow (40)
-   +- CometProject (39)
-      +- CometFilter (38)
-         +- CometScan parquet spark_catalog.default.date_dim (37)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#22, d_dom#23]
+Output [3]: [d_date_sk#7, d_year#23, d_dom#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(And(GreaterThanOrEqual(d_dom,1),LessThanOrEqual(d_dom,3)),And(GreaterThanOrEqual(d_dom,25),LessThanOrEqual(d_dom,28))), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(38) CometFilter
-Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
-Condition : (((((d_dom#23 >= 1) AND (d_dom#23 <= 3)) OR ((d_dom#23 >= 25) AND (d_dom#23 <= 28))) AND d_year#22 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
+(34) CometFilter
+Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
+Condition : (((((d_dom#24 >= 1) AND (d_dom#24 <= 3)) OR ((d_dom#24 >= 25) AND (d_dom#24 <= 28))) AND d_year#23 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
 
-(39) CometProject
-Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
+(35) CometProject
+Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(40) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(41) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt
index eed22a0307..80405a784d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q34/simplified.txt
@@ -1,60 +1,56 @@
 WholeStageCodegen (7)
-  ColumnarToRow
+  Sort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag]
     InputAdapter
-      CometSort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag]
-        CometColumnarExchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag] #1
-          RowToColumnar
-            WholeStageCodegen (6)
-              Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
-                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [cnt]
-                        CometHashAggregate [ss_ticket_number,ss_customer_sk,count]
-                          CometColumnarExchange [ss_ticket_number,ss_customer_sk] #2
-                            RowToColumnar
-                              WholeStageCodegen (4)
-                                HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
-                                  Project [ss_customer_sk,ss_ticket_number]
-                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                      Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
-                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                          Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_dom,d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
+      Exchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag] #1
+        WholeStageCodegen (6)
+          Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
+            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+              Filter [cnt]
+                HashAggregate [ss_ticket_number,ss_customer_sk,count] [count(1),cnt,count]
+                  InputAdapter
+                    Exchange [ss_ticket_number,ss_customer_sk] #2
+                      WholeStageCodegen (4)
+                        HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
+                          Project [ss_customer_sk,ss_ticket_number]
+                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                              Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
+                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_dom,d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                  InputAdapter
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
                                           InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [s_store_sk]
-                                                      CometFilter [s_county,s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
+                                            CometProject [s_store_sk]
+                                              CometFilter [s_county,s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (3)
+                                    ColumnarToRow
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (3)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [hd_demo_sk]
-                                                  CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
-                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
-                  InputAdapter
-                    BroadcastExchange #6
-                      WholeStageCodegen (5)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [c_customer_sk]
-                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
+                                        CometProject [hd_demo_sk]
+                                          CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
+                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
+              InputAdapter
+                BroadcastExchange #6
+                  WholeStageCodegen (5)
+                    ColumnarToRow
+                      InputAdapter
+                        CometFilter [c_customer_sk]
+                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt
index 4d8be2c63a..de7514efce 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/explain.txt
@@ -1,48 +1,46 @@
 == Physical Plan ==
-* ColumnarToRow (44)
-+- CometTakeOrderedAndProject (43)
-   +- CometHashAggregate (42)
-      +- CometColumnarExchange (41)
-         +- RowToColumnar (40)
-            +- * HashAggregate (39)
-               +- * Project (38)
-                  +- * BroadcastHashJoin Inner BuildRight (37)
-                     :- * Project (32)
-                     :  +- * BroadcastHashJoin Inner BuildRight (31)
-                     :     :- * Project (26)
-                     :     :  +- * Filter (25)
-                     :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
-                     :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
-                     :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-                     :     :        :  :  :- * ColumnarToRow (3)
-                     :     :        :  :  :  +- CometFilter (2)
-                     :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-                     :     :        :  :  +- BroadcastExchange (9)
-                     :     :        :  :     +- * Project (8)
-                     :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-                     :     :        :  :           :- * ColumnarToRow (5)
-                     :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-                     :     :        :  :           +- ReusedExchange (6)
-                     :     :        :  +- BroadcastExchange (16)
-                     :     :        :     +- * Project (15)
-                     :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :        :           :- * ColumnarToRow (12)
-                     :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-                     :     :        :           +- ReusedExchange (13)
-                     :     :        +- BroadcastExchange (23)
-                     :     :           +- * Project (22)
-                     :     :              +- * BroadcastHashJoin Inner BuildRight (21)
-                     :     :                 :- * ColumnarToRow (19)
-                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-                     :     :                 +- ReusedExchange (20)
-                     :     +- BroadcastExchange (30)
-                     :        +- * ColumnarToRow (29)
-                     :           +- CometFilter (28)
-                     :              +- CometScan parquet spark_catalog.default.customer_address (27)
-                     +- BroadcastExchange (36)
-                        +- * ColumnarToRow (35)
-                           +- CometFilter (34)
-                              +- CometScan parquet spark_catalog.default.customer_demographics (33)
+TakeOrderedAndProject (42)
++- * HashAggregate (41)
+   +- Exchange (40)
+      +- * HashAggregate (39)
+         +- * Project (38)
+            +- * BroadcastHashJoin Inner BuildRight (37)
+               :- * Project (32)
+               :  +- * BroadcastHashJoin Inner BuildRight (31)
+               :     :- * Project (26)
+               :     :  +- * Filter (25)
+               :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
+               :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
+               :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+               :     :        :  :  :- * ColumnarToRow (3)
+               :     :        :  :  :  +- CometFilter (2)
+               :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+               :     :        :  :  +- BroadcastExchange (9)
+               :     :        :  :     +- * Project (8)
+               :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :        :  :           :- * ColumnarToRow (5)
+               :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+               :     :        :  :           +- ReusedExchange (6)
+               :     :        :  +- BroadcastExchange (16)
+               :     :        :     +- * Project (15)
+               :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :        :           :- * ColumnarToRow (12)
+               :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+               :     :        :           +- ReusedExchange (13)
+               :     :        +- BroadcastExchange (23)
+               :     :           +- * Project (22)
+               :     :              +- * BroadcastHashJoin Inner BuildRight (21)
+               :     :                 :- * ColumnarToRow (19)
+               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+               :     :                 +- ReusedExchange (20)
+               :     +- BroadcastExchange (30)
+               :        +- * ColumnarToRow (29)
+               :           +- CometFilter (28)
+               :              +- CometScan parquet spark_catalog.default.customer_address (27)
+               +- BroadcastExchange (36)
+                  +- * ColumnarToRow (35)
+                     +- CometFilter (34)
+                        +- CometScan parquet spark_catalog.default.customer_demographics (33)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -69,7 +67,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#6, ss_sold_date_sk#7]
 
-(6) ReusedExchange [Reuses operator id: 49]
+(6) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#9]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -102,7 +100,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#10, ws_sold_date_sk#11]
 
-(13) ReusedExchange [Reuses operator id: 49]
+(13) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#13]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -135,7 +133,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#14, cs_sold_date_sk#15]
 
-(20) ReusedExchange [Reuses operator id: 49]
+(20) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#17]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -229,54 +227,50 @@ Functions [10]: [partial_count(1), partial_min(cd_dep_count#23), partial_max(cd_
 Aggregate Attributes [13]: [count#26, min#27, max#28, sum#29, count#30, min#31, max#32, sum#33, count#34, min#35, max#36, sum#37, count#38]
 Results [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
 
-(40) RowToColumnar
+(40) Exchange
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
+Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) CometColumnarExchange
-Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
-Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 10]
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, min#40, max#41, sum#42, count#43, min#44, max#45, sum#46, count#47, min#48, max#49, sum#50, count#51]
 Keys [6]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25]
 Functions [10]: [count(1), min(cd_dep_count#23), max(cd_dep_count#23), avg(cd_dep_count#23), min(cd_dep_employed_count#24), max(cd_dep_employed_count#24), avg(cd_dep_employed_count#24), min(cd_dep_college_count#25), max(cd_dep_college_count#25), avg(cd_dep_college_count#25)]
+Aggregate Attributes [10]: [count(1)#52, min(cd_dep_count#23)#53, max(cd_dep_count#23)#54, avg(cd_dep_count#23)#55, min(cd_dep_employed_count#24)#56, max(cd_dep_employed_count#24)#57, avg(cd_dep_employed_count#24)#58, min(cd_dep_college_count#25)#59, max(cd_dep_college_count#25)#60, avg(cd_dep_college_count#25)#61]
+Results [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, count(1)#52 AS cnt1#62, min(cd_dep_count#23)#53 AS min(cd_dep_count)#63, max(cd_dep_count#23)#54 AS max(cd_dep_count)#64, avg(cd_dep_count#23)#55 AS avg(cd_dep_count)#65, cd_dep_employed_count#24, count(1)#52 AS cnt2#66, min(cd_dep_employed_count#24)#56 AS min(cd_dep_employed_count)#67, max(cd_dep_employed_count#24)#57 AS max(cd_dep_employed_count)#68, avg(cd_dep_employed_count#24)#58 AS avg(cd_dep_employed_count)#69, cd_dep_college_count#25, count(1)#52 AS cnt3#70, min(cd_dep_college_count#25)#59 AS min(cd_dep_college_count)#71, max(cd_dep_college_count#25)#60 AS max(cd_dep_college_count)#72, avg(cd_dep_college_count#25)#61 AS avg(cd_dep_college_count)#73, cd_dep_count#23]
 
-(43) CometTakeOrderedAndProject
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#52, min(cd_dep_count)#53, max(cd_dep_count)#54, avg(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, min(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, avg(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, min(cd_dep_college_count)#61, max(cd_dep_college_count)#62, avg(cd_dep_college_count)#63, cd_dep_count#23]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_state#19 ASC NULLS FIRST,cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_dep_count#23 ASC NULLS FIRST,cd_dep_employed_count#24 ASC NULLS FIRST,cd_dep_college_count#25 ASC NULLS FIRST], output=[ca_state#19,cd_gender#21,cd_marital_status#22,cnt1#52,min(cd_dep_count)#53,max(cd_dep_count)#54,avg(cd_dep_count)#55,cd_dep_employed_count#24,cnt2#56,min(cd_dep_employed_count)#57,max(cd_dep_employed_count)#58,avg(cd_dep_employed_count)#59,cd_dep_college_count#25,cnt3#60,min(cd_dep_college_count)#61,max(cd_dep_college_count)#62,avg(cd_dep_college_count)#63]), 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#52, min(cd_dep_count)#53, max(cd_dep_count)#54, avg(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, min(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, avg(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, min(cd_dep_college_count)#61, max(cd_dep_college_count)#62, avg(cd_dep_college_count)#63]
-
-(44) ColumnarToRow [codegen id : 10]
-Input [17]: [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#52, min(cd_dep_count)#53, max(cd_dep_count)#54, avg(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, min(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, avg(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, min(cd_dep_college_count)#61, max(cd_dep_college_count)#62, avg(cd_dep_college_count)#63]
+(42) TakeOrderedAndProject
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#62, min(cd_dep_count)#63, max(cd_dep_count)#64, avg(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, min(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, avg(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, min(cd_dep_college_count)#71, max(cd_dep_college_count)#72, avg(cd_dep_college_count)#73, cd_dep_count#23]
+Arguments: 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cnt1#62, min(cd_dep_count)#63, max(cd_dep_count)#64, avg(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, min(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, avg(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, min(cd_dep_college_count)#71, max(cd_dep_college_count)#72, avg(cd_dep_college_count)#73]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#9, d_year#64, d_qoy#65]
+Output [3]: [d_date_sk#9, d_year#74, d_qoy#75]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_qoy), EqualTo(d_year,2002), LessThan(d_qoy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(46) CometFilter
-Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
-Condition : ((((isnotnull(d_year#64) AND isnotnull(d_qoy#65)) AND (d_year#64 = 2002)) AND (d_qoy#65 < 4)) AND isnotnull(d_date_sk#9))
+(44) CometFilter
+Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
+Condition : ((((isnotnull(d_year#74) AND isnotnull(d_qoy#75)) AND (d_year#74 = 2002)) AND (d_qoy#75 < 4)) AND isnotnull(d_date_sk#9))
 
-(47) CometProject
-Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
+(45) CometProject
+Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(48) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt
index c2b0d7dde1..ea0ef274ea 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q35/simplified.txt
@@ -1,76 +1,74 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),cnt2,min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),cnt3,min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count)]
-        CometHashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
-          CometColumnarExchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-            RowToColumnar
-              WholeStageCodegen (9)
-                HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,min,max,sum,count,min,max,sum,count,min,max,sum,count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
-                  Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                      Project [c_current_cdemo_sk,ca_state]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [c_current_cdemo_sk,c_current_addr_sk]
-                            Filter [exists,exists]
-                              BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                                BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                    InputAdapter
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (2)
-                                          Project [ss_customer_sk]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_qoy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),cnt2,min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),cnt3,min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count)]
+  WholeStageCodegen (10)
+    HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count] [count(1),min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count),cnt1,min(cd_dep_count),max(cd_dep_count),avg(cd_dep_count),cnt2,min(cd_dep_employed_count),max(cd_dep_employed_count),avg(cd_dep_employed_count),cnt3,min(cd_dep_college_count),max(cd_dep_college_count),avg(cd_dep_college_count),count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
+      InputAdapter
+        Exchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+          WholeStageCodegen (9)
+            HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,min,max,sum,count,min,max,sum,count,min,max,sum,count,count,min,max,sum,count,min,max,sum,count,min,max,sum,count]
+              Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                  Project [c_current_cdemo_sk,ca_state]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [c_current_cdemo_sk,c_current_addr_sk]
+                        Filter [exists,exists]
+                          BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                            BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                ColumnarToRow
                                   InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (4)
-                                        Project [ws_bill_customer_sk]
-                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk] #3
+                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
                                 InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (6)
-                                      Project [cs_ship_customer_sk]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (2)
+                                      Project [ss_customer_sk]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_qoy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                                           InputAdapter
                                             ReusedExchange [d_date_sk] #3
-                          InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (7)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                              InputAdapter
+                                BroadcastExchange #4
+                                  WholeStageCodegen (4)
+                                    Project [ws_bill_customer_sk]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                            InputAdapter
+                              BroadcastExchange #5
+                                WholeStageCodegen (6)
+                                  Project [cs_ship_customer_sk]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (8)
+                        BroadcastExchange #6
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cd_demo_sk]
-                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [ca_address_sk]
+                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                  InputAdapter
+                    BroadcastExchange #7
+                      WholeStageCodegen (8)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cd_demo_sk]
+                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt
index a71f17fb59..bb2a1b1a5c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/explain.txt
@@ -1,34 +1,32 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * Project (29)
-   +- Window (28)
-      +- * ColumnarToRow (27)
-         +- CometSort (26)
-            +- CometColumnarExchange (25)
-               +- CometHashAggregate (24)
-                  +- CometColumnarExchange (23)
-                     +- RowToColumnar (22)
-                        +- * HashAggregate (21)
-                           +- * Expand (20)
-                              +- * Project (19)
-                                 +- * BroadcastHashJoin Inner BuildRight (18)
-                                    :- * Project (12)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (11)
-                                    :     :- * Project (6)
-                                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                                    :     :     :- * ColumnarToRow (3)
-                                    :     :     :  +- CometFilter (2)
-                                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                                    :     :     +- ReusedExchange (4)
-                                    :     +- BroadcastExchange (10)
-                                    :        +- * ColumnarToRow (9)
-                                    :           +- CometFilter (8)
-                                    :              +- CometScan parquet spark_catalog.default.item (7)
-                                    +- BroadcastExchange (17)
-                                       +- * ColumnarToRow (16)
-                                          +- CometProject (15)
-                                             +- CometFilter (14)
-                                                +- CometScan parquet spark_catalog.default.store (13)
+TakeOrderedAndProject (28)
++- * Project (27)
+   +- Window (26)
+      +- * Sort (25)
+         +- Exchange (24)
+            +- * HashAggregate (23)
+               +- Exchange (22)
+                  +- * HashAggregate (21)
+                     +- * Expand (20)
+                        +- * Project (19)
+                           +- * BroadcastHashJoin Inner BuildRight (18)
+                              :- * Project (12)
+                              :  +- * BroadcastHashJoin Inner BuildRight (11)
+                              :     :- * Project (6)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                              :     :     :- * ColumnarToRow (3)
+                              :     :     :  +- CometFilter (2)
+                              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     :     +- ReusedExchange (4)
+                              :     +- BroadcastExchange (10)
+                              :        +- * ColumnarToRow (9)
+                              :           +- CometFilter (8)
+                              :              +- CometScan parquet spark_catalog.default.item (7)
+                              +- BroadcastExchange (17)
+                                 +- * ColumnarToRow (16)
+                                    +- CometProject (15)
+                                       +- CometFilter (14)
+                                          +- CometScan parquet spark_catalog.default.store (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -46,7 +44,7 @@ Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_store_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_ext_sales_price#3, ss_net_profit#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 35]
+(4) ReusedExchange [Reuses operator id: 33]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -130,70 +128,66 @@ Functions [2]: [partial_sum(UnscaledValue(ss_net_profit#4)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#16, sum#17]
 Results [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
 
-(22) RowToColumnar
+(22) Exchange
 Input [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
+Arguments: hashpartitioning(i_category#13, i_class#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) CometColumnarExchange
-Input [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
-Arguments: hashpartitioning(i_category#13, i_class#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(24) CometHashAggregate
+(23) HashAggregate [codegen id : 5]
 Input [5]: [i_category#13, i_class#14, spark_grouping_id#15, sum#18, sum#19]
 Keys [3]: [i_category#13, i_class#14, spark_grouping_id#15]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#20, sum(UnscaledValue(ss_ext_sales_price#3))#21]
+Results [7]: [(MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#20,17,2) / MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#21,17,2)) AS gross_margin#22, i_category#13, i_class#14, (cast((shiftright(spark_grouping_id#15, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#15, 0) & 1) as tinyint)) AS lochierarchy#23, (MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#20,17,2) / MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#21,17,2)) AS _w0#24, (cast((shiftright(spark_grouping_id#15, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#15, 0) & 1) as tinyint)) AS _w1#25, CASE WHEN (cast((shiftright(spark_grouping_id#15, 0) & 1) as tinyint) = 0) THEN i_category#13 END AS _w2#26]
 
-(25) CometColumnarExchange
-Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
-Arguments: hashpartitioning(_w1#23, _w2#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(26) CometSort
-Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
-Arguments: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24], [_w1#23 ASC NULLS FIRST, _w2#24 ASC NULLS FIRST, _w0#22 ASC NULLS FIRST]
+(24) Exchange
+Input [7]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26]
+Arguments: hashpartitioning(_w1#25, _w2#26, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(27) ColumnarToRow [codegen id : 5]
-Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
+(25) Sort [codegen id : 6]
+Input [7]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26]
+Arguments: [_w1#25 ASC NULLS FIRST, _w2#26 ASC NULLS FIRST, _w0#24 ASC NULLS FIRST], false, 0
 
-(28) Window
-Input [7]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24]
-Arguments: [rank(_w0#22) windowspecdefinition(_w1#23, _w2#24, _w0#22 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#25], [_w1#23, _w2#24], [_w0#22 ASC NULLS FIRST]
+(26) Window
+Input [7]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26]
+Arguments: [rank(_w0#24) windowspecdefinition(_w1#25, _w2#26, _w0#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#27], [_w1#25, _w2#26], [_w0#24 ASC NULLS FIRST]
 
-(29) Project [codegen id : 6]
-Output [5]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, rank_within_parent#25]
-Input [8]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, _w0#22, _w1#23, _w2#24, rank_within_parent#25]
+(27) Project [codegen id : 7]
+Output [5]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, rank_within_parent#27]
+Input [8]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, _w0#24, _w1#25, _w2#26, rank_within_parent#27]
 
-(30) TakeOrderedAndProject
-Input [5]: [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, rank_within_parent#25]
-Arguments: 100, [lochierarchy#21 DESC NULLS LAST, CASE WHEN (lochierarchy#21 = 0) THEN i_category#13 END ASC NULLS FIRST, rank_within_parent#25 ASC NULLS FIRST], [gross_margin#20, i_category#13, i_class#14, lochierarchy#21, rank_within_parent#25]
+(28) TakeOrderedAndProject
+Input [5]: [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, rank_within_parent#27]
+Arguments: 100, [lochierarchy#23 DESC NULLS LAST, CASE WHEN (lochierarchy#23 = 0) THEN i_category#13 END ASC NULLS FIRST, rank_within_parent#27 ASC NULLS FIRST], [gross_margin#22, i_category#13, i_class#14, lochierarchy#23, rank_within_parent#27]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (33)
++- * ColumnarToRow (32)
+   +- CometProject (31)
+      +- CometFilter (30)
+         +- CometScan parquet spark_catalog.default.date_dim (29)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_year#26]
+Output [2]: [d_date_sk#7, d_year#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(32) CometFilter
-Input [2]: [d_date_sk#7, d_year#26]
-Condition : ((isnotnull(d_year#26) AND (d_year#26 = 2001)) AND isnotnull(d_date_sk#7))
+(30) CometFilter
+Input [2]: [d_date_sk#7, d_year#28]
+Condition : ((isnotnull(d_year#28) AND (d_year#28 = 2001)) AND isnotnull(d_date_sk#7))
 
-(33) CometProject
-Input [2]: [d_date_sk#7, d_year#26]
+(31) CometProject
+Input [2]: [d_date_sk#7, d_year#28]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(34) ColumnarToRow [codegen id : 1]
+(32) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(35) BroadcastExchange
+(33) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt
index e9e6131a9e..7eeb607c3b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q36/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,gross_margin,i_class]
-  WholeStageCodegen (6)
+  WholeStageCodegen (7)
     Project [gross_margin,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [_w0,_w1,_w2]
-          WholeStageCodegen (5)
-            ColumnarToRow
+          WholeStageCodegen (6)
+            Sort [_w1,_w2,_w0]
               InputAdapter
-                CometSort [_w1,_w2,_w0]
-                  CometColumnarExchange [_w1,_w2] #1
-                    CometHashAggregate [i_category,i_class,spark_grouping_id,sum,sum]
-                      CometColumnarExchange [i_category,i_class,spark_grouping_id] #2
-                        RowToColumnar
+                Exchange [_w1,_w2] #1
+                  WholeStageCodegen (5)
+                    HashAggregate [i_category,i_class,spark_grouping_id,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),gross_margin,lochierarchy,_w0,_w1,_w2,sum,sum]
+                      InputAdapter
+                        Exchange [i_category,i_class,spark_grouping_id] #2
                           WholeStageCodegen (4)
                             HashAggregate [i_category,i_class,spark_grouping_id,ss_net_profit,ss_ext_sales_price] [sum,sum,sum,sum]
                               Expand [ss_ext_sales_price,ss_net_profit,i_category,i_class]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt
index 06405034bc..d13ff264cd 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/explain.txt
@@ -1,31 +1,29 @@
 == Physical Plan ==
-* ColumnarToRow (27)
-+- CometTakeOrderedAndProject (26)
-   +- CometHashAggregate (25)
-      +- CometColumnarExchange (24)
-         +- RowToColumnar (23)
-            +- * HashAggregate (22)
-               +- * Project (21)
-                  +- * BroadcastHashJoin Inner BuildLeft (20)
-                     :- BroadcastExchange (15)
-                     :  +- * Project (14)
-                     :     +- * BroadcastHashJoin Inner BuildRight (13)
-                     :        :- * Project (11)
-                     :        :  +- * BroadcastHashJoin Inner BuildRight (10)
-                     :        :     :- * ColumnarToRow (4)
-                     :        :     :  +- CometProject (3)
-                     :        :     :     +- CometFilter (2)
-                     :        :     :        +- CometScan parquet spark_catalog.default.item (1)
-                     :        :     +- BroadcastExchange (9)
-                     :        :        +- * ColumnarToRow (8)
-                     :        :           +- CometProject (7)
-                     :        :              +- CometFilter (6)
-                     :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
-                     :        +- ReusedExchange (12)
-                     +- * ColumnarToRow (19)
-                        +- CometProject (18)
-                           +- CometFilter (17)
-                              +- CometScan parquet spark_catalog.default.catalog_sales (16)
+TakeOrderedAndProject (25)
++- * HashAggregate (24)
+   +- Exchange (23)
+      +- * HashAggregate (22)
+         +- * Project (21)
+            +- * BroadcastHashJoin Inner BuildLeft (20)
+               :- BroadcastExchange (15)
+               :  +- * Project (14)
+               :     +- * BroadcastHashJoin Inner BuildRight (13)
+               :        :- * Project (11)
+               :        :  +- * BroadcastHashJoin Inner BuildRight (10)
+               :        :     :- * ColumnarToRow (4)
+               :        :     :  +- CometProject (3)
+               :        :     :     +- CometFilter (2)
+               :        :     :        +- CometScan parquet spark_catalog.default.item (1)
+               :        :     +- BroadcastExchange (9)
+               :        :        +- * ColumnarToRow (8)
+               :        :           +- CometProject (7)
+               :        :              +- CometFilter (6)
+               :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
+               :        +- ReusedExchange (12)
+               +- * ColumnarToRow (19)
+                  +- CometProject (18)
+                     +- CometFilter (17)
+                        +- CometScan parquet spark_catalog.default.catalog_sales (16)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -79,7 +77,7 @@ Join condition: None
 Output [5]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_date_sk#8]
 Input [6]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_item_sk#6, inv_date_sk#8]
 
-(12) ReusedExchange [Reuses operator id: 32]
+(12) ReusedExchange [Reuses operator id: 30]
 Output [1]: [d_date_sk#10]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -131,33 +129,29 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(23) RowToColumnar
+(23) Exchange
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(24) CometColumnarExchange
-Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(25) CometHashAggregate
+(24) HashAggregate [codegen id : 5]
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Keys [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Functions: []
+Aggregate Attributes: []
+Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(26) CometTakeOrderedAndProject
-Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#2 ASC NULLS FIRST], output=[i_item_id#2,i_item_desc#3,i_current_price#4]), 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
-
-(27) ColumnarToRow [codegen id : 5]
+(25) TakeOrderedAndProject
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = inv_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (32)
-+- * ColumnarToRow (31)
-   +- CometProject (30)
-      +- CometFilter (29)
-         +- CometScan parquet spark_catalog.default.date_dim (28)
+BroadcastExchange (30)
++- * ColumnarToRow (29)
+   +- CometProject (28)
+      +- CometFilter (27)
+         +- CometScan parquet spark_catalog.default.date_dim (26)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -167,18 +161,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-01), LessThanOrEqual(d_date,2000-04-01), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(29) CometFilter
+(27) CometFilter
 Input [2]: [d_date_sk#10, d_date#13]
 Condition : (((isnotnull(d_date#13) AND (d_date#13 >= 2000-02-01)) AND (d_date#13 <= 2000-04-01)) AND isnotnull(d_date_sk#10))
 
-(30) CometProject
+(28) CometProject
 Input [2]: [d_date_sk#10, d_date#13]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(31) ColumnarToRow [codegen id : 1]
+(29) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(32) BroadcastExchange
+(30) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt
index 3f84fa0598..65bb06348b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q37/simplified.txt
@@ -1,46 +1,44 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
-        CometHashAggregate [i_item_id,i_item_desc,i_current_price]
-          CometColumnarExchange [i_item_id,i_item_desc,i_current_price] #1
-            RowToColumnar
-              WholeStageCodegen (4)
-                HashAggregate [i_item_id,i_item_desc,i_current_price]
-                  Project [i_item_id,i_item_desc,i_current_price]
-                    BroadcastHashJoin [i_item_sk,cs_item_sk]
-                      InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (3)
-                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                              BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
-                                  BroadcastHashJoin [i_item_sk,inv_item_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                                          CometFilter [i_current_price,i_manufact_id,i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
-                                    InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [inv_item_sk,inv_date_sk]
-                                                CometFilter [inv_quantity_on_hand,inv_item_sk]
-                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #4
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_date,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+TakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
+  WholeStageCodegen (5)
+    HashAggregate [i_item_id,i_item_desc,i_current_price]
+      InputAdapter
+        Exchange [i_item_id,i_item_desc,i_current_price] #1
+          WholeStageCodegen (4)
+            HashAggregate [i_item_id,i_item_desc,i_current_price]
+              Project [i_item_id,i_item_desc,i_current_price]
+                BroadcastHashJoin [i_item_sk,cs_item_sk]
+                  InputAdapter
+                    BroadcastExchange #2
+                      WholeStageCodegen (3)
+                        Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                          BroadcastHashJoin [inv_date_sk,d_date_sk]
+                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
+                              BroadcastHashJoin [i_item_sk,inv_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                                      CometFilter [i_current_price,i_manufact_id,i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #4
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [cs_item_sk]
-                            CometFilter [cs_item_sk]
-                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [inv_item_sk,inv_date_sk]
+                                            CometFilter [inv_quantity_on_hand,inv_item_sk]
+                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #4
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_date,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #4
+                  ColumnarToRow
+                    InputAdapter
+                      CometProject [cs_item_sk]
+                        CometFilter [cs_item_sk]
+                          CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt
index d42b2f1bf6..87d960592d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/explain.txt
@@ -1,59 +1,51 @@
 == Physical Plan ==
-* ColumnarToRow (55)
-+- CometHashAggregate (54)
-   +- CometColumnarExchange (53)
-      +- RowToColumnar (52)
-         +- * HashAggregate (51)
-            +- * Project (50)
-               +- * BroadcastHashJoin LeftSemi BuildRight (49)
-                  :- * BroadcastHashJoin LeftSemi BuildRight (33)
-                  :  :- * ColumnarToRow (17)
-                  :  :  +- CometHashAggregate (16)
-                  :  :     +- CometColumnarExchange (15)
-                  :  :        +- RowToColumnar (14)
-                  :  :           +- * HashAggregate (13)
-                  :  :              +- * Project (12)
-                  :  :                 +- * BroadcastHashJoin Inner BuildRight (11)
-                  :  :                    :- * Project (6)
-                  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-                  :  :                    :     :- * ColumnarToRow (3)
-                  :  :                    :     :  +- CometFilter (2)
-                  :  :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :  :                    :     +- ReusedExchange (4)
-                  :  :                    +- BroadcastExchange (10)
-                  :  :                       +- * ColumnarToRow (9)
-                  :  :                          +- CometFilter (8)
-                  :  :                             +- CometScan parquet spark_catalog.default.customer (7)
-                  :  +- BroadcastExchange (32)
-                  :     +- * ColumnarToRow (31)
-                  :        +- CometHashAggregate (30)
-                  :           +- CometColumnarExchange (29)
-                  :              +- RowToColumnar (28)
-                  :                 +- * HashAggregate (27)
-                  :                    +- * Project (26)
-                  :                       +- * BroadcastHashJoin Inner BuildRight (25)
-                  :                          :- * Project (23)
-                  :                          :  +- * BroadcastHashJoin Inner BuildRight (22)
-                  :                          :     :- * ColumnarToRow (20)
-                  :                          :     :  +- CometFilter (19)
-                  :                          :     :     +- CometScan parquet spark_catalog.default.catalog_sales (18)
-                  :                          :     +- ReusedExchange (21)
-                  :                          +- ReusedExchange (24)
-                  +- BroadcastExchange (48)
-                     +- * ColumnarToRow (47)
-                        +- CometHashAggregate (46)
-                           +- CometColumnarExchange (45)
-                              +- RowToColumnar (44)
-                                 +- * HashAggregate (43)
-                                    +- * Project (42)
-                                       +- * BroadcastHashJoin Inner BuildRight (41)
-                                          :- * Project (39)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (38)
-                                          :     :- * ColumnarToRow (36)
-                                          :     :  +- CometFilter (35)
-                                          :     :     +- CometScan parquet spark_catalog.default.web_sales (34)
-                                          :     +- ReusedExchange (37)
-                                          +- ReusedExchange (40)
+* HashAggregate (47)
++- Exchange (46)
+   +- * HashAggregate (45)
+      +- * Project (44)
+         +- * BroadcastHashJoin LeftSemi BuildRight (43)
+            :- * BroadcastHashJoin LeftSemi BuildRight (29)
+            :  :- * HashAggregate (15)
+            :  :  +- Exchange (14)
+            :  :     +- * HashAggregate (13)
+            :  :        +- * Project (12)
+            :  :           +- * BroadcastHashJoin Inner BuildRight (11)
+            :  :              :- * Project (6)
+            :  :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+            :  :              :     :- * ColumnarToRow (3)
+            :  :              :     :  +- CometFilter (2)
+            :  :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :  :              :     +- ReusedExchange (4)
+            :  :              +- BroadcastExchange (10)
+            :  :                 +- * ColumnarToRow (9)
+            :  :                    +- CometFilter (8)
+            :  :                       +- CometScan parquet spark_catalog.default.customer (7)
+            :  +- BroadcastExchange (28)
+            :     +- * HashAggregate (27)
+            :        +- Exchange (26)
+            :           +- * HashAggregate (25)
+            :              +- * Project (24)
+            :                 +- * BroadcastHashJoin Inner BuildRight (23)
+            :                    :- * Project (21)
+            :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+            :                    :     :- * ColumnarToRow (18)
+            :                    :     :  +- CometFilter (17)
+            :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (16)
+            :                    :     +- ReusedExchange (19)
+            :                    +- ReusedExchange (22)
+            +- BroadcastExchange (42)
+               +- * HashAggregate (41)
+                  +- Exchange (40)
+                     +- * HashAggregate (39)
+                        +- * Project (38)
+                           +- * BroadcastHashJoin Inner BuildRight (37)
+                              :- * Project (35)
+                              :  +- * BroadcastHashJoin Inner BuildRight (34)
+                              :     :- * ColumnarToRow (32)
+                              :     :  +- CometFilter (31)
+                              :     :     +- CometScan parquet spark_catalog.default.web_sales (30)
+                              :     +- ReusedExchange (33)
+                              +- ReusedExchange (36)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -71,7 +63,7 @@ Condition : isnotnull(ss_customer_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_customer_sk#1, ss_sold_date_sk#2]
 
-(4) ReusedExchange [Reuses operator id: 60]
+(4) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#4, d_date#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -119,20 +111,16 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
+Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
-Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 12]
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Keys [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Functions: []
-
-(17) ColumnarToRow [codegen id : 12]
-Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
+Aggregate Attributes: []
+Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
@@ -142,66 +130,62 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#10), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int>
 
-(19) CometFilter
+(17) CometFilter
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 Condition : isnotnull(cs_bill_customer_sk#9)
 
-(20) ColumnarToRow [codegen id : 6]
+(18) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 
-(21) ReusedExchange [Reuses operator id: 60]
+(19) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#12, d_date#13]
 
-(22) BroadcastHashJoin [codegen id : 6]
+(20) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_sold_date_sk#10]
 Right keys [1]: [d_date_sk#12]
 Join type: Inner
 Join condition: None
 
-(23) Project [codegen id : 6]
+(21) Project [codegen id : 6]
 Output [2]: [cs_bill_customer_sk#9, d_date#13]
 Input [4]: [cs_bill_customer_sk#9, cs_sold_date_sk#10, d_date_sk#12, d_date#13]
 
-(24) ReusedExchange [Reuses operator id: 10]
+(22) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(25) BroadcastHashJoin [codegen id : 6]
+(23) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_bill_customer_sk#9]
 Right keys [1]: [c_customer_sk#14]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
+(24) Project [codegen id : 6]
 Output [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Input [5]: [cs_bill_customer_sk#9, d_date#13, c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(27) HashAggregate [codegen id : 6]
+(25) HashAggregate [codegen id : 6]
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(28) RowToColumnar
+(26) Exchange
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
+Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(29) CometColumnarExchange
-Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
-Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
+(27) HashAggregate [codegen id : 7]
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
+Aggregate Attributes: []
+Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(31) ColumnarToRow [codegen id : 7]
-Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
-
-(32) BroadcastExchange
+(28) BroadcastExchange
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 12]
+(29) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#16, ), isnull(c_last_name#16), coalesce(c_first_name#15, ), isnull(c_first_name#15), coalesce(d_date#13, 1970-01-01), isnull(d_date#13)]
 Join type: LeftSemi
@@ -215,131 +199,123 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#18), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int>
 
-(35) CometFilter
+(31) CometFilter
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 Condition : isnotnull(ws_bill_customer_sk#17)
 
-(36) ColumnarToRow [codegen id : 10]
+(32) ColumnarToRow [codegen id : 10]
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 
-(37) ReusedExchange [Reuses operator id: 60]
+(33) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#20, d_date#21]
 
-(38) BroadcastHashJoin [codegen id : 10]
+(34) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_sold_date_sk#18]
 Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 10]
+(35) Project [codegen id : 10]
 Output [2]: [ws_bill_customer_sk#17, d_date#21]
 Input [4]: [ws_bill_customer_sk#17, ws_sold_date_sk#18, d_date_sk#20, d_date#21]
 
-(40) ReusedExchange [Reuses operator id: 10]
+(36) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(41) BroadcastHashJoin [codegen id : 10]
+(37) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_bill_customer_sk#17]
 Right keys [1]: [c_customer_sk#22]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
+(38) Project [codegen id : 10]
 Output [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Input [5]: [ws_bill_customer_sk#17, d_date#21, c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(43) HashAggregate [codegen id : 10]
+(39) HashAggregate [codegen id : 10]
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(44) RowToColumnar
-Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-
-(45) CometColumnarExchange
+(40) Exchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(46) CometHashAggregate
+(41) HashAggregate [codegen id : 11]
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
+Aggregate Attributes: []
+Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(47) ColumnarToRow [codegen id : 11]
-Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-
-(48) BroadcastExchange
+(42) BroadcastExchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=6]
 
-(49) BroadcastHashJoin [codegen id : 12]
+(43) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#24, ), isnull(c_last_name#24), coalesce(c_first_name#23, ), isnull(c_first_name#23), coalesce(d_date#21, 1970-01-01), isnull(d_date#21)]
 Join type: LeftSemi
 Join condition: None
 
-(50) Project [codegen id : 12]
+(44) Project [codegen id : 12]
 Output: []
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(51) HashAggregate [codegen id : 12]
+(45) HashAggregate [codegen id : 12]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#25]
 Results [1]: [count#26]
 
-(52) RowToColumnar
+(46) Exchange
 Input [1]: [count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(53) CometColumnarExchange
-Input [1]: [count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(54) CometHashAggregate
+(47) HashAggregate [codegen id : 13]
 Input [1]: [count#26]
 Keys: []
 Functions [1]: [count(1)]
-
-(55) ColumnarToRow [codegen id : 13]
-Input [1]: [count(1)#27]
+Aggregate Attributes [1]: [count(1)#27]
+Results [1]: [count(1)#27 AS count(1)#28]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#2 IN dynamicpruning#3
-BroadcastExchange (60)
-+- * ColumnarToRow (59)
-   +- CometProject (58)
-      +- CometFilter (57)
-         +- CometScan parquet spark_catalog.default.date_dim (56)
+BroadcastExchange (52)
++- * ColumnarToRow (51)
+   +- CometProject (50)
+      +- CometFilter (49)
+         +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
+Output [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(57) CometFilter
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
-Condition : (((isnotnull(d_month_seq#28) AND (d_month_seq#28 >= 1200)) AND (d_month_seq#28 <= 1211)) AND isnotnull(d_date_sk#4))
+(49) CometFilter
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
+Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1200)) AND (d_month_seq#29 <= 1211)) AND isnotnull(d_date_sk#4))
 
-(58) CometProject
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
+(50) CometProject
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
 Arguments: [d_date_sk#4, d_date#5], [d_date_sk#4, d_date#5]
 
-(59) ColumnarToRow [codegen id : 1]
+(51) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#4, d_date#5]
 
-(60) BroadcastExchange
+(52) BroadcastExchange
 Input [2]: [d_date_sk#4, d_date#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 18 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
+Subquery:2 Hosting operator id = 16 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
 
-Subquery:3 Hosting operator id = 34 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
+Subquery:3 Hosting operator id = 30 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt
index 28771f9d42..315afe6602 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q38/simplified.txt
@@ -1,89 +1,81 @@
 WholeStageCodegen (13)
-  ColumnarToRow
+  HashAggregate [count] [count(1),count(1),count]
     InputAdapter
-      CometHashAggregate [count]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (12)
-              HashAggregate [count,count]
-                Project
-                  BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                    BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                      ColumnarToRow
-                        InputAdapter
-                          CometHashAggregate [c_last_name,c_first_name,d_date]
-                            CometColumnarExchange [c_last_name,c_first_name,d_date] #2
-                              RowToColumnar
-                                WholeStageCodegen (3)
-                                  HashAggregate [c_last_name,c_first_name,d_date]
-                                    Project [c_last_name,c_first_name,d_date]
-                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                        Project [ss_customer_sk,d_date]
-                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_customer_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk,d_date]
-                                                                CometFilter [d_month_seq,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk,d_date] #3
-                                        InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [c_customer_sk]
-                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
-                      InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (7)
-                            ColumnarToRow
-                              InputAdapter
-                                CometHashAggregate [c_last_name,c_first_name,d_date]
-                                  CometColumnarExchange [c_last_name,c_first_name,d_date] #6
-                                    RowToColumnar
-                                      WholeStageCodegen (6)
-                                        HashAggregate [c_last_name,c_first_name,d_date]
-                                          Project [c_last_name,c_first_name,d_date]
-                                            BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                              Project [cs_bill_customer_sk,d_date]
-                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+      Exchange #1
+        WholeStageCodegen (12)
+          HashAggregate [count,count]
+            Project
+              BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                  HashAggregate [c_last_name,c_first_name,d_date]
+                    InputAdapter
+                      Exchange [c_last_name,c_first_name,d_date] #2
+                        WholeStageCodegen (3)
+                          HashAggregate [c_last_name,c_first_name,d_date]
+                            Project [c_last_name,c_first_name,d_date]
+                              BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                Project [ss_customer_sk,d_date]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_customer_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [cs_bill_customer_sk]
-                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
-                                                  InputAdapter
-                                                    ReusedExchange [d_date_sk,d_date] #3
-                                              InputAdapter
-                                                ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (11)
-                          ColumnarToRow
-                            InputAdapter
-                              CometHashAggregate [c_last_name,c_first_name,d_date]
-                                CometColumnarExchange [c_last_name,c_first_name,d_date] #8
-                                  RowToColumnar
-                                    WholeStageCodegen (10)
-                                      HashAggregate [c_last_name,c_first_name,d_date]
-                                        Project [c_last_name,c_first_name,d_date]
-                                          BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                                            Project [ws_bill_customer_sk,d_date]
-                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk,d_date] #3
+                                                      CometProject [d_date_sk,d_date]
+                                                        CometFilter [d_month_seq,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk,d_date] #3
+                                InputAdapter
+                                  BroadcastExchange #4
+                                    WholeStageCodegen (2)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
+                  InputAdapter
+                    BroadcastExchange #5
+                      WholeStageCodegen (7)
+                        HashAggregate [c_last_name,c_first_name,d_date]
+                          InputAdapter
+                            Exchange [c_last_name,c_first_name,d_date] #6
+                              WholeStageCodegen (6)
+                                HashAggregate [c_last_name,c_first_name,d_date]
+                                  Project [c_last_name,c_first_name,d_date]
+                                    BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                      Project [cs_bill_customer_sk,d_date]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
                                             InputAdapter
-                                              ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                                              CometFilter [cs_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk,d_date] #3
+                                      InputAdapter
+                                        ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                InputAdapter
+                  BroadcastExchange #7
+                    WholeStageCodegen (11)
+                      HashAggregate [c_last_name,c_first_name,d_date]
+                        InputAdapter
+                          Exchange [c_last_name,c_first_name,d_date] #8
+                            WholeStageCodegen (10)
+                              HashAggregate [c_last_name,c_first_name,d_date]
+                                Project [c_last_name,c_first_name,d_date]
+                                  BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                                    Project [ws_bill_customer_sk,d_date]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ws_bill_customer_sk]
+                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk,d_date] #3
+                                    InputAdapter
+                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt
index 11adf85554..e10ff3340d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/explain.txt
@@ -1,54 +1,48 @@
 == Physical Plan ==
-* ColumnarToRow (50)
-+- CometSort (49)
-   +- CometColumnarExchange (48)
-      +- RowToColumnar (47)
-         +- * BroadcastHashJoin Inner BuildRight (46)
-            :- * Project (25)
-            :  +- * Filter (24)
-            :     +- * HashAggregate (23)
-            :        +- * ColumnarToRow (22)
-            :           +- CometColumnarExchange (21)
-            :              +- RowToColumnar (20)
-            :                 +- * HashAggregate (19)
-            :                    +- * Project (18)
-            :                       +- * BroadcastHashJoin Inner BuildRight (17)
-            :                          :- * Project (15)
-            :                          :  +- * BroadcastHashJoin Inner BuildRight (14)
-            :                          :     :- * Project (9)
-            :                          :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-            :                          :     :     :- * ColumnarToRow (3)
-            :                          :     :     :  +- CometFilter (2)
-            :                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-            :                          :     :     +- BroadcastExchange (7)
-            :                          :     :        +- * ColumnarToRow (6)
-            :                          :     :           +- CometFilter (5)
-            :                          :     :              +- CometScan parquet spark_catalog.default.item (4)
-            :                          :     +- BroadcastExchange (13)
-            :                          :        +- * ColumnarToRow (12)
-            :                          :           +- CometFilter (11)
-            :                          :              +- CometScan parquet spark_catalog.default.warehouse (10)
-            :                          +- ReusedExchange (16)
-            +- BroadcastExchange (45)
-               +- * Project (44)
-                  +- * Filter (43)
-                     +- * HashAggregate (42)
-                        +- * ColumnarToRow (41)
-                           +- CometColumnarExchange (40)
-                              +- RowToColumnar (39)
-                                 +- * HashAggregate (38)
-                                    +- * Project (37)
-                                       +- * BroadcastHashJoin Inner BuildRight (36)
-                                          :- * Project (34)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (33)
-                                          :     :- * Project (31)
-                                          :     :  +- * BroadcastHashJoin Inner BuildRight (30)
-                                          :     :     :- * ColumnarToRow (28)
-                                          :     :     :  +- CometFilter (27)
-                                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (26)
-                                          :     :     +- ReusedExchange (29)
-                                          :     +- ReusedExchange (32)
-                                          +- ReusedExchange (35)
+* Sort (44)
++- Exchange (43)
+   +- * BroadcastHashJoin Inner BuildRight (42)
+      :- * Project (23)
+      :  +- * Filter (22)
+      :     +- * HashAggregate (21)
+      :        +- Exchange (20)
+      :           +- * HashAggregate (19)
+      :              +- * Project (18)
+      :                 +- * BroadcastHashJoin Inner BuildRight (17)
+      :                    :- * Project (15)
+      :                    :  +- * BroadcastHashJoin Inner BuildRight (14)
+      :                    :     :- * Project (9)
+      :                    :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :                    :     :     :- * ColumnarToRow (3)
+      :                    :     :     :  +- CometFilter (2)
+      :                    :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+      :                    :     :     +- BroadcastExchange (7)
+      :                    :     :        +- * ColumnarToRow (6)
+      :                    :     :           +- CometFilter (5)
+      :                    :     :              +- CometScan parquet spark_catalog.default.item (4)
+      :                    :     +- BroadcastExchange (13)
+      :                    :        +- * ColumnarToRow (12)
+      :                    :           +- CometFilter (11)
+      :                    :              +- CometScan parquet spark_catalog.default.warehouse (10)
+      :                    +- ReusedExchange (16)
+      +- BroadcastExchange (41)
+         +- * Project (40)
+            +- * Filter (39)
+               +- * HashAggregate (38)
+                  +- Exchange (37)
+                     +- * HashAggregate (36)
+                        +- * Project (35)
+                           +- * BroadcastHashJoin Inner BuildRight (34)
+                              :- * Project (32)
+                              :  +- * BroadcastHashJoin Inner BuildRight (31)
+                              :     :- * Project (29)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (28)
+                              :     :     :- * ColumnarToRow (26)
+                              :     :     :  +- CometFilter (25)
+                              :     :     :     +- CometScan parquet spark_catalog.default.inventory (24)
+                              :     :     +- ReusedExchange (27)
+                              :     +- ReusedExchange (30)
+                              +- ReusedExchange (33)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -122,7 +116,7 @@ Join condition: None
 Output [5]: [inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 Input [6]: [inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 
-(16) ReusedExchange [Reuses operator id: 55]
+(16) ReusedExchange [Reuses operator id: 49]
 Output [2]: [d_date_sk#9, d_moy#10]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -142,28 +136,22 @@ Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#3 as double)), par
 Aggregate Attributes [5]: [n#11, avg#12, m2#13, sum#14, count#15]
 Results [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 
-(20) RowToColumnar
+(20) Exchange
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
+Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
-Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) ColumnarToRow [codegen id : 10]
-Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
-
-(23) HashAggregate [codegen id : 10]
+(21) HashAggregate [codegen id : 10]
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 Keys [4]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double)), avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double))#21, avg(inv_quantity_on_hand#3)#22]
 Results [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stddev_samp(cast(inv_quantity_on_hand#3 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#3)#22 AS mean#24]
 
-(24) Filter [codegen id : 10]
+(22) Filter [codegen id : 10]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 Condition : CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END
 
-(25) Project [codegen id : 10]
+(23) Project [codegen id : 10]
 Output [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#25]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 
@@ -175,116 +163,104 @@ PartitionFilters: [isnotnull(inv_date_sk#29), dynamicpruningexpression(inv_date_
 PushedFilters: [IsNotNull(inv_item_sk), IsNotNull(inv_warehouse_sk)]
 ReadSchema: struct<inv_item_sk:int,inv_warehouse_sk:int,inv_quantity_on_hand:int>
 
-(27) CometFilter
+(25) CometFilter
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 Condition : (isnotnull(inv_item_sk#26) AND isnotnull(inv_warehouse_sk#27))
 
-(28) ColumnarToRow [codegen id : 8]
+(26) ColumnarToRow [codegen id : 8]
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 
-(29) ReusedExchange [Reuses operator id: 7]
+(27) ReusedExchange [Reuses operator id: 7]
 Output [1]: [i_item_sk#31]
 
-(30) BroadcastHashJoin [codegen id : 8]
+(28) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_item_sk#26]
 Right keys [1]: [i_item_sk#31]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 8]
+(29) Project [codegen id : 8]
 Output [4]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 Input [5]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 
-(32) ReusedExchange [Reuses operator id: 13]
+(30) ReusedExchange [Reuses operator id: 13]
 Output [2]: [w_warehouse_sk#32, w_warehouse_name#33]
 
-(33) BroadcastHashJoin [codegen id : 8]
+(31) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_warehouse_sk#27]
 Right keys [1]: [w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 8]
+(32) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 Input [6]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 
-(35) ReusedExchange [Reuses operator id: 60]
+(33) ReusedExchange [Reuses operator id: 54]
 Output [2]: [d_date_sk#34, d_moy#35]
 
-(36) BroadcastHashJoin [codegen id : 8]
+(34) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_date_sk#29]
 Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
+(35) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Input [7]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_date_sk#34, d_moy#35]
 
-(38) HashAggregate [codegen id : 8]
+(36) HashAggregate [codegen id : 8]
 Input [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#28 as double)), partial_avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [5]: [n#36, avg#37, m2#38, sum#39, count#40]
 Results [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 
-(39) RowToColumnar
-Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-
-(40) CometColumnarExchange
+(37) Exchange
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(41) ColumnarToRow [codegen id : 9]
-Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-
-(42) HashAggregate [codegen id : 9]
+(38) HashAggregate [codegen id : 9]
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double)), avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double))#21, avg(inv_quantity_on_hand#28)#22]
 Results [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stddev_samp(cast(inv_quantity_on_hand#28 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#28)#22 AS mean#24]
 
-(43) Filter [codegen id : 9]
+(39) Filter [codegen id : 9]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 Condition : CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END
 
-(44) Project [codegen id : 9]
+(40) Project [codegen id : 9]
 Output [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#24 AS mean#46, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#47]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 
-(45) BroadcastExchange
+(41) BroadcastExchange
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
-(46) BroadcastHashJoin [codegen id : 10]
+(42) BroadcastHashJoin [codegen id : 10]
 Left keys [2]: [i_item_sk#6, w_warehouse_sk#7]
 Right keys [2]: [i_item_sk#31, w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(47) RowToColumnar
-Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-
-(48) CometColumnarExchange
-Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(49) CometSort
+(43) Exchange
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47], [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST]
+Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(50) ColumnarToRow [codegen id : 11]
+(44) Sort [codegen id : 11]
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
+Arguments: [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (55)
-+- * ColumnarToRow (54)
-   +- CometProject (53)
-      +- CometFilter (52)
-         +- CometScan parquet spark_catalog.default.date_dim (51)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -294,27 +270,27 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,1), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(52) CometFilter
+(46) CometFilter
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Condition : ((((isnotnull(d_year#48) AND isnotnull(d_moy#10)) AND (d_year#48 = 2001)) AND (d_moy#10 = 1)) AND isnotnull(d_date_sk#9))
 
-(53) CometProject
+(47) CometProject
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Arguments: [d_date_sk#9, d_moy#10], [d_date_sk#9, d_moy#10]
 
-(54) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_moy#10]
 
-(55) BroadcastExchange
+(49) BroadcastExchange
 Input [2]: [d_date_sk#9, d_moy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 26 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
-BroadcastExchange (60)
-+- * ColumnarToRow (59)
-   +- CometProject (58)
-      +- CometFilter (57)
-         +- CometScan parquet spark_catalog.default.date_dim (56)
+Subquery:2 Hosting operator id = 24 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
+BroadcastExchange (54)
++- * ColumnarToRow (53)
+   +- CometProject (52)
+      +- CometFilter (51)
+         +- CometScan parquet spark_catalog.default.date_dim (50)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -324,18 +300,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(57) CometFilter
+(51) CometFilter
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#35)) AND (d_year#49 = 2001)) AND (d_moy#35 = 2)) AND isnotnull(d_date_sk#34))
 
-(58) CometProject
+(52) CometProject
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Arguments: [d_date_sk#34, d_moy#35], [d_date_sk#34, d_moy#35]
 
-(59) ColumnarToRow [codegen id : 1]
+(53) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#34, d_moy#35]
 
-(60) BroadcastExchange
+(54) BroadcastExchange
 Input [2]: [d_date_sk#34, d_moy#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt
index 0dc072692c..002266e76e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39a/simplified.txt
@@ -1,87 +1,81 @@
 WholeStageCodegen (11)
-  ColumnarToRow
+  Sort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
     InputAdapter
-      CometSort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
-        CometColumnarExchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
-          RowToColumnar
-            WholeStageCodegen (10)
-              BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
-                Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-                  Filter [mean,stdev]
-                    HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                      ColumnarToRow
-                        InputAdapter
-                          CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
-                            RowToColumnar
-                              WholeStageCodegen (4)
-                                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                                  Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                                    BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                      Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                          Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                            BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [inv_item_sk,inv_warehouse_sk]
-                                                    CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk,d_moy]
-                                                                  CometFilter [d_year,d_moy,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #4
+      Exchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
+        WholeStageCodegen (10)
+          BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
+            Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+              Filter [mean,stdev]
+                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                  InputAdapter
+                    Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
+                      WholeStageCodegen (4)
+                        HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                          Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                            BroadcastHashJoin [inv_date_sk,d_date_sk]
+                              Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                  Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                    BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [inv_item_sk,inv_warehouse_sk]
+                                            CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
                                                   WholeStageCodegen (1)
                                                     ColumnarToRow
                                                       InputAdapter
-                                                        CometFilter [i_item_sk]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk]
-                                          InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [w_warehouse_sk]
-                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                                        CometProject [d_date_sk,d_moy]
+                                                          CometFilter [d_year,d_moy,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_moy] #3
-                InputAdapter
-                  BroadcastExchange #6
-                    WholeStageCodegen (9)
-                      Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-                        Filter [mean,stdev]
-                          HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                            ColumnarToRow
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [i_item_sk]
+                                                  CometScan parquet spark_catalog.default.item [i_item_sk]
+                                  InputAdapter
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [w_warehouse_sk]
+                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                               InputAdapter
-                                CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
-                                  RowToColumnar
-                                    WholeStageCodegen (8)
-                                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                                        Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                                          BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                            Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                              BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                                Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                                  BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [inv_item_sk,inv_warehouse_sk]
-                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #2
-                                                              BroadcastExchange #8
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk,d_moy]
-                                                                        CometFilter [d_year,d_moy,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                    InputAdapter
-                                                      ReusedExchange [i_item_sk] #4
-                                                InputAdapter
-                                                  ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
+                                ReusedExchange [d_date_sk,d_moy] #3
+            InputAdapter
+              BroadcastExchange #6
+                WholeStageCodegen (9)
+                  Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+                    Filter [mean,stdev]
+                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                        InputAdapter
+                          Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
+                            WholeStageCodegen (8)
+                              HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                                Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                                  BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                    Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                        Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                          BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [inv_item_sk,inv_warehouse_sk]
+                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #2
+                                                      BroadcastExchange #8
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk,d_moy]
+                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                             InputAdapter
-                                              ReusedExchange [d_date_sk,d_moy] #8
+                                              ReusedExchange [i_item_sk] #4
+                                        InputAdapter
+                                          ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk,d_moy] #8
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt
index cf500fbd99..98e8bc4642 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/explain.txt
@@ -1,54 +1,48 @@
 == Physical Plan ==
-* ColumnarToRow (50)
-+- CometSort (49)
-   +- CometColumnarExchange (48)
-      +- RowToColumnar (47)
-         +- * BroadcastHashJoin Inner BuildRight (46)
-            :- * Project (25)
-            :  +- * Filter (24)
-            :     +- * HashAggregate (23)
-            :        +- * ColumnarToRow (22)
-            :           +- CometColumnarExchange (21)
-            :              +- RowToColumnar (20)
-            :                 +- * HashAggregate (19)
-            :                    +- * Project (18)
-            :                       +- * BroadcastHashJoin Inner BuildRight (17)
-            :                          :- * Project (15)
-            :                          :  +- * BroadcastHashJoin Inner BuildRight (14)
-            :                          :     :- * Project (9)
-            :                          :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-            :                          :     :     :- * ColumnarToRow (3)
-            :                          :     :     :  +- CometFilter (2)
-            :                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-            :                          :     :     +- BroadcastExchange (7)
-            :                          :     :        +- * ColumnarToRow (6)
-            :                          :     :           +- CometFilter (5)
-            :                          :     :              +- CometScan parquet spark_catalog.default.item (4)
-            :                          :     +- BroadcastExchange (13)
-            :                          :        +- * ColumnarToRow (12)
-            :                          :           +- CometFilter (11)
-            :                          :              +- CometScan parquet spark_catalog.default.warehouse (10)
-            :                          +- ReusedExchange (16)
-            +- BroadcastExchange (45)
-               +- * Project (44)
-                  +- * Filter (43)
-                     +- * HashAggregate (42)
-                        +- * ColumnarToRow (41)
-                           +- CometColumnarExchange (40)
-                              +- RowToColumnar (39)
-                                 +- * HashAggregate (38)
-                                    +- * Project (37)
-                                       +- * BroadcastHashJoin Inner BuildRight (36)
-                                          :- * Project (34)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (33)
-                                          :     :- * Project (31)
-                                          :     :  +- * BroadcastHashJoin Inner BuildRight (30)
-                                          :     :     :- * ColumnarToRow (28)
-                                          :     :     :  +- CometFilter (27)
-                                          :     :     :     +- CometScan parquet spark_catalog.default.inventory (26)
-                                          :     :     +- ReusedExchange (29)
-                                          :     +- ReusedExchange (32)
-                                          +- ReusedExchange (35)
+* Sort (44)
++- Exchange (43)
+   +- * BroadcastHashJoin Inner BuildRight (42)
+      :- * Project (23)
+      :  +- * Filter (22)
+      :     +- * HashAggregate (21)
+      :        +- Exchange (20)
+      :           +- * HashAggregate (19)
+      :              +- * Project (18)
+      :                 +- * BroadcastHashJoin Inner BuildRight (17)
+      :                    :- * Project (15)
+      :                    :  +- * BroadcastHashJoin Inner BuildRight (14)
+      :                    :     :- * Project (9)
+      :                    :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :                    :     :     :- * ColumnarToRow (3)
+      :                    :     :     :  +- CometFilter (2)
+      :                    :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+      :                    :     :     +- BroadcastExchange (7)
+      :                    :     :        +- * ColumnarToRow (6)
+      :                    :     :           +- CometFilter (5)
+      :                    :     :              +- CometScan parquet spark_catalog.default.item (4)
+      :                    :     +- BroadcastExchange (13)
+      :                    :        +- * ColumnarToRow (12)
+      :                    :           +- CometFilter (11)
+      :                    :              +- CometScan parquet spark_catalog.default.warehouse (10)
+      :                    +- ReusedExchange (16)
+      +- BroadcastExchange (41)
+         +- * Project (40)
+            +- * Filter (39)
+               +- * HashAggregate (38)
+                  +- Exchange (37)
+                     +- * HashAggregate (36)
+                        +- * Project (35)
+                           +- * BroadcastHashJoin Inner BuildRight (34)
+                              :- * Project (32)
+                              :  +- * BroadcastHashJoin Inner BuildRight (31)
+                              :     :- * Project (29)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (28)
+                              :     :     :- * ColumnarToRow (26)
+                              :     :     :  +- CometFilter (25)
+                              :     :     :     +- CometScan parquet spark_catalog.default.inventory (24)
+                              :     :     +- ReusedExchange (27)
+                              :     +- ReusedExchange (30)
+                              +- ReusedExchange (33)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -122,7 +116,7 @@ Join condition: None
 Output [5]: [inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 Input [6]: [inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4, i_item_sk#6, w_warehouse_sk#7, w_warehouse_name#8]
 
-(16) ReusedExchange [Reuses operator id: 55]
+(16) ReusedExchange [Reuses operator id: 49]
 Output [2]: [d_date_sk#9, d_moy#10]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -142,28 +136,22 @@ Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#3 as double)), par
 Aggregate Attributes [5]: [n#11, avg#12, m2#13, sum#14, count#15]
 Results [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 
-(20) RowToColumnar
+(20) Exchange
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
+Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
-Arguments: hashpartitioning(w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) ColumnarToRow [codegen id : 10]
-Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
-
-(23) HashAggregate [codegen id : 10]
+(21) HashAggregate [codegen id : 10]
 Input [9]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10, n#16, avg#17, m2#18, sum#19, count#20]
 Keys [4]: [w_warehouse_name#8, w_warehouse_sk#7, i_item_sk#6, d_moy#10]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double)), avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#3 as double))#21, avg(inv_quantity_on_hand#3)#22]
 Results [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stddev_samp(cast(inv_quantity_on_hand#3 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#3)#22 AS mean#24]
 
-(24) Filter [codegen id : 10]
+(22) Filter [codegen id : 10]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 Condition : (CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END AND CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.5) END)
 
-(25) Project [codegen id : 10]
+(23) Project [codegen id : 10]
 Output [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#25]
 Input [5]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, stdev#23, mean#24]
 
@@ -175,116 +163,104 @@ PartitionFilters: [isnotnull(inv_date_sk#29), dynamicpruningexpression(inv_date_
 PushedFilters: [IsNotNull(inv_item_sk), IsNotNull(inv_warehouse_sk)]
 ReadSchema: struct<inv_item_sk:int,inv_warehouse_sk:int,inv_quantity_on_hand:int>
 
-(27) CometFilter
+(25) CometFilter
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 Condition : (isnotnull(inv_item_sk#26) AND isnotnull(inv_warehouse_sk#27))
 
-(28) ColumnarToRow [codegen id : 8]
+(26) ColumnarToRow [codegen id : 8]
 Input [4]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29]
 
-(29) ReusedExchange [Reuses operator id: 7]
+(27) ReusedExchange [Reuses operator id: 7]
 Output [1]: [i_item_sk#31]
 
-(30) BroadcastHashJoin [codegen id : 8]
+(28) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_item_sk#26]
 Right keys [1]: [i_item_sk#31]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 8]
+(29) Project [codegen id : 8]
 Output [4]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 Input [5]: [inv_item_sk#26, inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31]
 
-(32) ReusedExchange [Reuses operator id: 13]
+(30) ReusedExchange [Reuses operator id: 13]
 Output [2]: [w_warehouse_sk#32, w_warehouse_name#33]
 
-(33) BroadcastHashJoin [codegen id : 8]
+(31) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_warehouse_sk#27]
 Right keys [1]: [w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 8]
+(32) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 Input [6]: [inv_warehouse_sk#27, inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33]
 
-(35) ReusedExchange [Reuses operator id: 60]
+(33) ReusedExchange [Reuses operator id: 54]
 Output [2]: [d_date_sk#34, d_moy#35]
 
-(36) BroadcastHashJoin [codegen id : 8]
+(34) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [inv_date_sk#29]
 Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
+(35) Project [codegen id : 8]
 Output [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Input [7]: [inv_quantity_on_hand#28, inv_date_sk#29, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_date_sk#34, d_moy#35]
 
-(38) HashAggregate [codegen id : 8]
+(36) HashAggregate [codegen id : 8]
 Input [5]: [inv_quantity_on_hand#28, i_item_sk#31, w_warehouse_sk#32, w_warehouse_name#33, d_moy#35]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [partial_stddev_samp(cast(inv_quantity_on_hand#28 as double)), partial_avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [5]: [n#36, avg#37, m2#38, sum#39, count#40]
 Results [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 
-(39) RowToColumnar
-Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-
-(40) CometColumnarExchange
+(37) Exchange
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(41) ColumnarToRow [codegen id : 9]
-Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
-
-(42) HashAggregate [codegen id : 9]
+(38) HashAggregate [codegen id : 9]
 Input [9]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35, n#41, avg#42, m2#43, sum#44, count#45]
 Keys [4]: [w_warehouse_name#33, w_warehouse_sk#32, i_item_sk#31, d_moy#35]
 Functions [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double)), avg(inv_quantity_on_hand#28)]
 Aggregate Attributes [2]: [stddev_samp(cast(inv_quantity_on_hand#28 as double))#21, avg(inv_quantity_on_hand#28)#22]
 Results [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stddev_samp(cast(inv_quantity_on_hand#28 as double))#21 AS stdev#23, avg(inv_quantity_on_hand#28)#22 AS mean#24]
 
-(43) Filter [codegen id : 9]
+(39) Filter [codegen id : 9]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 Condition : CASE WHEN (mean#24 = 0.0) THEN false ELSE ((stdev#23 / mean#24) > 1.0) END
 
-(44) Project [codegen id : 9]
+(40) Project [codegen id : 9]
 Output [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#24 AS mean#46, CASE WHEN (mean#24 = 0.0) THEN null ELSE (stdev#23 / mean#24) END AS cov#47]
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, stdev#23, mean#24]
 
-(45) BroadcastExchange
+(41) BroadcastExchange
 Input [5]: [w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
-(46) BroadcastHashJoin [codegen id : 10]
+(42) BroadcastHashJoin [codegen id : 10]
 Left keys [2]: [i_item_sk#6, w_warehouse_sk#7]
 Right keys [2]: [i_item_sk#31, w_warehouse_sk#32]
 Join type: Inner
 Join condition: None
 
-(47) RowToColumnar
-Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-
-(48) CometColumnarExchange
-Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(49) CometSort
+(43) Exchange
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
-Arguments: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47], [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST]
+Arguments: rangepartitioning(w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(50) ColumnarToRow [codegen id : 11]
+(44) Sort [codegen id : 11]
 Input [10]: [w_warehouse_sk#7, i_item_sk#6, d_moy#10, mean#24, cov#25, w_warehouse_sk#32, i_item_sk#31, d_moy#35, mean#46, cov#47]
+Arguments: [w_warehouse_sk#7 ASC NULLS FIRST, i_item_sk#6 ASC NULLS FIRST, d_moy#10 ASC NULLS FIRST, mean#24 ASC NULLS FIRST, cov#25 ASC NULLS FIRST, d_moy#35 ASC NULLS FIRST, mean#46 ASC NULLS FIRST, cov#47 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (55)
-+- * ColumnarToRow (54)
-   +- CometProject (53)
-      +- CometFilter (52)
-         +- CometScan parquet spark_catalog.default.date_dim (51)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometProject (47)
+      +- CometFilter (46)
+         +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -294,27 +270,27 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,1), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(52) CometFilter
+(46) CometFilter
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Condition : ((((isnotnull(d_year#48) AND isnotnull(d_moy#10)) AND (d_year#48 = 2001)) AND (d_moy#10 = 1)) AND isnotnull(d_date_sk#9))
 
-(53) CometProject
+(47) CometProject
 Input [3]: [d_date_sk#9, d_year#48, d_moy#10]
 Arguments: [d_date_sk#9, d_moy#10], [d_date_sk#9, d_moy#10]
 
-(54) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_moy#10]
 
-(55) BroadcastExchange
+(49) BroadcastExchange
 Input [2]: [d_date_sk#9, d_moy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 26 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
-BroadcastExchange (60)
-+- * ColumnarToRow (59)
-   +- CometProject (58)
-      +- CometFilter (57)
-         +- CometScan parquet spark_catalog.default.date_dim (56)
+Subquery:2 Hosting operator id = 24 Hosting Expression = inv_date_sk#29 IN dynamicpruning#30
+BroadcastExchange (54)
++- * ColumnarToRow (53)
+   +- CometProject (52)
+      +- CometFilter (51)
+         +- CometScan parquet spark_catalog.default.date_dim (50)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -324,18 +300,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(57) CometFilter
+(51) CometFilter
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#35)) AND (d_year#49 = 2001)) AND (d_moy#35 = 2)) AND isnotnull(d_date_sk#34))
 
-(58) CometProject
+(52) CometProject
 Input [3]: [d_date_sk#34, d_year#49, d_moy#35]
 Arguments: [d_date_sk#34, d_moy#35], [d_date_sk#34, d_moy#35]
 
-(59) ColumnarToRow [codegen id : 1]
+(53) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#34, d_moy#35]
 
-(60) BroadcastExchange
+(54) BroadcastExchange
 Input [2]: [d_date_sk#34, d_moy#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt
index 0dc072692c..002266e76e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q39b/simplified.txt
@@ -1,87 +1,81 @@
 WholeStageCodegen (11)
-  ColumnarToRow
+  Sort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
     InputAdapter
-      CometSort [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov]
-        CometColumnarExchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
-          RowToColumnar
-            WholeStageCodegen (10)
-              BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
-                Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-                  Filter [mean,stdev]
-                    HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                      ColumnarToRow
-                        InputAdapter
-                          CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
-                            RowToColumnar
-                              WholeStageCodegen (4)
-                                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                                  Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                                    BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                      Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                          Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                            BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [inv_item_sk,inv_warehouse_sk]
-                                                    CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk,d_moy]
-                                                                  CometFilter [d_year,d_moy,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #4
+      Exchange [w_warehouse_sk,i_item_sk,d_moy,mean,cov,d_moy,mean,cov] #1
+        WholeStageCodegen (10)
+          BroadcastHashJoin [i_item_sk,w_warehouse_sk,i_item_sk,w_warehouse_sk]
+            Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+              Filter [mean,stdev]
+                HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                  InputAdapter
+                    Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #2
+                      WholeStageCodegen (4)
+                        HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                          Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                            BroadcastHashJoin [inv_date_sk,d_date_sk]
+                              Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                  Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                    BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [inv_item_sk,inv_warehouse_sk]
+                                            CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
                                                   WholeStageCodegen (1)
                                                     ColumnarToRow
                                                       InputAdapter
-                                                        CometFilter [i_item_sk]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk]
-                                          InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [w_warehouse_sk]
-                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                                        CometProject [d_date_sk,d_moy]
+                                                          CometFilter [d_year,d_moy,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_moy] #3
-                InputAdapter
-                  BroadcastExchange #6
-                    WholeStageCodegen (9)
-                      Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
-                        Filter [mean,stdev]
-                          HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
-                            ColumnarToRow
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [i_item_sk]
+                                                  CometScan parquet spark_catalog.default.item [i_item_sk]
+                                  InputAdapter
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [w_warehouse_sk]
+                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                               InputAdapter
-                                CometColumnarExchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
-                                  RowToColumnar
-                                    WholeStageCodegen (8)
-                                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
-                                        Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
-                                          BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                            Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
-                                              BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                                Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
-                                                  BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [inv_item_sk,inv_warehouse_sk]
-                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #2
-                                                              BroadcastExchange #8
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk,d_moy]
-                                                                        CometFilter [d_year,d_moy,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                    InputAdapter
-                                                      ReusedExchange [i_item_sk] #4
-                                                InputAdapter
-                                                  ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
+                                ReusedExchange [d_date_sk,d_moy] #3
+            InputAdapter
+              BroadcastExchange #6
+                WholeStageCodegen (9)
+                  Project [w_warehouse_sk,i_item_sk,d_moy,mean,stdev]
+                    Filter [mean,stdev]
+                      HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,n,avg,m2,sum,count] [stddev_samp(cast(inv_quantity_on_hand as double)),avg(inv_quantity_on_hand),stdev,mean,n,avg,m2,sum,count]
+                        InputAdapter
+                          Exchange [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy] #7
+                            WholeStageCodegen (8)
+                              HashAggregate [w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy,inv_quantity_on_hand] [n,avg,m2,sum,count,n,avg,m2,sum,count]
+                                Project [inv_quantity_on_hand,i_item_sk,w_warehouse_sk,w_warehouse_name,d_moy]
+                                  BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                    Project [inv_quantity_on_hand,inv_date_sk,i_item_sk,w_warehouse_sk,w_warehouse_name]
+                                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                        Project [inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk,i_item_sk]
+                                          BroadcastHashJoin [inv_item_sk,i_item_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [inv_item_sk,inv_warehouse_sk]
+                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #2
+                                                      BroadcastExchange #8
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk,d_moy]
+                                                                CometFilter [d_year,d_moy,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                             InputAdapter
-                                              ReusedExchange [d_date_sk,d_moy] #8
+                                              ReusedExchange [i_item_sk] #4
+                                        InputAdapter
+                                          ReusedExchange [w_warehouse_sk,w_warehouse_name] #5
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk,d_moy] #8
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt
index 092603e845..9b2bb49916 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/explain.txt
@@ -1,124 +1,112 @@
 == Physical Plan ==
-TakeOrderedAndProject (120)
-+- * Project (119)
-   +- * BroadcastHashJoin Inner BuildRight (118)
-      :- * Project (99)
-      :  +- * BroadcastHashJoin Inner BuildRight (98)
-      :     :- * Project (78)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (77)
-      :     :     :- * Project (58)
-      :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
-      :     :     :     :- * BroadcastHashJoin Inner BuildRight (37)
-      :     :     :     :  :- * ColumnarToRow (18)
-      :     :     :     :  :  +- CometFilter (17)
-      :     :     :     :  :     +- CometHashAggregate (16)
-      :     :     :     :  :        +- CometColumnarExchange (15)
-      :     :     :     :  :           +- RowToColumnar (14)
-      :     :     :     :  :              +- * HashAggregate (13)
-      :     :     :     :  :                 +- * Project (12)
-      :     :     :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :     :  :                       :- * Project (9)
-      :     :     :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :     :     :  :                       :     :- * ColumnarToRow (3)
-      :     :     :     :  :                       :     :  +- CometFilter (2)
-      :     :     :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :     :     :  :                       :     +- BroadcastExchange (7)
-      :     :     :     :  :                       :        +- * ColumnarToRow (6)
-      :     :     :     :  :                       :           +- CometFilter (5)
-      :     :     :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :     :     :  :                       +- ReusedExchange (10)
-      :     :     :     :  +- BroadcastExchange (36)
-      :     :     :     :     +- * ColumnarToRow (35)
-      :     :     :     :        +- CometHashAggregate (34)
-      :     :     :     :           +- CometColumnarExchange (33)
-      :     :     :     :              +- RowToColumnar (32)
-      :     :     :     :                 +- * HashAggregate (31)
-      :     :     :     :                    +- * Project (30)
-      :     :     :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :     :     :                          :- * Project (27)
-      :     :     :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :     :     :                          :     :- * ColumnarToRow (21)
-      :     :     :     :                          :     :  +- CometFilter (20)
-      :     :     :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
-      :     :     :     :                          :     +- BroadcastExchange (25)
-      :     :     :     :                          :        +- * ColumnarToRow (24)
-      :     :     :     :                          :           +- CometFilter (23)
-      :     :     :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
-      :     :     :     :                          +- ReusedExchange (28)
-      :     :     :     +- BroadcastExchange (56)
-      :     :     :        +- * ColumnarToRow (55)
-      :     :     :           +- CometFilter (54)
-      :     :     :              +- CometHashAggregate (53)
-      :     :     :                 +- CometColumnarExchange (52)
-      :     :     :                    +- RowToColumnar (51)
-      :     :     :                       +- * HashAggregate (50)
-      :     :     :                          +- * Project (49)
-      :     :     :                             +- * BroadcastHashJoin Inner BuildRight (48)
-      :     :     :                                :- * Project (46)
-      :     :     :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
-      :     :     :                                :     :- * ColumnarToRow (40)
-      :     :     :                                :     :  +- CometFilter (39)
-      :     :     :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
-      :     :     :                                :     +- BroadcastExchange (44)
-      :     :     :                                :        +- * ColumnarToRow (43)
-      :     :     :                                :           +- CometFilter (42)
-      :     :     :                                :              +- CometScan parquet spark_catalog.default.catalog_sales (41)
-      :     :     :                                +- ReusedExchange (47)
-      :     :     +- BroadcastExchange (76)
-      :     :        +- * ColumnarToRow (75)
-      :     :           +- CometHashAggregate (74)
-      :     :              +- CometColumnarExchange (73)
-      :     :                 +- RowToColumnar (72)
-      :     :                    +- * HashAggregate (71)
-      :     :                       +- * Project (70)
-      :     :                          +- * BroadcastHashJoin Inner BuildRight (69)
-      :     :                             :- * Project (67)
-      :     :                             :  +- * BroadcastHashJoin Inner BuildRight (66)
-      :     :                             :     :- * ColumnarToRow (61)
-      :     :                             :     :  +- CometFilter (60)
-      :     :                             :     :     +- CometScan parquet spark_catalog.default.customer (59)
-      :     :                             :     +- BroadcastExchange (65)
-      :     :                             :        +- * ColumnarToRow (64)
-      :     :                             :           +- CometFilter (63)
-      :     :                             :              +- CometScan parquet spark_catalog.default.catalog_sales (62)
-      :     :                             +- ReusedExchange (68)
-      :     +- BroadcastExchange (97)
-      :        +- * ColumnarToRow (96)
-      :           +- CometFilter (95)
-      :              +- CometHashAggregate (94)
-      :                 +- CometColumnarExchange (93)
-      :                    +- RowToColumnar (92)
-      :                       +- * HashAggregate (91)
-      :                          +- * Project (90)
-      :                             +- * BroadcastHashJoin Inner BuildRight (89)
-      :                                :- * Project (87)
-      :                                :  +- * BroadcastHashJoin Inner BuildRight (86)
-      :                                :     :- * ColumnarToRow (81)
-      :                                :     :  +- CometFilter (80)
-      :                                :     :     +- CometScan parquet spark_catalog.default.customer (79)
-      :                                :     +- BroadcastExchange (85)
-      :                                :        +- * ColumnarToRow (84)
-      :                                :           +- CometFilter (83)
-      :                                :              +- CometScan parquet spark_catalog.default.web_sales (82)
-      :                                +- ReusedExchange (88)
-      +- BroadcastExchange (117)
-         +- * ColumnarToRow (116)
-            +- CometHashAggregate (115)
-               +- CometColumnarExchange (114)
-                  +- RowToColumnar (113)
-                     +- * HashAggregate (112)
-                        +- * Project (111)
-                           +- * BroadcastHashJoin Inner BuildRight (110)
-                              :- * Project (108)
-                              :  +- * BroadcastHashJoin Inner BuildRight (107)
-                              :     :- * ColumnarToRow (102)
-                              :     :  +- CometFilter (101)
-                              :     :     +- CometScan parquet spark_catalog.default.customer (100)
-                              :     +- BroadcastExchange (106)
-                              :        +- * ColumnarToRow (105)
-                              :           +- CometFilter (104)
-                              :              +- CometScan parquet spark_catalog.default.web_sales (103)
-                              +- ReusedExchange (109)
+TakeOrderedAndProject (108)
++- * Project (107)
+   +- * BroadcastHashJoin Inner BuildRight (106)
+      :- * Project (89)
+      :  +- * BroadcastHashJoin Inner BuildRight (88)
+      :     :- * Project (70)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (69)
+      :     :     :- * Project (52)
+      :     :     :  +- * BroadcastHashJoin Inner BuildRight (51)
+      :     :     :     :- * BroadcastHashJoin Inner BuildRight (33)
+      :     :     :     :  :- * Filter (16)
+      :     :     :     :  :  +- * HashAggregate (15)
+      :     :     :     :  :     +- Exchange (14)
+      :     :     :     :  :        +- * HashAggregate (13)
+      :     :     :     :  :           +- * Project (12)
+      :     :     :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :     :  :                 :- * Project (9)
+      :     :     :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :     :     :  :                 :     :- * ColumnarToRow (3)
+      :     :     :     :  :                 :     :  +- CometFilter (2)
+      :     :     :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :     :     :  :                 :     +- BroadcastExchange (7)
+      :     :     :     :  :                 :        +- * ColumnarToRow (6)
+      :     :     :     :  :                 :           +- CometFilter (5)
+      :     :     :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :     :     :  :                 +- ReusedExchange (10)
+      :     :     :     :  +- BroadcastExchange (32)
+      :     :     :     :     +- * HashAggregate (31)
+      :     :     :     :        +- Exchange (30)
+      :     :     :     :           +- * HashAggregate (29)
+      :     :     :     :              +- * Project (28)
+      :     :     :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
+      :     :     :     :                    :- * Project (25)
+      :     :     :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :     :     :                    :     :- * ColumnarToRow (19)
+      :     :     :     :                    :     :  +- CometFilter (18)
+      :     :     :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
+      :     :     :     :                    :     +- BroadcastExchange (23)
+      :     :     :     :                    :        +- * ColumnarToRow (22)
+      :     :     :     :                    :           +- CometFilter (21)
+      :     :     :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
+      :     :     :     :                    +- ReusedExchange (26)
+      :     :     :     +- BroadcastExchange (50)
+      :     :     :        +- * Filter (49)
+      :     :     :           +- * HashAggregate (48)
+      :     :     :              +- Exchange (47)
+      :     :     :                 +- * HashAggregate (46)
+      :     :     :                    +- * Project (45)
+      :     :     :                       +- * BroadcastHashJoin Inner BuildRight (44)
+      :     :     :                          :- * Project (42)
+      :     :     :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
+      :     :     :                          :     :- * ColumnarToRow (36)
+      :     :     :                          :     :  +- CometFilter (35)
+      :     :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
+      :     :     :                          :     +- BroadcastExchange (40)
+      :     :     :                          :        +- * ColumnarToRow (39)
+      :     :     :                          :           +- CometFilter (38)
+      :     :     :                          :              +- CometScan parquet spark_catalog.default.catalog_sales (37)
+      :     :     :                          +- ReusedExchange (43)
+      :     :     +- BroadcastExchange (68)
+      :     :        +- * HashAggregate (67)
+      :     :           +- Exchange (66)
+      :     :              +- * HashAggregate (65)
+      :     :                 +- * Project (64)
+      :     :                    +- * BroadcastHashJoin Inner BuildRight (63)
+      :     :                       :- * Project (61)
+      :     :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
+      :     :                       :     :- * ColumnarToRow (55)
+      :     :                       :     :  +- CometFilter (54)
+      :     :                       :     :     +- CometScan parquet spark_catalog.default.customer (53)
+      :     :                       :     +- BroadcastExchange (59)
+      :     :                       :        +- * ColumnarToRow (58)
+      :     :                       :           +- CometFilter (57)
+      :     :                       :              +- CometScan parquet spark_catalog.default.catalog_sales (56)
+      :     :                       +- ReusedExchange (62)
+      :     +- BroadcastExchange (87)
+      :        +- * Filter (86)
+      :           +- * HashAggregate (85)
+      :              +- Exchange (84)
+      :                 +- * HashAggregate (83)
+      :                    +- * Project (82)
+      :                       +- * BroadcastHashJoin Inner BuildRight (81)
+      :                          :- * Project (79)
+      :                          :  +- * BroadcastHashJoin Inner BuildRight (78)
+      :                          :     :- * ColumnarToRow (73)
+      :                          :     :  +- CometFilter (72)
+      :                          :     :     +- CometScan parquet spark_catalog.default.customer (71)
+      :                          :     +- BroadcastExchange (77)
+      :                          :        +- * ColumnarToRow (76)
+      :                          :           +- CometFilter (75)
+      :                          :              +- CometScan parquet spark_catalog.default.web_sales (74)
+      :                          +- ReusedExchange (80)
+      +- BroadcastExchange (105)
+         +- * HashAggregate (104)
+            +- Exchange (103)
+               +- * HashAggregate (102)
+                  +- * Project (101)
+                     +- * BroadcastHashJoin Inner BuildRight (100)
+                        :- * Project (98)
+                        :  +- * BroadcastHashJoin Inner BuildRight (97)
+                        :     :- * ColumnarToRow (92)
+                        :     :  +- CometFilter (91)
+                        :     :     +- CometScan parquet spark_catalog.default.customer (90)
+                        :     +- BroadcastExchange (96)
+                        :        +- * ColumnarToRow (95)
+                        :           +- CometFilter (94)
+                        :              +- CometScan parquet spark_catalog.default.web_sales (93)
+                        +- ReusedExchange (99)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -164,7 +152,7 @@ Join condition: None
 Output [12]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_ext_discount_amt#10, ss_ext_sales_price#11, ss_ext_wholesale_cost#12, ss_ext_list_price#13, ss_sold_date_sk#14]
 Input [14]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_customer_sk#9, ss_ext_discount_amt#10, ss_ext_sales_price#11, ss_ext_wholesale_cost#12, ss_ext_list_price#13, ss_sold_date_sk#14]
 
-(10) ReusedExchange [Reuses operator id: 124]
+(10) ReusedExchange [Reuses operator id: 112]
 Output [2]: [d_date_sk#16, d_year#17]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -184,500 +172,476 @@ Functions [1]: [partial_sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12)
 Aggregate Attributes [2]: [sum#18, isEmpty#19]
 Results [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
 
-(14) RowToColumnar
+(14) Exchange
 Input [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 24]
 Input [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17, sum#20, isEmpty#21]
 Keys [8]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, d_year#17]
 Functions [1]: [sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12) - ss_ext_discount_amt#10) + ss_ext_sales_price#11) / 2))]
+Aggregate Attributes [1]: [sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12) - ss_ext_discount_amt#10) + ss_ext_sales_price#11) / 2))#22]
+Results [2]: [c_customer_id#2 AS customer_id#23, sum(((((ss_ext_list_price#13 - ss_ext_wholesale_cost#12) - ss_ext_discount_amt#10) + ss_ext_sales_price#11) / 2))#22 AS year_total#24]
 
-(17) CometFilter
-Input [2]: [customer_id#22, year_total#23]
-Condition : (isnotnull(year_total#23) AND (year_total#23 > 0.000000))
-
-(18) ColumnarToRow [codegen id : 24]
-Input [2]: [customer_id#22, year_total#23]
+(16) Filter [codegen id : 24]
+Input [2]: [customer_id#23, year_total#24]
+Condition : (isnotnull(year_total#24) AND (year_total#24 > 0.000000))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31]
+Output [8]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(20) CometFilter
-Input [8]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31]
-Condition : (isnotnull(c_customer_sk#24) AND isnotnull(c_customer_id#25))
+(18) CometFilter
+Input [8]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32]
+Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_customer_id#26))
 
-(21) ColumnarToRow [codegen id : 6]
-Input [8]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31]
+(19) ColumnarToRow [codegen id : 6]
+Input [8]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
+Output [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#37), dynamicpruningexpression(ss_sold_date_sk#37 IN dynamicpruning#38)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#38), dynamicpruningexpression(ss_sold_date_sk#38 IN dynamicpruning#39)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_discount_amt:decimal(7,2),ss_ext_sales_price:decimal(7,2),ss_ext_wholesale_cost:decimal(7,2),ss_ext_list_price:decimal(7,2)>
 
-(23) CometFilter
-Input [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
-Condition : isnotnull(ss_customer_sk#32)
+(21) CometFilter
+Input [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
+Condition : isnotnull(ss_customer_sk#33)
 
-(24) ColumnarToRow [codegen id : 4]
-Input [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
+(22) ColumnarToRow [codegen id : 4]
+Input [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
 
-(25) BroadcastExchange
-Input [6]: [ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
+(23) BroadcastExchange
+Input [6]: [ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(26) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#24]
-Right keys [1]: [ss_customer_sk#32]
+(24) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#25]
+Right keys [1]: [ss_customer_sk#33]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
-Output [12]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
-Input [14]: [c_customer_sk#24, c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_customer_sk#32, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37]
+(25) Project [codegen id : 6]
+Output [12]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
+Input [14]: [c_customer_sk#25, c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_customer_sk#33, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38]
 
-(28) ReusedExchange [Reuses operator id: 128]
-Output [2]: [d_date_sk#39, d_year#40]
+(26) ReusedExchange [Reuses operator id: 116]
+Output [2]: [d_date_sk#40, d_year#41]
 
-(29) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#37]
-Right keys [1]: [d_date_sk#39]
+(27) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#38]
+Right keys [1]: [d_date_sk#40]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [12]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, d_year#40]
-Input [14]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, ss_sold_date_sk#37, d_date_sk#39, d_year#40]
-
-(31) HashAggregate [codegen id : 6]
-Input [12]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, ss_ext_discount_amt#33, ss_ext_sales_price#34, ss_ext_wholesale_cost#35, ss_ext_list_price#36, d_year#40]
-Keys [8]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40]
-Functions [1]: [partial_sum(((((ss_ext_list_price#36 - ss_ext_wholesale_cost#35) - ss_ext_discount_amt#33) + ss_ext_sales_price#34) / 2))]
-Aggregate Attributes [2]: [sum#41, isEmpty#42]
-Results [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
-
-(32) RowToColumnar
-Input [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
-
-(33) CometColumnarExchange
-Input [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
-Arguments: hashpartitioning(c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [10]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40, sum#43, isEmpty#44]
-Keys [8]: [c_customer_id#25, c_first_name#26, c_last_name#27, c_preferred_cust_flag#28, c_birth_country#29, c_login#30, c_email_address#31, d_year#40]
-Functions [1]: [sum(((((ss_ext_list_price#36 - ss_ext_wholesale_cost#35) - ss_ext_discount_amt#33) + ss_ext_sales_price#34) / 2))]
-
-(35) ColumnarToRow [codegen id : 7]
-Input [8]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52]
-
-(36) BroadcastExchange
-Input [8]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52]
+(28) Project [codegen id : 6]
+Output [12]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, d_year#41]
+Input [14]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, ss_sold_date_sk#38, d_date_sk#40, d_year#41]
+
+(29) HashAggregate [codegen id : 6]
+Input [12]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, ss_ext_discount_amt#34, ss_ext_sales_price#35, ss_ext_wholesale_cost#36, ss_ext_list_price#37, d_year#41]
+Keys [8]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41]
+Functions [1]: [partial_sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))]
+Aggregate Attributes [2]: [sum#42, isEmpty#43]
+Results [10]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, sum#44, isEmpty#45]
+
+(30) Exchange
+Input [10]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, sum#44, isEmpty#45]
+Arguments: hashpartitioning(c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 7]
+Input [10]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41, sum#44, isEmpty#45]
+Keys [8]: [c_customer_id#26, c_first_name#27, c_last_name#28, c_preferred_cust_flag#29, c_birth_country#30, c_login#31, c_email_address#32, d_year#41]
+Functions [1]: [sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))]
+Aggregate Attributes [1]: [sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))#22]
+Results [8]: [c_customer_id#26 AS customer_id#46, c_first_name#27 AS customer_first_name#47, c_last_name#28 AS customer_last_name#48, c_preferred_cust_flag#29 AS customer_preferred_cust_flag#49, c_birth_country#30 AS customer_birth_country#50, c_login#31 AS customer_login#51, c_email_address#32 AS customer_email_address#52, sum(((((ss_ext_list_price#37 - ss_ext_wholesale_cost#36) - ss_ext_discount_amt#34) + ss_ext_sales_price#35) / 2))#22 AS year_total#53]
+
+(32) BroadcastExchange
+Input [8]: [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(37) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#22]
-Right keys [1]: [customer_id#45]
+(33) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#23]
+Right keys [1]: [customer_id#46]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60]
+Output [8]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(39) CometFilter
-Input [8]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60]
-Condition : (isnotnull(c_customer_sk#53) AND isnotnull(c_customer_id#54))
+(35) CometFilter
+Input [8]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61]
+Condition : (isnotnull(c_customer_sk#54) AND isnotnull(c_customer_id#55))
 
-(40) ColumnarToRow [codegen id : 10]
-Input [8]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60]
+(36) ColumnarToRow [codegen id : 10]
+Input [8]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
+Output [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#66), dynamicpruningexpression(cs_sold_date_sk#66 IN dynamicpruning#67)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#67), dynamicpruningexpression(cs_sold_date_sk#67 IN dynamicpruning#68)]
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_ext_discount_amt:decimal(7,2),cs_ext_sales_price:decimal(7,2),cs_ext_wholesale_cost:decimal(7,2),cs_ext_list_price:decimal(7,2)>
 
-(42) CometFilter
-Input [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
-Condition : isnotnull(cs_bill_customer_sk#61)
+(38) CometFilter
+Input [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
+Condition : isnotnull(cs_bill_customer_sk#62)
 
-(43) ColumnarToRow [codegen id : 8]
-Input [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
+(39) ColumnarToRow [codegen id : 8]
+Input [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
 
-(44) BroadcastExchange
-Input [6]: [cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
+(40) BroadcastExchange
+Input [6]: [cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(45) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#53]
-Right keys [1]: [cs_bill_customer_sk#61]
+(41) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#54]
+Right keys [1]: [cs_bill_customer_sk#62]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 10]
-Output [12]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
-Input [14]: [c_customer_sk#53, c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_bill_customer_sk#61, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66]
+(42) Project [codegen id : 10]
+Output [12]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
+Input [14]: [c_customer_sk#54, c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_bill_customer_sk#62, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67]
 
-(47) ReusedExchange [Reuses operator id: 124]
-Output [2]: [d_date_sk#68, d_year#69]
+(43) ReusedExchange [Reuses operator id: 112]
+Output [2]: [d_date_sk#69, d_year#70]
 
-(48) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#66]
-Right keys [1]: [d_date_sk#68]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#67]
+Right keys [1]: [d_date_sk#69]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 10]
-Output [12]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, d_year#69]
-Input [14]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, cs_sold_date_sk#66, d_date_sk#68, d_year#69]
-
-(50) HashAggregate [codegen id : 10]
-Input [12]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, cs_ext_discount_amt#62, cs_ext_sales_price#63, cs_ext_wholesale_cost#64, cs_ext_list_price#65, d_year#69]
-Keys [8]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69]
-Functions [1]: [partial_sum(((((cs_ext_list_price#65 - cs_ext_wholesale_cost#64) - cs_ext_discount_amt#62) + cs_ext_sales_price#63) / 2))]
-Aggregate Attributes [2]: [sum#70, isEmpty#71]
-Results [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
-
-(51) RowToColumnar
-Input [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
-
-(52) CometColumnarExchange
-Input [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
-Arguments: hashpartitioning(c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(53) CometHashAggregate
-Input [10]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69, sum#72, isEmpty#73]
-Keys [8]: [c_customer_id#54, c_first_name#55, c_last_name#56, c_preferred_cust_flag#57, c_birth_country#58, c_login#59, c_email_address#60, d_year#69]
-Functions [1]: [sum(((((cs_ext_list_price#65 - cs_ext_wholesale_cost#64) - cs_ext_discount_amt#62) + cs_ext_sales_price#63) / 2))]
-
-(54) CometFilter
-Input [2]: [customer_id#74, year_total#75]
-Condition : (isnotnull(year_total#75) AND (year_total#75 > 0.000000))
-
-(55) ColumnarToRow [codegen id : 11]
-Input [2]: [customer_id#74, year_total#75]
-
-(56) BroadcastExchange
-Input [2]: [customer_id#74, year_total#75]
+(45) Project [codegen id : 10]
+Output [12]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, d_year#70]
+Input [14]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, cs_sold_date_sk#67, d_date_sk#69, d_year#70]
+
+(46) HashAggregate [codegen id : 10]
+Input [12]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, cs_ext_discount_amt#63, cs_ext_sales_price#64, cs_ext_wholesale_cost#65, cs_ext_list_price#66, d_year#70]
+Keys [8]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70]
+Functions [1]: [partial_sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))]
+Aggregate Attributes [2]: [sum#71, isEmpty#72]
+Results [10]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, sum#73, isEmpty#74]
+
+(47) Exchange
+Input [10]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, sum#73, isEmpty#74]
+Arguments: hashpartitioning(c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(48) HashAggregate [codegen id : 11]
+Input [10]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70, sum#73, isEmpty#74]
+Keys [8]: [c_customer_id#55, c_first_name#56, c_last_name#57, c_preferred_cust_flag#58, c_birth_country#59, c_login#60, c_email_address#61, d_year#70]
+Functions [1]: [sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))]
+Aggregate Attributes [1]: [sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))#75]
+Results [2]: [c_customer_id#55 AS customer_id#76, sum(((((cs_ext_list_price#66 - cs_ext_wholesale_cost#65) - cs_ext_discount_amt#63) + cs_ext_sales_price#64) / 2))#75 AS year_total#77]
+
+(49) Filter [codegen id : 11]
+Input [2]: [customer_id#76, year_total#77]
+Condition : (isnotnull(year_total#77) AND (year_total#77 > 0.000000))
+
+(50) BroadcastExchange
+Input [2]: [customer_id#76, year_total#77]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(57) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#22]
-Right keys [1]: [customer_id#74]
+(51) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#23]
+Right keys [1]: [customer_id#76]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 24]
-Output [11]: [customer_id#22, year_total#23, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52, year_total#75]
-Input [12]: [customer_id#22, year_total#23, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52, customer_id#74, year_total#75]
+(52) Project [codegen id : 24]
+Output [11]: [customer_id#23, year_total#24, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53, year_total#77]
+Input [12]: [customer_id#23, year_total#24, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53, customer_id#76, year_total#77]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83]
+Output [8]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(60) CometFilter
-Input [8]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83]
-Condition : (isnotnull(c_customer_sk#76) AND isnotnull(c_customer_id#77))
+(54) CometFilter
+Input [8]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85]
+Condition : (isnotnull(c_customer_sk#78) AND isnotnull(c_customer_id#79))
 
-(61) ColumnarToRow [codegen id : 14]
-Input [8]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83]
+(55) ColumnarToRow [codegen id : 14]
+Input [8]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
+Output [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#89), dynamicpruningexpression(cs_sold_date_sk#89 IN dynamicpruning#90)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#91), dynamicpruningexpression(cs_sold_date_sk#91 IN dynamicpruning#92)]
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_ext_discount_amt:decimal(7,2),cs_ext_sales_price:decimal(7,2),cs_ext_wholesale_cost:decimal(7,2),cs_ext_list_price:decimal(7,2)>
 
-(63) CometFilter
-Input [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
-Condition : isnotnull(cs_bill_customer_sk#84)
+(57) CometFilter
+Input [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
+Condition : isnotnull(cs_bill_customer_sk#86)
 
-(64) ColumnarToRow [codegen id : 12]
-Input [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
+(58) ColumnarToRow [codegen id : 12]
+Input [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
 
-(65) BroadcastExchange
-Input [6]: [cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
+(59) BroadcastExchange
+Input [6]: [cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(66) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#76]
-Right keys [1]: [cs_bill_customer_sk#84]
+(60) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#78]
+Right keys [1]: [cs_bill_customer_sk#86]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 14]
-Output [12]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
-Input [14]: [c_customer_sk#76, c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_bill_customer_sk#84, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89]
+(61) Project [codegen id : 14]
+Output [12]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
+Input [14]: [c_customer_sk#78, c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_bill_customer_sk#86, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91]
 
-(68) ReusedExchange [Reuses operator id: 128]
-Output [2]: [d_date_sk#91, d_year#92]
+(62) ReusedExchange [Reuses operator id: 116]
+Output [2]: [d_date_sk#93, d_year#94]
 
-(69) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [cs_sold_date_sk#89]
-Right keys [1]: [d_date_sk#91]
+(63) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [cs_sold_date_sk#91]
+Right keys [1]: [d_date_sk#93]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 14]
-Output [12]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, d_year#92]
-Input [14]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, cs_sold_date_sk#89, d_date_sk#91, d_year#92]
-
-(71) HashAggregate [codegen id : 14]
-Input [12]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, cs_ext_discount_amt#85, cs_ext_sales_price#86, cs_ext_wholesale_cost#87, cs_ext_list_price#88, d_year#92]
-Keys [8]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92]
-Functions [1]: [partial_sum(((((cs_ext_list_price#88 - cs_ext_wholesale_cost#87) - cs_ext_discount_amt#85) + cs_ext_sales_price#86) / 2))]
-Aggregate Attributes [2]: [sum#93, isEmpty#94]
-Results [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
-
-(72) RowToColumnar
-Input [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
-
-(73) CometColumnarExchange
-Input [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
-Arguments: hashpartitioning(c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(74) CometHashAggregate
-Input [10]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92, sum#95, isEmpty#96]
-Keys [8]: [c_customer_id#77, c_first_name#78, c_last_name#79, c_preferred_cust_flag#80, c_birth_country#81, c_login#82, c_email_address#83, d_year#92]
-Functions [1]: [sum(((((cs_ext_list_price#88 - cs_ext_wholesale_cost#87) - cs_ext_discount_amt#85) + cs_ext_sales_price#86) / 2))]
-
-(75) ColumnarToRow [codegen id : 15]
-Input [2]: [customer_id#97, year_total#98]
-
-(76) BroadcastExchange
-Input [2]: [customer_id#97, year_total#98]
+(64) Project [codegen id : 14]
+Output [12]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, d_year#94]
+Input [14]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, cs_sold_date_sk#91, d_date_sk#93, d_year#94]
+
+(65) HashAggregate [codegen id : 14]
+Input [12]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, cs_ext_discount_amt#87, cs_ext_sales_price#88, cs_ext_wholesale_cost#89, cs_ext_list_price#90, d_year#94]
+Keys [8]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94]
+Functions [1]: [partial_sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))]
+Aggregate Attributes [2]: [sum#95, isEmpty#96]
+Results [10]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, sum#97, isEmpty#98]
+
+(66) Exchange
+Input [10]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, sum#97, isEmpty#98]
+Arguments: hashpartitioning(c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(67) HashAggregate [codegen id : 15]
+Input [10]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94, sum#97, isEmpty#98]
+Keys [8]: [c_customer_id#79, c_first_name#80, c_last_name#81, c_preferred_cust_flag#82, c_birth_country#83, c_login#84, c_email_address#85, d_year#94]
+Functions [1]: [sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))]
+Aggregate Attributes [1]: [sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))#75]
+Results [2]: [c_customer_id#79 AS customer_id#99, sum(((((cs_ext_list_price#90 - cs_ext_wholesale_cost#89) - cs_ext_discount_amt#87) + cs_ext_sales_price#88) / 2))#75 AS year_total#100]
+
+(68) BroadcastExchange
+Input [2]: [customer_id#99, year_total#100]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(77) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#22]
-Right keys [1]: [customer_id#97]
+(69) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#23]
+Right keys [1]: [customer_id#99]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#75 > 0.000000) THEN (year_total#98 / year_total#75) END > CASE WHEN (year_total#23 > 0.000000) THEN (year_total#52 / year_total#23) END)
+Join condition: (CASE WHEN (year_total#77 > 0.000000) THEN (year_total#100 / year_total#77) END > CASE WHEN (year_total#24 > 0.000000) THEN (year_total#53 / year_total#24) END)
 
-(78) Project [codegen id : 24]
-Output [10]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98]
-Input [13]: [customer_id#22, year_total#23, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#52, year_total#75, customer_id#97, year_total#98]
+(70) Project [codegen id : 24]
+Output [10]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100]
+Input [13]: [customer_id#23, year_total#24, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#53, year_total#77, customer_id#99, year_total#100]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106]
+Output [8]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(80) CometFilter
-Input [8]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106]
-Condition : (isnotnull(c_customer_sk#99) AND isnotnull(c_customer_id#100))
+(72) CometFilter
+Input [8]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108]
+Condition : (isnotnull(c_customer_sk#101) AND isnotnull(c_customer_id#102))
 
-(81) ColumnarToRow [codegen id : 18]
-Input [8]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106]
+(73) ColumnarToRow [codegen id : 18]
+Input [8]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
+Output [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#112), dynamicpruningexpression(ws_sold_date_sk#112 IN dynamicpruning#113)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#114), dynamicpruningexpression(ws_sold_date_sk#114 IN dynamicpruning#115)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_sales_price:decimal(7,2),ws_ext_wholesale_cost:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(83) CometFilter
-Input [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
-Condition : isnotnull(ws_bill_customer_sk#107)
+(75) CometFilter
+Input [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
+Condition : isnotnull(ws_bill_customer_sk#109)
 
-(84) ColumnarToRow [codegen id : 16]
-Input [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
+(76) ColumnarToRow [codegen id : 16]
+Input [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
 
-(85) BroadcastExchange
-Input [6]: [ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
+(77) BroadcastExchange
+Input [6]: [ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-(86) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [c_customer_sk#99]
-Right keys [1]: [ws_bill_customer_sk#107]
+(78) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [c_customer_sk#101]
+Right keys [1]: [ws_bill_customer_sk#109]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 18]
-Output [12]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
-Input [14]: [c_customer_sk#99, c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_bill_customer_sk#107, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112]
+(79) Project [codegen id : 18]
+Output [12]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
+Input [14]: [c_customer_sk#101, c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_bill_customer_sk#109, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114]
 
-(88) ReusedExchange [Reuses operator id: 124]
-Output [2]: [d_date_sk#114, d_year#115]
+(80) ReusedExchange [Reuses operator id: 112]
+Output [2]: [d_date_sk#116, d_year#117]
 
-(89) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ws_sold_date_sk#112]
-Right keys [1]: [d_date_sk#114]
+(81) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ws_sold_date_sk#114]
+Right keys [1]: [d_date_sk#116]
 Join type: Inner
 Join condition: None
 
-(90) Project [codegen id : 18]
-Output [12]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, d_year#115]
-Input [14]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, ws_sold_date_sk#112, d_date_sk#114, d_year#115]
-
-(91) HashAggregate [codegen id : 18]
-Input [12]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, ws_ext_discount_amt#108, ws_ext_sales_price#109, ws_ext_wholesale_cost#110, ws_ext_list_price#111, d_year#115]
-Keys [8]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115]
-Functions [1]: [partial_sum(((((ws_ext_list_price#111 - ws_ext_wholesale_cost#110) - ws_ext_discount_amt#108) + ws_ext_sales_price#109) / 2))]
-Aggregate Attributes [2]: [sum#116, isEmpty#117]
-Results [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
-
-(92) RowToColumnar
-Input [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
-
-(93) CometColumnarExchange
-Input [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
-Arguments: hashpartitioning(c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
-
-(94) CometHashAggregate
-Input [10]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115, sum#118, isEmpty#119]
-Keys [8]: [c_customer_id#100, c_first_name#101, c_last_name#102, c_preferred_cust_flag#103, c_birth_country#104, c_login#105, c_email_address#106, d_year#115]
-Functions [1]: [sum(((((ws_ext_list_price#111 - ws_ext_wholesale_cost#110) - ws_ext_discount_amt#108) + ws_ext_sales_price#109) / 2))]
-
-(95) CometFilter
-Input [2]: [customer_id#120, year_total#121]
-Condition : (isnotnull(year_total#121) AND (year_total#121 > 0.000000))
-
-(96) ColumnarToRow [codegen id : 19]
-Input [2]: [customer_id#120, year_total#121]
-
-(97) BroadcastExchange
-Input [2]: [customer_id#120, year_total#121]
+(82) Project [codegen id : 18]
+Output [12]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, d_year#117]
+Input [14]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, ws_sold_date_sk#114, d_date_sk#116, d_year#117]
+
+(83) HashAggregate [codegen id : 18]
+Input [12]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, ws_ext_discount_amt#110, ws_ext_sales_price#111, ws_ext_wholesale_cost#112, ws_ext_list_price#113, d_year#117]
+Keys [8]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117]
+Functions [1]: [partial_sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))]
+Aggregate Attributes [2]: [sum#118, isEmpty#119]
+Results [10]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, sum#120, isEmpty#121]
+
+(84) Exchange
+Input [10]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, sum#120, isEmpty#121]
+Arguments: hashpartitioning(c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, 5), ENSURE_REQUIREMENTS, [plan_id=13]
+
+(85) HashAggregate [codegen id : 19]
+Input [10]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117, sum#120, isEmpty#121]
+Keys [8]: [c_customer_id#102, c_first_name#103, c_last_name#104, c_preferred_cust_flag#105, c_birth_country#106, c_login#107, c_email_address#108, d_year#117]
+Functions [1]: [sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))]
+Aggregate Attributes [1]: [sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))#122]
+Results [2]: [c_customer_id#102 AS customer_id#123, sum(((((ws_ext_list_price#113 - ws_ext_wholesale_cost#112) - ws_ext_discount_amt#110) + ws_ext_sales_price#111) / 2))#122 AS year_total#124]
+
+(86) Filter [codegen id : 19]
+Input [2]: [customer_id#123, year_total#124]
+Condition : (isnotnull(year_total#124) AND (year_total#124 > 0.000000))
+
+(87) BroadcastExchange
+Input [2]: [customer_id#123, year_total#124]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=14]
 
-(98) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#22]
-Right keys [1]: [customer_id#120]
+(88) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#23]
+Right keys [1]: [customer_id#123]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 24]
-Output [11]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98, year_total#121]
-Input [12]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98, customer_id#120, year_total#121]
+(89) Project [codegen id : 24]
+Output [11]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100, year_total#124]
+Input [12]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100, customer_id#123, year_total#124]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129]
+Output [8]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(101) CometFilter
-Input [8]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129]
-Condition : (isnotnull(c_customer_sk#122) AND isnotnull(c_customer_id#123))
+(91) CometFilter
+Input [8]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132]
+Condition : (isnotnull(c_customer_sk#125) AND isnotnull(c_customer_id#126))
 
-(102) ColumnarToRow [codegen id : 22]
-Input [8]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129]
+(92) ColumnarToRow [codegen id : 22]
+Input [8]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
+Output [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#135), dynamicpruningexpression(ws_sold_date_sk#135 IN dynamicpruning#136)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#138), dynamicpruningexpression(ws_sold_date_sk#138 IN dynamicpruning#139)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_sales_price:decimal(7,2),ws_ext_wholesale_cost:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(104) CometFilter
-Input [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
-Condition : isnotnull(ws_bill_customer_sk#130)
+(94) CometFilter
+Input [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
+Condition : isnotnull(ws_bill_customer_sk#133)
 
-(105) ColumnarToRow [codegen id : 20]
-Input [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
+(95) ColumnarToRow [codegen id : 20]
+Input [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
 
-(106) BroadcastExchange
-Input [6]: [ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
+(96) BroadcastExchange
+Input [6]: [ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=15]
 
-(107) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [c_customer_sk#122]
-Right keys [1]: [ws_bill_customer_sk#130]
+(97) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [c_customer_sk#125]
+Right keys [1]: [ws_bill_customer_sk#133]
 Join type: Inner
 Join condition: None
 
-(108) Project [codegen id : 22]
-Output [12]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
-Input [14]: [c_customer_sk#122, c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_bill_customer_sk#130, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135]
+(98) Project [codegen id : 22]
+Output [12]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
+Input [14]: [c_customer_sk#125, c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_bill_customer_sk#133, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138]
 
-(109) ReusedExchange [Reuses operator id: 128]
-Output [2]: [d_date_sk#137, d_year#138]
+(99) ReusedExchange [Reuses operator id: 116]
+Output [2]: [d_date_sk#140, d_year#141]
 
-(110) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [ws_sold_date_sk#135]
-Right keys [1]: [d_date_sk#137]
+(100) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [ws_sold_date_sk#138]
+Right keys [1]: [d_date_sk#140]
 Join type: Inner
 Join condition: None
 
-(111) Project [codegen id : 22]
-Output [12]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, d_year#138]
-Input [14]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, ws_sold_date_sk#135, d_date_sk#137, d_year#138]
-
-(112) HashAggregate [codegen id : 22]
-Input [12]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, ws_ext_discount_amt#131, ws_ext_sales_price#132, ws_ext_wholesale_cost#133, ws_ext_list_price#134, d_year#138]
-Keys [8]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138]
-Functions [1]: [partial_sum(((((ws_ext_list_price#134 - ws_ext_wholesale_cost#133) - ws_ext_discount_amt#131) + ws_ext_sales_price#132) / 2))]
-Aggregate Attributes [2]: [sum#139, isEmpty#140]
-Results [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
-
-(113) RowToColumnar
-Input [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
-
-(114) CometColumnarExchange
-Input [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
-Arguments: hashpartitioning(c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
-
-(115) CometHashAggregate
-Input [10]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138, sum#141, isEmpty#142]
-Keys [8]: [c_customer_id#123, c_first_name#124, c_last_name#125, c_preferred_cust_flag#126, c_birth_country#127, c_login#128, c_email_address#129, d_year#138]
-Functions [1]: [sum(((((ws_ext_list_price#134 - ws_ext_wholesale_cost#133) - ws_ext_discount_amt#131) + ws_ext_sales_price#132) / 2))]
-
-(116) ColumnarToRow [codegen id : 23]
-Input [2]: [customer_id#143, year_total#144]
-
-(117) BroadcastExchange
-Input [2]: [customer_id#143, year_total#144]
+(101) Project [codegen id : 22]
+Output [12]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, d_year#141]
+Input [14]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, ws_sold_date_sk#138, d_date_sk#140, d_year#141]
+
+(102) HashAggregate [codegen id : 22]
+Input [12]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, ws_ext_discount_amt#134, ws_ext_sales_price#135, ws_ext_wholesale_cost#136, ws_ext_list_price#137, d_year#141]
+Keys [8]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141]
+Functions [1]: [partial_sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))]
+Aggregate Attributes [2]: [sum#142, isEmpty#143]
+Results [10]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, sum#144, isEmpty#145]
+
+(103) Exchange
+Input [10]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, sum#144, isEmpty#145]
+Arguments: hashpartitioning(c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, 5), ENSURE_REQUIREMENTS, [plan_id=16]
+
+(104) HashAggregate [codegen id : 23]
+Input [10]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141, sum#144, isEmpty#145]
+Keys [8]: [c_customer_id#126, c_first_name#127, c_last_name#128, c_preferred_cust_flag#129, c_birth_country#130, c_login#131, c_email_address#132, d_year#141]
+Functions [1]: [sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))]
+Aggregate Attributes [1]: [sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))#122]
+Results [2]: [c_customer_id#126 AS customer_id#146, sum(((((ws_ext_list_price#137 - ws_ext_wholesale_cost#136) - ws_ext_discount_amt#134) + ws_ext_sales_price#135) / 2))#122 AS year_total#147]
+
+(105) BroadcastExchange
+Input [2]: [customer_id#146, year_total#147]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=17]
 
-(118) BroadcastHashJoin [codegen id : 24]
-Left keys [1]: [customer_id#22]
-Right keys [1]: [customer_id#143]
+(106) BroadcastHashJoin [codegen id : 24]
+Left keys [1]: [customer_id#23]
+Right keys [1]: [customer_id#146]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#75 > 0.000000) THEN (year_total#98 / year_total#75) END > CASE WHEN (year_total#121 > 0.000000) THEN (year_total#144 / year_total#121) END)
+Join condition: (CASE WHEN (year_total#77 > 0.000000) THEN (year_total#100 / year_total#77) END > CASE WHEN (year_total#124 > 0.000000) THEN (year_total#147 / year_total#124) END)
 
-(119) Project [codegen id : 24]
-Output [7]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51]
-Input [13]: [customer_id#22, customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51, year_total#75, year_total#98, year_total#121, customer_id#143, year_total#144]
+(107) Project [codegen id : 24]
+Output [7]: [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52]
+Input [13]: [customer_id#23, customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52, year_total#77, year_total#100, year_total#124, customer_id#146, year_total#147]
 
-(120) TakeOrderedAndProject
-Input [7]: [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51]
-Arguments: 100, [customer_id#45 ASC NULLS FIRST, customer_first_name#46 ASC NULLS FIRST, customer_last_name#47 ASC NULLS FIRST, customer_preferred_cust_flag#48 ASC NULLS FIRST, customer_birth_country#49 ASC NULLS FIRST, customer_login#50 ASC NULLS FIRST, customer_email_address#51 ASC NULLS FIRST], [customer_id#45, customer_first_name#46, customer_last_name#47, customer_preferred_cust_flag#48, customer_birth_country#49, customer_login#50, customer_email_address#51]
+(108) TakeOrderedAndProject
+Input [7]: [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52]
+Arguments: 100, [customer_id#46 ASC NULLS FIRST, customer_first_name#47 ASC NULLS FIRST, customer_last_name#48 ASC NULLS FIRST, customer_preferred_cust_flag#49 ASC NULLS FIRST, customer_birth_country#50 ASC NULLS FIRST, customer_login#51 ASC NULLS FIRST, customer_email_address#52 ASC NULLS FIRST], [customer_id#46, customer_first_name#47, customer_last_name#48, customer_preferred_cust_flag#49, customer_birth_country#50, customer_login#51, customer_email_address#52]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#14 IN dynamicpruning#15
-BroadcastExchange (124)
-+- * ColumnarToRow (123)
-   +- CometFilter (122)
-      +- CometScan parquet spark_catalog.default.date_dim (121)
+BroadcastExchange (112)
++- * ColumnarToRow (111)
+   +- CometFilter (110)
+      +- CometScan parquet spark_catalog.default.date_dim (109)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -687,48 +651,48 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(122) CometFilter
+(110) CometFilter
 Input [2]: [d_date_sk#16, d_year#17]
 Condition : ((isnotnull(d_year#17) AND (d_year#17 = 2001)) AND isnotnull(d_date_sk#16))
 
-(123) ColumnarToRow [codegen id : 1]
+(111) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#16, d_year#17]
 
-(124) BroadcastExchange
+(112) BroadcastExchange
 Input [2]: [d_date_sk#16, d_year#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=18]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#37 IN dynamicpruning#38
-BroadcastExchange (128)
-+- * ColumnarToRow (127)
-   +- CometFilter (126)
-      +- CometScan parquet spark_catalog.default.date_dim (125)
+Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#38 IN dynamicpruning#39
+BroadcastExchange (116)
++- * ColumnarToRow (115)
+   +- CometFilter (114)
+      +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#39, d_year#40]
+Output [2]: [d_date_sk#40, d_year#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(126) CometFilter
-Input [2]: [d_date_sk#39, d_year#40]
-Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2002)) AND isnotnull(d_date_sk#39))
+(114) CometFilter
+Input [2]: [d_date_sk#40, d_year#41]
+Condition : ((isnotnull(d_year#41) AND (d_year#41 = 2002)) AND isnotnull(d_date_sk#40))
 
-(127) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#39, d_year#40]
+(115) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#40, d_year#41]
 
-(128) BroadcastExchange
-Input [2]: [d_date_sk#39, d_year#40]
+(116) BroadcastExchange
+Input [2]: [d_date_sk#40, d_year#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=19]
 
-Subquery:3 Hosting operator id = 41 Hosting Expression = cs_sold_date_sk#66 IN dynamicpruning#15
+Subquery:3 Hosting operator id = 37 Hosting Expression = cs_sold_date_sk#67 IN dynamicpruning#15
 
-Subquery:4 Hosting operator id = 62 Hosting Expression = cs_sold_date_sk#89 IN dynamicpruning#38
+Subquery:4 Hosting operator id = 56 Hosting Expression = cs_sold_date_sk#91 IN dynamicpruning#39
 
-Subquery:5 Hosting operator id = 82 Hosting Expression = ws_sold_date_sk#112 IN dynamicpruning#15
+Subquery:5 Hosting operator id = 74 Hosting Expression = ws_sold_date_sk#114 IN dynamicpruning#15
 
-Subquery:6 Hosting operator id = 103 Hosting Expression = ws_sold_date_sk#135 IN dynamicpruning#38
+Subquery:6 Hosting operator id = 93 Hosting Expression = ws_sold_date_sk#138 IN dynamicpruning#39
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt
index 3299726c59..99e255a0e4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q4/simplified.txt
@@ -9,13 +9,43 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
                 Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,customer_preferred_cust_flag,customer_birth_country,customer_login,customer_email_address,year_total,year_total]
                   BroadcastHashJoin [customer_id,customer_id]
                     BroadcastHashJoin [customer_id,customer_id]
-                      ColumnarToRow
-                        InputAdapter
-                          CometFilter [year_total]
-                            CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
-                              CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #1
-                                RowToColumnar
-                                  WholeStageCodegen (3)
+                      Filter [year_total]
+                        HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ss_ext_list_price - ss_ext_wholesale_cost) - ss_ext_discount_amt) + ss_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
+                          InputAdapter
+                            Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #1
+                              WholeStageCodegen (3)
+                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ss_ext_list_price,ss_ext_wholesale_cost,ss_ext_discount_amt,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,d_year]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
+                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [c_customer_sk,c_customer_id]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                          InputAdapter
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [ss_customer_sk]
+                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #1
+                                                          BroadcastExchange #3
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometFilter [d_year,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year] #3
+                      InputAdapter
+                        BroadcastExchange #4
+                          WholeStageCodegen (7)
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ss_ext_list_price - ss_ext_wholesale_cost) - ss_ext_discount_amt) + ss_ext_sales_price) / 2)),customer_id,customer_first_name,customer_last_name,customer_preferred_cust_flag,customer_birth_country,customer_login,customer_email_address,year_total,sum,isEmpty]
+                              InputAdapter
+                                Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #5
+                                  WholeStageCodegen (6)
                                     HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ss_ext_list_price,ss_ext_wholesale_cost,ss_ext_discount_amt,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty]
                                       Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,d_year]
                                         BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -26,166 +56,124 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
                                                   CometFilter [c_customer_sk,c_customer_id]
                                                     CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                               InputAdapter
-                                                BroadcastExchange #2
-                                                  WholeStageCodegen (1)
+                                                BroadcastExchange #6
+                                                  WholeStageCodegen (4)
                                                     ColumnarToRow
                                                       InputAdapter
                                                         CometFilter [ss_customer_sk]
                                                           CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #1
-                                                              BroadcastExchange #3
+                                                            SubqueryBroadcast [d_date_sk] #2
+                                                              BroadcastExchange #7
                                                                 WholeStageCodegen (1)
                                                                   ColumnarToRow
                                                                     InputAdapter
                                                                       CometFilter [d_year,d_date_sk]
                                                                         CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_year] #3
-                      InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (7)
-                            ColumnarToRow
-                              InputAdapter
-                                CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
-                                  CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #5
-                                    RowToColumnar
-                                      WholeStageCodegen (6)
-                                        HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ss_ext_list_price,ss_ext_wholesale_cost,ss_ext_discount_amt,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,d_year]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
-                                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [c_customer_sk,c_customer_id]
-                                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                                  InputAdapter
-                                                    BroadcastExchange #6
-                                                      WholeStageCodegen (4)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [ss_customer_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_sales_price,ss_ext_wholesale_cost,ss_ext_list_price,ss_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #2
-                                                                  BroadcastExchange #7
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
-                                                                        InputAdapter
-                                                                          CometFilter [d_year,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk,d_year] #7
+                                            ReusedExchange [d_date_sk,d_year] #7
                     InputAdapter
                       BroadcastExchange #8
                         WholeStageCodegen (11)
-                          ColumnarToRow
-                            InputAdapter
-                              CometFilter [year_total]
-                                CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
-                                  CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
-                                    RowToColumnar
-                                      WholeStageCodegen (10)
-                                        HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
-                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                                BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [c_customer_sk,c_customer_id]
-                                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                                  InputAdapter
-                                                    BroadcastExchange #10
-                                                      WholeStageCodegen (8)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [cs_bill_customer_sk]
-                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
+                          Filter [year_total]
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((cs_ext_list_price - cs_ext_wholesale_cost) - cs_ext_discount_amt) + cs_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
+                              InputAdapter
+                                Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
+                                  WholeStageCodegen (10)
+                                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                            BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [c_customer_sk,c_customer_id]
+                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                               InputAdapter
-                                                ReusedExchange [d_date_sk,d_year] #3
+                                                BroadcastExchange #10
+                                                  WholeStageCodegen (8)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [cs_bill_customer_sk]
+                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                                            ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk,d_year] #3
                 InputAdapter
                   BroadcastExchange #11
                     WholeStageCodegen (15)
-                      ColumnarToRow
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((cs_ext_list_price - cs_ext_wholesale_cost) - cs_ext_discount_amt) + cs_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
                         InputAdapter
-                          CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
-                            CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
-                              RowToColumnar
-                                WholeStageCodegen (14)
-                                  HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                    Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
-                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                          BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [c_customer_sk,c_customer_id]
-                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                            InputAdapter
-                                              BroadcastExchange #13
-                                                WholeStageCodegen (12)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [cs_bill_customer_sk]
-                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #2
+                          Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
+                            WholeStageCodegen (14)
+                              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,cs_ext_list_price,cs_ext_wholesale_cost,cs_ext_discount_amt,cs_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,d_year]
+                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                    Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                      BroadcastHashJoin [c_customer_sk,cs_bill_customer_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [c_customer_sk,c_customer_id]
+                                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                         InputAdapter
-                                          ReusedExchange [d_date_sk,d_year] #7
+                                          BroadcastExchange #13
+                                            WholeStageCodegen (12)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [cs_bill_customer_sk]
+                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_ext_discount_amt,cs_ext_sales_price,cs_ext_wholesale_cost,cs_ext_list_price,cs_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #2
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #14
                 WholeStageCodegen (19)
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [year_total]
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #15
-                            RowToColumnar
-                              WholeStageCodegen (18)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                          InputAdapter
-                                            BroadcastExchange #16
-                                              WholeStageCodegen (16)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
+                  Filter [year_total]
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ws_ext_list_price - ws_ext_wholesale_cost) - ws_ext_discount_amt) + ws_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #15
+                          WholeStageCodegen (18)
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk,c_customer_id]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
+                                        BroadcastExchange #16
+                                          WholeStageCodegen (16)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #17
             WholeStageCodegen (23)
-              ColumnarToRow
+              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty] [sum(((((ws_ext_list_price - ws_ext_wholesale_cost) - ws_ext_discount_amt) + ws_ext_sales_price) / 2)),customer_id,year_total,sum,isEmpty]
                 InputAdapter
-                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum,isEmpty]
-                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #18
-                      RowToColumnar
-                        WholeStageCodegen (22)
-                          HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_customer_id]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                    InputAdapter
-                                      BroadcastExchange #19
-                                        WholeStageCodegen (20)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #2
+                  Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #18
+                    WholeStageCodegen (22)
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_wholesale_cost,ws_ext_discount_amt,ws_ext_sales_price] [sum,isEmpty,sum,isEmpty]
+                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,d_year]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_customer_sk,c_customer_id]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #7
+                                  BroadcastExchange #19
+                                    WholeStageCodegen (20)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_customer_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_sales_price,ws_ext_wholesale_cost,ws_ext_list_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #2
+                            InputAdapter
+                              ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt
index 89bb2af3e9..9f6036a23d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/explain.txt
@@ -1,38 +1,36 @@
 == Physical Plan ==
-* ColumnarToRow (34)
-+- CometTakeOrderedAndProject (33)
-   +- CometHashAggregate (32)
-      +- CometColumnarExchange (31)
-         +- RowToColumnar (30)
-            +- * HashAggregate (29)
-               +- * Project (28)
-                  +- * BroadcastHashJoin Inner BuildRight (27)
-                     :- * Project (25)
-                     :  +- * BroadcastHashJoin Inner BuildRight (24)
-                     :     :- * Project (18)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                     :     :     :- * ColumnarToRow (12)
-                     :     :     :  +- CometProject (11)
-                     :     :     :     +- CometSortMergeJoin (10)
-                     :     :     :        :- CometSort (4)
-                     :     :     :        :  +- CometColumnarExchange (3)
-                     :     :     :        :     +- CometFilter (2)
-                     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                     :     :     :        +- CometSort (9)
-                     :     :     :           +- CometColumnarExchange (8)
-                     :     :     :              +- CometProject (7)
-                     :     :     :                 +- CometFilter (6)
-                     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (5)
-                     :     :     +- BroadcastExchange (16)
-                     :     :        +- * ColumnarToRow (15)
-                     :     :           +- CometFilter (14)
-                     :     :              +- CometScan parquet spark_catalog.default.warehouse (13)
-                     :     +- BroadcastExchange (23)
-                     :        +- * ColumnarToRow (22)
-                     :           +- CometProject (21)
-                     :              +- CometFilter (20)
-                     :                 +- CometScan parquet spark_catalog.default.item (19)
-                     +- ReusedExchange (26)
+TakeOrderedAndProject (32)
++- * HashAggregate (31)
+   +- Exchange (30)
+      +- * HashAggregate (29)
+         +- * Project (28)
+            +- * BroadcastHashJoin Inner BuildRight (27)
+               :- * Project (25)
+               :  +- * BroadcastHashJoin Inner BuildRight (24)
+               :     :- * Project (18)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+               :     :     :- * ColumnarToRow (12)
+               :     :     :  +- CometProject (11)
+               :     :     :     +- CometSortMergeJoin (10)
+               :     :     :        :- CometSort (4)
+               :     :     :        :  +- CometExchange (3)
+               :     :     :        :     +- CometFilter (2)
+               :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :     :     :        +- CometSort (9)
+               :     :     :           +- CometExchange (8)
+               :     :     :              +- CometProject (7)
+               :     :     :                 +- CometFilter (6)
+               :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (5)
+               :     :     +- BroadcastExchange (16)
+               :     :        +- * ColumnarToRow (15)
+               :     :           +- CometFilter (14)
+               :     :              +- CometScan parquet spark_catalog.default.warehouse (13)
+               :     +- BroadcastExchange (23)
+               :        +- * ColumnarToRow (22)
+               :           +- CometProject (21)
+               :              +- CometFilter (20)
+               :                 +- CometScan parquet spark_catalog.default.item (19)
+               +- ReusedExchange (26)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -47,9 +45,9 @@ ReadSchema: struct<cs_warehouse_sk:int,cs_item_sk:int,cs_order_number:int,cs_sal
 Input [5]: [cs_warehouse_sk#1, cs_item_sk#2, cs_order_number#3, cs_sales_price#4, cs_sold_date_sk#5]
 Condition : (isnotnull(cs_warehouse_sk#1) AND isnotnull(cs_item_sk#2))
 
-(3) CometColumnarExchange
+(3) CometExchange
 Input [5]: [cs_warehouse_sk#1, cs_item_sk#2, cs_order_number#3, cs_sales_price#4, cs_sold_date_sk#5]
-Arguments: hashpartitioning(cs_order_number#3, cs_item_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(cs_order_number#3, cs_item_sk#2, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (4) CometSort
 Input [5]: [cs_warehouse_sk#1, cs_item_sk#2, cs_order_number#3, cs_sales_price#4, cs_sold_date_sk#5]
@@ -70,9 +68,9 @@ Condition : (isnotnull(cr_order_number#8) AND isnotnull(cr_item_sk#7))
 Input [4]: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9, cr_returned_date_sk#10]
 Arguments: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9], [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9]
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [3]: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9]
-Arguments: hashpartitioning(cr_order_number#8, cr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(cr_order_number#8, cr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [3]: [cr_item_sk#7, cr_order_number#8, cr_refunded_cash#9]
@@ -150,7 +148,7 @@ Join condition: None
 Output [5]: [cs_sales_price#4, cs_sold_date_sk#5, cr_refunded_cash#9, w_state#12, i_item_id#14]
 Input [7]: [cs_item_sk#2, cs_sales_price#4, cs_sold_date_sk#5, cr_refunded_cash#9, w_state#12, i_item_sk#13, i_item_id#14]
 
-(26) ReusedExchange [Reuses operator id: 38]
+(26) ReusedExchange [Reuses operator id: 36]
 Output [2]: [d_date_sk#16, d_date#17]
 
 (27) BroadcastHashJoin [codegen id : 4]
@@ -170,32 +168,28 @@ Functions [2]: [partial_sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_pr
 Aggregate Attributes [4]: [sum#18, isEmpty#19, sum#20, isEmpty#21]
 Results [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
 
-(30) RowToColumnar
+(30) Exchange
 Input [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
+Arguments: hashpartitioning(w_state#12, i_item_id#14, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(31) CometColumnarExchange
-Input [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
-Arguments: hashpartitioning(w_state#12, i_item_id#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(32) CometHashAggregate
+(31) HashAggregate [codegen id : 5]
 Input [6]: [w_state#12, i_item_id#14, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Keys [2]: [w_state#12, i_item_id#14]
 Functions [2]: [sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END), sum(CASE WHEN (d_date#17 >= 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)]
+Aggregate Attributes [2]: [sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#26, sum(CASE WHEN (d_date#17 >= 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#27]
+Results [4]: [w_state#12, i_item_id#14, sum(CASE WHEN (d_date#17 < 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#26 AS sales_before#28, sum(CASE WHEN (d_date#17 >= 2000-03-11) THEN (cs_sales_price#4 - coalesce(cast(cr_refunded_cash#9 as decimal(12,2)), 0.00)) ELSE 0.00 END)#27 AS sales_after#29]
 
-(33) CometTakeOrderedAndProject
-Input [4]: [w_state#12, i_item_id#14, sales_before#26, sales_after#27]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[w_state#12 ASC NULLS FIRST,i_item_id#14 ASC NULLS FIRST], output=[w_state#12,i_item_id#14,sales_before#26,sales_after#27]), 100, [w_state#12 ASC NULLS FIRST, i_item_id#14 ASC NULLS FIRST], [w_state#12, i_item_id#14, sales_before#26, sales_after#27]
-
-(34) ColumnarToRow [codegen id : 5]
-Input [4]: [w_state#12, i_item_id#14, sales_before#26, sales_after#27]
+(32) TakeOrderedAndProject
+Input [4]: [w_state#12, i_item_id#14, sales_before#28, sales_after#29]
+Arguments: 100, [w_state#12 ASC NULLS FIRST, i_item_id#14 ASC NULLS FIRST], [w_state#12, i_item_id#14, sales_before#28, sales_after#29]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (38)
-+- * ColumnarToRow (37)
-   +- CometFilter (36)
-      +- CometScan parquet spark_catalog.default.date_dim (35)
+BroadcastExchange (36)
++- * ColumnarToRow (35)
+   +- CometFilter (34)
+      +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -205,14 +199,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-02-10), LessThanOrEqual(d_date,2000-04-10), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(36) CometFilter
+(34) CometFilter
 Input [2]: [d_date_sk#16, d_date#17]
 Condition : (((isnotnull(d_date#17) AND (d_date#17 >= 2000-02-10)) AND (d_date#17 <= 2000-04-10)) AND isnotnull(d_date_sk#16))
 
-(37) ColumnarToRow [codegen id : 1]
+(35) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#16, d_date#17]
 
-(38) BroadcastExchange
+(36) BroadcastExchange
 Input [2]: [d_date_sk#16, d_date#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt
index 541de7ec5e..98d39c58d5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q40/simplified.txt
@@ -1,52 +1,50 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [w_state,i_item_id,sales_before,sales_after]
-        CometHashAggregate [w_state,i_item_id,sum,isEmpty,sum,isEmpty]
-          CometColumnarExchange [w_state,i_item_id] #1
-            RowToColumnar
-              WholeStageCodegen (4)
-                HashAggregate [w_state,i_item_id,d_date,cs_sales_price,cr_refunded_cash] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  Project [cs_sales_price,cr_refunded_cash,w_state,i_item_id,d_date]
-                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                      Project [cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state,i_item_id]
-                        BroadcastHashJoin [cs_item_sk,i_item_sk]
-                          Project [cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state]
-                            BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometProject [cs_warehouse_sk,cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash]
-                                    CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                      CometSort [cs_order_number,cs_item_sk]
-                                        CometColumnarExchange [cs_order_number,cs_item_sk] #2
-                                          CometFilter [cs_warehouse_sk,cs_item_sk]
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_item_sk,cs_order_number,cs_sales_price,cs_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [d_date,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                      CometSort [cr_order_number,cr_item_sk]
-                                        CometColumnarExchange [cr_order_number,cr_item_sk] #4
-                                          CometProject [cr_item_sk,cr_order_number,cr_refunded_cash]
-                                            CometFilter [cr_order_number,cr_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_returned_date_sk]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (1)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [w_warehouse_sk]
-                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_state]
+TakeOrderedAndProject [w_state,i_item_id,sales_before,sales_after]
+  WholeStageCodegen (5)
+    HashAggregate [w_state,i_item_id,sum,isEmpty,sum,isEmpty] [sum(CASE WHEN (d_date < 2000-03-11) THEN (cs_sales_price - coalesce(cast(cr_refunded_cash as decimal(12,2)), 0.00)) ELSE 0.00 END),sum(CASE WHEN (d_date >= 2000-03-11) THEN (cs_sales_price - coalesce(cast(cr_refunded_cash as decimal(12,2)), 0.00)) ELSE 0.00 END),sales_before,sales_after,sum,isEmpty,sum,isEmpty]
+      InputAdapter
+        Exchange [w_state,i_item_id] #1
+          WholeStageCodegen (4)
+            HashAggregate [w_state,i_item_id,d_date,cs_sales_price,cr_refunded_cash] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+              Project [cs_sales_price,cr_refunded_cash,w_state,i_item_id,d_date]
+                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                  Project [cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state,i_item_id]
+                    BroadcastHashJoin [cs_item_sk,i_item_sk]
+                      Project [cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash,w_state]
+                        BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [cs_warehouse_sk,cs_item_sk,cs_sales_price,cs_sold_date_sk,cr_refunded_cash]
+                                CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                  CometSort [cs_order_number,cs_item_sk]
+                                    CometExchange [cs_order_number,cs_item_sk] #2
+                                      CometFilter [cs_warehouse_sk,cs_item_sk]
+                                        CometScan parquet spark_catalog.default.catalog_sales [cs_warehouse_sk,cs_item_sk,cs_order_number,cs_sales_price,cs_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #3
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [d_date,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                  CometSort [cr_order_number,cr_item_sk]
+                                    CometExchange [cr_order_number,cr_item_sk] #4
+                                      CometProject [cr_item_sk,cr_order_number,cr_refunded_cash]
+                                        CometFilter [cr_order_number,cr_item_sk]
+                                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_returned_date_sk]
                           InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (2)
+                            BroadcastExchange #5
+                              WholeStageCodegen (1)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometProject [i_item_sk,i_item_id]
-                                      CometFilter [i_current_price,i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
+                                    CometFilter [w_warehouse_sk]
+                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_state]
                       InputAdapter
-                        ReusedExchange [d_date_sk,d_date] #3
+                        BroadcastExchange #6
+                          WholeStageCodegen (2)
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [i_item_sk,i_item_id]
+                                  CometFilter [i_current_price,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_current_price]
+                  InputAdapter
+                    ReusedExchange [d_date_sk,d_date] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt
index ee6d6a04ec..2308990771 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/explain.txt
@@ -1,26 +1,24 @@
 == Physical Plan ==
-* ColumnarToRow (22)
-+- CometTakeOrderedAndProject (21)
-   +- CometHashAggregate (20)
-      +- CometColumnarExchange (19)
-         +- RowToColumnar (18)
-            +- * HashAggregate (17)
-               +- * Project (16)
-                  +- * BroadcastHashJoin Inner BuildRight (15)
-                     :- * ColumnarToRow (4)
-                     :  +- CometProject (3)
-                     :     +- CometFilter (2)
-                     :        +- CometScan parquet spark_catalog.default.item (1)
-                     +- BroadcastExchange (14)
-                        +- * ColumnarToRow (13)
-                           +- CometProject (12)
-                              +- CometFilter (11)
-                                 +- CometHashAggregate (10)
-                                    +- CometColumnarExchange (9)
-                                       +- CometHashAggregate (8)
-                                          +- CometProject (7)
-                                             +- CometFilter (6)
-                                                +- CometScan parquet spark_catalog.default.item (5)
+TakeOrderedAndProject (20)
++- * HashAggregate (19)
+   +- Exchange (18)
+      +- * HashAggregate (17)
+         +- * Project (16)
+            +- * BroadcastHashJoin Inner BuildRight (15)
+               :- * ColumnarToRow (4)
+               :  +- CometProject (3)
+               :     +- CometFilter (2)
+               :        +- CometScan parquet spark_catalog.default.item (1)
+               +- BroadcastExchange (14)
+                  +- * ColumnarToRow (13)
+                     +- CometProject (12)
+                        +- CometFilter (11)
+                           +- CometHashAggregate (10)
+                              +- CometExchange (9)
+                                 +- CometHashAggregate (8)
+                                    +- CometProject (7)
+                                       +- CometFilter (6)
+                                          +- CometScan parquet spark_catalog.default.item (5)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -61,9 +59,9 @@ Input [1]: [i_manufact#5]
 Keys [1]: [i_manufact#5]
 Functions [1]: [partial_count(1)]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [2]: [i_manufact#5, count#9]
-Arguments: hashpartitioning(i_manufact#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(i_manufact#5, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (10) CometHashAggregate
 Input [2]: [i_manufact#5, count#9]
@@ -102,22 +100,18 @@ Functions: []
 Aggregate Attributes: []
 Results [1]: [i_product_name#3]
 
-(18) RowToColumnar
+(18) Exchange
 Input [1]: [i_product_name#3]
+Arguments: hashpartitioning(i_product_name#3, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) CometColumnarExchange
-Input [1]: [i_product_name#3]
-Arguments: hashpartitioning(i_product_name#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(20) CometHashAggregate
+(19) HashAggregate [codegen id : 3]
 Input [1]: [i_product_name#3]
 Keys [1]: [i_product_name#3]
 Functions: []
+Aggregate Attributes: []
+Results [1]: [i_product_name#3]
 
-(21) CometTakeOrderedAndProject
-Input [1]: [i_product_name#3]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_product_name#3 ASC NULLS FIRST], output=[i_product_name#3]), 100, [i_product_name#3 ASC NULLS FIRST], [i_product_name#3]
-
-(22) ColumnarToRow [codegen id : 3]
+(20) TakeOrderedAndProject
 Input [1]: [i_product_name#3]
+Arguments: 100, [i_product_name#3 ASC NULLS FIRST], [i_product_name#3]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt
index 3c68188747..6c8ffadfdb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q41/simplified.txt
@@ -1,29 +1,27 @@
-WholeStageCodegen (3)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_product_name]
-        CometHashAggregate [i_product_name]
-          CometColumnarExchange [i_product_name] #1
-            RowToColumnar
-              WholeStageCodegen (2)
-                HashAggregate [i_product_name]
-                  Project [i_product_name]
-                    BroadcastHashJoin [i_manufact,i_manufact]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [i_manufact,i_product_name]
-                            CometFilter [i_manufact_id,i_manufact]
-                              CometScan parquet spark_catalog.default.item [i_manufact_id,i_manufact,i_product_name]
-                      InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (1)
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [i_manufact]
-                                  CometFilter [item_cnt]
-                                    CometHashAggregate [i_manufact,count]
-                                      CometColumnarExchange [i_manufact] #3
-                                        CometHashAggregate [i_manufact]
-                                          CometProject [i_manufact]
-                                            CometFilter [i_category,i_color,i_units,i_size,i_manufact]
-                                              CometScan parquet spark_catalog.default.item [i_category,i_manufact,i_size,i_color,i_units]
+TakeOrderedAndProject [i_product_name]
+  WholeStageCodegen (3)
+    HashAggregate [i_product_name]
+      InputAdapter
+        Exchange [i_product_name] #1
+          WholeStageCodegen (2)
+            HashAggregate [i_product_name]
+              Project [i_product_name]
+                BroadcastHashJoin [i_manufact,i_manufact]
+                  ColumnarToRow
+                    InputAdapter
+                      CometProject [i_manufact,i_product_name]
+                        CometFilter [i_manufact_id,i_manufact]
+                          CometScan parquet spark_catalog.default.item [i_manufact_id,i_manufact,i_product_name]
+                  InputAdapter
+                    BroadcastExchange #2
+                      WholeStageCodegen (1)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [i_manufact]
+                              CometFilter [item_cnt]
+                                CometHashAggregate [i_manufact,count]
+                                  CometExchange [i_manufact] #3
+                                    CometHashAggregate [i_manufact]
+                                      CometProject [i_manufact]
+                                        CometFilter [i_category,i_color,i_units,i_size,i_manufact]
+                                          CometScan parquet spark_catalog.default.item [i_category,i_manufact,i_size,i_color,i_units]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt
index 647bf61f60..958f358b7b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/explain.txt
@@ -1,27 +1,25 @@
 == Physical Plan ==
-* ColumnarToRow (23)
-+- CometTakeOrderedAndProject (22)
-   +- CometHashAggregate (21)
-      +- CometColumnarExchange (20)
-         +- RowToColumnar (19)
-            +- * HashAggregate (18)
-               +- * Project (17)
-                  +- * BroadcastHashJoin Inner BuildRight (16)
-                     :- * Project (10)
-                     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :- * ColumnarToRow (4)
-                     :     :  +- CometProject (3)
-                     :     :     +- CometFilter (2)
-                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-                     :     +- BroadcastExchange (8)
-                     :        +- * ColumnarToRow (7)
-                     :           +- CometFilter (6)
-                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                     +- BroadcastExchange (15)
-                        +- * ColumnarToRow (14)
-                           +- CometProject (13)
-                              +- CometFilter (12)
-                                 +- CometScan parquet spark_catalog.default.item (11)
+TakeOrderedAndProject (21)
++- * HashAggregate (20)
+   +- Exchange (19)
+      +- * HashAggregate (18)
+         +- * Project (17)
+            +- * BroadcastHashJoin Inner BuildRight (16)
+               :- * Project (10)
+               :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :- * ColumnarToRow (4)
+               :     :  +- CometProject (3)
+               :     :     +- CometFilter (2)
+               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+               :     +- BroadcastExchange (8)
+               :        +- * ColumnarToRow (7)
+               :           +- CometFilter (6)
+               :              +- CometScan parquet spark_catalog.default.store_sales (5)
+               +- BroadcastExchange (15)
+                  +- * ColumnarToRow (14)
+                     +- CometProject (13)
+                        +- CometFilter (12)
+                           +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -110,22 +108,18 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
 
-(19) RowToColumnar
+(19) Exchange
 Input [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
+Arguments: hashpartitioning(d_year#2, i_category_id#8, i_category#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) CometColumnarExchange
-Input [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
-Arguments: hashpartitioning(d_year#2, i_category_id#8, i_category#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(21) CometHashAggregate
+(20) HashAggregate [codegen id : 4]
 Input [4]: [d_year#2, i_category_id#8, i_category#9, sum#12]
 Keys [3]: [d_year#2, i_category_id#8, i_category#9]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
+Results [4]: [d_year#2, i_category_id#8, i_category#9, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS sum(ss_ext_sales_price)#14]
 
-(22) CometTakeOrderedAndProject
-Input [4]: [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#13]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[sum(ss_ext_sales_price)#13 DESC NULLS LAST,d_year#2 ASC NULLS FIRST,i_category_id#8 ASC NULLS FIRST,i_category#9 ASC NULLS FIRST], output=[d_year#2,i_category_id#8,i_category#9,sum(ss_ext_sales_price)#13]), 100, [sum(ss_ext_sales_price)#13 DESC NULLS LAST, d_year#2 ASC NULLS FIRST, i_category_id#8 ASC NULLS FIRST, i_category#9 ASC NULLS FIRST], [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#13]
-
-(23) ColumnarToRow [codegen id : 4]
-Input [4]: [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#13]
+(21) TakeOrderedAndProject
+Input [4]: [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#14]
+Arguments: 100, [sum(ss_ext_sales_price)#14 DESC NULLS LAST, d_year#2 ASC NULLS FIRST, i_category_id#8 ASC NULLS FIRST, i_category#9 ASC NULLS FIRST], [d_year#2, i_category_id#8, i_category#9, sum(ss_ext_sales_price)#14]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt
index d33229197b..67906b8c7a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q42/simplified.txt
@@ -1,33 +1,31 @@
-WholeStageCodegen (4)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [sum(ss_ext_sales_price),d_year,i_category_id,i_category]
-        CometHashAggregate [d_year,i_category_id,i_category,sum]
-          CometColumnarExchange [d_year,i_category_id,i_category] #1
-            RowToColumnar
-              WholeStageCodegen (3)
-                HashAggregate [d_year,i_category_id,i_category,ss_ext_sales_price] [sum,sum]
-                  Project [d_year,ss_ext_sales_price,i_category_id,i_category]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [d_year,ss_item_sk,ss_ext_sales_price]
-                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [d_date_sk,d_year]
-                                CometFilter [d_moy,d_year,d_date_sk]
-                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                          InputAdapter
-                            BroadcastExchange #2
-                              WholeStageCodegen (1)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+TakeOrderedAndProject [sum(ss_ext_sales_price),d_year,i_category_id,i_category]
+  WholeStageCodegen (4)
+    HashAggregate [d_year,i_category_id,i_category,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(ss_ext_sales_price),sum]
+      InputAdapter
+        Exchange [d_year,i_category_id,i_category] #1
+          WholeStageCodegen (3)
+            HashAggregate [d_year,i_category_id,i_category,ss_ext_sales_price] [sum,sum]
+              Project [d_year,ss_ext_sales_price,i_category_id,i_category]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [d_year,ss_item_sk,ss_ext_sales_price]
+                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [d_date_sk,d_year]
+                            CometFilter [d_moy,d_year,d_date_sk]
+                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                       InputAdapter
-                        BroadcastExchange #3
-                          WholeStageCodegen (2)
+                        BroadcastExchange #2
+                          WholeStageCodegen (1)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [i_item_sk,i_category_id,i_category]
-                                  CometFilter [i_manager_id,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_category_id,i_category,i_manager_id]
+                                CometFilter [ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                  InputAdapter
+                    BroadcastExchange #3
+                      WholeStageCodegen (2)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [i_item_sk,i_category_id,i_category]
+                              CometFilter [i_manager_id,i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_category_id,i_category,i_manager_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt
index 4e1468e50c..68b4b54005 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/explain.txt
@@ -1,27 +1,25 @@
 == Physical Plan ==
-* ColumnarToRow (23)
-+- CometTakeOrderedAndProject (22)
-   +- CometHashAggregate (21)
-      +- CometColumnarExchange (20)
-         +- RowToColumnar (19)
-            +- * HashAggregate (18)
-               +- * Project (17)
-                  +- * BroadcastHashJoin Inner BuildRight (16)
-                     :- * Project (10)
-                     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :- * ColumnarToRow (4)
-                     :     :  +- CometProject (3)
-                     :     :     +- CometFilter (2)
-                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-                     :     +- BroadcastExchange (8)
-                     :        +- * ColumnarToRow (7)
-                     :           +- CometFilter (6)
-                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                     +- BroadcastExchange (15)
-                        +- * ColumnarToRow (14)
-                           +- CometProject (13)
-                              +- CometFilter (12)
-                                 +- CometScan parquet spark_catalog.default.store (11)
+TakeOrderedAndProject (21)
++- * HashAggregate (20)
+   +- Exchange (19)
+      +- * HashAggregate (18)
+         +- * Project (17)
+            +- * BroadcastHashJoin Inner BuildRight (16)
+               :- * Project (10)
+               :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :- * ColumnarToRow (4)
+               :     :  +- CometProject (3)
+               :     :     +- CometFilter (2)
+               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+               :     +- BroadcastExchange (8)
+               :        +- * ColumnarToRow (7)
+               :           +- CometFilter (6)
+               :              +- CometScan parquet spark_catalog.default.store_sales (5)
+               +- BroadcastExchange (15)
+                  +- * ColumnarToRow (14)
+                     +- CometProject (13)
+                        +- CometFilter (12)
+                           +- CometScan parquet spark_catalog.default.store (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -110,22 +108,18 @@ Functions [7]: [partial_sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) T
 Aggregate Attributes [7]: [sum#11, sum#12, sum#13, sum#14, sum#15, sum#16, sum#17]
 Results [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
 
-(19) RowToColumnar
+(19) Exchange
 Input [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(s_store_name#9, s_store_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) CometColumnarExchange
-Input [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(s_store_name#9, s_store_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(21) CometHashAggregate
+(20) HashAggregate [codegen id : 4]
 Input [9]: [s_store_name#9, s_store_id#8, sum#18, sum#19, sum#20, sum#21, sum#22, sum#23, sum#24]
 Keys [2]: [s_store_name#9, s_store_id#8]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Monday   ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Tuesday  ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Wednesday) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Thursday ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Friday   ) THEN ss_sales_price#5 END)), sum(UnscaledValue(CASE WHEN (d_day_name#3 = Saturday ) THEN ss_sales_price#5 END))]
+Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) THEN ss_sales_price#5 END))#25, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Monday   ) THEN ss_sales_price#5 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Tuesday  ) THEN ss_sales_price#5 END))#27, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Wednesday) THEN ss_sales_price#5 END))#28, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Thursday ) THEN ss_sales_price#5 END))#29, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Friday   ) THEN ss_sales_price#5 END))#30, sum(UnscaledValue(CASE WHEN (d_day_name#3 = Saturday ) THEN ss_sales_price#5 END))#31]
+Results [9]: [s_store_name#9, s_store_id#8, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Sunday   ) THEN ss_sales_price#5 END))#25,17,2) AS sun_sales#32, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Monday   ) THEN ss_sales_price#5 END))#26,17,2) AS mon_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Tuesday  ) THEN ss_sales_price#5 END))#27,17,2) AS tue_sales#34, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Wednesday) THEN ss_sales_price#5 END))#28,17,2) AS wed_sales#35, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Thursday ) THEN ss_sales_price#5 END))#29,17,2) AS thu_sales#36, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Friday   ) THEN ss_sales_price#5 END))#30,17,2) AS fri_sales#37, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#3 = Saturday ) THEN ss_sales_price#5 END))#31,17,2) AS sat_sales#38]
 
-(22) CometTakeOrderedAndProject
-Input [9]: [s_store_name#9, s_store_id#8, sun_sales#25, mon_sales#26, tue_sales#27, wed_sales#28, thu_sales#29, fri_sales#30, sat_sales#31]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[s_store_name#9 ASC NULLS FIRST,s_store_id#8 ASC NULLS FIRST,sun_sales#25 ASC NULLS FIRST,mon_sales#26 ASC NULLS FIRST,tue_sales#27 ASC NULLS FIRST,wed_sales#28 ASC NULLS FIRST,thu_sales#29 ASC NULLS FIRST,fri_sales#30 ASC NULLS FIRST,sat_sales#31 ASC NULLS FIRST], output=[s_store_name#9,s_store_id#8,sun_sales#25,mon_sales#26,tue_sales#27,wed_sales#28,thu_sales#29,fri_sales#30,sat_sales#31]), 100, [s_store_name#9 ASC NULLS FIRST, s_store_id#8 ASC NULLS FIRST, sun_sales#25 ASC NULLS FIRST, mon_sales#26 ASC NULLS FIRST, tue_sales#27 ASC NULLS FIRST, wed_sales#28 ASC NULLS FIRST, thu_sales#29 ASC NULLS FIRST, fri_sales#30 ASC NULLS FIRST, sat_sales#31 ASC NULLS FIRST], [s_store_name#9, s_store_id#8, sun_sales#25, mon_sales#26, tue_sales#27, wed_sales#28, thu_sales#29, fri_sales#30, sat_sales#31]
-
-(23) ColumnarToRow [codegen id : 4]
-Input [9]: [s_store_name#9, s_store_id#8, sun_sales#25, mon_sales#26, tue_sales#27, wed_sales#28, thu_sales#29, fri_sales#30, sat_sales#31]
+(21) TakeOrderedAndProject
+Input [9]: [s_store_name#9, s_store_id#8, sun_sales#32, mon_sales#33, tue_sales#34, wed_sales#35, thu_sales#36, fri_sales#37, sat_sales#38]
+Arguments: 100, [s_store_name#9 ASC NULLS FIRST, s_store_id#8 ASC NULLS FIRST, sun_sales#32 ASC NULLS FIRST, mon_sales#33 ASC NULLS FIRST, tue_sales#34 ASC NULLS FIRST, wed_sales#35 ASC NULLS FIRST, thu_sales#36 ASC NULLS FIRST, fri_sales#37 ASC NULLS FIRST, sat_sales#38 ASC NULLS FIRST], [s_store_name#9, s_store_id#8, sun_sales#32, mon_sales#33, tue_sales#34, wed_sales#35, thu_sales#36, fri_sales#37, sat_sales#38]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt
index 0980f4764e..ef20430969 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q43/simplified.txt
@@ -1,33 +1,31 @@
-WholeStageCodegen (4)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [s_store_name,s_store_id,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
-        CometHashAggregate [s_store_name,s_store_id,sum,sum,sum,sum,sum,sum,sum]
-          CometColumnarExchange [s_store_name,s_store_id] #1
-            RowToColumnar
-              WholeStageCodegen (3)
-                HashAggregate [s_store_name,s_store_id,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                  Project [d_day_name,ss_sales_price,s_store_id,s_store_name]
-                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      Project [d_day_name,ss_store_sk,ss_sales_price]
-                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [d_date_sk,d_day_name]
-                                CometFilter [d_year,d_date_sk]
-                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_day_name]
-                          InputAdapter
-                            BroadcastExchange #2
-                              WholeStageCodegen (1)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_store_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
+TakeOrderedAndProject [s_store_name,s_store_id,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales]
+  WholeStageCodegen (4)
+    HashAggregate [s_store_name,s_store_id,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN ss_sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
+      InputAdapter
+        Exchange [s_store_name,s_store_id] #1
+          WholeStageCodegen (3)
+            HashAggregate [s_store_name,s_store_id,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+              Project [d_day_name,ss_sales_price,s_store_id,s_store_name]
+                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                  Project [d_day_name,ss_store_sk,ss_sales_price]
+                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [d_date_sk,d_day_name]
+                            CometFilter [d_year,d_date_sk]
+                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_day_name]
                       InputAdapter
-                        BroadcastExchange #3
-                          WholeStageCodegen (2)
+                        BroadcastExchange #2
+                          WholeStageCodegen (1)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [s_store_sk,s_store_id,s_store_name]
-                                  CometFilter [s_gmt_offset,s_store_sk]
-                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name,s_gmt_offset]
+                                CometFilter [ss_store_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
+                  InputAdapter
+                    BroadcastExchange #3
+                      WholeStageCodegen (2)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [s_store_sk,s_store_id,s_store_name]
+                              CometFilter [s_gmt_offset,s_store_sk]
+                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id,s_store_name,s_gmt_offset]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt
index e3a07a650d..d7f13b274c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/explain.txt
@@ -12,10 +12,10 @@ TakeOrderedAndProject (33)
       :     :     :        +- Window (11)
       :     :     :           +- * ColumnarToRow (10)
       :     :     :              +- CometSort (9)
-      :     :     :                 +- CometColumnarExchange (8)
+      :     :     :                 +- CometExchange (8)
       :     :     :                    +- CometFilter (7)
       :     :     :                       +- CometHashAggregate (6)
-      :     :     :                          +- CometColumnarExchange (5)
+      :     :     :                          +- CometExchange (5)
       :     :     :                             +- CometHashAggregate (4)
       :     :     :                                +- CometProject (3)
       :     :     :                                   +- CometFilter (2)
@@ -54,9 +54,9 @@ Input [2]: [ss_item_sk#1, ss_net_profit#3]
 Keys [1]: [ss_item_sk#1]
 Functions [1]: [partial_avg(UnscaledValue(ss_net_profit#3))]
 
-(5) CometColumnarExchange
+(5) CometExchange
 Input [3]: [ss_item_sk#1, sum#5, count#6]
-Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (6) CometHashAggregate
 Input [3]: [ss_item_sk#1, sum#5, count#6]
@@ -67,9 +67,9 @@ Functions [1]: [avg(UnscaledValue(ss_net_profit#3))]
 Input [2]: [item_sk#7, rank_col#8]
 Condition : (isnotnull(rank_col#8) AND (cast(rank_col#8 as decimal(13,7)) > (0.9 * Subquery scalar-subquery#9, [id=#10])))
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [2]: [item_sk#7, rank_col#8]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [2]: [item_sk#7, rank_col#8]
@@ -180,7 +180,7 @@ Arguments: 100, [rnk#11 ASC NULLS FIRST], [rnk#11, best_performing#19, worst_per
 Subquery:1 Hosting operator id = 7 Hosting Expression = Subquery scalar-subquery#9, [id=#10]
 * ColumnarToRow (40)
 +- CometHashAggregate (39)
-   +- CometColumnarExchange (38)
+   +- CometExchange (38)
       +- CometHashAggregate (37)
          +- CometProject (36)
             +- CometFilter (35)
@@ -207,9 +207,9 @@ Input [2]: [ss_store_sk#22, ss_net_profit#23]
 Keys [1]: [ss_store_sk#22]
 Functions [1]: [partial_avg(UnscaledValue(ss_net_profit#23))]
 
-(38) CometColumnarExchange
+(38) CometExchange
 Input [3]: [ss_store_sk#22, sum#25, count#26]
-Arguments: hashpartitioning(ss_store_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(ss_store_sk#22, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
 
 (39) CometHashAggregate
 Input [3]: [ss_store_sk#22, sum#25, count#26]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt
index faccc1ec5e..bc065345c8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q44/simplified.txt
@@ -17,20 +17,20 @@ TakeOrderedAndProject [rnk,best_performing,worst_performing]
                                 ColumnarToRow
                                   InputAdapter
                                     CometSort [rank_col]
-                                      CometColumnarExchange #1
+                                      CometExchange #1
                                         CometFilter [rank_col]
                                           Subquery #1
                                             WholeStageCodegen (1)
                                               ColumnarToRow
                                                 InputAdapter
                                                   CometHashAggregate [ss_store_sk,sum,count]
-                                                    CometColumnarExchange [ss_store_sk] #3
+                                                    CometExchange [ss_store_sk] #3
                                                       CometHashAggregate [ss_store_sk,ss_net_profit]
                                                         CometProject [ss_store_sk,ss_net_profit]
                                                           CometFilter [ss_store_sk,ss_addr_sk]
                                                             CometScan parquet spark_catalog.default.store_sales [ss_addr_sk,ss_store_sk,ss_net_profit,ss_sold_date_sk]
                                           CometHashAggregate [ss_item_sk,sum,count]
-                                            CometColumnarExchange [ss_item_sk] #2
+                                            CometExchange [ss_item_sk] #2
                                               CometHashAggregate [ss_item_sk,ss_net_profit]
                                                 CometProject [ss_item_sk,ss_net_profit]
                                                   CometFilter [ss_store_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt
index ac8a1f4f7a..d5d860a393 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/explain.txt
@@ -1,42 +1,40 @@
 == Physical Plan ==
-* ColumnarToRow (38)
-+- CometTakeOrderedAndProject (37)
-   +- CometHashAggregate (36)
-      +- CometColumnarExchange (35)
-         +- RowToColumnar (34)
-            +- * HashAggregate (33)
-               +- * Project (32)
-                  +- * Filter (31)
-                     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (30)
-                        :- * Project (24)
-                        :  +- * BroadcastHashJoin Inner BuildRight (23)
-                        :     :- * Project (18)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                        :     :     :- * Project (15)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                        :     :     :     :- * Project (9)
-                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                        :     :     :     :     :- * ColumnarToRow (3)
-                        :     :     :     :     :  +- CometFilter (2)
-                        :     :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                        :     :     :     :     +- BroadcastExchange (7)
-                        :     :     :     :        +- * ColumnarToRow (6)
-                        :     :     :     :           +- CometFilter (5)
-                        :     :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                        :     :     :     +- BroadcastExchange (13)
-                        :     :     :        +- * ColumnarToRow (12)
-                        :     :     :           +- CometFilter (11)
-                        :     :     :              +- CometScan parquet spark_catalog.default.customer_address (10)
-                        :     :     +- ReusedExchange (16)
-                        :     +- BroadcastExchange (22)
-                        :        +- * ColumnarToRow (21)
-                        :           +- CometFilter (20)
-                        :              +- CometScan parquet spark_catalog.default.item (19)
-                        +- BroadcastExchange (29)
-                           +- * ColumnarToRow (28)
-                              +- CometProject (27)
-                                 +- CometFilter (26)
-                                    +- CometScan parquet spark_catalog.default.item (25)
+TakeOrderedAndProject (36)
++- * HashAggregate (35)
+   +- Exchange (34)
+      +- * HashAggregate (33)
+         +- * Project (32)
+            +- * Filter (31)
+               +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (30)
+                  :- * Project (24)
+                  :  +- * BroadcastHashJoin Inner BuildRight (23)
+                  :     :- * Project (18)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                  :     :     :- * Project (15)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :     :     :     :- * Project (9)
+                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :     :     :     :     +- BroadcastExchange (7)
+                  :     :     :     :        +- * ColumnarToRow (6)
+                  :     :     :     :           +- CometFilter (5)
+                  :     :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                  :     :     :     +- BroadcastExchange (13)
+                  :     :     :        +- * ColumnarToRow (12)
+                  :     :     :           +- CometFilter (11)
+                  :     :     :              +- CometScan parquet spark_catalog.default.customer_address (10)
+                  :     :     +- ReusedExchange (16)
+                  :     +- BroadcastExchange (22)
+                  :        +- * ColumnarToRow (21)
+                  :           +- CometFilter (20)
+                  :              +- CometScan parquet spark_catalog.default.item (19)
+                  +- BroadcastExchange (29)
+                     +- * ColumnarToRow (28)
+                        +- CometProject (27)
+                           +- CometFilter (26)
+                              +- CometScan parquet spark_catalog.default.item (25)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -110,7 +108,7 @@ Join condition: None
 Output [5]: [ws_item_sk#2, ws_sales_price#4, ws_sold_date_sk#5, ca_city#10, ca_zip#11]
 Input [7]: [ws_item_sk#2, ws_sales_price#4, ws_sold_date_sk#5, c_current_addr_sk#8, ca_address_sk#9, ca_city#10, ca_zip#11]
 
-(16) ReusedExchange [Reuses operator id: 43]
+(16) ReusedExchange [Reuses operator id: 41]
 Output [1]: [d_date_sk#12]
 
 (17) BroadcastHashJoin [codegen id : 6]
@@ -194,54 +192,50 @@ Functions [1]: [partial_sum(UnscaledValue(ws_sales_price#4))]
 Aggregate Attributes [1]: [sum#17]
 Results [3]: [ca_zip#11, ca_city#10, sum#18]
 
-(34) RowToColumnar
+(34) Exchange
 Input [3]: [ca_zip#11, ca_city#10, sum#18]
+Arguments: hashpartitioning(ca_zip#11, ca_city#10, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(35) CometColumnarExchange
-Input [3]: [ca_zip#11, ca_city#10, sum#18]
-Arguments: hashpartitioning(ca_zip#11, ca_city#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(36) CometHashAggregate
+(35) HashAggregate [codegen id : 7]
 Input [3]: [ca_zip#11, ca_city#10, sum#18]
 Keys [2]: [ca_zip#11, ca_city#10]
 Functions [1]: [sum(UnscaledValue(ws_sales_price#4))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_sales_price#4))#19]
+Results [3]: [ca_zip#11, ca_city#10, MakeDecimal(sum(UnscaledValue(ws_sales_price#4))#19,17,2) AS sum(ws_sales_price)#20]
 
-(37) CometTakeOrderedAndProject
-Input [3]: [ca_zip#11, ca_city#10, sum(ws_sales_price)#19]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_zip#11 ASC NULLS FIRST,ca_city#10 ASC NULLS FIRST], output=[ca_zip#11,ca_city#10,sum(ws_sales_price)#19]), 100, [ca_zip#11 ASC NULLS FIRST, ca_city#10 ASC NULLS FIRST], [ca_zip#11, ca_city#10, sum(ws_sales_price)#19]
-
-(38) ColumnarToRow [codegen id : 7]
-Input [3]: [ca_zip#11, ca_city#10, sum(ws_sales_price)#19]
+(36) TakeOrderedAndProject
+Input [3]: [ca_zip#11, ca_city#10, sum(ws_sales_price)#20]
+Arguments: 100, [ca_zip#11 ASC NULLS FIRST, ca_city#10 ASC NULLS FIRST], [ca_zip#11, ca_city#10, sum(ws_sales_price)#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (43)
-+- * ColumnarToRow (42)
-   +- CometProject (41)
-      +- CometFilter (40)
-         +- CometScan parquet spark_catalog.default.date_dim (39)
+BroadcastExchange (41)
++- * ColumnarToRow (40)
+   +- CometProject (39)
+      +- CometFilter (38)
+         +- CometScan parquet spark_catalog.default.date_dim (37)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#12, d_year#20, d_qoy#21]
+Output [3]: [d_date_sk#12, d_year#21, d_qoy#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(40) CometFilter
-Input [3]: [d_date_sk#12, d_year#20, d_qoy#21]
-Condition : ((((isnotnull(d_qoy#21) AND isnotnull(d_year#20)) AND (d_qoy#21 = 2)) AND (d_year#20 = 2001)) AND isnotnull(d_date_sk#12))
+(38) CometFilter
+Input [3]: [d_date_sk#12, d_year#21, d_qoy#22]
+Condition : ((((isnotnull(d_qoy#22) AND isnotnull(d_year#21)) AND (d_qoy#22 = 2)) AND (d_year#21 = 2001)) AND isnotnull(d_date_sk#12))
 
-(41) CometProject
-Input [3]: [d_date_sk#12, d_year#20, d_qoy#21]
+(39) CometProject
+Input [3]: [d_date_sk#12, d_year#21, d_qoy#22]
 Arguments: [d_date_sk#12], [d_date_sk#12]
 
-(42) ColumnarToRow [codegen id : 1]
+(40) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#12]
 
-(43) BroadcastExchange
+(41) BroadcastExchange
 Input [1]: [d_date_sk#12]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt
index b4965dae7c..383cbb7e3b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q45/simplified.txt
@@ -1,63 +1,61 @@
-WholeStageCodegen (7)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_zip,ca_city,sum(ws_sales_price)]
-        CometHashAggregate [ca_zip,ca_city,sum]
-          CometColumnarExchange [ca_zip,ca_city] #1
-            RowToColumnar
-              WholeStageCodegen (6)
-                HashAggregate [ca_zip,ca_city,ws_sales_price] [sum,sum]
-                  Project [ws_sales_price,ca_city,ca_zip]
-                    Filter [ca_zip,exists]
-                      BroadcastHashJoin [i_item_id,i_item_id]
-                        Project [ws_sales_price,ca_city,ca_zip,i_item_id]
-                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                            Project [ws_item_sk,ws_sales_price,ca_city,ca_zip]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,ca_city,ca_zip]
-                                  BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                    Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,c_current_addr_sk]
-                                      BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [ws_bill_customer_sk,ws_item_sk]
-                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sales_price,ws_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_qoy,d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                        InputAdapter
-                                          BroadcastExchange #3
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [c_customer_sk,c_current_addr_sk]
-                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+TakeOrderedAndProject [ca_zip,ca_city,sum(ws_sales_price)]
+  WholeStageCodegen (7)
+    HashAggregate [ca_zip,ca_city,sum] [sum(UnscaledValue(ws_sales_price)),sum(ws_sales_price),sum]
+      InputAdapter
+        Exchange [ca_zip,ca_city] #1
+          WholeStageCodegen (6)
+            HashAggregate [ca_zip,ca_city,ws_sales_price] [sum,sum]
+              Project [ws_sales_price,ca_city,ca_zip]
+                Filter [ca_zip,exists]
+                  BroadcastHashJoin [i_item_id,i_item_id]
+                    Project [ws_sales_price,ca_city,ca_zip,i_item_id]
+                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                        Project [ws_item_sk,ws_sales_price,ca_city,ca_zip]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,ca_city,ca_zip]
+                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                Project [ws_item_sk,ws_sales_price,ws_sold_date_sk,c_current_addr_sk]
+                                  BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ws_bill_customer_sk,ws_item_sk]
+                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sales_price,ws_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_qoy,d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                                     InputAdapter
-                                      BroadcastExchange #4
-                                        WholeStageCodegen (2)
+                                      BroadcastExchange #3
+                                        WholeStageCodegen (1)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [ca_address_sk]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city,ca_zip]
+                                              CometFilter [c_customer_sk,c_current_addr_sk]
+                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  BroadcastExchange #4
+                                    WholeStageCodegen (2)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ca_address_sk]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city,ca_zip]
                             InputAdapter
-                              BroadcastExchange #5
-                                WholeStageCodegen (4)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (5)
+                          BroadcastExchange #5
+                            WholeStageCodegen (4)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [i_item_id]
-                                    CometFilter [i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                    InputAdapter
+                      BroadcastExchange #6
+                        WholeStageCodegen (5)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [i_item_id]
+                                CometFilter [i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt
index a5c06c49ae..84d65306e0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/explain.txt
@@ -1,45 +1,43 @@
 == Physical Plan ==
-TakeOrderedAndProject (41)
-+- * Project (40)
-   +- * BroadcastHashJoin Inner BuildRight (39)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * ColumnarToRow (31)
-      :     :  +- CometHashAggregate (30)
-      :     :     +- CometColumnarExchange (29)
-      :     :        +- RowToColumnar (28)
-      :     :           +- * HashAggregate (27)
-      :     :              +- * Project (26)
-      :     :                 +- * BroadcastHashJoin Inner BuildRight (25)
-      :     :                    :- * Project (20)
-      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (19)
-      :     :                    :     :- * Project (13)
-      :     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :     :                    :     :     :- * Project (6)
-      :     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :                    :     :     :     :- * ColumnarToRow (3)
-      :     :                    :     :     :     :  +- CometFilter (2)
-      :     :                    :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :                    :     :     :     +- ReusedExchange (4)
-      :     :                    :     :     +- BroadcastExchange (11)
-      :     :                    :     :        +- * ColumnarToRow (10)
-      :     :                    :     :           +- CometProject (9)
-      :     :                    :     :              +- CometFilter (8)
-      :     :                    :     :                 +- CometScan parquet spark_catalog.default.store (7)
-      :     :                    :     +- BroadcastExchange (18)
-      :     :                    :        +- * ColumnarToRow (17)
-      :     :                    :           +- CometProject (16)
-      :     :                    :              +- CometFilter (15)
-      :     :                    :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
-      :     :                    +- BroadcastExchange (24)
-      :     :                       +- * ColumnarToRow (23)
-      :     :                          +- CometFilter (22)
-      :     :                             +- CometScan parquet spark_catalog.default.customer_address (21)
-      :     +- BroadcastExchange (35)
-      :        +- * ColumnarToRow (34)
-      :           +- CometFilter (33)
-      :              +- CometScan parquet spark_catalog.default.customer (32)
-      +- ReusedExchange (38)
+TakeOrderedAndProject (39)
++- * Project (38)
+   +- * BroadcastHashJoin Inner BuildRight (37)
+      :- * Project (35)
+      :  +- * BroadcastHashJoin Inner BuildRight (34)
+      :     :- * HashAggregate (29)
+      :     :  +- Exchange (28)
+      :     :     +- * HashAggregate (27)
+      :     :        +- * Project (26)
+      :     :           +- * BroadcastHashJoin Inner BuildRight (25)
+      :     :              :- * Project (20)
+      :     :              :  +- * BroadcastHashJoin Inner BuildRight (19)
+      :     :              :     :- * Project (13)
+      :     :              :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :     :              :     :     :- * Project (6)
+      :     :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :              :     :     :     :- * ColumnarToRow (3)
+      :     :              :     :     :     :  +- CometFilter (2)
+      :     :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :              :     :     :     +- ReusedExchange (4)
+      :     :              :     :     +- BroadcastExchange (11)
+      :     :              :     :        +- * ColumnarToRow (10)
+      :     :              :     :           +- CometProject (9)
+      :     :              :     :              +- CometFilter (8)
+      :     :              :     :                 +- CometScan parquet spark_catalog.default.store (7)
+      :     :              :     +- BroadcastExchange (18)
+      :     :              :        +- * ColumnarToRow (17)
+      :     :              :           +- CometProject (16)
+      :     :              :              +- CometFilter (15)
+      :     :              :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
+      :     :              +- BroadcastExchange (24)
+      :     :                 +- * ColumnarToRow (23)
+      :     :                    +- CometFilter (22)
+      :     :                       +- CometScan parquet spark_catalog.default.customer_address (21)
+      :     +- BroadcastExchange (33)
+      :        +- * ColumnarToRow (32)
+      :           +- CometFilter (31)
+      :              +- CometScan parquet spark_catalog.default.customer (30)
+      +- ReusedExchange (36)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -57,7 +55,7 @@ Condition : (((isnotnull(ss_store_sk#4) AND isnotnull(ss_hdemo_sk#2)) AND isnotn
 (3) ColumnarToRow [codegen id : 5]
 Input [8]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_store_sk#4, ss_ticket_number#5, ss_coupon_amt#6, ss_net_profit#7, ss_sold_date_sk#8]
 
-(4) ReusedExchange [Reuses operator id: 46]
+(4) ReusedExchange [Reuses operator id: 44]
 Output [1]: [d_date_sk#10]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -169,95 +167,91 @@ Functions [2]: [partial_sum(UnscaledValue(ss_coupon_amt#6)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#18, sum#19]
 Results [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
 
-(28) RowToColumnar
+(28) Exchange
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
+Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometColumnarExchange
-Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
-Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 8]
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17, sum#20, sum#21]
 Keys [4]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#17]
 Functions [2]: [sum(UnscaledValue(ss_coupon_amt#6)), sum(UnscaledValue(ss_net_profit#7))]
-
-(31) ColumnarToRow [codegen id : 8]
-Input [5]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#22, amt#23, profit#24]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_coupon_amt#6))#22, sum(UnscaledValue(ss_net_profit#7))#23]
+Results [5]: [ss_ticket_number#5, ss_customer_sk#1, ca_city#17 AS bought_city#24, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#6))#22,17,2) AS amt#25, MakeDecimal(sum(UnscaledValue(ss_net_profit#7))#23,17,2) AS profit#26]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
+Output [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_addr_sk:int,c_first_name:string,c_last_name:string>
 
-(33) CometFilter
-Input [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
-Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_current_addr_sk#26))
+(31) CometFilter
+Input [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
+Condition : (isnotnull(c_customer_sk#27) AND isnotnull(c_current_addr_sk#28))
 
-(34) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
+(32) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
 
-(35) BroadcastExchange
-Input [4]: [c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
+(33) BroadcastExchange
+Input [4]: [c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(36) BroadcastHashJoin [codegen id : 8]
+(34) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#25]
+Right keys [1]: [c_customer_sk#27]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
-Output [7]: [ss_ticket_number#5, bought_city#22, amt#23, profit#24, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
-Input [9]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#22, amt#23, profit#24, c_customer_sk#25, c_current_addr_sk#26, c_first_name#27, c_last_name#28]
+(35) Project [codegen id : 8]
+Output [7]: [ss_ticket_number#5, bought_city#24, amt#25, profit#26, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
+Input [9]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#24, amt#25, profit#26, c_customer_sk#27, c_current_addr_sk#28, c_first_name#29, c_last_name#30]
 
-(38) ReusedExchange [Reuses operator id: 24]
-Output [2]: [ca_address_sk#29, ca_city#30]
+(36) ReusedExchange [Reuses operator id: 24]
+Output [2]: [ca_address_sk#31, ca_city#32]
 
-(39) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [c_current_addr_sk#26]
-Right keys [1]: [ca_address_sk#29]
+(37) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [c_current_addr_sk#28]
+Right keys [1]: [ca_address_sk#31]
 Join type: Inner
-Join condition: NOT (ca_city#30 = bought_city#22)
+Join condition: NOT (ca_city#32 = bought_city#24)
 
-(40) Project [codegen id : 8]
-Output [7]: [c_last_name#28, c_first_name#27, ca_city#30, bought_city#22, ss_ticket_number#5, amt#23, profit#24]
-Input [9]: [ss_ticket_number#5, bought_city#22, amt#23, profit#24, c_current_addr_sk#26, c_first_name#27, c_last_name#28, ca_address_sk#29, ca_city#30]
+(38) Project [codegen id : 8]
+Output [7]: [c_last_name#30, c_first_name#29, ca_city#32, bought_city#24, ss_ticket_number#5, amt#25, profit#26]
+Input [9]: [ss_ticket_number#5, bought_city#24, amt#25, profit#26, c_current_addr_sk#28, c_first_name#29, c_last_name#30, ca_address_sk#31, ca_city#32]
 
-(41) TakeOrderedAndProject
-Input [7]: [c_last_name#28, c_first_name#27, ca_city#30, bought_city#22, ss_ticket_number#5, amt#23, profit#24]
-Arguments: 100, [c_last_name#28 ASC NULLS FIRST, c_first_name#27 ASC NULLS FIRST, ca_city#30 ASC NULLS FIRST, bought_city#22 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#28, c_first_name#27, ca_city#30, bought_city#22, ss_ticket_number#5, amt#23, profit#24]
+(39) TakeOrderedAndProject
+Input [7]: [c_last_name#30, c_first_name#29, ca_city#32, bought_city#24, ss_ticket_number#5, amt#25, profit#26]
+Arguments: 100, [c_last_name#30 ASC NULLS FIRST, c_first_name#29 ASC NULLS FIRST, ca_city#32 ASC NULLS FIRST, bought_city#24 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#30, c_first_name#29, ca_city#32, bought_city#24, ss_ticket_number#5, amt#25, profit#26]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (46)
-+- * ColumnarToRow (45)
-   +- CometProject (44)
-      +- CometFilter (43)
-         +- CometScan parquet spark_catalog.default.date_dim (42)
+BroadcastExchange (44)
++- * ColumnarToRow (43)
+   +- CometProject (42)
+      +- CometFilter (41)
+         +- CometScan parquet spark_catalog.default.date_dim (40)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#31, d_dow#32]
+Output [3]: [d_date_sk#10, d_year#33, d_dow#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_dow, [0,6]), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dow:int>
 
-(43) CometFilter
-Input [3]: [d_date_sk#10, d_year#31, d_dow#32]
-Condition : ((d_dow#32 IN (6,0) AND d_year#31 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
+(41) CometFilter
+Input [3]: [d_date_sk#10, d_year#33, d_dow#34]
+Condition : ((d_dow#34 IN (6,0) AND d_year#33 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
 
-(44) CometProject
-Input [3]: [d_date_sk#10, d_year#31, d_dow#32]
+(42) CometProject
+Input [3]: [d_date_sk#10, d_year#33, d_dow#34]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(45) ColumnarToRow [codegen id : 1]
+(43) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(46) BroadcastExchange
+(44) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt
index 4b9b7960e9..04c59a2d35 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q46/simplified.txt
@@ -4,58 +4,56 @@ TakeOrderedAndProject [c_last_name,c_first_name,ca_city,bought_city,ss_ticket_nu
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_city,bought_city]
         Project [ss_ticket_number,bought_city,amt,profit,c_current_addr_sk,c_first_name,c_last_name]
           BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-            ColumnarToRow
+            HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum] [sum(UnscaledValue(ss_coupon_amt)),sum(UnscaledValue(ss_net_profit)),bought_city,amt,profit,sum,sum]
               InputAdapter
-                CometHashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum]
-                  CometColumnarExchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
-                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ca_city]
-                            BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                              Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                      Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #2
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_dow,d_year,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #2
+                Exchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
+                  WholeStageCodegen (5)
+                    HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
+                      Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ca_city]
+                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                              Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #2
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_dow,d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
                                       InputAdapter
-                                        BroadcastExchange #3
-                                          WholeStageCodegen (2)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [s_store_sk]
-                                                  CometFilter [s_city,s_store_sk]
-                                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
+                                        ReusedExchange [d_date_sk] #2
                                   InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (3)
+                                    BroadcastExchange #3
+                                      WholeStageCodegen (2)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [hd_demo_sk]
-                                              CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                                            CometProject [s_store_sk]
+                                              CometFilter [s_city,s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
                               InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (4)
+                                BroadcastExchange #4
+                                  WholeStageCodegen (3)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [ca_address_sk,ca_city]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
+                                        CometProject [hd_demo_sk]
+                                          CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                          InputAdapter
+                            BroadcastExchange #5
+                              WholeStageCodegen (4)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk,ca_city]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
             InputAdapter
               BroadcastExchange #6
                 WholeStageCodegen (6)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt
index d7dfc7147d..9ea57de066 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-TakeOrderedAndProject (47)
-+- * Project (46)
-   +- * BroadcastHashJoin Inner BuildRight (45)
-      :- * Project (38)
-      :  +- * BroadcastHashJoin Inner BuildRight (37)
-      :     :- * Project (30)
-      :     :  +- * Filter (29)
-      :     :     +- Window (28)
-      :     :        +- * Filter (27)
-      :     :           +- Window (26)
-      :     :              +- * ColumnarToRow (25)
-      :     :                 +- CometSort (24)
-      :     :                    +- CometColumnarExchange (23)
-      :     :                       +- CometHashAggregate (22)
-      :     :                          +- CometColumnarExchange (21)
-      :     :                             +- RowToColumnar (20)
-      :     :                                +- * HashAggregate (19)
-      :     :                                   +- * Project (18)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                         :- * Project (12)
-      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                         :     :- * Project (9)
-      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                         :     :     :- * ColumnarToRow (3)
-      :     :                                         :     :     :  +- CometFilter (2)
-      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                         :     :     +- BroadcastExchange (7)
-      :     :                                         :     :        +- * ColumnarToRow (6)
-      :     :                                         :     :           +- CometFilter (5)
-      :     :                                         :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :                                         :     +- ReusedExchange (10)
-      :     :                                         +- BroadcastExchange (16)
-      :     :                                            +- * ColumnarToRow (15)
-      :     :                                               +- CometFilter (14)
-      :     :                                                  +- CometScan parquet spark_catalog.default.store (13)
-      :     +- BroadcastExchange (36)
-      :        +- * Project (35)
-      :           +- Window (34)
-      :              +- * ColumnarToRow (33)
-      :                 +- CometSort (32)
-      :                    +- ReusedExchange (31)
-      +- BroadcastExchange (44)
-         +- * Project (43)
-            +- Window (42)
-               +- * ColumnarToRow (41)
-                  +- CometSort (40)
-                     +- ReusedExchange (39)
+TakeOrderedAndProject (45)
++- * Project (44)
+   +- * BroadcastHashJoin Inner BuildRight (43)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * Project (28)
+      :     :  +- * Filter (27)
+      :     :     +- Window (26)
+      :     :        +- * Filter (25)
+      :     :           +- Window (24)
+      :     :              +- * Sort (23)
+      :     :                 +- Exchange (22)
+      :     :                    +- * HashAggregate (21)
+      :     :                       +- Exchange (20)
+      :     :                          +- * HashAggregate (19)
+      :     :                             +- * Project (18)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                   :- * Project (12)
+      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                   :     :- * Project (9)
+      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                   :     :     :- * ColumnarToRow (3)
+      :     :                                   :     :     :  +- CometFilter (2)
+      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                   :     :     +- BroadcastExchange (7)
+      :     :                                   :     :        +- * ColumnarToRow (6)
+      :     :                                   :     :           +- CometFilter (5)
+      :     :                                   :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :                                   :     +- ReusedExchange (10)
+      :     :                                   +- BroadcastExchange (16)
+      :     :                                      +- * ColumnarToRow (15)
+      :     :                                         +- CometFilter (14)
+      :     :                                            +- CometScan parquet spark_catalog.default.store (13)
+      :     +- BroadcastExchange (35)
+      :        +- * Project (34)
+      :           +- Window (33)
+      :              +- * Sort (32)
+      :                 +- Exchange (31)
+      :                    +- * HashAggregate (30)
+      :                       +- ReusedExchange (29)
+      +- BroadcastExchange (42)
+         +- * Project (41)
+            +- Window (40)
+               +- * Sort (39)
+                  +- ReusedExchange (38)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -91,7 +89,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, ss_item_sk#4, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 51]
+(10) ReusedExchange [Reuses operator id: 49]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -139,124 +137,125 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#6))]
 Aggregate Attributes [1]: [sum#15]
 Results [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 
-(20) RowToColumnar
+(20) Exchange
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 Keys [6]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#6))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#6))#17]
+Results [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS sum_sales#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS _w0#19]
 
-(23) CometColumnarExchange
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(22) Exchange
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(24) CometSort
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(23) Sort [codegen id : 6]
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
+Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
 
-(25) ColumnarToRow [codegen id : 5]
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-
-(26) Window
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(24) Window
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(27) Filter [codegen id : 6]
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+(25) Filter [codegen id : 7]
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(28) Window
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
-Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
-
-(29) Filter [codegen id : 19]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
-
-(30) Project [codegen id : 19]
-Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-
-(31) ReusedExchange [Reuses operator id: 23]
-Output [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-
-(32) CometSort
-Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-Arguments: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17], [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, s_store_name#23 ASC NULLS FIRST, s_company_name#24 ASC NULLS FIRST, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
-
-(33) ColumnarToRow [codegen id : 11]
-Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-
-(34) Window
-Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-Arguments: [rank(d_year#25, d_moy#26) windowspecdefinition(i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#27], [i_category#21, i_brand#22, s_store_name#23, s_company_name#24], [d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
-
-(35) Project [codegen id : 12]
-Output [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#17 AS sum_sales#28, rn#27]
-Input [8]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17, rn#27]
-
-(36) BroadcastExchange
-Input [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=5]
-
-(37) BroadcastHashJoin [codegen id : 19]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
-Right keys [5]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, (rn#27 + 1)]
+(26) Window
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
+Arguments: [avg(_w0#19) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#21], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
+
+(27) Filter [codegen id : 22]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
+Condition : ((isnotnull(avg_monthly_sales#21) AND (avg_monthly_sales#21 > 0.000000)) AND CASE WHEN (avg_monthly_sales#21 > 0.000000) THEN ((abs((sum_sales#18 - avg_monthly_sales#21)) / avg_monthly_sales#21) > 0.1000000000000000) END)
+
+(28) Project [codegen id : 22]
+Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
+
+(29) ReusedExchange [Reuses operator id: 20]
+Output [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
+
+(30) HashAggregate [codegen id : 12]
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
+Keys [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#29))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#29))#17]
+Results [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, MakeDecimal(sum(UnscaledValue(ss_sales_price#29))#17,17,2) AS sum_sales#18]
+
+(31) Exchange
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
+Arguments: hashpartitioning(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(32) Sort [codegen id : 13]
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
+Arguments: [i_category#22 ASC NULLS FIRST, i_brand#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST, s_company_name#25 ASC NULLS FIRST, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST], false, 0
+
+(33) Window
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
+Arguments: [rank(d_year#26, d_moy#27) windowspecdefinition(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#30], [i_category#22, i_brand#23, s_store_name#24, s_company_name#25], [d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST]
+
+(34) Project [codegen id : 14]
+Output [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#18 AS sum_sales#31, rn#30]
+Input [8]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18, rn#30]
+
+(35) BroadcastExchange
+Input [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=6]
+
+(36) BroadcastHashJoin [codegen id : 22]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
+Right keys [5]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, (rn#30 + 1)]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 19]
-Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28]
-Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
-
-(39) ReusedExchange [Reuses operator id: 23]
-Output [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+(37) Project [codegen id : 22]
+Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31]
+Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
 
-(40) CometSort
-Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17], [i_category#29 ASC NULLS FIRST, i_brand#30 ASC NULLS FIRST, s_store_name#31 ASC NULLS FIRST, s_company_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
+(38) ReusedExchange [Reuses operator id: 31]
+Output [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
 
-(41) ColumnarToRow [codegen id : 17]
-Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+(39) Sort [codegen id : 20]
+Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
+Arguments: [i_category#32 ASC NULLS FIRST, i_brand#33 ASC NULLS FIRST, s_store_name#34 ASC NULLS FIRST, s_company_name#35 ASC NULLS FIRST, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST], false, 0
 
-(42) Window
-Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#29, i_brand#30, s_store_name#31, s_company_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
+(40) Window
+Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
+Arguments: [rank(d_year#36, d_moy#37) windowspecdefinition(i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#38], [i_category#32, i_brand#33, s_store_name#34, s_company_name#35], [d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST]
 
-(43) Project [codegen id : 18]
-Output [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#17 AS sum_sales#36, rn#35]
-Input [8]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
+(41) Project [codegen id : 21]
+Output [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#18 AS sum_sales#39, rn#38]
+Input [8]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18, rn#38]
 
-(44) BroadcastExchange
-Input [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=6]
+(42) BroadcastExchange
+Input [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=7]
 
-(45) BroadcastHashJoin [codegen id : 19]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
-Right keys [5]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, (rn#35 - 1)]
+(43) BroadcastHashJoin [codegen id : 22]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
+Right keys [5]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, (rn#38 - 1)]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 19]
-Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#28 AS psum#37, sum_sales#36 AS nsum#38]
-Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28, i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
+(44) Project [codegen id : 22]
+Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, sum_sales#31 AS psum#40, sum_sales#39 AS nsum#41]
+Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31, i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
 
-(47) TakeOrderedAndProject
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
-Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+(45) TakeOrderedAndProject
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
+Arguments: 100, [(sum_sales#18 - avg_monthly_sales#21) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (51)
-+- * ColumnarToRow (50)
-   +- CometFilter (49)
-      +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometFilter (47)
+      +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -266,15 +265,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(49) CometFilter
+(47) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(50) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(51) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt
index b93090ae54..80b8da7b14 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q47/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_brand,s_company_name,d_year,d_moy,psum,nsum]
-  WholeStageCodegen (19)
+  WholeStageCodegen (22)
     Project [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,s_store_name,s_company_name,rn,i_category,i_brand,s_store_name,s_company_name,rn]
         Project [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_bra
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,s_store_name,s_company_name,d_year]
-                    WholeStageCodegen (6)
+                    WholeStageCodegen (7)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                            WholeStageCodegen (5)
-                              ColumnarToRow
+                            WholeStageCodegen (6)
+                              Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
                                 InputAdapter
-                                  CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
-                                    CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name] #1
-                                      CometHashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum]
-                                        CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
-                                          RowToColumnar
+                                  Exchange [i_category,i_brand,s_store_name,s_company_name] #1
+                                    WholeStageCodegen (5)
+                                      HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
+                                        InputAdapter
+                                          Exchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,ss_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,ss_sales_price,d_year,d_moy,s_store_name,s_company_name]
@@ -57,23 +57,25 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_bra
                                                                 CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (12)
+                WholeStageCodegen (14)
                   Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                        WholeStageCodegen (11)
-                          ColumnarToRow
+                        WholeStageCodegen (13)
+                          Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
                             InputAdapter
-                              CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
-                                ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
+                              Exchange [i_category,i_brand,s_store_name,s_company_name] #7
+                                WholeStageCodegen (12)
+                                  HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,sum]
+                                    InputAdapter
+                                      ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] #2
         InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (18)
+          BroadcastExchange #8
+            WholeStageCodegen (21)
               Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                    WholeStageCodegen (17)
-                      ColumnarToRow
+                    WholeStageCodegen (20)
+                      Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
                         InputAdapter
-                          CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
-                            ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
+                          ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt
index 4c4c294385..a13a86a914 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/explain.txt
@@ -1,34 +1,32 @@
 == Physical Plan ==
-* ColumnarToRow (30)
-+- CometHashAggregate (29)
-   +- CometColumnarExchange (28)
-      +- RowToColumnar (27)
-         +- * HashAggregate (26)
-            +- * Project (25)
-               +- * BroadcastHashJoin Inner BuildRight (24)
-                  :- * Project (22)
-                  :  +- * BroadcastHashJoin Inner BuildRight (21)
-                  :     :- * Project (15)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :     :     :- * Project (9)
-                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :     :- * ColumnarToRow (3)
-                  :     :     :     :  +- CometFilter (2)
-                  :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :     :     :     +- BroadcastExchange (7)
-                  :     :     :        +- * ColumnarToRow (6)
-                  :     :     :           +- CometFilter (5)
-                  :     :     :              +- CometScan parquet spark_catalog.default.store (4)
-                  :     :     +- BroadcastExchange (13)
-                  :     :        +- * ColumnarToRow (12)
-                  :     :           +- CometFilter (11)
-                  :     :              +- CometScan parquet spark_catalog.default.customer_demographics (10)
-                  :     +- BroadcastExchange (20)
-                  :        +- * ColumnarToRow (19)
-                  :           +- CometProject (18)
-                  :              +- CometFilter (17)
-                  :                 +- CometScan parquet spark_catalog.default.customer_address (16)
-                  +- ReusedExchange (23)
+* HashAggregate (28)
++- Exchange (27)
+   +- * HashAggregate (26)
+      +- * Project (25)
+         +- * BroadcastHashJoin Inner BuildRight (24)
+            :- * Project (22)
+            :  +- * BroadcastHashJoin Inner BuildRight (21)
+            :     :- * Project (15)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+            :     :     :- * Project (9)
+            :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+            :     :     :     :- * ColumnarToRow (3)
+            :     :     :     :  +- CometFilter (2)
+            :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :     :     :     +- BroadcastExchange (7)
+            :     :     :        +- * ColumnarToRow (6)
+            :     :     :           +- CometFilter (5)
+            :     :     :              +- CometScan parquet spark_catalog.default.store (4)
+            :     :     +- BroadcastExchange (13)
+            :     :        +- * ColumnarToRow (12)
+            :     :           +- CometFilter (11)
+            :     :              +- CometScan parquet spark_catalog.default.customer_demographics (10)
+            :     +- BroadcastExchange (20)
+            :        +- * ColumnarToRow (19)
+            :           +- CometProject (18)
+            :              +- CometFilter (17)
+            :                 +- CometScan parquet spark_catalog.default.customer_address (16)
+            +- ReusedExchange (23)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -134,7 +132,7 @@ Join condition: ((((ca_state#14 IN (CO,OH,TX) AND (ss_net_profit#6 >= 0.00)) AND
 Output [2]: [ss_quantity#4, ss_sold_date_sk#7]
 Input [6]: [ss_addr_sk#2, ss_quantity#4, ss_net_profit#6, ss_sold_date_sk#7, ca_address_sk#13, ca_state#14]
 
-(23) ReusedExchange [Reuses operator id: 35]
+(23) ReusedExchange [Reuses operator id: 33]
 Output [1]: [d_date_sk#16]
 
 (24) BroadcastHashJoin [codegen id : 5]
@@ -154,50 +152,46 @@ Functions [1]: [partial_sum(ss_quantity#4)]
 Aggregate Attributes [1]: [sum#17]
 Results [1]: [sum#18]
 
-(27) RowToColumnar
+(27) Exchange
 Input [1]: [sum#18]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [1]: [sum#18]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 6]
 Input [1]: [sum#18]
 Keys: []
 Functions [1]: [sum(ss_quantity#4)]
-
-(30) ColumnarToRow [codegen id : 6]
-Input [1]: [sum(ss_quantity)#19]
+Aggregate Attributes [1]: [sum(ss_quantity#4)#19]
+Results [1]: [sum(ss_quantity#4)#19 AS sum(ss_quantity)#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (33)
++- * ColumnarToRow (32)
+   +- CometProject (31)
+      +- CometFilter (30)
+         +- CometScan parquet spark_catalog.default.date_dim (29)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#16, d_year#20]
+Output [2]: [d_date_sk#16, d_year#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(32) CometFilter
-Input [2]: [d_date_sk#16, d_year#20]
-Condition : ((isnotnull(d_year#20) AND (d_year#20 = 2001)) AND isnotnull(d_date_sk#16))
+(30) CometFilter
+Input [2]: [d_date_sk#16, d_year#21]
+Condition : ((isnotnull(d_year#21) AND (d_year#21 = 2001)) AND isnotnull(d_date_sk#16))
 
-(33) CometProject
-Input [2]: [d_date_sk#16, d_year#20]
+(31) CometProject
+Input [2]: [d_date_sk#16, d_year#21]
 Arguments: [d_date_sk#16], [d_date_sk#16]
 
-(34) ColumnarToRow [codegen id : 1]
+(32) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#16]
 
-(35) BroadcastExchange
+(33) BroadcastExchange
 Input [1]: [d_date_sk#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt
index fee69a7cc8..4022da74f1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q48/simplified.txt
@@ -1,52 +1,50 @@
 WholeStageCodegen (6)
-  ColumnarToRow
+  HashAggregate [sum] [sum(ss_quantity),sum(ss_quantity),sum]
     InputAdapter
-      CometHashAggregate [sum]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (5)
-              HashAggregate [ss_quantity] [sum,sum]
-                Project [ss_quantity]
-                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                    Project [ss_quantity,ss_sold_date_sk]
-                      BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
-                        Project [ss_addr_sk,ss_quantity,ss_net_profit,ss_sold_date_sk]
-                          BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
-                            Project [ss_cdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
-                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_store_sk,ss_cdemo_sk,ss_addr_sk,ss_sales_price,ss_net_profit]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_year,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [s_store_sk]
-                                            CometScan parquet spark_catalog.default.store [s_store_sk]
+      Exchange #1
+        WholeStageCodegen (5)
+          HashAggregate [ss_quantity] [sum,sum]
+            Project [ss_quantity]
+              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                Project [ss_quantity,ss_sold_date_sk]
+                  BroadcastHashJoin [ss_addr_sk,ca_address_sk,ca_state,ss_net_profit]
+                    Project [ss_addr_sk,ss_quantity,ss_net_profit,ss_sold_date_sk]
+                      BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ss_sales_price]
+                        Project [ss_cdemo_sk,ss_addr_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
+                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ss_store_sk,ss_cdemo_sk,ss_addr_sk,ss_sales_price,ss_net_profit]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_cdemo_sk,ss_addr_sk,ss_store_sk,ss_quantity,ss_sales_price,ss_net_profit,ss_sold_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_year,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                             InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (2)
+                              BroadcastExchange #3
+                                WholeStageCodegen (1)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
-                                        CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
+                                      CometFilter [s_store_sk]
+                                        CometScan parquet spark_catalog.default.store [s_store_sk]
                         InputAdapter
-                          BroadcastExchange #5
-                            WholeStageCodegen (3)
+                          BroadcastExchange #4
+                            WholeStageCodegen (2)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [ca_address_sk,ca_state]
-                                    CometFilter [ca_country,ca_address_sk,ca_state]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                                  CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
+                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                     InputAdapter
-                      ReusedExchange [d_date_sk] #2
+                      BroadcastExchange #5
+                        WholeStageCodegen (3)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [ca_address_sk,ca_state]
+                                CometFilter [ca_country,ca_address_sk,ca_state]
+                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                InputAdapter
+                  ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
index 367b843853..fa45aa3820 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/explain.txt
@@ -1,89 +1,81 @@
 == Physical Plan ==
-* ColumnarToRow (85)
-+- CometTakeOrderedAndProject (84)
-   +- CometHashAggregate (83)
-      +- CometColumnarExchange (82)
-         +- RowToColumnar (81)
-            +- * HashAggregate (80)
-               +- Union (79)
-                  :- * Project (26)
-                  :  +- * Filter (25)
-                  :     +- Window (24)
-                  :        +- * Sort (23)
-                  :           +- Window (22)
-                  :              +- * ColumnarToRow (21)
-                  :                 +- CometSort (20)
-                  :                    +- CometColumnarExchange (19)
-                  :                       +- CometHashAggregate (18)
-                  :                          +- CometColumnarExchange (17)
-                  :                             +- RowToColumnar (16)
-                  :                                +- * HashAggregate (15)
-                  :                                   +- * Project (14)
-                  :                                      +- * BroadcastHashJoin Inner BuildRight (13)
-                  :                                         :- * Project (11)
-                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (10)
-                  :                                         :     :- BroadcastExchange (5)
-                  :                                         :     :  +- * ColumnarToRow (4)
-                  :                                         :     :     +- CometProject (3)
-                  :                                         :     :        +- CometFilter (2)
-                  :                                         :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :                                         :     +- * ColumnarToRow (9)
-                  :                                         :        +- CometProject (8)
-                  :                                         :           +- CometFilter (7)
-                  :                                         :              +- CometScan parquet spark_catalog.default.web_returns (6)
-                  :                                         +- ReusedExchange (12)
-                  :- * Project (52)
-                  :  +- * Filter (51)
-                  :     +- Window (50)
-                  :        +- * Sort (49)
-                  :           +- Window (48)
-                  :              +- * ColumnarToRow (47)
-                  :                 +- CometSort (46)
-                  :                    +- CometColumnarExchange (45)
-                  :                       +- CometHashAggregate (44)
-                  :                          +- CometColumnarExchange (43)
-                  :                             +- RowToColumnar (42)
-                  :                                +- * HashAggregate (41)
-                  :                                   +- * Project (40)
-                  :                                      +- * BroadcastHashJoin Inner BuildRight (39)
-                  :                                         :- * Project (37)
-                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (36)
-                  :                                         :     :- BroadcastExchange (31)
-                  :                                         :     :  +- * ColumnarToRow (30)
-                  :                                         :     :     +- CometProject (29)
-                  :                                         :     :        +- CometFilter (28)
-                  :                                         :     :           +- CometScan parquet spark_catalog.default.catalog_sales (27)
-                  :                                         :     +- * ColumnarToRow (35)
-                  :                                         :        +- CometProject (34)
-                  :                                         :           +- CometFilter (33)
-                  :                                         :              +- CometScan parquet spark_catalog.default.catalog_returns (32)
-                  :                                         +- ReusedExchange (38)
-                  +- * Project (78)
-                     +- * Filter (77)
-                        +- Window (76)
-                           +- * Sort (75)
-                              +- Window (74)
-                                 +- * ColumnarToRow (73)
-                                    +- CometSort (72)
-                                       +- CometColumnarExchange (71)
-                                          +- CometHashAggregate (70)
-                                             +- CometColumnarExchange (69)
-                                                +- RowToColumnar (68)
-                                                   +- * HashAggregate (67)
-                                                      +- * Project (66)
-                                                         +- * BroadcastHashJoin Inner BuildRight (65)
-                                                            :- * Project (63)
-                                                            :  +- * BroadcastHashJoin Inner BuildLeft (62)
-                                                            :     :- BroadcastExchange (57)
-                                                            :     :  +- * ColumnarToRow (56)
-                                                            :     :     +- CometProject (55)
-                                                            :     :        +- CometFilter (54)
-                                                            :     :           +- CometScan parquet spark_catalog.default.store_sales (53)
-                                                            :     +- * ColumnarToRow (61)
-                                                            :        +- CometProject (60)
-                                                            :           +- CometFilter (59)
-                                                            :              +- CometScan parquet spark_catalog.default.store_returns (58)
-                                                            +- ReusedExchange (64)
+TakeOrderedAndProject (77)
++- * HashAggregate (76)
+   +- Exchange (75)
+      +- * HashAggregate (74)
+         +- Union (73)
+            :- * Project (24)
+            :  +- * Filter (23)
+            :     +- Window (22)
+            :        +- * Sort (21)
+            :           +- Window (20)
+            :              +- * Sort (19)
+            :                 +- Exchange (18)
+            :                    +- * HashAggregate (17)
+            :                       +- Exchange (16)
+            :                          +- * HashAggregate (15)
+            :                             +- * Project (14)
+            :                                +- * BroadcastHashJoin Inner BuildRight (13)
+            :                                   :- * Project (11)
+            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (10)
+            :                                   :     :- BroadcastExchange (5)
+            :                                   :     :  +- * ColumnarToRow (4)
+            :                                   :     :     +- CometProject (3)
+            :                                   :     :        +- CometFilter (2)
+            :                                   :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
+            :                                   :     +- * ColumnarToRow (9)
+            :                                   :        +- CometProject (8)
+            :                                   :           +- CometFilter (7)
+            :                                   :              +- CometScan parquet spark_catalog.default.web_returns (6)
+            :                                   +- ReusedExchange (12)
+            :- * Project (48)
+            :  +- * Filter (47)
+            :     +- Window (46)
+            :        +- * Sort (45)
+            :           +- Window (44)
+            :              +- * Sort (43)
+            :                 +- Exchange (42)
+            :                    +- * HashAggregate (41)
+            :                       +- Exchange (40)
+            :                          +- * HashAggregate (39)
+            :                             +- * Project (38)
+            :                                +- * BroadcastHashJoin Inner BuildRight (37)
+            :                                   :- * Project (35)
+            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (34)
+            :                                   :     :- BroadcastExchange (29)
+            :                                   :     :  +- * ColumnarToRow (28)
+            :                                   :     :     +- CometProject (27)
+            :                                   :     :        +- CometFilter (26)
+            :                                   :     :           +- CometScan parquet spark_catalog.default.catalog_sales (25)
+            :                                   :     +- * ColumnarToRow (33)
+            :                                   :        +- CometProject (32)
+            :                                   :           +- CometFilter (31)
+            :                                   :              +- CometScan parquet spark_catalog.default.catalog_returns (30)
+            :                                   +- ReusedExchange (36)
+            +- * Project (72)
+               +- * Filter (71)
+                  +- Window (70)
+                     +- * Sort (69)
+                        +- Window (68)
+                           +- * Sort (67)
+                              +- Exchange (66)
+                                 +- * HashAggregate (65)
+                                    +- Exchange (64)
+                                       +- * HashAggregate (63)
+                                          +- * Project (62)
+                                             +- * BroadcastHashJoin Inner BuildRight (61)
+                                                :- * Project (59)
+                                                :  +- * BroadcastHashJoin Inner BuildLeft (58)
+                                                :     :- BroadcastExchange (53)
+                                                :     :  +- * ColumnarToRow (52)
+                                                :     :     +- CometProject (51)
+                                                :     :        +- CometFilter (50)
+                                                :     :           +- CometScan parquet spark_catalog.default.store_sales (49)
+                                                :     +- * ColumnarToRow (57)
+                                                :        +- CometProject (56)
+                                                :           +- CometFilter (55)
+                                                :              +- CometScan parquet spark_catalog.default.store_returns (54)
+                                                +- ReusedExchange (60)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -137,7 +129,7 @@ Join condition: None
 Output [6]: [ws_item_sk#1, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_return_quantity#10, wr_return_amt#11]
 Input [9]: [ws_item_sk#1, ws_order_number#2, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_item_sk#8, wr_order_number#9, wr_return_quantity#10, wr_return_amt#11]
 
-(12) ReusedExchange [Reuses operator id: 90]
+(12) ReusedExchange [Reuses operator id: 82]
 Output [1]: [d_date_sk#13]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -157,339 +149,323 @@ Functions [4]: [partial_sum(coalesce(wr_return_quantity#10, 0)), partial_sum(coa
 Aggregate Attributes [6]: [sum#14, sum#15, sum#16, isEmpty#17, sum#18, isEmpty#19]
 Results [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 
-(16) RowToColumnar
+(16) Exchange
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(17) CometColumnarExchange
-Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(18) CometHashAggregate
+(17) HashAggregate [codegen id : 4]
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Keys [1]: [ws_item_sk#1]
 Functions [4]: [sum(coalesce(wr_return_quantity#10, 0)), sum(coalesce(ws_quantity#3, 0)), sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00)), sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))]
+Aggregate Attributes [4]: [sum(coalesce(wr_return_quantity#10, 0))#26, sum(coalesce(ws_quantity#3, 0))#27, sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28, sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29]
+Results [3]: [ws_item_sk#1 AS item#30, (cast(sum(coalesce(wr_return_quantity#10, 0))#26 as decimal(15,4)) / cast(sum(coalesce(ws_quantity#3, 0))#27 as decimal(15,4))) AS return_ratio#31, (cast(sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28 as decimal(15,4)) / cast(sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29 as decimal(15,4))) AS currency_ratio#32]
 
-(19) CometColumnarExchange
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(20) CometSort
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
-Arguments: [item#26, return_ratio#27, currency_ratio#28], [return_ratio#27 ASC NULLS FIRST]
+(18) Exchange
+Input [3]: [item#30, return_ratio#31, currency_ratio#32]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) ColumnarToRow [codegen id : 4]
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+(19) Sort [codegen id : 5]
+Input [3]: [item#30, return_ratio#31, currency_ratio#32]
+Arguments: [return_ratio#31 ASC NULLS FIRST], false, 0
 
-(22) Window
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
-Arguments: [rank(return_ratio#27) windowspecdefinition(return_ratio#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#29], [return_ratio#27 ASC NULLS FIRST]
+(20) Window
+Input [3]: [item#30, return_ratio#31, currency_ratio#32]
+Arguments: [rank(return_ratio#31) windowspecdefinition(return_ratio#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#33], [return_ratio#31 ASC NULLS FIRST]
 
-(23) Sort [codegen id : 5]
-Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
-Arguments: [currency_ratio#28 ASC NULLS FIRST], false, 0
+(21) Sort [codegen id : 6]
+Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
+Arguments: [currency_ratio#32 ASC NULLS FIRST], false, 0
 
-(24) Window
-Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
-Arguments: [rank(currency_ratio#28) windowspecdefinition(currency_ratio#28 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#30], [currency_ratio#28 ASC NULLS FIRST]
+(22) Window
+Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
+Arguments: [rank(currency_ratio#32) windowspecdefinition(currency_ratio#32 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#34], [currency_ratio#32 ASC NULLS FIRST]
 
-(25) Filter [codegen id : 6]
-Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
-Condition : ((return_rank#29 <= 10) OR (currency_rank#30 <= 10))
+(23) Filter [codegen id : 7]
+Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
+Condition : ((return_rank#33 <= 10) OR (currency_rank#34 <= 10))
 
-(26) Project [codegen id : 6]
-Output [5]: [web AS channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
+(24) Project [codegen id : 7]
+Output [5]: [web AS channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
+Output [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#37), dynamicpruningexpression(cs_sold_date_sk#37 IN dynamicpruning#38)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#41), dynamicpruningexpression(cs_sold_date_sk#41 IN dynamicpruning#42)]
 PushedFilters: [IsNotNull(cs_net_profit), IsNotNull(cs_net_paid), IsNotNull(cs_quantity), GreaterThan(cs_net_profit,1.00), GreaterThan(cs_net_paid,0.00), GreaterThan(cs_quantity,0), IsNotNull(cs_order_number), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_net_paid:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(28) CometFilter
-Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
-Condition : (((((((isnotnull(cs_net_profit#36) AND isnotnull(cs_net_paid#35)) AND isnotnull(cs_quantity#34)) AND (cs_net_profit#36 > 1.00)) AND (cs_net_paid#35 > 0.00)) AND (cs_quantity#34 > 0)) AND isnotnull(cs_order_number#33)) AND isnotnull(cs_item_sk#32))
+(26) CometFilter
+Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
+Condition : (((((((isnotnull(cs_net_profit#40) AND isnotnull(cs_net_paid#39)) AND isnotnull(cs_quantity#38)) AND (cs_net_profit#40 > 1.00)) AND (cs_net_paid#39 > 0.00)) AND (cs_quantity#38 > 0)) AND isnotnull(cs_order_number#37)) AND isnotnull(cs_item_sk#36))
 
-(29) CometProject
-Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
-Arguments: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37], [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
+(27) CometProject
+Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
+Arguments: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41], [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
 
-(30) ColumnarToRow [codegen id : 7]
-Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
+(28) ColumnarToRow [codegen id : 8]
+Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
 
-(31) BroadcastExchange
-Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
+(29) BroadcastExchange
+Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=4]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
+Output [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_return_amount), GreaterThan(cr_return_amount,10000.00), IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(33) CometFilter
-Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
-Condition : (((isnotnull(cr_return_amount#42) AND (cr_return_amount#42 > 10000.00)) AND isnotnull(cr_order_number#40)) AND isnotnull(cr_item_sk#39))
+(31) CometFilter
+Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
+Condition : (((isnotnull(cr_return_amount#46) AND (cr_return_amount#46 > 10000.00)) AND isnotnull(cr_order_number#44)) AND isnotnull(cr_item_sk#43))
 
-(34) CometProject
-Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
-Arguments: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42], [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
+(32) CometProject
+Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
+Arguments: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46], [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
 
-(35) ColumnarToRow
-Input [4]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
+(33) ColumnarToRow
+Input [4]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
 
-(36) BroadcastHashJoin [codegen id : 9]
-Left keys [2]: [cs_order_number#33, cs_item_sk#32]
-Right keys [2]: [cr_order_number#40, cr_item_sk#39]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [2]: [cs_order_number#37, cs_item_sk#36]
+Right keys [2]: [cr_order_number#44, cr_item_sk#43]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 9]
-Output [6]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42]
-Input [9]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
+(35) Project [codegen id : 10]
+Output [6]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46]
+Input [9]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
 
-(38) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#44]
+(36) ReusedExchange [Reuses operator id: 82]
+Output [1]: [d_date_sk#48]
 
-(39) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [cs_sold_date_sk#37]
-Right keys [1]: [d_date_sk#44]
+(37) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#41]
+Right keys [1]: [d_date_sk#48]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 9]
-Output [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
-Input [7]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42, d_date_sk#44]
-
-(41) HashAggregate [codegen id : 9]
-Input [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
-Keys [1]: [cs_item_sk#32]
-Functions [4]: [partial_sum(coalesce(cr_return_quantity#41, 0)), partial_sum(coalesce(cs_quantity#34, 0)), partial_sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#45, sum#46, sum#47, isEmpty#48, sum#49, isEmpty#50]
-Results [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+(38) Project [codegen id : 10]
+Output [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
+Input [7]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46, d_date_sk#48]
 
-(42) RowToColumnar
-Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+(39) HashAggregate [codegen id : 10]
+Input [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
+Keys [1]: [cs_item_sk#36]
+Functions [4]: [partial_sum(coalesce(cr_return_quantity#45, 0)), partial_sum(coalesce(cs_quantity#38, 0)), partial_sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#49, sum#50, sum#51, isEmpty#52, sum#53, isEmpty#54]
+Results [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
 
-(43) CometColumnarExchange
-Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
-Arguments: hashpartitioning(cs_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(40) Exchange
+Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
+Arguments: hashpartitioning(cs_item_sk#36, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(44) CometHashAggregate
-Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
-Keys [1]: [cs_item_sk#32]
-Functions [4]: [sum(coalesce(cr_return_quantity#41, 0)), sum(coalesce(cs_quantity#34, 0)), sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
+(41) HashAggregate [codegen id : 11]
+Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
+Keys [1]: [cs_item_sk#36]
+Functions [4]: [sum(coalesce(cr_return_quantity#45, 0)), sum(coalesce(cs_quantity#38, 0)), sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
+Aggregate Attributes [4]: [sum(coalesce(cr_return_quantity#45, 0))#61, sum(coalesce(cs_quantity#38, 0))#62, sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63, sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64]
+Results [3]: [cs_item_sk#36 AS item#65, (cast(sum(coalesce(cr_return_quantity#45, 0))#61 as decimal(15,4)) / cast(sum(coalesce(cs_quantity#38, 0))#62 as decimal(15,4))) AS return_ratio#66, (cast(sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63 as decimal(15,4)) / cast(sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64 as decimal(15,4))) AS currency_ratio#67]
 
-(45) CometColumnarExchange
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(42) Exchange
+Input [3]: [item#65, return_ratio#66, currency_ratio#67]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
 
-(46) CometSort
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
-Arguments: [item#57, return_ratio#58, currency_ratio#59], [return_ratio#58 ASC NULLS FIRST]
+(43) Sort [codegen id : 12]
+Input [3]: [item#65, return_ratio#66, currency_ratio#67]
+Arguments: [return_ratio#66 ASC NULLS FIRST], false, 0
 
-(47) ColumnarToRow [codegen id : 10]
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+(44) Window
+Input [3]: [item#65, return_ratio#66, currency_ratio#67]
+Arguments: [rank(return_ratio#66) windowspecdefinition(return_ratio#66 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#68], [return_ratio#66 ASC NULLS FIRST]
 
-(48) Window
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
-Arguments: [rank(return_ratio#58) windowspecdefinition(return_ratio#58 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#60], [return_ratio#58 ASC NULLS FIRST]
+(45) Sort [codegen id : 13]
+Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
+Arguments: [currency_ratio#67 ASC NULLS FIRST], false, 0
 
-(49) Sort [codegen id : 11]
-Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
-Arguments: [currency_ratio#59 ASC NULLS FIRST], false, 0
+(46) Window
+Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
+Arguments: [rank(currency_ratio#67) windowspecdefinition(currency_ratio#67 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#69], [currency_ratio#67 ASC NULLS FIRST]
 
-(50) Window
-Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
-Arguments: [rank(currency_ratio#59) windowspecdefinition(currency_ratio#59 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#61], [currency_ratio#59 ASC NULLS FIRST]
+(47) Filter [codegen id : 14]
+Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
+Condition : ((return_rank#68 <= 10) OR (currency_rank#69 <= 10))
 
-(51) Filter [codegen id : 12]
-Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
-Condition : ((return_rank#60 <= 10) OR (currency_rank#61 <= 10))
-
-(52) Project [codegen id : 12]
-Output [5]: [catalog AS channel#62, item#57, return_ratio#58, return_rank#60, currency_rank#61]
-Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
+(48) Project [codegen id : 14]
+Output [5]: [catalog AS channel#70, item#65, return_ratio#66, return_rank#68, currency_rank#69]
+Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
+Output [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#68), dynamicpruningexpression(ss_sold_date_sk#68 IN dynamicpruning#69)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#76), dynamicpruningexpression(ss_sold_date_sk#76 IN dynamicpruning#77)]
 PushedFilters: [IsNotNull(ss_net_profit), IsNotNull(ss_net_paid), IsNotNull(ss_quantity), GreaterThan(ss_net_profit,1.00), GreaterThan(ss_net_paid,0.00), GreaterThan(ss_quantity,0), IsNotNull(ss_ticket_number), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_net_paid:decimal(7,2),ss_net_profit:decimal(7,2)>
 
-(54) CometFilter
-Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
-Condition : (((((((isnotnull(ss_net_profit#67) AND isnotnull(ss_net_paid#66)) AND isnotnull(ss_quantity#65)) AND (ss_net_profit#67 > 1.00)) AND (ss_net_paid#66 > 0.00)) AND (ss_quantity#65 > 0)) AND isnotnull(ss_ticket_number#64)) AND isnotnull(ss_item_sk#63))
+(50) CometFilter
+Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
+Condition : (((((((isnotnull(ss_net_profit#75) AND isnotnull(ss_net_paid#74)) AND isnotnull(ss_quantity#73)) AND (ss_net_profit#75 > 1.00)) AND (ss_net_paid#74 > 0.00)) AND (ss_quantity#73 > 0)) AND isnotnull(ss_ticket_number#72)) AND isnotnull(ss_item_sk#71))
 
-(55) CometProject
-Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
-Arguments: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68], [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
+(51) CometProject
+Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
+Arguments: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76], [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
 
-(56) ColumnarToRow [codegen id : 13]
-Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
+(52) ColumnarToRow [codegen id : 15]
+Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
 
-(57) BroadcastExchange
-Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
+(53) BroadcastExchange
+Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=7]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
+Output [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_return_amt), GreaterThan(sr_return_amt,10000.00), IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(59) CometFilter
-Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
-Condition : (((isnotnull(sr_return_amt#73) AND (sr_return_amt#73 > 10000.00)) AND isnotnull(sr_ticket_number#71)) AND isnotnull(sr_item_sk#70))
+(55) CometFilter
+Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
+Condition : (((isnotnull(sr_return_amt#81) AND (sr_return_amt#81 > 10000.00)) AND isnotnull(sr_ticket_number#79)) AND isnotnull(sr_item_sk#78))
 
-(60) CometProject
-Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
-Arguments: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73], [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
+(56) CometProject
+Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
+Arguments: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81], [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
 
-(61) ColumnarToRow
-Input [4]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
+(57) ColumnarToRow
+Input [4]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
 
-(62) BroadcastHashJoin [codegen id : 15]
-Left keys [2]: [ss_ticket_number#64, ss_item_sk#63]
-Right keys [2]: [sr_ticket_number#71, sr_item_sk#70]
+(58) BroadcastHashJoin [codegen id : 17]
+Left keys [2]: [ss_ticket_number#72, ss_item_sk#71]
+Right keys [2]: [sr_ticket_number#79, sr_item_sk#78]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 15]
-Output [6]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73]
-Input [9]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
+(59) Project [codegen id : 17]
+Output [6]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81]
+Input [9]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
 
-(64) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#75]
+(60) ReusedExchange [Reuses operator id: 82]
+Output [1]: [d_date_sk#83]
 
-(65) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ss_sold_date_sk#68]
-Right keys [1]: [d_date_sk#75]
+(61) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ss_sold_date_sk#76]
+Right keys [1]: [d_date_sk#83]
 Join type: Inner
 Join condition: None
 
-(66) Project [codegen id : 15]
-Output [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
-Input [7]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73, d_date_sk#75]
-
-(67) HashAggregate [codegen id : 15]
-Input [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
-Keys [1]: [ss_item_sk#63]
-Functions [4]: [partial_sum(coalesce(sr_return_quantity#72, 0)), partial_sum(coalesce(ss_quantity#65, 0)), partial_sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#76, sum#77, sum#78, isEmpty#79, sum#80, isEmpty#81]
-Results [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-
-(68) RowToColumnar
-Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-
-(69) CometColumnarExchange
-Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-Arguments: hashpartitioning(ss_item_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
-
-(70) CometHashAggregate
-Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-Keys [1]: [ss_item_sk#63]
-Functions [4]: [sum(coalesce(sr_return_quantity#72, 0)), sum(coalesce(ss_quantity#65, 0)), sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
-
-(71) CometColumnarExchange
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(72) CometSort
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-Arguments: [item#88, return_ratio#89, currency_ratio#90], [return_ratio#89 ASC NULLS FIRST]
-
-(73) ColumnarToRow [codegen id : 16]
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-
-(74) Window
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-Arguments: [rank(return_ratio#89) windowspecdefinition(return_ratio#89 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#91], [return_ratio#89 ASC NULLS FIRST]
-
-(75) Sort [codegen id : 17]
-Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
-Arguments: [currency_ratio#90 ASC NULLS FIRST], false, 0
-
-(76) Window
-Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
-Arguments: [rank(currency_ratio#90) windowspecdefinition(currency_ratio#90 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#92], [currency_ratio#90 ASC NULLS FIRST]
-
-(77) Filter [codegen id : 18]
-Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
-Condition : ((return_rank#91 <= 10) OR (currency_rank#92 <= 10))
-
-(78) Project [codegen id : 18]
-Output [5]: [store AS channel#93, item#88, return_ratio#89, return_rank#91, currency_rank#92]
-Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
-
-(79) Union
-
-(80) HashAggregate [codegen id : 19]
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(62) Project [codegen id : 17]
+Output [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
+Input [7]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81, d_date_sk#83]
+
+(63) HashAggregate [codegen id : 17]
+Input [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
+Keys [1]: [ss_item_sk#71]
+Functions [4]: [partial_sum(coalesce(sr_return_quantity#80, 0)), partial_sum(coalesce(ss_quantity#73, 0)), partial_sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#84, sum#85, sum#86, isEmpty#87, sum#88, isEmpty#89]
+Results [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+
+(64) Exchange
+Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+Arguments: hashpartitioning(ss_item_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+
+(65) HashAggregate [codegen id : 18]
+Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+Keys [1]: [ss_item_sk#71]
+Functions [4]: [sum(coalesce(sr_return_quantity#80, 0)), sum(coalesce(ss_quantity#73, 0)), sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
+Aggregate Attributes [4]: [sum(coalesce(sr_return_quantity#80, 0))#96, sum(coalesce(ss_quantity#73, 0))#97, sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98, sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99]
+Results [3]: [ss_item_sk#71 AS item#100, (cast(sum(coalesce(sr_return_quantity#80, 0))#96 as decimal(15,4)) / cast(sum(coalesce(ss_quantity#73, 0))#97 as decimal(15,4))) AS return_ratio#101, (cast(sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98 as decimal(15,4)) / cast(sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99 as decimal(15,4))) AS currency_ratio#102]
+
+(66) Exchange
+Input [3]: [item#100, return_ratio#101, currency_ratio#102]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=9]
+
+(67) Sort [codegen id : 19]
+Input [3]: [item#100, return_ratio#101, currency_ratio#102]
+Arguments: [return_ratio#101 ASC NULLS FIRST], false, 0
+
+(68) Window
+Input [3]: [item#100, return_ratio#101, currency_ratio#102]
+Arguments: [rank(return_ratio#101) windowspecdefinition(return_ratio#101 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#103], [return_ratio#101 ASC NULLS FIRST]
+
+(69) Sort [codegen id : 20]
+Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
+Arguments: [currency_ratio#102 ASC NULLS FIRST], false, 0
+
+(70) Window
+Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
+Arguments: [rank(currency_ratio#102) windowspecdefinition(currency_ratio#102 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#104], [currency_ratio#102 ASC NULLS FIRST]
+
+(71) Filter [codegen id : 21]
+Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
+Condition : ((return_rank#103 <= 10) OR (currency_rank#104 <= 10))
+
+(72) Project [codegen id : 21]
+Output [5]: [store AS channel#105, item#100, return_ratio#101, return_rank#103, currency_rank#104]
+Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
+
+(73) Union
+
+(74) HashAggregate [codegen id : 22]
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 Functions: []
 Aggregate Attributes: []
-Results [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
-(81) RowToColumnar
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(75) Exchange
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Arguments: hashpartitioning(channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(82) CometColumnarExchange
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Arguments: hashpartitioning(channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(83) CometHashAggregate
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(76) HashAggregate [codegen id : 23]
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
-(84) CometTakeOrderedAndProject
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#31 ASC NULLS FIRST,return_rank#29 ASC NULLS FIRST,currency_rank#30 ASC NULLS FIRST], output=[channel#31,item#26,return_ratio#27,return_rank#29,currency_rank#30]), 100, [channel#31 ASC NULLS FIRST, return_rank#29 ASC NULLS FIRST, currency_rank#30 ASC NULLS FIRST], [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-
-(85) ColumnarToRow [codegen id : 20]
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(77) TakeOrderedAndProject
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Arguments: 100, [channel#35 ASC NULLS FIRST, return_rank#33 ASC NULLS FIRST, currency_rank#34 ASC NULLS FIRST], [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (90)
-+- * ColumnarToRow (89)
-   +- CometProject (88)
-      +- CometFilter (87)
-         +- CometScan parquet spark_catalog.default.date_dim (86)
+BroadcastExchange (82)
++- * ColumnarToRow (81)
+   +- CometProject (80)
+      +- CometFilter (79)
+         +- CometScan parquet spark_catalog.default.date_dim (78)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#13, d_year#94, d_moy#95]
+Output [3]: [d_date_sk#13, d_year#106, d_moy#107]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,12), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(87) CometFilter
-Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
-Condition : ((((isnotnull(d_year#94) AND isnotnull(d_moy#95)) AND (d_year#94 = 2001)) AND (d_moy#95 = 12)) AND isnotnull(d_date_sk#13))
+(79) CometFilter
+Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
+Condition : ((((isnotnull(d_year#106) AND isnotnull(d_moy#107)) AND (d_year#106 = 2001)) AND (d_moy#107 = 12)) AND isnotnull(d_date_sk#13))
 
-(88) CometProject
-Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
+(80) CometProject
+Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
 Arguments: [d_date_sk#13], [d_date_sk#13]
 
-(89) ColumnarToRow [codegen id : 1]
+(81) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#13]
 
-(90) BroadcastExchange
+(82) BroadcastExchange
 Input [1]: [d_date_sk#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-Subquery:2 Hosting operator id = 27 Hosting Expression = cs_sold_date_sk#37 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 25 Hosting Expression = cs_sold_date_sk#41 IN dynamicpruning#7
 
-Subquery:3 Hosting operator id = 53 Hosting Expression = ss_sold_date_sk#68 IN dynamicpruning#7
+Subquery:3 Hosting operator id = 49 Hosting Expression = ss_sold_date_sk#76 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
index 728ec5ade5..f007c1c663 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q49/simplified.txt
@@ -1,135 +1,133 @@
-WholeStageCodegen (20)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
-        CometHashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-          CometColumnarExchange [channel,item,return_ratio,return_rank,currency_rank] #1
-            RowToColumnar
-              WholeStageCodegen (19)
-                HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-                  InputAdapter
-                    Union
-                      WholeStageCodegen (6)
-                        Project [item,return_ratio,return_rank,currency_rank]
-                          Filter [return_rank,currency_rank]
-                            InputAdapter
-                              Window [currency_ratio]
-                                WholeStageCodegen (5)
-                                  Sort [currency_ratio]
-                                    InputAdapter
-                                      Window [return_ratio]
-                                        WholeStageCodegen (4)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [return_ratio]
-                                                CometColumnarExchange #2
-                                                  CometHashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                    CometColumnarExchange [ws_item_sk] #3
-                                                      RowToColumnar
-                                                        WholeStageCodegen (3)
-                                                          HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
-                                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
-                                                                  BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #4
-                                                                        WholeStageCodegen (1)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
-                                                                                CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
-                                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
-                                                                                    SubqueryBroadcast [d_date_sk] #1
-                                                                                      BroadcastExchange #5
-                                                                                        WholeStageCodegen (1)
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometProject [d_date_sk]
-                                                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                                                          CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
-                                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+TakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
+  WholeStageCodegen (23)
+    HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+      InputAdapter
+        Exchange [channel,item,return_ratio,return_rank,currency_rank] #1
+          WholeStageCodegen (22)
+            HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+              InputAdapter
+                Union
+                  WholeStageCodegen (7)
+                    Project [item,return_ratio,return_rank,currency_rank]
+                      Filter [return_rank,currency_rank]
+                        InputAdapter
+                          Window [currency_ratio]
+                            WholeStageCodegen (6)
+                              Sort [currency_ratio]
+                                InputAdapter
+                                  Window [return_ratio]
+                                    WholeStageCodegen (5)
+                                      Sort [return_ratio]
+                                        InputAdapter
+                                          Exchange #2
+                                            WholeStageCodegen (4)
+                                              HashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(wr_return_quantity, 0)),sum(coalesce(ws_quantity, 0)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ws_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [ws_item_sk] #3
+                                                    WholeStageCodegen (3)
+                                                      HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                        Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
+                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
+                                                              BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
                                                                 InputAdapter
-                                                                  ReusedExchange [d_date_sk] #5
-                      WholeStageCodegen (12)
-                        Project [item,return_ratio,return_rank,currency_rank]
-                          Filter [return_rank,currency_rank]
-                            InputAdapter
-                              Window [currency_ratio]
-                                WholeStageCodegen (11)
-                                  Sort [currency_ratio]
-                                    InputAdapter
-                                      Window [return_ratio]
-                                        WholeStageCodegen (10)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [return_ratio]
-                                                CometColumnarExchange #6
-                                                  CometHashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                    CometColumnarExchange [cs_item_sk] #7
-                                                      RowToColumnar
-                                                        WholeStageCodegen (9)
-                                                          HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
-                                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
-                                                                  BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #8
-                                                                        WholeStageCodegen (7)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
-                                                                                CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
-                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
-                                                                                    ReusedSubquery [d_date_sk] #1
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                                                          CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
-                                                                            CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                                                  BroadcastExchange #4
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
+                                                                            CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
+                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                                  BroadcastExchange #5
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometProject [d_date_sk]
+                                                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                                                      CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
+                                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+                                                            InputAdapter
+                                                              ReusedExchange [d_date_sk] #5
+                  WholeStageCodegen (14)
+                    Project [item,return_ratio,return_rank,currency_rank]
+                      Filter [return_rank,currency_rank]
+                        InputAdapter
+                          Window [currency_ratio]
+                            WholeStageCodegen (13)
+                              Sort [currency_ratio]
+                                InputAdapter
+                                  Window [return_ratio]
+                                    WholeStageCodegen (12)
+                                      Sort [return_ratio]
+                                        InputAdapter
+                                          Exchange #6
+                                            WholeStageCodegen (11)
+                                              HashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(cr_return_quantity, 0)),sum(coalesce(cs_quantity, 0)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum(coalesce(cast(cs_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [cs_item_sk] #7
+                                                    WholeStageCodegen (10)
+                                                      HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                        Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
+                                                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
+                                                              BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
                                                                 InputAdapter
-                                                                  ReusedExchange [d_date_sk] #5
-                      WholeStageCodegen (18)
-                        Project [item,return_ratio,return_rank,currency_rank]
-                          Filter [return_rank,currency_rank]
-                            InputAdapter
-                              Window [currency_ratio]
-                                WholeStageCodegen (17)
-                                  Sort [currency_ratio]
-                                    InputAdapter
-                                      Window [return_ratio]
-                                        WholeStageCodegen (16)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [return_ratio]
-                                                CometColumnarExchange #9
-                                                  CometHashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                    CometColumnarExchange [ss_item_sk] #10
-                                                      RowToColumnar
-                                                        WholeStageCodegen (15)
-                                                          HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
-                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
-                                                                  BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #11
-                                                                        WholeStageCodegen (13)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
-                                                                                CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
-                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
-                                                                                    ReusedSubquery [d_date_sk] #1
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                                                          CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
-                                                                            CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                                                  BroadcastExchange #8
+                                                                    WholeStageCodegen (8)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
+                                                                            CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
+                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                                                      CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
+                                                                        CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                                            InputAdapter
+                                                              ReusedExchange [d_date_sk] #5
+                  WholeStageCodegen (21)
+                    Project [item,return_ratio,return_rank,currency_rank]
+                      Filter [return_rank,currency_rank]
+                        InputAdapter
+                          Window [currency_ratio]
+                            WholeStageCodegen (20)
+                              Sort [currency_ratio]
+                                InputAdapter
+                                  Window [return_ratio]
+                                    WholeStageCodegen (19)
+                                      Sort [return_ratio]
+                                        InputAdapter
+                                          Exchange #9
+                                            WholeStageCodegen (18)
+                                              HashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(sr_return_quantity, 0)),sum(coalesce(ss_quantity, 0)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ss_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [ss_item_sk] #10
+                                                    WholeStageCodegen (17)
+                                                      HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                        Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
+                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
+                                                              BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                                 InputAdapter
-                                                                  ReusedExchange [d_date_sk] #5
+                                                                  BroadcastExchange #11
+                                                                    WholeStageCodegen (15)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
+                                                                            CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                                                      CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
+                                                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                                            InputAdapter
+                                                              ReusedExchange [d_date_sk] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
index e6cab40f97..468df4fec4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/explain.txt
@@ -1,84 +1,76 @@
 == Physical Plan ==
-* ColumnarToRow (80)
-+- CometTakeOrderedAndProject (79)
-   +- CometHashAggregate (78)
-      +- CometColumnarExchange (77)
-         +- RowToColumnar (76)
-            +- * HashAggregate (75)
-               +- * Expand (74)
-                  +- Union (73)
-                     :- * HashAggregate (22)
-                     :  +- * ColumnarToRow (21)
-                     :     +- CometColumnarExchange (20)
-                     :        +- RowToColumnar (19)
-                     :           +- * HashAggregate (18)
-                     :              +- * Project (17)
-                     :                 +- * BroadcastHashJoin Inner BuildRight (16)
-                     :                    :- * Project (11)
-                     :                    :  +- * BroadcastHashJoin Inner BuildRight (10)
-                     :                    :     :- * ColumnarToRow (8)
-                     :                    :     :  +- CometUnion (7)
-                     :                    :     :     :- CometProject (3)
-                     :                    :     :     :  +- CometFilter (2)
-                     :                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :                    :     :     +- CometProject (6)
-                     :                    :     :        +- CometFilter (5)
-                     :                    :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
-                     :                    :     +- ReusedExchange (9)
-                     :                    +- BroadcastExchange (15)
-                     :                       +- * ColumnarToRow (14)
-                     :                          +- CometFilter (13)
-                     :                             +- CometScan parquet spark_catalog.default.store (12)
-                     :- * HashAggregate (44)
-                     :  +- * ColumnarToRow (43)
-                     :     +- CometColumnarExchange (42)
-                     :        +- RowToColumnar (41)
-                     :           +- * HashAggregate (40)
-                     :              +- * Project (39)
-                     :                 +- * BroadcastHashJoin Inner BuildRight (38)
-                     :                    :- * Project (33)
-                     :                    :  +- * BroadcastHashJoin Inner BuildRight (32)
-                     :                    :     :- * ColumnarToRow (30)
-                     :                    :     :  +- CometUnion (29)
-                     :                    :     :     :- CometProject (25)
-                     :                    :     :     :  +- CometFilter (24)
-                     :                    :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (23)
-                     :                    :     :     +- CometProject (28)
-                     :                    :     :        +- CometFilter (27)
-                     :                    :     :           +- CometScan parquet spark_catalog.default.catalog_returns (26)
-                     :                    :     +- ReusedExchange (31)
-                     :                    +- BroadcastExchange (37)
-                     :                       +- * ColumnarToRow (36)
-                     :                          +- CometFilter (35)
-                     :                             +- CometScan parquet spark_catalog.default.catalog_page (34)
-                     +- * HashAggregate (72)
-                        +- * ColumnarToRow (71)
-                           +- CometColumnarExchange (70)
-                              +- RowToColumnar (69)
-                                 +- * HashAggregate (68)
-                                    +- * Project (67)
-                                       +- * BroadcastHashJoin Inner BuildRight (66)
-                                          :- * Project (61)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (60)
-                                          :     :- Union (58)
-                                          :     :  :- * ColumnarToRow (48)
-                                          :     :  :  +- CometProject (47)
-                                          :     :  :     +- CometFilter (46)
-                                          :     :  :        +- CometScan parquet spark_catalog.default.web_sales (45)
-                                          :     :  +- * Project (57)
-                                          :     :     +- * BroadcastHashJoin Inner BuildLeft (56)
-                                          :     :        :- BroadcastExchange (51)
-                                          :     :        :  +- * ColumnarToRow (50)
-                                          :     :        :     +- CometScan parquet spark_catalog.default.web_returns (49)
-                                          :     :        +- * ColumnarToRow (55)
-                                          :     :           +- CometProject (54)
-                                          :     :              +- CometFilter (53)
-                                          :     :                 +- CometScan parquet spark_catalog.default.web_sales (52)
-                                          :     +- ReusedExchange (59)
-                                          +- BroadcastExchange (65)
-                                             +- * ColumnarToRow (64)
-                                                +- CometFilter (63)
-                                                   +- CometScan parquet spark_catalog.default.web_site (62)
+TakeOrderedAndProject (72)
++- * HashAggregate (71)
+   +- Exchange (70)
+      +- * HashAggregate (69)
+         +- * Expand (68)
+            +- Union (67)
+               :- * HashAggregate (20)
+               :  +- Exchange (19)
+               :     +- * HashAggregate (18)
+               :        +- * Project (17)
+               :           +- * BroadcastHashJoin Inner BuildRight (16)
+               :              :- * Project (11)
+               :              :  +- * BroadcastHashJoin Inner BuildRight (10)
+               :              :     :- * ColumnarToRow (8)
+               :              :     :  +- CometUnion (7)
+               :              :     :     :- CometProject (3)
+               :              :     :     :  +- CometFilter (2)
+               :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :              :     :     +- CometProject (6)
+               :              :     :        +- CometFilter (5)
+               :              :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
+               :              :     +- ReusedExchange (9)
+               :              +- BroadcastExchange (15)
+               :                 +- * ColumnarToRow (14)
+               :                    +- CometFilter (13)
+               :                       +- CometScan parquet spark_catalog.default.store (12)
+               :- * HashAggregate (40)
+               :  +- Exchange (39)
+               :     +- * HashAggregate (38)
+               :        +- * Project (37)
+               :           +- * BroadcastHashJoin Inner BuildRight (36)
+               :              :- * Project (31)
+               :              :  +- * BroadcastHashJoin Inner BuildRight (30)
+               :              :     :- * ColumnarToRow (28)
+               :              :     :  +- CometUnion (27)
+               :              :     :     :- CometProject (23)
+               :              :     :     :  +- CometFilter (22)
+               :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (21)
+               :              :     :     +- CometProject (26)
+               :              :     :        +- CometFilter (25)
+               :              :     :           +- CometScan parquet spark_catalog.default.catalog_returns (24)
+               :              :     +- ReusedExchange (29)
+               :              +- BroadcastExchange (35)
+               :                 +- * ColumnarToRow (34)
+               :                    +- CometFilter (33)
+               :                       +- CometScan parquet spark_catalog.default.catalog_page (32)
+               +- * HashAggregate (66)
+                  +- Exchange (65)
+                     +- * HashAggregate (64)
+                        +- * Project (63)
+                           +- * BroadcastHashJoin Inner BuildRight (62)
+                              :- * Project (57)
+                              :  +- * BroadcastHashJoin Inner BuildRight (56)
+                              :     :- Union (54)
+                              :     :  :- * ColumnarToRow (44)
+                              :     :  :  +- CometProject (43)
+                              :     :  :     +- CometFilter (42)
+                              :     :  :        +- CometScan parquet spark_catalog.default.web_sales (41)
+                              :     :  +- * Project (53)
+                              :     :     +- * BroadcastHashJoin Inner BuildLeft (52)
+                              :     :        :- BroadcastExchange (47)
+                              :     :        :  +- * ColumnarToRow (46)
+                              :     :        :     +- CometScan parquet spark_catalog.default.web_returns (45)
+                              :     :        +- * ColumnarToRow (51)
+                              :     :           +- CometProject (50)
+                              :     :              +- CometFilter (49)
+                              :     :                 +- CometScan parquet spark_catalog.default.web_sales (48)
+                              :     +- ReusedExchange (55)
+                              +- BroadcastExchange (61)
+                                 +- * ColumnarToRow (60)
+                                    +- CometFilter (59)
+                                       +- CometScan parquet spark_catalog.default.web_site (58)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -120,7 +112,7 @@ Child 1 Input [6]: [store_sk#16, date_sk#17, sales_price#18, profit#19, return_a
 (8) ColumnarToRow [codegen id : 3]
 Input [6]: [store_sk#6, date_sk#7, sales_price#8, profit#9, return_amt#10, net_loss#11]
 
-(9) ReusedExchange [Reuses operator id: 85]
+(9) ReusedExchange [Reuses operator id: 77]
 Output [1]: [d_date_sk#22]
 
 (10) BroadcastHashJoin [codegen id : 3]
@@ -168,17 +160,11 @@ Functions [4]: [partial_sum(UnscaledValue(sales_price#8)), partial_sum(UnscaledV
 Aggregate Attributes [4]: [sum#25, sum#26, sum#27, sum#28]
 Results [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 
-(19) RowToColumnar
+(19) Exchange
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
+Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(20) CometColumnarExchange
-Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
-Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(21) ColumnarToRow [codegen id : 4]
-Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
-
-(22) HashAggregate [codegen id : 4]
+(20) HashAggregate [codegen id : 4]
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 Keys [1]: [s_store_id#24]
 Functions [4]: [sum(UnscaledValue(sales_price#8)), sum(UnscaledValue(return_amt#10)), sum(UnscaledValue(profit#9)), sum(UnscaledValue(net_loss#11))]
@@ -193,11 +179,11 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(24) CometFilter
+(22) CometFilter
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : isnotnull(cs_catalog_page_sk#42)
 
-(25) CometProject
+(23) CometProject
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52], [cs_catalog_page_sk#42 AS page_sk#47, cs_sold_date_sk#45 AS date_sk#48, cs_ext_sales_price#43 AS sales_price#49, cs_net_profit#44 AS profit#50, 0.00 AS return_amt#51, 0.00 AS net_loss#52]
 
@@ -209,31 +195,31 @@ PartitionFilters: [isnotnull(cr_returned_date_sk#56), dynamicpruningexpression(c
 PushedFilters: [IsNotNull(cr_catalog_page_sk)]
 ReadSchema: struct<cr_catalog_page_sk:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(27) CometFilter
+(25) CometFilter
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Condition : isnotnull(cr_catalog_page_sk#53)
 
-(28) CometProject
+(26) CometProject
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Arguments: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62], [cr_catalog_page_sk#53 AS page_sk#57, cr_returned_date_sk#56 AS date_sk#58, 0.00 AS sales_price#59, 0.00 AS profit#60, cr_return_amount#54 AS return_amt#61, cr_net_loss#55 AS net_loss#62]
 
-(29) CometUnion
+(27) CometUnion
 Child 0 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Child 1 Input [6]: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62]
 
-(30) ColumnarToRow [codegen id : 7]
+(28) ColumnarToRow [codegen id : 7]
 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 
-(31) ReusedExchange [Reuses operator id: 85]
+(29) ReusedExchange [Reuses operator id: 77]
 Output [1]: [d_date_sk#63]
 
-(32) BroadcastHashJoin [codegen id : 7]
+(30) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [date_sk#48]
 Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 7]
+(31) Project [codegen id : 7]
 Output [5]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Input [7]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52, d_date_sk#63]
 
@@ -244,45 +230,39 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(35) CometFilter
+(33) CometFilter
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Condition : isnotnull(cp_catalog_page_sk#64)
 
-(36) ColumnarToRow [codegen id : 6]
+(34) ColumnarToRow [codegen id : 6]
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(37) BroadcastExchange
+(35) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(38) BroadcastHashJoin [codegen id : 7]
+(36) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [page_sk#47]
 Right keys [1]: [cp_catalog_page_sk#64]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 7]
+(37) Project [codegen id : 7]
 Output [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Input [7]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(40) HashAggregate [codegen id : 7]
+(38) HashAggregate [codegen id : 7]
 Input [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#49)), partial_sum(UnscaledValue(return_amt#51)), partial_sum(UnscaledValue(profit#50)), partial_sum(UnscaledValue(net_loss#52))]
 Aggregate Attributes [4]: [sum#66, sum#67, sum#68, sum#69]
 Results [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 
-(41) RowToColumnar
-Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
-
-(42) CometColumnarExchange
-Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
-Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(43) ColumnarToRow [codegen id : 8]
+(39) Exchange
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
+Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(44) HashAggregate [codegen id : 8]
+(40) HashAggregate [codegen id : 8]
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [sum(UnscaledValue(sales_price#49)), sum(UnscaledValue(return_amt#51)), sum(UnscaledValue(profit#50)), sum(UnscaledValue(net_loss#52))]
@@ -297,15 +277,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#86), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_web_site_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(46) CometFilter
+(42) CometFilter
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Condition : isnotnull(ws_web_site_sk#83)
 
-(47) CometProject
+(43) CometProject
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Arguments: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93], [ws_web_site_sk#83 AS wsr_web_site_sk#88, ws_sold_date_sk#86 AS date_sk#89, ws_ext_sales_price#84 AS sales_price#90, ws_net_profit#85 AS profit#91, 0.00 AS return_amt#92, 0.00 AS net_loss#93]
 
-(48) ColumnarToRow [codegen id : 9]
+(44) ColumnarToRow [codegen id : 9]
 Input [6]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
@@ -315,10 +295,10 @@ Location: InMemoryFileIndex []
 PartitionFilters: [isnotnull(wr_returned_date_sk#98), dynamicpruningexpression(wr_returned_date_sk#98 IN dynamicpruning#87)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(50) ColumnarToRow [codegen id : 10]
+(46) ColumnarToRow [codegen id : 10]
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 
-(51) BroadcastExchange
+(47) BroadcastExchange
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, true] as bigint), 32) | (cast(input[1, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
@@ -329,39 +309,39 @@ Location [not included in comparison]/{warehouse_dir}/web_sales]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_order_number), IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_order_number:int>
 
-(53) CometFilter
+(49) CometFilter
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Condition : ((isnotnull(ws_item_sk#99) AND isnotnull(ws_order_number#101)) AND isnotnull(ws_web_site_sk#100))
 
-(54) CometProject
+(50) CometProject
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Arguments: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101], [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(55) ColumnarToRow
+(51) ColumnarToRow
 Input [3]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(56) BroadcastHashJoin [codegen id : 11]
+(52) BroadcastHashJoin [codegen id : 11]
 Left keys [2]: [wr_item_sk#94, wr_order_number#95]
 Right keys [2]: [ws_item_sk#99, ws_order_number#101]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 11]
+(53) Project [codegen id : 11]
 Output [6]: [ws_web_site_sk#100 AS wsr_web_site_sk#103, wr_returned_date_sk#98 AS date_sk#104, 0.00 AS sales_price#105, 0.00 AS profit#106, wr_return_amt#96 AS return_amt#107, wr_net_loss#97 AS net_loss#108]
 Input [8]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98, ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(58) Union
+(54) Union
 
-(59) ReusedExchange [Reuses operator id: 85]
+(55) ReusedExchange [Reuses operator id: 77]
 Output [1]: [d_date_sk#109]
 
-(60) BroadcastHashJoin [codegen id : 14]
+(56) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [date_sk#89]
 Right keys [1]: [d_date_sk#109]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 14]
+(57) Project [codegen id : 14]
 Output [5]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93]
 Input [7]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93, d_date_sk#109]
 
@@ -372,123 +352,113 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(63) CometFilter
+(59) CometFilter
 Input [2]: [web_site_sk#110, web_site_id#111]
 Condition : isnotnull(web_site_sk#110)
 
-(64) ColumnarToRow [codegen id : 13]
+(60) ColumnarToRow [codegen id : 13]
 Input [2]: [web_site_sk#110, web_site_id#111]
 
-(65) BroadcastExchange
+(61) BroadcastExchange
 Input [2]: [web_site_sk#110, web_site_id#111]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(66) BroadcastHashJoin [codegen id : 14]
+(62) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [wsr_web_site_sk#88]
 Right keys [1]: [web_site_sk#110]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 14]
+(63) Project [codegen id : 14]
 Output [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Input [7]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_sk#110, web_site_id#111]
 
-(68) HashAggregate [codegen id : 14]
+(64) HashAggregate [codegen id : 14]
 Input [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Keys [1]: [web_site_id#111]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#90)), partial_sum(UnscaledValue(return_amt#92)), partial_sum(UnscaledValue(profit#91)), partial_sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum#112, sum#113, sum#114, sum#115]
 Results [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 
-(69) RowToColumnar
+(65) Exchange
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
+Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(70) CometColumnarExchange
-Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
-Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(71) ColumnarToRow [codegen id : 15]
-Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
-
-(72) HashAggregate [codegen id : 15]
+(66) HashAggregate [codegen id : 15]
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 Keys [1]: [web_site_id#111]
 Functions [4]: [sum(UnscaledValue(sales_price#90)), sum(UnscaledValue(return_amt#92)), sum(UnscaledValue(profit#91)), sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum(UnscaledValue(sales_price#90))#120, sum(UnscaledValue(return_amt#92))#121, sum(UnscaledValue(profit#91))#122, sum(UnscaledValue(net_loss#93))#123]
 Results [5]: [MakeDecimal(sum(UnscaledValue(sales_price#90))#120,17,2) AS sales#124, MakeDecimal(sum(UnscaledValue(return_amt#92))#121,17,2) AS returns#125, (MakeDecimal(sum(UnscaledValue(profit#91))#122,17,2) - MakeDecimal(sum(UnscaledValue(net_loss#93))#123,17,2)) AS profit#126, web channel AS channel#127, concat(web_site, web_site_id#111) AS id#128]
 
-(73) Union
+(67) Union
 
-(74) Expand [codegen id : 16]
+(68) Expand [codegen id : 16]
 Input [5]: [sales#37, returns#38, profit#39, channel#40, id#41]
 Arguments: [[sales#37, returns#38, profit#39, channel#40, id#41, 0], [sales#37, returns#38, profit#39, channel#40, null, 1], [sales#37, returns#38, profit#39, null, null, 3]], [sales#37, returns#38, profit#39, channel#129, id#130, spark_grouping_id#131]
 
-(75) HashAggregate [codegen id : 16]
+(69) HashAggregate [codegen id : 16]
 Input [6]: [sales#37, returns#38, profit#39, channel#129, id#130, spark_grouping_id#131]
 Keys [3]: [channel#129, id#130, spark_grouping_id#131]
 Functions [3]: [partial_sum(sales#37), partial_sum(returns#38), partial_sum(profit#39)]
 Aggregate Attributes [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
 Results [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
 
-(76) RowToColumnar
+(70) Exchange
 Input [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
+Arguments: hashpartitioning(channel#129, id#130, spark_grouping_id#131, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(77) CometColumnarExchange
-Input [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
-Arguments: hashpartitioning(channel#129, id#130, spark_grouping_id#131, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
-
-(78) CometHashAggregate
+(71) HashAggregate [codegen id : 17]
 Input [9]: [channel#129, id#130, spark_grouping_id#131, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
 Keys [3]: [channel#129, id#130, spark_grouping_id#131]
 Functions [3]: [sum(sales#37), sum(returns#38), sum(profit#39)]
+Aggregate Attributes [3]: [sum(sales#37)#144, sum(returns#38)#145, sum(profit#39)#146]
+Results [5]: [channel#129, id#130, sum(sales#37)#144 AS sales#147, sum(returns#38)#145 AS returns#148, sum(profit#39)#146 AS profit#149]
 
-(79) CometTakeOrderedAndProject
-Input [5]: [channel#129, id#130, sales#144, returns#145, profit#146]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#129 ASC NULLS FIRST,id#130 ASC NULLS FIRST], output=[channel#129,id#130,sales#144,returns#145,profit#146]), 100, [channel#129 ASC NULLS FIRST, id#130 ASC NULLS FIRST], [channel#129, id#130, sales#144, returns#145, profit#146]
-
-(80) ColumnarToRow [codegen id : 17]
-Input [5]: [channel#129, id#130, sales#144, returns#145, profit#146]
+(72) TakeOrderedAndProject
+Input [5]: [channel#129, id#130, sales#147, returns#148, profit#149]
+Arguments: 100, [channel#129 ASC NULLS FIRST, id#130 ASC NULLS FIRST], [channel#129, id#130, sales#147, returns#148, profit#149]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (85)
-+- * ColumnarToRow (84)
-   +- CometProject (83)
-      +- CometFilter (82)
-         +- CometScan parquet spark_catalog.default.date_dim (81)
+BroadcastExchange (77)
++- * ColumnarToRow (76)
+   +- CometProject (75)
+      +- CometFilter (74)
+         +- CometScan parquet spark_catalog.default.date_dim (73)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#22, d_date#147]
+Output [2]: [d_date_sk#22, d_date#150]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), LessThanOrEqual(d_date,2000-09-06), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(82) CometFilter
-Input [2]: [d_date_sk#22, d_date#147]
-Condition : (((isnotnull(d_date#147) AND (d_date#147 >= 2000-08-23)) AND (d_date#147 <= 2000-09-06)) AND isnotnull(d_date_sk#22))
+(74) CometFilter
+Input [2]: [d_date_sk#22, d_date#150]
+Condition : (((isnotnull(d_date#150) AND (d_date#150 >= 2000-08-23)) AND (d_date#150 <= 2000-09-06)) AND isnotnull(d_date_sk#22))
 
-(83) CometProject
-Input [2]: [d_date_sk#22, d_date#147]
+(75) CometProject
+Input [2]: [d_date_sk#22, d_date#150]
 Arguments: [d_date_sk#22], [d_date_sk#22]
 
-(84) ColumnarToRow [codegen id : 1]
+(76) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#22]
 
-(85) BroadcastExchange
+(77) BroadcastExchange
 Input [1]: [d_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#15 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 23 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 21 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 26 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 24 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 45 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 49 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 45 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
index 26119c3bd3..33a1fb7a82 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q5/simplified.txt
@@ -1,128 +1,120 @@
-WholeStageCodegen (17)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
-        CometHashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-          CometColumnarExchange [channel,id,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (16)
-                HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  Expand [sales,returns,profit,channel,id]
-                    InputAdapter
-                      Union
-                        WholeStageCodegen (4)
-                          HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [s_store_id] #2
-                                  RowToColumnar
-                                    WholeStageCodegen (3)
-                                      HashAggregate [s_store_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
-                                        Project [sales_price,profit,return_amt,net_loss,s_store_id]
-                                          BroadcastHashJoin [store_sk,s_store_sk]
-                                            Project [store_sk,sales_price,profit,return_amt,net_loss]
-                                              BroadcastHashJoin [date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometUnion
-                                                      CometProject [ss_store_sk,ss_sold_date_sk,ss_ext_sales_price,ss_net_profit] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                        CometFilter [ss_store_sk]
-                                                          CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #1
-                                                              BroadcastExchange #3
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_date,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                      CometProject [sr_store_sk,sr_returned_date_sk,sr_return_amt,sr_net_loss] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                        CometFilter [sr_store_sk]
-                                                          CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [channel,id,sales,returns,profit]
+  WholeStageCodegen (17)
+    HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+      InputAdapter
+        Exchange [channel,id,spark_grouping_id] #1
+          WholeStageCodegen (16)
+            HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+              Expand [sales,returns,profit,channel,id]
+                InputAdapter
+                  Union
+                    WholeStageCodegen (4)
+                      HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
+                        InputAdapter
+                          Exchange [s_store_id] #2
+                            WholeStageCodegen (3)
+                              HashAggregate [s_store_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
+                                Project [sales_price,profit,return_amt,net_loss,s_store_id]
+                                  BroadcastHashJoin [store_sk,s_store_sk]
+                                    Project [store_sk,sales_price,profit,return_amt,net_loss]
+                                      BroadcastHashJoin [date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometUnion
+                                              CometProject [ss_store_sk,ss_sold_date_sk,ss_ext_sales_price,ss_net_profit] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                CometFilter [ss_store_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_date,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                              CometProject [sr_store_sk,sr_returned_date_sk,sr_return_amt,sr_net_loss] [store_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                CometFilter [sr_store_sk]
+                                                  CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                                    InputAdapter
+                                      BroadcastExchange #4
+                                        WholeStageCodegen (2)
+                                          ColumnarToRow
                                             InputAdapter
-                                              BroadcastExchange #4
-                                                WholeStageCodegen (2)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
-                        WholeStageCodegen (8)
-                          HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [cp_catalog_page_id] #5
-                                  RowToColumnar
-                                    WholeStageCodegen (7)
-                                      HashAggregate [cp_catalog_page_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
-                                        Project [sales_price,profit,return_amt,net_loss,cp_catalog_page_id]
-                                          BroadcastHashJoin [page_sk,cp_catalog_page_sk]
-                                            Project [page_sk,sales_price,profit,return_amt,net_loss]
-                                              BroadcastHashJoin [date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometUnion
-                                                      CometProject [cs_catalog_page_sk,cs_sold_date_sk,cs_ext_sales_price,cs_net_profit] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                        CometFilter [cs_catalog_page_sk]
-                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
-                                                      CometProject [cr_catalog_page_sk,cr_returned_date_sk,cr_return_amount,cr_net_loss] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                        CometFilter [cr_catalog_page_sk]
-                                                          CometScan parquet spark_catalog.default.catalog_returns [cr_catalog_page_sk,cr_return_amount,cr_net_loss,cr_returned_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk] #3
+                                              CometFilter [s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
+                    WholeStageCodegen (8)
+                      HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
+                        InputAdapter
+                          Exchange [cp_catalog_page_id] #5
+                            WholeStageCodegen (7)
+                              HashAggregate [cp_catalog_page_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
+                                Project [sales_price,profit,return_amt,net_loss,cp_catalog_page_id]
+                                  BroadcastHashJoin [page_sk,cp_catalog_page_sk]
+                                    Project [page_sk,sales_price,profit,return_amt,net_loss]
+                                      BroadcastHashJoin [date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometUnion
+                                              CometProject [cs_catalog_page_sk,cs_sold_date_sk,cs_ext_sales_price,cs_net_profit] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                CometFilter [cs_catalog_page_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                              CometProject [cr_catalog_page_sk,cr_returned_date_sk,cr_return_amount,cr_net_loss] [page_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                CometFilter [cr_catalog_page_sk]
+                                                  CometScan parquet spark_catalog.default.catalog_returns [cr_catalog_page_sk,cr_return_amount,cr_net_loss,cr_returned_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                                    InputAdapter
+                                      BroadcastExchange #6
+                                        WholeStageCodegen (6)
+                                          ColumnarToRow
                                             InputAdapter
-                                              BroadcastExchange #6
-                                                WholeStageCodegen (6)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [cp_catalog_page_sk]
-                                                        CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
-                        WholeStageCodegen (15)
-                          HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [web_site_id] #7
-                                  RowToColumnar
-                                    WholeStageCodegen (14)
-                                      HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
-                                        Project [sales_price,profit,return_amt,net_loss,web_site_id]
-                                          BroadcastHashJoin [wsr_web_site_sk,web_site_sk]
-                                            Project [wsr_web_site_sk,sales_price,profit,return_amt,net_loss]
-                                              BroadcastHashJoin [date_sk,d_date_sk]
+                                              CometFilter [cp_catalog_page_sk]
+                                                CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
+                    WholeStageCodegen (15)
+                      HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),sales,returns,profit,channel,id,sum,sum,sum,sum]
+                        InputAdapter
+                          Exchange [web_site_id] #7
+                            WholeStageCodegen (14)
+                              HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
+                                Project [sales_price,profit,return_amt,net_loss,web_site_id]
+                                  BroadcastHashJoin [wsr_web_site_sk,web_site_sk]
+                                    Project [wsr_web_site_sk,sales_price,profit,return_amt,net_loss]
+                                      BroadcastHashJoin [date_sk,d_date_sk]
+                                        InputAdapter
+                                          Union
+                                            WholeStageCodegen (9)
+                                              ColumnarToRow
                                                 InputAdapter
-                                                  Union
-                                                    WholeStageCodegen (9)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [ws_web_site_sk,ws_sold_date_sk,ws_ext_sales_price,ws_net_profit] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
-                                                            CometFilter [ws_web_site_sk]
-                                                              CometScan parquet spark_catalog.default.web_sales [ws_web_site_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                    WholeStageCodegen (11)
-                                                      Project [ws_web_site_sk,wr_returned_date_sk,wr_return_amt,wr_net_loss]
-                                                        BroadcastHashJoin [wr_item_sk,wr_order_number,ws_item_sk,ws_order_number]
+                                                  CometProject [ws_web_site_sk,ws_sold_date_sk,ws_ext_sales_price,ws_net_profit] [wsr_web_site_sk,date_sk,sales_price,profit,return_amt,net_loss]
+                                                    CometFilter [ws_web_site_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_web_site_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
+                                            WholeStageCodegen (11)
+                                              Project [ws_web_site_sk,wr_returned_date_sk,wr_return_amt,wr_net_loss]
+                                                BroadcastHashJoin [wr_item_sk,wr_order_number,ws_item_sk,ws_order_number]
+                                                  InputAdapter
+                                                    BroadcastExchange #8
+                                                      WholeStageCodegen (10)
+                                                        ColumnarToRow
                                                           InputAdapter
-                                                            BroadcastExchange #8
-                                                              WholeStageCodegen (10)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
-                                                                      ReusedSubquery [d_date_sk] #1
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [ws_item_sk,ws_web_site_sk,ws_order_number]
-                                                                CometFilter [ws_item_sk,ws_order_number,ws_web_site_sk]
-                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_order_number,ws_sold_date_sk]
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk] #3
-                                            InputAdapter
-                                              BroadcastExchange #9
-                                                WholeStageCodegen (13)
+                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                              ReusedSubquery [d_date_sk] #1
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [web_site_sk]
-                                                        CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
+                                                      CometProject [ws_item_sk,ws_web_site_sk,ws_order_number]
+                                                        CometFilter [ws_item_sk,ws_order_number,ws_web_site_sk]
+                                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_order_number,ws_sold_date_sk]
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                                    InputAdapter
+                                      BroadcastExchange #9
+                                        WholeStageCodegen (13)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [web_site_sk]
+                                                CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt
index c30a1571cb..b178faed1a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/explain.txt
@@ -1,34 +1,32 @@
 == Physical Plan ==
-* ColumnarToRow (30)
-+- CometTakeOrderedAndProject (29)
-   +- CometHashAggregate (28)
-      +- CometColumnarExchange (27)
-         +- RowToColumnar (26)
-            +- * HashAggregate (25)
-               +- * Project (24)
-                  +- * BroadcastHashJoin Inner BuildRight (23)
-                     :- * Project (21)
-                     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :     :- * Project (15)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :- * Project (9)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :     :     +- BroadcastExchange (7)
-                     :     :     :        +- * ColumnarToRow (6)
-                     :     :     :           +- CometFilter (5)
-                     :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
-                     :     :     +- BroadcastExchange (13)
-                     :     :        +- * ColumnarToRow (12)
-                     :     :           +- CometFilter (11)
-                     :     :              +- CometScan parquet spark_catalog.default.store (10)
-                     :     +- BroadcastExchange (19)
-                     :        +- * ColumnarToRow (18)
-                     :           +- CometFilter (17)
-                     :              +- CometScan parquet spark_catalog.default.date_dim (16)
-                     +- ReusedExchange (22)
+TakeOrderedAndProject (28)
++- * HashAggregate (27)
+   +- Exchange (26)
+      +- * HashAggregate (25)
+         +- * Project (24)
+            +- * BroadcastHashJoin Inner BuildRight (23)
+               :- * Project (21)
+               :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :     :- * Project (15)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :- * Project (9)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :  +- CometFilter (2)
+               :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :     :     +- BroadcastExchange (7)
+               :     :     :        +- * ColumnarToRow (6)
+               :     :     :           +- CometFilter (5)
+               :     :     :              +- CometScan parquet spark_catalog.default.store_returns (4)
+               :     :     +- BroadcastExchange (13)
+               :     :        +- * ColumnarToRow (12)
+               :     :           +- CometFilter (11)
+               :     :              +- CometScan parquet spark_catalog.default.store (10)
+               :     +- BroadcastExchange (19)
+               :        +- * ColumnarToRow (18)
+               :           +- CometFilter (17)
+               :              +- CometScan parquet spark_catalog.default.date_dim (16)
+               +- ReusedExchange (22)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -131,7 +129,7 @@ Join condition: None
 Output [12]: [ss_sold_date_sk#5, sr_returned_date_sk#9, s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21]
 Input [13]: [ss_sold_date_sk#5, sr_returned_date_sk#9, s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, d_date_sk#22]
 
-(22) ReusedExchange [Reuses operator id: 35]
+(22) ReusedExchange [Reuses operator id: 33]
 Output [1]: [d_date_sk#23]
 
 (23) BroadcastHashJoin [codegen id : 5]
@@ -151,54 +149,50 @@ Functions [5]: [partial_sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#
 Aggregate Attributes [5]: [sum#24, sum#25, sum#26, sum#27, sum#28]
 Results [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
 
-(26) RowToColumnar
+(26) Exchange
 Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
+Arguments: hashpartitioning(s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(27) CometColumnarExchange
-Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
-Arguments: hashpartitioning(s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(28) CometHashAggregate
+(27) HashAggregate [codegen id : 6]
 Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum#29, sum#30, sum#31, sum#32, sum#33]
 Keys [10]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21]
 Functions [5]: [sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END), sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 30) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END), sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 60) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END), sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 90) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END), sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)]
+Aggregate Attributes [5]: [sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#34, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 30) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#35, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 60) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#36, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 90) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#37, sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#38]
+Results [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#34 AS 30 days #39, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 30) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#35 AS 31 - 60 days #40, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 60) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#36 AS 61 - 90 days #41, sum(CASE WHEN (((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 90) AND ((sr_returned_date_sk#9 - ss_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#37 AS 91 - 120 days #42, sum(CASE WHEN ((sr_returned_date_sk#9 - ss_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#38 AS >120 days #43]
 
-(29) CometTakeOrderedAndProject
-Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #34, 31 - 60 days #35, 61 - 90 days #36, 91 - 120 days #37, >120 days #38]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[s_store_name#12 ASC NULLS FIRST,s_company_id#13 ASC NULLS FIRST,s_street_number#14 ASC NULLS FIRST,s_street_name#15 ASC NULLS FIRST,s_street_type#16 ASC NULLS FIRST,s_suite_number#17 ASC NULLS FIRST,s_city#18 ASC NULLS FIRST,s_county#19 ASC NULLS FIRST,s_state#20 ASC NULLS FIRST,s_zip#21 ASC NULLS FIRST], output=[s_store_name#12,s_company_id#13,s_street_number#14,s_street_name#15,s_street_type#16,s_suite_number#17,s_city#18,s_county#19,s_state#20,s_zip#21,30 days #34,31 - 60 days #35,61 - 90 days #36,91 - 120 days #37,>120 days #38]), 100, [s_store_name#12 ASC NULLS FIRST, s_company_id#13 ASC NULLS FIRST, s_street_number#14 ASC NULLS FIRST, s_street_name#15 ASC NULLS FIRST, s_street_type#16 ASC NULLS FIRST, s_suite_number#17 ASC NULLS FIRST, s_city#18 ASC NULLS FIRST, s_county#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST, s_zip#21 ASC NULLS FIRST], [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #34, 31 - 60 days #35, 61 - 90 days #36, 91 - 120 days #37, >120 days #38]
-
-(30) ColumnarToRow [codegen id : 6]
-Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #34, 31 - 60 days #35, 61 - 90 days #36, 91 - 120 days #37, >120 days #38]
+(28) TakeOrderedAndProject
+Input [15]: [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #39, 31 - 60 days #40, 61 - 90 days #41, 91 - 120 days #42, >120 days #43]
+Arguments: 100, [s_store_name#12 ASC NULLS FIRST, s_company_id#13 ASC NULLS FIRST, s_street_number#14 ASC NULLS FIRST, s_street_name#15 ASC NULLS FIRST, s_street_type#16 ASC NULLS FIRST, s_suite_number#17 ASC NULLS FIRST, s_city#18 ASC NULLS FIRST, s_county#19 ASC NULLS FIRST, s_state#20 ASC NULLS FIRST, s_zip#21 ASC NULLS FIRST], [s_store_name#12, s_company_id#13, s_street_number#14, s_street_name#15, s_street_type#16, s_suite_number#17, s_city#18, s_county#19, s_state#20, s_zip#21, 30 days #39, 31 - 60 days #40, 61 - 90 days #41, 91 - 120 days #42, >120 days #43]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (33)
++- * ColumnarToRow (32)
+   +- CometProject (31)
+      +- CometFilter (30)
+         +- CometScan parquet spark_catalog.default.date_dim (29)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#23, d_year#39, d_moy#40]
+Output [3]: [d_date_sk#23, d_year#44, d_moy#45]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,8), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(32) CometFilter
-Input [3]: [d_date_sk#23, d_year#39, d_moy#40]
-Condition : ((((isnotnull(d_year#39) AND isnotnull(d_moy#40)) AND (d_year#39 = 2001)) AND (d_moy#40 = 8)) AND isnotnull(d_date_sk#23))
+(30) CometFilter
+Input [3]: [d_date_sk#23, d_year#44, d_moy#45]
+Condition : ((((isnotnull(d_year#44) AND isnotnull(d_moy#45)) AND (d_year#44 = 2001)) AND (d_moy#45 = 8)) AND isnotnull(d_date_sk#23))
 
-(33) CometProject
-Input [3]: [d_date_sk#23, d_year#39, d_moy#40]
+(31) CometProject
+Input [3]: [d_date_sk#23, d_year#44, d_moy#45]
 Arguments: [d_date_sk#23], [d_date_sk#23]
 
-(34) ColumnarToRow [codegen id : 1]
+(32) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#23]
 
-(35) BroadcastExchange
+(33) BroadcastExchange
 Input [1]: [d_date_sk#23]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt
index 07cfd15950..dfdcaf4975 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q50/simplified.txt
@@ -1,52 +1,50 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
-        CometHashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sum,sum,sum,sum,sum]
-          CometColumnarExchange [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                HashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sr_returned_date_sk,ss_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+TakeOrderedAndProject [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
+  WholeStageCodegen (6)
+    HashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sum,sum,sum,sum,sum] [sum(CASE WHEN ((sr_returned_date_sk - ss_sold_date_sk) <= 30) THEN 1 ELSE 0 END),sum(CASE WHEN (((sr_returned_date_sk - ss_sold_date_sk) > 30) AND ((sr_returned_date_sk - ss_sold_date_sk) <= 60)) THEN 1 ELSE 0 END),sum(CASE WHEN (((sr_returned_date_sk - ss_sold_date_sk) > 60) AND ((sr_returned_date_sk - ss_sold_date_sk) <= 90)) THEN 1 ELSE 0 END),sum(CASE WHEN (((sr_returned_date_sk - ss_sold_date_sk) > 90) AND ((sr_returned_date_sk - ss_sold_date_sk) <= 120)) THEN 1 ELSE 0 END),sum(CASE WHEN ((sr_returned_date_sk - ss_sold_date_sk) > 120) THEN 1 ELSE 0 END),30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ,sum,sum,sum,sum,sum]
+      InputAdapter
+        Exchange [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip] #1
+          WholeStageCodegen (5)
+            HashAggregate [s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip,sr_returned_date_sk,ss_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+              Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
+                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
                   Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
-                    BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                       Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
-                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                          Project [ss_sold_date_sk,sr_returned_date_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
-                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                              Project [ss_store_sk,ss_sold_date_sk,sr_returned_date_sk]
-                                BroadcastHashJoin [ss_ticket_number,ss_item_sk,ss_customer_sk,sr_ticket_number,sr_item_sk,sr_customer_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ss_ticket_number,ss_item_sk,ss_customer_sk,ss_store_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [sr_ticket_number,sr_item_sk,sr_customer_sk]
-                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_returned_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_store_sk,ss_sold_date_sk,sr_returned_date_sk]
+                            BroadcastHashJoin [ss_ticket_number,ss_item_sk,ss_customer_sk,sr_ticket_number,sr_item_sk,sr_customer_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [ss_ticket_number,ss_item_sk,ss_customer_sk,ss_store_sk]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
                               InputAdapter
-                                BroadcastExchange #4
-                                  WholeStageCodegen (2)
+                                BroadcastExchange #2
+                                  WholeStageCodegen (1)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [s_store_sk]
-                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
+                                        CometFilter [sr_ticket_number,sr_item_sk,sr_customer_sk]
+                                          CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_customer_sk,sr_ticket_number,sr_returned_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_moy,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                           InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (3)
+                            BroadcastExchange #4
+                              WholeStageCodegen (2)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [d_date_sk]
-                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk]
+                                    CometFilter [s_store_sk]
+                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_id,s_street_number,s_street_name,s_street_type,s_suite_number,s_city,s_county,s_state,s_zip]
                       InputAdapter
-                        ReusedExchange [d_date_sk] #3
+                        BroadcastExchange #5
+                          WholeStageCodegen (3)
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [d_date_sk]
+                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk]
+                  InputAdapter
+                    ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
index 68387ead7b..c55b122617 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/explain.txt
@@ -1,48 +1,41 @@
 == Physical Plan ==
-TakeOrderedAndProject (44)
-+- * Filter (43)
-   +- Window (42)
-      +- * ColumnarToRow (41)
-         +- CometSort (40)
-            +- CometColumnarExchange (39)
-               +- CometProject (38)
-                  +- CometSortMergeJoin (37)
-                     :- CometSort (18)
-                     :  +- CometColumnarExchange (17)
-                     :     +- RowToColumnar (16)
-                     :        +- * Project (15)
-                     :           +- Window (14)
-                     :              +- * ColumnarToRow (13)
-                     :                 +- CometSort (12)
-                     :                    +- CometColumnarExchange (11)
-                     :                       +- CometHashAggregate (10)
-                     :                          +- CometColumnarExchange (9)
-                     :                             +- RowToColumnar (8)
-                     :                                +- * HashAggregate (7)
-                     :                                   +- * Project (6)
-                     :                                      +- * BroadcastHashJoin Inner BuildRight (5)
-                     :                                         :- * ColumnarToRow (3)
-                     :                                         :  +- CometFilter (2)
-                     :                                         :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                     :                                         +- ReusedExchange (4)
-                     +- CometSort (36)
-                        +- CometColumnarExchange (35)
-                           +- RowToColumnar (34)
-                              +- * Project (33)
-                                 +- Window (32)
-                                    +- * ColumnarToRow (31)
-                                       +- CometSort (30)
-                                          +- CometColumnarExchange (29)
-                                             +- CometHashAggregate (28)
-                                                +- CometColumnarExchange (27)
-                                                   +- RowToColumnar (26)
-                                                      +- * HashAggregate (25)
-                                                         +- * Project (24)
-                                                            +- * BroadcastHashJoin Inner BuildRight (23)
-                                                               :- * ColumnarToRow (21)
-                                                               :  +- CometFilter (20)
-                                                               :     +- CometScan parquet spark_catalog.default.store_sales (19)
-                                                               +- ReusedExchange (22)
+TakeOrderedAndProject (37)
++- * Filter (36)
+   +- Window (35)
+      +- * Sort (34)
+         +- Exchange (33)
+            +- * Project (32)
+               +- * SortMergeJoin FullOuter (31)
+                  :- * Sort (15)
+                  :  +- Exchange (14)
+                  :     +- * Project (13)
+                  :        +- Window (12)
+                  :           +- * Sort (11)
+                  :              +- Exchange (10)
+                  :                 +- * HashAggregate (9)
+                  :                    +- Exchange (8)
+                  :                       +- * HashAggregate (7)
+                  :                          +- * Project (6)
+                  :                             +- * BroadcastHashJoin Inner BuildRight (5)
+                  :                                :- * ColumnarToRow (3)
+                  :                                :  +- CometFilter (2)
+                  :                                :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :                                +- ReusedExchange (4)
+                  +- * Sort (30)
+                     +- Exchange (29)
+                        +- * Project (28)
+                           +- Window (27)
+                              +- * Sort (26)
+                                 +- Exchange (25)
+                                    +- * HashAggregate (24)
+                                       +- Exchange (23)
+                                          +- * HashAggregate (22)
+                                             +- * Project (21)
+                                                +- * BroadcastHashJoin Inner BuildRight (20)
+                                                   :- * ColumnarToRow (18)
+                                                   :  +- CometFilter (17)
+                                                   :     +- CometScan parquet spark_catalog.default.store_sales (16)
+                                                   +- ReusedExchange (19)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -60,7 +53,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 2]
 Input [3]: [ws_item_sk#1, ws_sales_price#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 49]
+(4) ReusedExchange [Reuses operator id: 42]
 Output [2]: [d_date_sk#5, d_date#6]
 
 (5) BroadcastHashJoin [codegen id : 2]
@@ -80,189 +73,173 @@ Functions [1]: [partial_sum(UnscaledValue(ws_sales_price#2))]
 Aggregate Attributes [1]: [sum#7]
 Results [3]: [ws_item_sk#1, d_date#6, sum#8]
 
-(8) RowToColumnar
+(8) Exchange
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
+Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(9) CometColumnarExchange
-Input [3]: [ws_item_sk#1, d_date#6, sum#8]
-Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
-
-(10) CometHashAggregate
+(9) HashAggregate [codegen id : 3]
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
 Keys [2]: [ws_item_sk#1, d_date#6]
 Functions [1]: [sum(UnscaledValue(ws_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_sales_price#2))#9]
+Results [4]: [ws_item_sk#1 AS item_sk#10, d_date#6, MakeDecimal(sum(UnscaledValue(ws_sales_price#2))#9,17,2) AS _w0#11, ws_item_sk#1]
 
-(11) CometColumnarExchange
-Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(12) CometSort
-Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
-Arguments: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1], [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
+(10) Exchange
+Input [4]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(13) ColumnarToRow [codegen id : 3]
-Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
+(11) Sort [codegen id : 4]
+Input [4]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1]
+Arguments: [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
 
-(14) Window
-Input [4]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1]
-Arguments: [sum(_w0#10) windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#11], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
+(12) Window
+Input [4]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1]
+Arguments: [sum(_w0#11) windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#12], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
 
-(15) Project [codegen id : 4]
-Output [3]: [item_sk#9, d_date#6, cume_sales#11]
-Input [5]: [item_sk#9, d_date#6, _w0#10, ws_item_sk#1, cume_sales#11]
+(13) Project [codegen id : 5]
+Output [3]: [item_sk#10, d_date#6, cume_sales#12]
+Input [5]: [item_sk#10, d_date#6, _w0#11, ws_item_sk#1, cume_sales#12]
 
-(16) RowToColumnar
-Input [3]: [item_sk#9, d_date#6, cume_sales#11]
+(14) Exchange
+Input [3]: [item_sk#10, d_date#6, cume_sales#12]
+Arguments: hashpartitioning(item_sk#10, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(17) CometColumnarExchange
-Input [3]: [item_sk#9, d_date#6, cume_sales#11]
-Arguments: hashpartitioning(item_sk#9, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(18) CometSort
-Input [3]: [item_sk#9, d_date#6, cume_sales#11]
-Arguments: [item_sk#9, d_date#6, cume_sales#11], [item_sk#9 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
+(15) Sort [codegen id : 6]
+Input [3]: [item_sk#10, d_date#6, cume_sales#12]
+Arguments: [item_sk#10 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14]
+Output [3]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#14), dynamicpruningexpression(ss_sold_date_sk#14 IN dynamicpruning#15)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#15), dynamicpruningexpression(ss_sold_date_sk#15 IN dynamicpruning#16)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_sales_price:decimal(7,2)>
 
-(20) CometFilter
-Input [3]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14]
-Condition : isnotnull(ss_item_sk#12)
+(17) CometFilter
+Input [3]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15]
+Condition : isnotnull(ss_item_sk#13)
 
-(21) ColumnarToRow [codegen id : 6]
-Input [3]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14]
+(18) ColumnarToRow [codegen id : 8]
+Input [3]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15]
 
-(22) ReusedExchange [Reuses operator id: 49]
-Output [2]: [d_date_sk#16, d_date#17]
+(19) ReusedExchange [Reuses operator id: 42]
+Output [2]: [d_date_sk#17, d_date#18]
 
-(23) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#14]
-Right keys [1]: [d_date_sk#16]
+(20) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_sold_date_sk#15]
+Right keys [1]: [d_date_sk#17]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
-Output [3]: [ss_item_sk#12, ss_sales_price#13, d_date#17]
-Input [5]: [ss_item_sk#12, ss_sales_price#13, ss_sold_date_sk#14, d_date_sk#16, d_date#17]
-
-(25) HashAggregate [codegen id : 6]
-Input [3]: [ss_item_sk#12, ss_sales_price#13, d_date#17]
-Keys [2]: [ss_item_sk#12, d_date#17]
-Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#13))]
-Aggregate Attributes [1]: [sum#18]
-Results [3]: [ss_item_sk#12, d_date#17, sum#19]
-
-(26) RowToColumnar
-Input [3]: [ss_item_sk#12, d_date#17, sum#19]
-
-(27) CometColumnarExchange
-Input [3]: [ss_item_sk#12, d_date#17, sum#19]
-Arguments: hashpartitioning(ss_item_sk#12, d_date#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(28) CometHashAggregate
-Input [3]: [ss_item_sk#12, d_date#17, sum#19]
-Keys [2]: [ss_item_sk#12, d_date#17]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#13))]
-
-(29) CometColumnarExchange
-Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
-Arguments: hashpartitioning(ss_item_sk#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(30) CometSort
-Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
-Arguments: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12], [ss_item_sk#12 ASC NULLS FIRST, d_date#17 ASC NULLS FIRST]
-
-(31) ColumnarToRow [codegen id : 7]
-Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
-
-(32) Window
-Input [4]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12]
-Arguments: [sum(_w0#21) windowspecdefinition(ss_item_sk#12, d_date#17 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#22], [ss_item_sk#12], [d_date#17 ASC NULLS FIRST]
-
-(33) Project [codegen id : 8]
-Output [3]: [item_sk#20, d_date#17, cume_sales#22]
-Input [5]: [item_sk#20, d_date#17, _w0#21, ss_item_sk#12, cume_sales#22]
-
-(34) RowToColumnar
-Input [3]: [item_sk#20, d_date#17, cume_sales#22]
-
-(35) CometColumnarExchange
-Input [3]: [item_sk#20, d_date#17, cume_sales#22]
-Arguments: hashpartitioning(item_sk#20, d_date#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(36) CometSort
-Input [3]: [item_sk#20, d_date#17, cume_sales#22]
-Arguments: [item_sk#20, d_date#17, cume_sales#22], [item_sk#20 ASC NULLS FIRST, d_date#17 ASC NULLS FIRST]
-
-(37) CometSortMergeJoin
-Left output [3]: [item_sk#9, d_date#6, cume_sales#11]
-Right output [3]: [item_sk#20, d_date#17, cume_sales#22]
-Arguments: [item_sk#9, d_date#6], [item_sk#20, d_date#17], FullOuter
-
-(38) CometProject
-Input [6]: [item_sk#9, d_date#6, cume_sales#11, item_sk#20, d_date#17, cume_sales#22]
-Arguments: [item_sk#23, d_date#24, web_sales#25, store_sales#26], [CASE WHEN isnotnull(item_sk#9) THEN item_sk#9 ELSE item_sk#20 END AS item_sk#23, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#17 END AS d_date#24, cume_sales#11 AS web_sales#25, cume_sales#22 AS store_sales#26]
+(21) Project [codegen id : 8]
+Output [3]: [ss_item_sk#13, ss_sales_price#14, d_date#18]
+Input [5]: [ss_item_sk#13, ss_sales_price#14, ss_sold_date_sk#15, d_date_sk#17, d_date#18]
+
+(22) HashAggregate [codegen id : 8]
+Input [3]: [ss_item_sk#13, ss_sales_price#14, d_date#18]
+Keys [2]: [ss_item_sk#13, d_date#18]
+Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#14))]
+Aggregate Attributes [1]: [sum#19]
+Results [3]: [ss_item_sk#13, d_date#18, sum#20]
+
+(23) Exchange
+Input [3]: [ss_item_sk#13, d_date#18, sum#20]
+Arguments: hashpartitioning(ss_item_sk#13, d_date#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(24) HashAggregate [codegen id : 9]
+Input [3]: [ss_item_sk#13, d_date#18, sum#20]
+Keys [2]: [ss_item_sk#13, d_date#18]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#14))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#14))#21]
+Results [4]: [ss_item_sk#13 AS item_sk#22, d_date#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#14))#21,17,2) AS _w0#23, ss_item_sk#13]
+
+(25) Exchange
+Input [4]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13]
+Arguments: hashpartitioning(ss_item_sk#13, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(26) Sort [codegen id : 10]
+Input [4]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13]
+Arguments: [ss_item_sk#13 ASC NULLS FIRST, d_date#18 ASC NULLS FIRST], false, 0
+
+(27) Window
+Input [4]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13]
+Arguments: [sum(_w0#23) windowspecdefinition(ss_item_sk#13, d_date#18 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS cume_sales#24], [ss_item_sk#13], [d_date#18 ASC NULLS FIRST]
+
+(28) Project [codegen id : 11]
+Output [3]: [item_sk#22, d_date#18, cume_sales#24]
+Input [5]: [item_sk#22, d_date#18, _w0#23, ss_item_sk#13, cume_sales#24]
+
+(29) Exchange
+Input [3]: [item_sk#22, d_date#18, cume_sales#24]
+Arguments: hashpartitioning(item_sk#22, d_date#18, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(30) Sort [codegen id : 12]
+Input [3]: [item_sk#22, d_date#18, cume_sales#24]
+Arguments: [item_sk#22 ASC NULLS FIRST, d_date#18 ASC NULLS FIRST], false, 0
+
+(31) SortMergeJoin [codegen id : 13]
+Left keys [2]: [item_sk#10, d_date#6]
+Right keys [2]: [item_sk#22, d_date#18]
+Join type: FullOuter
+Join condition: None
 
-(39) CometColumnarExchange
-Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
-Arguments: hashpartitioning(item_sk#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(32) Project [codegen id : 13]
+Output [4]: [CASE WHEN isnotnull(item_sk#10) THEN item_sk#10 ELSE item_sk#22 END AS item_sk#25, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#18 END AS d_date#26, cume_sales#12 AS web_sales#27, cume_sales#24 AS store_sales#28]
+Input [6]: [item_sk#10, d_date#6, cume_sales#12, item_sk#22, d_date#18, cume_sales#24]
 
-(40) CometSort
-Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
-Arguments: [item_sk#23, d_date#24, web_sales#25, store_sales#26], [item_sk#23 ASC NULLS FIRST, d_date#24 ASC NULLS FIRST]
+(33) Exchange
+Input [4]: [item_sk#25, d_date#26, web_sales#27, store_sales#28]
+Arguments: hashpartitioning(item_sk#25, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) ColumnarToRow [codegen id : 9]
-Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
+(34) Sort [codegen id : 14]
+Input [4]: [item_sk#25, d_date#26, web_sales#27, store_sales#28]
+Arguments: [item_sk#25 ASC NULLS FIRST, d_date#26 ASC NULLS FIRST], false, 0
 
-(42) Window
-Input [4]: [item_sk#23, d_date#24, web_sales#25, store_sales#26]
-Arguments: [max(web_sales#25) windowspecdefinition(item_sk#23, d_date#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS web_cumulative#27, max(store_sales#26) windowspecdefinition(item_sk#23, d_date#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS store_cumulative#28], [item_sk#23], [d_date#24 ASC NULLS FIRST]
+(35) Window
+Input [4]: [item_sk#25, d_date#26, web_sales#27, store_sales#28]
+Arguments: [max(web_sales#27) windowspecdefinition(item_sk#25, d_date#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS web_cumulative#29, max(store_sales#28) windowspecdefinition(item_sk#25, d_date#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS store_cumulative#30], [item_sk#25], [d_date#26 ASC NULLS FIRST]
 
-(43) Filter [codegen id : 10]
-Input [6]: [item_sk#23, d_date#24, web_sales#25, store_sales#26, web_cumulative#27, store_cumulative#28]
-Condition : ((isnotnull(web_cumulative#27) AND isnotnull(store_cumulative#28)) AND (web_cumulative#27 > store_cumulative#28))
+(36) Filter [codegen id : 15]
+Input [6]: [item_sk#25, d_date#26, web_sales#27, store_sales#28, web_cumulative#29, store_cumulative#30]
+Condition : ((isnotnull(web_cumulative#29) AND isnotnull(store_cumulative#30)) AND (web_cumulative#29 > store_cumulative#30))
 
-(44) TakeOrderedAndProject
-Input [6]: [item_sk#23, d_date#24, web_sales#25, store_sales#26, web_cumulative#27, store_cumulative#28]
-Arguments: 100, [item_sk#23 ASC NULLS FIRST, d_date#24 ASC NULLS FIRST], [item_sk#23, d_date#24, web_sales#25, store_sales#26, web_cumulative#27, store_cumulative#28]
+(37) TakeOrderedAndProject
+Input [6]: [item_sk#25, d_date#26, web_sales#27, store_sales#28, web_cumulative#29, store_cumulative#30]
+Arguments: 100, [item_sk#25 ASC NULLS FIRST, d_date#26 ASC NULLS FIRST], [item_sk#25, d_date#26, web_sales#27, store_sales#28, web_cumulative#29, store_cumulative#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (42)
++- * ColumnarToRow (41)
+   +- CometProject (40)
+      +- CometFilter (39)
+         +- CometScan parquet spark_catalog.default.date_dim (38)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#5, d_date#6, d_month_seq#29]
+Output [3]: [d_date_sk#5, d_date#6, d_month_seq#31]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(46) CometFilter
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#29]
-Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1200)) AND (d_month_seq#29 <= 1211)) AND isnotnull(d_date_sk#5))
+(39) CometFilter
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#31]
+Condition : (((isnotnull(d_month_seq#31) AND (d_month_seq#31 >= 1200)) AND (d_month_seq#31 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(47) CometProject
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#29]
+(40) CometProject
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#31]
 Arguments: [d_date_sk#5, d_date#6], [d_date_sk#5, d_date#6]
 
-(48) ColumnarToRow [codegen id : 1]
+(41) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#5, d_date#6]
 
-(49) BroadcastExchange
+(42) BroadcastExchange
 Input [2]: [d_date_sk#5, d_date#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 19 Hosting Expression = ss_sold_date_sk#14 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 16 Hosting Expression = ss_sold_date_sk#15 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
index d46e28b44c..181cd1b98c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q51/simplified.txt
@@ -1,71 +1,75 @@
 TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-  WholeStageCodegen (10)
+  WholeStageCodegen (15)
     Filter [web_cumulative,store_cumulative]
       InputAdapter
         Window [web_sales,item_sk,d_date,store_sales]
-          WholeStageCodegen (9)
-            ColumnarToRow
+          WholeStageCodegen (14)
+            Sort [item_sk,d_date]
               InputAdapter
-                CometSort [item_sk,d_date]
-                  CometColumnarExchange [item_sk] #1
-                    CometProject [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales] [item_sk,d_date,web_sales,store_sales]
-                      CometSortMergeJoin [item_sk,d_date,item_sk,d_date]
-                        CometSort [item_sk,d_date]
-                          CometColumnarExchange [item_sk,d_date] #2
-                            RowToColumnar
-                              WholeStageCodegen (4)
-                                Project [item_sk,d_date,cume_sales]
-                                  InputAdapter
-                                    Window [_w0,ws_item_sk,d_date]
-                                      WholeStageCodegen (3)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometSort [ws_item_sk,d_date]
-                                              CometColumnarExchange [ws_item_sk] #3
-                                                CometHashAggregate [ws_item_sk,d_date,sum]
-                                                  CometColumnarExchange [ws_item_sk,d_date] #4
-                                                    RowToColumnar
-                                                      WholeStageCodegen (2)
-                                                        HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
-                                                          Project [ws_item_sk,ws_sales_price,d_date]
-                                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [ws_item_sk]
-                                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
-                                                                      SubqueryBroadcast [d_date_sk] #1
-                                                                        BroadcastExchange #5
-                                                                          WholeStageCodegen (1)
-                                                                            ColumnarToRow
-                                                                              InputAdapter
-                                                                                CometProject [d_date_sk,d_date]
-                                                                                  CometFilter [d_month_seq,d_date_sk]
-                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                                              InputAdapter
-                                                                ReusedExchange [d_date_sk,d_date] #5
-                        CometSort [item_sk,d_date]
-                          CometColumnarExchange [item_sk,d_date] #6
-                            RowToColumnar
-                              WholeStageCodegen (8)
-                                Project [item_sk,d_date,cume_sales]
-                                  InputAdapter
-                                    Window [_w0,ss_item_sk,d_date]
-                                      WholeStageCodegen (7)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometSort [ss_item_sk,d_date]
-                                              CometColumnarExchange [ss_item_sk] #7
-                                                CometHashAggregate [ss_item_sk,d_date,sum]
-                                                  CometColumnarExchange [ss_item_sk,d_date] #8
-                                                    RowToColumnar
-                                                      WholeStageCodegen (6)
-                                                        HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
-                                                          Project [ss_item_sk,ss_sales_price,d_date]
-                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [ss_item_sk]
-                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
-                                                                      ReusedSubquery [d_date_sk] #1
-                                                              InputAdapter
-                                                                ReusedExchange [d_date_sk,d_date] #5
+                Exchange [item_sk] #1
+                  WholeStageCodegen (13)
+                    Project [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales]
+                      SortMergeJoin [item_sk,d_date,item_sk,d_date]
+                        InputAdapter
+                          WholeStageCodegen (6)
+                            Sort [item_sk,d_date]
+                              InputAdapter
+                                Exchange [item_sk,d_date] #2
+                                  WholeStageCodegen (5)
+                                    Project [item_sk,d_date,cume_sales]
+                                      InputAdapter
+                                        Window [_w0,ws_item_sk,d_date]
+                                          WholeStageCodegen (4)
+                                            Sort [ws_item_sk,d_date]
+                                              InputAdapter
+                                                Exchange [ws_item_sk] #3
+                                                  WholeStageCodegen (3)
+                                                    HashAggregate [ws_item_sk,d_date,sum] [sum(UnscaledValue(ws_sales_price)),item_sk,_w0,sum]
+                                                      InputAdapter
+                                                        Exchange [ws_item_sk,d_date] #4
+                                                          WholeStageCodegen (2)
+                                                            HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
+                                                              Project [ws_item_sk,ws_sales_price,d_date]
+                                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometFilter [ws_item_sk]
+                                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
+                                                                          SubqueryBroadcast [d_date_sk] #1
+                                                                            BroadcastExchange #5
+                                                                              WholeStageCodegen (1)
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometProject [d_date_sk,d_date]
+                                                                                      CometFilter [d_month_seq,d_date_sk]
+                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                                                  InputAdapter
+                                                                    ReusedExchange [d_date_sk,d_date] #5
+                        InputAdapter
+                          WholeStageCodegen (12)
+                            Sort [item_sk,d_date]
+                              InputAdapter
+                                Exchange [item_sk,d_date] #6
+                                  WholeStageCodegen (11)
+                                    Project [item_sk,d_date,cume_sales]
+                                      InputAdapter
+                                        Window [_w0,ss_item_sk,d_date]
+                                          WholeStageCodegen (10)
+                                            Sort [ss_item_sk,d_date]
+                                              InputAdapter
+                                                Exchange [ss_item_sk] #7
+                                                  WholeStageCodegen (9)
+                                                    HashAggregate [ss_item_sk,d_date,sum] [sum(UnscaledValue(ss_sales_price)),item_sk,_w0,sum]
+                                                      InputAdapter
+                                                        Exchange [ss_item_sk,d_date] #8
+                                                          WholeStageCodegen (8)
+                                                            HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
+                                                              Project [ss_item_sk,ss_sales_price,d_date]
+                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometFilter [ss_item_sk]
+                                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
+                                                                          ReusedSubquery [d_date_sk] #1
+                                                                  InputAdapter
+                                                                    ReusedExchange [d_date_sk,d_date] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt
index d6e0e7ab24..8df157e51b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/explain.txt
@@ -1,27 +1,25 @@
 == Physical Plan ==
-* ColumnarToRow (23)
-+- CometTakeOrderedAndProject (22)
-   +- CometHashAggregate (21)
-      +- CometColumnarExchange (20)
-         +- RowToColumnar (19)
-            +- * HashAggregate (18)
-               +- * Project (17)
-                  +- * BroadcastHashJoin Inner BuildRight (16)
-                     :- * Project (10)
-                     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :- * ColumnarToRow (4)
-                     :     :  +- CometProject (3)
-                     :     :     +- CometFilter (2)
-                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-                     :     +- BroadcastExchange (8)
-                     :        +- * ColumnarToRow (7)
-                     :           +- CometFilter (6)
-                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                     +- BroadcastExchange (15)
-                        +- * ColumnarToRow (14)
-                           +- CometProject (13)
-                              +- CometFilter (12)
-                                 +- CometScan parquet spark_catalog.default.item (11)
+TakeOrderedAndProject (21)
++- * HashAggregate (20)
+   +- Exchange (19)
+      +- * HashAggregate (18)
+         +- * Project (17)
+            +- * BroadcastHashJoin Inner BuildRight (16)
+               :- * Project (10)
+               :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :- * ColumnarToRow (4)
+               :     :  +- CometProject (3)
+               :     :     +- CometFilter (2)
+               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+               :     +- BroadcastExchange (8)
+               :        +- * ColumnarToRow (7)
+               :           +- CometFilter (6)
+               :              +- CometScan parquet spark_catalog.default.store_sales (5)
+               +- BroadcastExchange (15)
+                  +- * ColumnarToRow (14)
+                     +- CometProject (13)
+                        +- CometFilter (12)
+                           +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -110,22 +108,18 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 
-(19) RowToColumnar
+(19) Exchange
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
+Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) CometColumnarExchange
-Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
-Arguments: hashpartitioning(d_year#2, i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(21) CometHashAggregate
+(20) HashAggregate [codegen id : 4]
 Input [4]: [d_year#2, i_brand#9, i_brand_id#8, sum#12]
 Keys [3]: [d_year#2, i_brand#9, i_brand_id#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
+Results [4]: [d_year#2, i_brand_id#8 AS brand_id#14, i_brand#9 AS brand#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS ext_price#16]
 
-(22) CometTakeOrderedAndProject
-Input [4]: [d_year#2, brand_id#13, brand#14, ext_price#15]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[d_year#2 ASC NULLS FIRST,ext_price#15 DESC NULLS LAST,brand_id#13 ASC NULLS FIRST], output=[d_year#2,brand_id#13,brand#14,ext_price#15]), 100, [d_year#2 ASC NULLS FIRST, ext_price#15 DESC NULLS LAST, brand_id#13 ASC NULLS FIRST], [d_year#2, brand_id#13, brand#14, ext_price#15]
-
-(23) ColumnarToRow [codegen id : 4]
-Input [4]: [d_year#2, brand_id#13, brand#14, ext_price#15]
+(21) TakeOrderedAndProject
+Input [4]: [d_year#2, brand_id#14, brand#15, ext_price#16]
+Arguments: 100, [d_year#2 ASC NULLS FIRST, ext_price#16 DESC NULLS LAST, brand_id#14 ASC NULLS FIRST], [d_year#2, brand_id#14, brand#15, ext_price#16]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt
index 7607d1ccdd..91fdc2f17d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q52/simplified.txt
@@ -1,33 +1,31 @@
-WholeStageCodegen (4)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [d_year,ext_price,brand_id,brand]
-        CometHashAggregate [d_year,i_brand,i_brand_id,sum]
-          CometColumnarExchange [d_year,i_brand,i_brand_id] #1
-            RowToColumnar
-              WholeStageCodegen (3)
-                HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
-                  Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [d_year,ss_item_sk,ss_ext_sales_price]
-                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [d_date_sk,d_year]
-                                CometFilter [d_moy,d_year,d_date_sk]
-                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                          InputAdapter
-                            BroadcastExchange #2
-                              WholeStageCodegen (1)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+TakeOrderedAndProject [d_year,ext_price,brand_id,brand]
+  WholeStageCodegen (4)
+    HashAggregate [d_year,i_brand,i_brand_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,ext_price,sum]
+      InputAdapter
+        Exchange [d_year,i_brand,i_brand_id] #1
+          WholeStageCodegen (3)
+            HashAggregate [d_year,i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
+              Project [d_year,ss_ext_sales_price,i_brand_id,i_brand]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [d_year,ss_item_sk,ss_ext_sales_price]
+                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [d_date_sk,d_year]
+                            CometFilter [d_moy,d_year,d_date_sk]
+                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                       InputAdapter
-                        BroadcastExchange #3
-                          WholeStageCodegen (2)
+                        BroadcastExchange #2
+                          WholeStageCodegen (1)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [i_item_sk,i_brand_id,i_brand]
-                                  CometFilter [i_manager_id,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
+                                CometFilter [ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                  InputAdapter
+                    BroadcastExchange #3
+                      WholeStageCodegen (2)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [i_item_sk,i_brand_id,i_brand]
+                              CometFilter [i_manager_id,i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt
index 5cb48513fc..5142c9e4e4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/explain.txt
@@ -1,34 +1,32 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * Project (29)
-   +- * Filter (28)
-      +- Window (27)
-         +- * ColumnarToRow (26)
-            +- CometSort (25)
-               +- CometColumnarExchange (24)
-                  +- CometHashAggregate (23)
-                     +- CometColumnarExchange (22)
-                        +- RowToColumnar (21)
-                           +- * HashAggregate (20)
-                              +- * Project (19)
-                                 +- * BroadcastHashJoin Inner BuildRight (18)
-                                    :- * Project (13)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (12)
-                                    :     :- * Project (10)
-                                    :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                                    :     :     :- * ColumnarToRow (4)
-                                    :     :     :  +- CometProject (3)
-                                    :     :     :     +- CometFilter (2)
-                                    :     :     :        +- CometScan parquet spark_catalog.default.item (1)
-                                    :     :     +- BroadcastExchange (8)
-                                    :     :        +- * ColumnarToRow (7)
-                                    :     :           +- CometFilter (6)
-                                    :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                                    :     +- ReusedExchange (11)
-                                    +- BroadcastExchange (17)
-                                       +- * ColumnarToRow (16)
-                                          +- CometFilter (15)
-                                             +- CometScan parquet spark_catalog.default.store (14)
+TakeOrderedAndProject (28)
++- * Project (27)
+   +- * Filter (26)
+      +- Window (25)
+         +- * Sort (24)
+            +- Exchange (23)
+               +- * HashAggregate (22)
+                  +- Exchange (21)
+                     +- * HashAggregate (20)
+                        +- * Project (19)
+                           +- * BroadcastHashJoin Inner BuildRight (18)
+                              :- * Project (13)
+                              :  +- * BroadcastHashJoin Inner BuildRight (12)
+                              :     :- * Project (10)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                              :     :     :- * ColumnarToRow (4)
+                              :     :     :  +- CometProject (3)
+                              :     :     :     +- CometFilter (2)
+                              :     :     :        +- CometScan parquet spark_catalog.default.item (1)
+                              :     :     +- BroadcastExchange (8)
+                              :     :        +- * ColumnarToRow (7)
+                              :     :           +- CometFilter (6)
+                              :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                              :     +- ReusedExchange (11)
+                              +- BroadcastExchange (17)
+                                 +- * ColumnarToRow (16)
+                                    +- CometFilter (15)
+                                       +- CometScan parquet spark_catalog.default.store (14)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -78,7 +76,7 @@ Join condition: None
 Output [4]: [i_manufact_id#5, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 Input [6]: [i_item_sk#1, i_manufact_id#5, ss_item_sk#10, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 
-(11) ReusedExchange [Reuses operator id: 35]
+(11) ReusedExchange [Reuses operator id: 33]
 Output [2]: [d_date_sk#15, d_qoy#16]
 
 (12) BroadcastHashJoin [codegen id : 4]
@@ -126,74 +124,70 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#12))]
 Aggregate Attributes [1]: [sum#18]
 Results [3]: [i_manufact_id#5, d_qoy#16, sum#19]
 
-(21) RowToColumnar
+(21) Exchange
 Input [3]: [i_manufact_id#5, d_qoy#16, sum#19]
+Arguments: hashpartitioning(i_manufact_id#5, d_qoy#16, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) CometColumnarExchange
-Input [3]: [i_manufact_id#5, d_qoy#16, sum#19]
-Arguments: hashpartitioning(i_manufact_id#5, d_qoy#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 5]
 Input [3]: [i_manufact_id#5, d_qoy#16, sum#19]
 Keys [2]: [i_manufact_id#5, d_qoy#16]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#12))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#12))#20]
+Results [3]: [i_manufact_id#5, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS sum_sales#21, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS _w0#22]
 
-(24) CometColumnarExchange
-Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
-Arguments: hashpartitioning(i_manufact_id#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(25) CometSort
-Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
-Arguments: [i_manufact_id#5, sum_sales#20, _w0#21], [i_manufact_id#5 ASC NULLS FIRST]
+(23) Exchange
+Input [3]: [i_manufact_id#5, sum_sales#21, _w0#22]
+Arguments: hashpartitioning(i_manufact_id#5, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(26) ColumnarToRow [codegen id : 5]
-Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
+(24) Sort [codegen id : 6]
+Input [3]: [i_manufact_id#5, sum_sales#21, _w0#22]
+Arguments: [i_manufact_id#5 ASC NULLS FIRST], false, 0
 
-(27) Window
-Input [3]: [i_manufact_id#5, sum_sales#20, _w0#21]
-Arguments: [avg(_w0#21) windowspecdefinition(i_manufact_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_quarterly_sales#22], [i_manufact_id#5]
+(25) Window
+Input [3]: [i_manufact_id#5, sum_sales#21, _w0#22]
+Arguments: [avg(_w0#22) windowspecdefinition(i_manufact_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_quarterly_sales#23], [i_manufact_id#5]
 
-(28) Filter [codegen id : 6]
-Input [4]: [i_manufact_id#5, sum_sales#20, _w0#21, avg_quarterly_sales#22]
-Condition : CASE WHEN (avg_quarterly_sales#22 > 0.000000) THEN ((abs((sum_sales#20 - avg_quarterly_sales#22)) / avg_quarterly_sales#22) > 0.1000000000000000) ELSE false END
+(26) Filter [codegen id : 7]
+Input [4]: [i_manufact_id#5, sum_sales#21, _w0#22, avg_quarterly_sales#23]
+Condition : CASE WHEN (avg_quarterly_sales#23 > 0.000000) THEN ((abs((sum_sales#21 - avg_quarterly_sales#23)) / avg_quarterly_sales#23) > 0.1000000000000000) ELSE false END
 
-(29) Project [codegen id : 6]
-Output [3]: [i_manufact_id#5, sum_sales#20, avg_quarterly_sales#22]
-Input [4]: [i_manufact_id#5, sum_sales#20, _w0#21, avg_quarterly_sales#22]
+(27) Project [codegen id : 7]
+Output [3]: [i_manufact_id#5, sum_sales#21, avg_quarterly_sales#23]
+Input [4]: [i_manufact_id#5, sum_sales#21, _w0#22, avg_quarterly_sales#23]
 
-(30) TakeOrderedAndProject
-Input [3]: [i_manufact_id#5, sum_sales#20, avg_quarterly_sales#22]
-Arguments: 100, [avg_quarterly_sales#22 ASC NULLS FIRST, sum_sales#20 ASC NULLS FIRST, i_manufact_id#5 ASC NULLS FIRST], [i_manufact_id#5, sum_sales#20, avg_quarterly_sales#22]
+(28) TakeOrderedAndProject
+Input [3]: [i_manufact_id#5, sum_sales#21, avg_quarterly_sales#23]
+Arguments: 100, [avg_quarterly_sales#23 ASC NULLS FIRST, sum_sales#21 ASC NULLS FIRST, i_manufact_id#5 ASC NULLS FIRST], [i_manufact_id#5, sum_sales#21, avg_quarterly_sales#23]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = ss_sold_date_sk#13 IN dynamicpruning#14
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (33)
++- * ColumnarToRow (32)
+   +- CometProject (31)
+      +- CometFilter (30)
+         +- CometScan parquet spark_catalog.default.date_dim (29)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#15, d_month_seq#23, d_qoy#16]
+Output [3]: [d_date_sk#15, d_month_seq#24, d_qoy#16]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_month_seq, [1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_qoy:int>
 
-(32) CometFilter
-Input [3]: [d_date_sk#15, d_month_seq#23, d_qoy#16]
-Condition : (d_month_seq#23 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
+(30) CometFilter
+Input [3]: [d_date_sk#15, d_month_seq#24, d_qoy#16]
+Condition : (d_month_seq#24 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
 
-(33) CometProject
-Input [3]: [d_date_sk#15, d_month_seq#23, d_qoy#16]
+(31) CometProject
+Input [3]: [d_date_sk#15, d_month_seq#24, d_qoy#16]
 Arguments: [d_date_sk#15, d_qoy#16], [d_date_sk#15, d_qoy#16]
 
-(34) ColumnarToRow [codegen id : 1]
+(32) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#15, d_qoy#16]
 
-(35) BroadcastExchange
+(33) BroadcastExchange
 Input [2]: [d_date_sk#15, d_qoy#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt
index af0269ae39..adda5c34f7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q53/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [avg_quarterly_sales,sum_sales,i_manufact_id]
-  WholeStageCodegen (6)
+  WholeStageCodegen (7)
     Project [i_manufact_id,sum_sales,avg_quarterly_sales]
       Filter [avg_quarterly_sales,sum_sales]
         InputAdapter
           Window [_w0,i_manufact_id]
-            WholeStageCodegen (5)
-              ColumnarToRow
+            WholeStageCodegen (6)
+              Sort [i_manufact_id]
                 InputAdapter
-                  CometSort [i_manufact_id]
-                    CometColumnarExchange [i_manufact_id] #1
-                      CometHashAggregate [i_manufact_id,d_qoy,sum]
-                        CometColumnarExchange [i_manufact_id,d_qoy] #2
-                          RowToColumnar
+                  Exchange [i_manufact_id] #1
+                    WholeStageCodegen (5)
+                      HashAggregate [i_manufact_id,d_qoy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
+                        InputAdapter
+                          Exchange [i_manufact_id,d_qoy] #2
                             WholeStageCodegen (4)
                               HashAggregate [i_manufact_id,d_qoy,ss_sales_price] [sum,sum]
                                 Project [i_manufact_id,ss_sales_price,d_qoy]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt
index 5baa553cf1..00c8f9c9b0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/explain.txt
@@ -1,63 +1,59 @@
 == Physical Plan ==
-* ColumnarToRow (59)
-+- CometTakeOrderedAndProject (58)
-   +- CometHashAggregate (57)
-      +- CometColumnarExchange (56)
-         +- CometHashAggregate (55)
-            +- CometHashAggregate (54)
-               +- CometColumnarExchange (53)
-                  +- RowToColumnar (52)
-                     +- * HashAggregate (51)
-                        +- * Project (50)
-                           +- * BroadcastHashJoin Inner BuildRight (49)
-                              :- * Project (47)
-                              :  +- * BroadcastHashJoin Inner BuildRight (46)
-                              :     :- * Project (41)
-                              :     :  +- * BroadcastHashJoin Inner BuildRight (40)
-                              :     :     :- * Project (35)
-                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-                              :     :     :     :- * ColumnarToRow (29)
-                              :     :     :     :  +- CometHashAggregate (28)
-                              :     :     :     :     +- CometColumnarExchange (27)
-                              :     :     :     :        +- RowToColumnar (26)
-                              :     :     :     :           +- * HashAggregate (25)
-                              :     :     :     :              +- * Project (24)
-                              :     :     :     :                 +- * BroadcastHashJoin Inner BuildRight (23)
-                              :     :     :     :                    :- * Project (18)
-                              :     :     :     :                    :  +- * BroadcastHashJoin Inner BuildRight (17)
-                              :     :     :     :                    :     :- * Project (15)
-                              :     :     :     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                              :     :     :     :                    :     :     :- * ColumnarToRow (8)
-                              :     :     :     :                    :     :     :  +- CometUnion (7)
-                              :     :     :     :                    :     :     :     :- CometProject (3)
-                              :     :     :     :                    :     :     :     :  +- CometFilter (2)
-                              :     :     :     :                    :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                              :     :     :     :                    :     :     :     +- CometProject (6)
-                              :     :     :     :                    :     :     :        +- CometFilter (5)
-                              :     :     :     :                    :     :     :           +- CometScan parquet spark_catalog.default.web_sales (4)
-                              :     :     :     :                    :     :     +- BroadcastExchange (13)
-                              :     :     :     :                    :     :        +- * ColumnarToRow (12)
-                              :     :     :     :                    :     :           +- CometProject (11)
-                              :     :     :     :                    :     :              +- CometFilter (10)
-                              :     :     :     :                    :     :                 +- CometScan parquet spark_catalog.default.item (9)
-                              :     :     :     :                    :     +- ReusedExchange (16)
-                              :     :     :     :                    +- BroadcastExchange (22)
-                              :     :     :     :                       +- * ColumnarToRow (21)
-                              :     :     :     :                          +- CometFilter (20)
-                              :     :     :     :                             +- CometScan parquet spark_catalog.default.customer (19)
-                              :     :     :     +- BroadcastExchange (33)
-                              :     :     :        +- * ColumnarToRow (32)
-                              :     :     :           +- CometFilter (31)
-                              :     :     :              +- CometScan parquet spark_catalog.default.store_sales (30)
-                              :     :     +- BroadcastExchange (39)
-                              :     :        +- * ColumnarToRow (38)
-                              :     :           +- CometFilter (37)
-                              :     :              +- CometScan parquet spark_catalog.default.customer_address (36)
-                              :     +- BroadcastExchange (45)
-                              :        +- * ColumnarToRow (44)
-                              :           +- CometFilter (43)
-                              :              +- CometScan parquet spark_catalog.default.store (42)
-                              +- ReusedExchange (48)
+TakeOrderedAndProject (55)
++- * HashAggregate (54)
+   +- Exchange (53)
+      +- * HashAggregate (52)
+         +- * HashAggregate (51)
+            +- Exchange (50)
+               +- * HashAggregate (49)
+                  +- * Project (48)
+                     +- * BroadcastHashJoin Inner BuildRight (47)
+                        :- * Project (45)
+                        :  +- * BroadcastHashJoin Inner BuildRight (44)
+                        :     :- * Project (39)
+                        :     :  +- * BroadcastHashJoin Inner BuildRight (38)
+                        :     :     :- * Project (33)
+                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (32)
+                        :     :     :     :- * HashAggregate (27)
+                        :     :     :     :  +- Exchange (26)
+                        :     :     :     :     +- * HashAggregate (25)
+                        :     :     :     :        +- * Project (24)
+                        :     :     :     :           +- * BroadcastHashJoin Inner BuildRight (23)
+                        :     :     :     :              :- * Project (18)
+                        :     :     :     :              :  +- * BroadcastHashJoin Inner BuildRight (17)
+                        :     :     :     :              :     :- * Project (15)
+                        :     :     :     :              :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                        :     :     :     :              :     :     :- * ColumnarToRow (8)
+                        :     :     :     :              :     :     :  +- CometUnion (7)
+                        :     :     :     :              :     :     :     :- CometProject (3)
+                        :     :     :     :              :     :     :     :  +- CometFilter (2)
+                        :     :     :     :              :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                        :     :     :     :              :     :     :     +- CometProject (6)
+                        :     :     :     :              :     :     :        +- CometFilter (5)
+                        :     :     :     :              :     :     :           +- CometScan parquet spark_catalog.default.web_sales (4)
+                        :     :     :     :              :     :     +- BroadcastExchange (13)
+                        :     :     :     :              :     :        +- * ColumnarToRow (12)
+                        :     :     :     :              :     :           +- CometProject (11)
+                        :     :     :     :              :     :              +- CometFilter (10)
+                        :     :     :     :              :     :                 +- CometScan parquet spark_catalog.default.item (9)
+                        :     :     :     :              :     +- ReusedExchange (16)
+                        :     :     :     :              +- BroadcastExchange (22)
+                        :     :     :     :                 +- * ColumnarToRow (21)
+                        :     :     :     :                    +- CometFilter (20)
+                        :     :     :     :                       +- CometScan parquet spark_catalog.default.customer (19)
+                        :     :     :     +- BroadcastExchange (31)
+                        :     :     :        +- * ColumnarToRow (30)
+                        :     :     :           +- CometFilter (29)
+                        :     :     :              +- CometScan parquet spark_catalog.default.store_sales (28)
+                        :     :     +- BroadcastExchange (37)
+                        :     :        +- * ColumnarToRow (36)
+                        :     :           +- CometFilter (35)
+                        :     :              +- CometScan parquet spark_catalog.default.customer_address (34)
+                        :     +- BroadcastExchange (43)
+                        :        +- * ColumnarToRow (42)
+                        :           +- CometFilter (41)
+                        :              +- CometScan parquet spark_catalog.default.store (40)
+                        +- ReusedExchange (46)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -131,7 +127,7 @@ Join condition: None
 Output [2]: [sold_date_sk#5, customer_sk#6]
 Input [4]: [sold_date_sk#5, customer_sk#6, item_sk#7, i_item_sk#14]
 
-(16) ReusedExchange [Reuses operator id: 64]
+(16) ReusedExchange [Reuses operator id: 60]
 Output [1]: [d_date_sk#17]
 
 (17) BroadcastHashJoin [codegen id : 4]
@@ -179,20 +175,16 @@ Functions: []
 Aggregate Attributes: []
 Results [2]: [c_customer_sk#18, c_current_addr_sk#19]
 
-(26) RowToColumnar
+(26) Exchange
 Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
+Arguments: hashpartitioning(c_customer_sk#18, c_current_addr_sk#19, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(27) CometColumnarExchange
-Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
-Arguments: hashpartitioning(c_customer_sk#18, c_current_addr_sk#19, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(28) CometHashAggregate
+(27) HashAggregate [codegen id : 9]
 Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
 Keys [2]: [c_customer_sk#18, c_current_addr_sk#19]
 Functions: []
-
-(29) ColumnarToRow [codegen id : 9]
-Input [2]: [c_customer_sk#18, c_current_addr_sk#19]
+Aggregate Attributes: []
+Results [2]: [c_customer_sk#18, c_current_addr_sk#19]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
@@ -202,24 +194,24 @@ PartitionFilters: [isnotnull(ss_sold_date_sk#22), dynamicpruningexpression(ss_so
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(31) CometFilter
+(29) CometFilter
 Input [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Condition : isnotnull(ss_customer_sk#20)
 
-(32) ColumnarToRow [codegen id : 5]
+(30) ColumnarToRow [codegen id : 5]
 Input [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 
-(33) BroadcastExchange
+(31) BroadcastExchange
 Input [3]: [ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(34) BroadcastHashJoin [codegen id : 9]
+(32) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [c_customer_sk#18]
 Right keys [1]: [ss_customer_sk#20]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 9]
+(33) Project [codegen id : 9]
 Output [4]: [c_customer_sk#18, c_current_addr_sk#19, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Input [5]: [c_customer_sk#18, c_current_addr_sk#19, ss_customer_sk#20, ss_ext_sales_price#21, ss_sold_date_sk#22]
 
@@ -230,24 +222,24 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_address_sk), IsNotNull(ca_county), IsNotNull(ca_state)]
 ReadSchema: struct<ca_address_sk:int,ca_county:string,ca_state:string>
 
-(37) CometFilter
+(35) CometFilter
 Input [3]: [ca_address_sk#24, ca_county#25, ca_state#26]
 Condition : ((isnotnull(ca_address_sk#24) AND isnotnull(ca_county#25)) AND isnotnull(ca_state#26))
 
-(38) ColumnarToRow [codegen id : 6]
+(36) ColumnarToRow [codegen id : 6]
 Input [3]: [ca_address_sk#24, ca_county#25, ca_state#26]
 
-(39) BroadcastExchange
+(37) BroadcastExchange
 Input [3]: [ca_address_sk#24, ca_county#25, ca_state#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(40) BroadcastHashJoin [codegen id : 9]
+(38) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [c_current_addr_sk#19]
 Right keys [1]: [ca_address_sk#24]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 9]
+(39) Project [codegen id : 9]
 Output [5]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22, ca_county#25, ca_state#26]
 Input [7]: [c_customer_sk#18, c_current_addr_sk#19, ss_ext_sales_price#21, ss_sold_date_sk#22, ca_address_sk#24, ca_county#25, ca_state#26]
 
@@ -258,226 +250,226 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_county), IsNotNull(s_state)]
 ReadSchema: struct<s_county:string,s_state:string>
 
-(43) CometFilter
+(41) CometFilter
 Input [2]: [s_county#27, s_state#28]
 Condition : (isnotnull(s_county#27) AND isnotnull(s_state#28))
 
-(44) ColumnarToRow [codegen id : 7]
+(42) ColumnarToRow [codegen id : 7]
 Input [2]: [s_county#27, s_state#28]
 
-(45) BroadcastExchange
+(43) BroadcastExchange
 Input [2]: [s_county#27, s_state#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, false], input[1, string, false]),false), [plan_id=6]
 
-(46) BroadcastHashJoin [codegen id : 9]
+(44) BroadcastHashJoin [codegen id : 9]
 Left keys [2]: [ca_county#25, ca_state#26]
 Right keys [2]: [s_county#27, s_state#28]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 9]
+(45) Project [codegen id : 9]
 Output [3]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22]
 Input [7]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22, ca_county#25, ca_state#26, s_county#27, s_state#28]
 
-(48) ReusedExchange [Reuses operator id: 69]
+(46) ReusedExchange [Reuses operator id: 65]
 Output [1]: [d_date_sk#29]
 
-(49) BroadcastHashJoin [codegen id : 9]
+(47) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_sold_date_sk#22]
 Right keys [1]: [d_date_sk#29]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 9]
+(48) Project [codegen id : 9]
 Output [2]: [c_customer_sk#18, ss_ext_sales_price#21]
 Input [4]: [c_customer_sk#18, ss_ext_sales_price#21, ss_sold_date_sk#22, d_date_sk#29]
 
-(51) HashAggregate [codegen id : 9]
+(49) HashAggregate [codegen id : 9]
 Input [2]: [c_customer_sk#18, ss_ext_sales_price#21]
 Keys [1]: [c_customer_sk#18]
 Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#21))]
 Aggregate Attributes [1]: [sum#30]
 Results [2]: [c_customer_sk#18, sum#31]
 
-(52) RowToColumnar
-Input [2]: [c_customer_sk#18, sum#31]
-
-(53) CometColumnarExchange
+(50) Exchange
 Input [2]: [c_customer_sk#18, sum#31]
-Arguments: hashpartitioning(c_customer_sk#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+Arguments: hashpartitioning(c_customer_sk#18, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(54) CometHashAggregate
+(51) HashAggregate [codegen id : 10]
 Input [2]: [c_customer_sk#18, sum#31]
 Keys [1]: [c_customer_sk#18]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#21))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#21))#32]
+Results [1]: [cast((MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#21))#32,17,2) / 50) as int) AS segment#33]
 
-(55) CometHashAggregate
-Input [1]: [segment#32]
-Keys [1]: [segment#32]
+(52) HashAggregate [codegen id : 10]
+Input [1]: [segment#33]
+Keys [1]: [segment#33]
 Functions [1]: [partial_count(1)]
+Aggregate Attributes [1]: [count#34]
+Results [2]: [segment#33, count#35]
 
-(56) CometColumnarExchange
-Input [2]: [segment#32, count#33]
-Arguments: hashpartitioning(segment#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(53) Exchange
+Input [2]: [segment#33, count#35]
+Arguments: hashpartitioning(segment#33, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(57) CometHashAggregate
-Input [2]: [segment#32, count#33]
-Keys [1]: [segment#32]
+(54) HashAggregate [codegen id : 11]
+Input [2]: [segment#33, count#35]
+Keys [1]: [segment#33]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#36]
+Results [3]: [segment#33, count(1)#36 AS num_customers#37, (segment#33 * 50) AS segment_base#38]
 
-(58) CometTakeOrderedAndProject
-Input [3]: [segment#32, num_customers#34, segment_base#35]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[segment#32 ASC NULLS FIRST,num_customers#34 ASC NULLS FIRST], output=[segment#32,num_customers#34,segment_base#35]), 100, [segment#32 ASC NULLS FIRST, num_customers#34 ASC NULLS FIRST], [segment#32, num_customers#34, segment_base#35]
-
-(59) ColumnarToRow [codegen id : 10]
-Input [3]: [segment#32, num_customers#34, segment_base#35]
+(55) TakeOrderedAndProject
+Input [3]: [segment#33, num_customers#37, segment_base#38]
+Arguments: 100, [segment#33 ASC NULLS FIRST, num_customers#37 ASC NULLS FIRST], [segment#33, num_customers#37, segment_base#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (64)
-+- * ColumnarToRow (63)
-   +- CometProject (62)
-      +- CometFilter (61)
-         +- CometScan parquet spark_catalog.default.date_dim (60)
+BroadcastExchange (60)
++- * ColumnarToRow (59)
+   +- CometProject (58)
+      +- CometFilter (57)
+         +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#17, d_year#36, d_moy#37]
+Output [3]: [d_date_sk#17, d_year#39, d_moy#40]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,12), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(61) CometFilter
-Input [3]: [d_date_sk#17, d_year#36, d_moy#37]
-Condition : ((((isnotnull(d_moy#37) AND isnotnull(d_year#36)) AND (d_moy#37 = 12)) AND (d_year#36 = 1998)) AND isnotnull(d_date_sk#17))
+(57) CometFilter
+Input [3]: [d_date_sk#17, d_year#39, d_moy#40]
+Condition : ((((isnotnull(d_moy#40) AND isnotnull(d_year#39)) AND (d_moy#40 = 12)) AND (d_year#39 = 1998)) AND isnotnull(d_date_sk#17))
 
-(62) CometProject
-Input [3]: [d_date_sk#17, d_year#36, d_moy#37]
+(58) CometProject
+Input [3]: [d_date_sk#17, d_year#39, d_moy#40]
 Arguments: [d_date_sk#17], [d_date_sk#17]
 
-(63) ColumnarToRow [codegen id : 1]
+(59) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#17]
 
-(64) BroadcastExchange
+(60) BroadcastExchange
 Input [1]: [d_date_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = ws_sold_date_sk#10 IN dynamicpruning#4
 
-Subquery:3 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
-BroadcastExchange (69)
-+- * ColumnarToRow (68)
-   +- CometProject (67)
-      +- CometFilter (66)
-         +- CometScan parquet spark_catalog.default.date_dim (65)
+Subquery:3 Hosting operator id = 28 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
+BroadcastExchange (65)
++- * ColumnarToRow (64)
+   +- CometProject (63)
+      +- CometFilter (62)
+         +- CometScan parquet spark_catalog.default.date_dim (61)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#29, d_month_seq#38]
+Output [2]: [d_date_sk#29, d_month_seq#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(66) CometFilter
-Input [2]: [d_date_sk#29, d_month_seq#38]
-Condition : (((isnotnull(d_month_seq#38) AND (d_month_seq#38 >= Subquery scalar-subquery#39, [id=#40])) AND (d_month_seq#38 <= Subquery scalar-subquery#41, [id=#42])) AND isnotnull(d_date_sk#29))
+(62) CometFilter
+Input [2]: [d_date_sk#29, d_month_seq#41]
+Condition : (((isnotnull(d_month_seq#41) AND (d_month_seq#41 >= Subquery scalar-subquery#42, [id=#43])) AND (d_month_seq#41 <= Subquery scalar-subquery#44, [id=#45])) AND isnotnull(d_date_sk#29))
 
-(67) CometProject
-Input [2]: [d_date_sk#29, d_month_seq#38]
+(63) CometProject
+Input [2]: [d_date_sk#29, d_month_seq#41]
 Arguments: [d_date_sk#29], [d_date_sk#29]
 
-(68) ColumnarToRow [codegen id : 1]
+(64) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#29]
 
-(69) BroadcastExchange
+(65) BroadcastExchange
 Input [1]: [d_date_sk#29]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=10]
 
-Subquery:4 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#39, [id=#40]
-* ColumnarToRow (76)
-+- CometHashAggregate (75)
-   +- CometColumnarExchange (74)
-      +- CometHashAggregate (73)
-         +- CometProject (72)
-            +- CometFilter (71)
-               +- CometScan parquet spark_catalog.default.date_dim (70)
+Subquery:4 Hosting operator id = 62 Hosting Expression = Subquery scalar-subquery#42, [id=#43]
+* ColumnarToRow (72)
++- CometHashAggregate (71)
+   +- CometExchange (70)
+      +- CometHashAggregate (69)
+         +- CometProject (68)
+            +- CometFilter (67)
+               +- CometScan parquet spark_catalog.default.date_dim (66)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#43, d_year#44, d_moy#45]
+Output [3]: [d_month_seq#46, d_year#47, d_moy#48]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,12)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(71) CometFilter
-Input [3]: [d_month_seq#43, d_year#44, d_moy#45]
-Condition : (((isnotnull(d_year#44) AND isnotnull(d_moy#45)) AND (d_year#44 = 1998)) AND (d_moy#45 = 12))
+(67) CometFilter
+Input [3]: [d_month_seq#46, d_year#47, d_moy#48]
+Condition : (((isnotnull(d_year#47) AND isnotnull(d_moy#48)) AND (d_year#47 = 1998)) AND (d_moy#48 = 12))
 
-(72) CometProject
-Input [3]: [d_month_seq#43, d_year#44, d_moy#45]
-Arguments: [(d_month_seq + 1)#46], [(d_month_seq#43 + 1) AS (d_month_seq + 1)#46]
+(68) CometProject
+Input [3]: [d_month_seq#46, d_year#47, d_moy#48]
+Arguments: [(d_month_seq + 1)#49], [(d_month_seq#46 + 1) AS (d_month_seq + 1)#49]
 
-(73) CometHashAggregate
-Input [1]: [(d_month_seq + 1)#46]
-Keys [1]: [(d_month_seq + 1)#46]
+(69) CometHashAggregate
+Input [1]: [(d_month_seq + 1)#49]
+Keys [1]: [(d_month_seq + 1)#49]
 Functions: []
 
-(74) CometColumnarExchange
-Input [1]: [(d_month_seq + 1)#46]
-Arguments: hashpartitioning((d_month_seq + 1)#46, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(70) CometExchange
+Input [1]: [(d_month_seq + 1)#49]
+Arguments: hashpartitioning((d_month_seq + 1)#49, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=11]
 
-(75) CometHashAggregate
-Input [1]: [(d_month_seq + 1)#46]
-Keys [1]: [(d_month_seq + 1)#46]
+(71) CometHashAggregate
+Input [1]: [(d_month_seq + 1)#49]
+Keys [1]: [(d_month_seq + 1)#49]
 Functions: []
 
-(76) ColumnarToRow [codegen id : 1]
-Input [1]: [(d_month_seq + 1)#46]
+(72) ColumnarToRow [codegen id : 1]
+Input [1]: [(d_month_seq + 1)#49]
 
-Subquery:5 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#41, [id=#42]
-* ColumnarToRow (83)
-+- CometHashAggregate (82)
-   +- CometColumnarExchange (81)
-      +- CometHashAggregate (80)
-         +- CometProject (79)
-            +- CometFilter (78)
-               +- CometScan parquet spark_catalog.default.date_dim (77)
+Subquery:5 Hosting operator id = 62 Hosting Expression = Subquery scalar-subquery#44, [id=#45]
+* ColumnarToRow (79)
++- CometHashAggregate (78)
+   +- CometExchange (77)
+      +- CometHashAggregate (76)
+         +- CometProject (75)
+            +- CometFilter (74)
+               +- CometScan parquet spark_catalog.default.date_dim (73)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#47, d_year#48, d_moy#49]
+Output [3]: [d_month_seq#50, d_year#51, d_moy#52]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,12)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(78) CometFilter
-Input [3]: [d_month_seq#47, d_year#48, d_moy#49]
-Condition : (((isnotnull(d_year#48) AND isnotnull(d_moy#49)) AND (d_year#48 = 1998)) AND (d_moy#49 = 12))
+(74) CometFilter
+Input [3]: [d_month_seq#50, d_year#51, d_moy#52]
+Condition : (((isnotnull(d_year#51) AND isnotnull(d_moy#52)) AND (d_year#51 = 1998)) AND (d_moy#52 = 12))
 
-(79) CometProject
-Input [3]: [d_month_seq#47, d_year#48, d_moy#49]
-Arguments: [(d_month_seq + 3)#50], [(d_month_seq#47 + 3) AS (d_month_seq + 3)#50]
+(75) CometProject
+Input [3]: [d_month_seq#50, d_year#51, d_moy#52]
+Arguments: [(d_month_seq + 3)#53], [(d_month_seq#50 + 3) AS (d_month_seq + 3)#53]
 
-(80) CometHashAggregate
-Input [1]: [(d_month_seq + 3)#50]
-Keys [1]: [(d_month_seq + 3)#50]
+(76) CometHashAggregate
+Input [1]: [(d_month_seq + 3)#53]
+Keys [1]: [(d_month_seq + 3)#53]
 Functions: []
 
-(81) CometColumnarExchange
-Input [1]: [(d_month_seq + 3)#50]
-Arguments: hashpartitioning((d_month_seq + 3)#50, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(77) CometExchange
+Input [1]: [(d_month_seq + 3)#53]
+Arguments: hashpartitioning((d_month_seq + 3)#53, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
 
-(82) CometHashAggregate
-Input [1]: [(d_month_seq + 3)#50]
-Keys [1]: [(d_month_seq + 3)#50]
+(78) CometHashAggregate
+Input [1]: [(d_month_seq + 3)#53]
+Keys [1]: [(d_month_seq + 3)#53]
 Functions: []
 
-(83) ColumnarToRow [codegen id : 1]
-Input [1]: [(d_month_seq + 3)#50]
+(79) ColumnarToRow [codegen id : 1]
+Input [1]: [(d_month_seq + 3)#53]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt
index 0d8b894b24..90604339a2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q54/simplified.txt
@@ -1,13 +1,13 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [segment,num_customers,segment_base]
-        CometHashAggregate [segment,count]
-          CometColumnarExchange [segment] #1
-            CometHashAggregate [segment]
-              CometHashAggregate [c_customer_sk,sum]
-                CometColumnarExchange [c_customer_sk] #2
-                  RowToColumnar
+TakeOrderedAndProject [segment,num_customers,segment_base]
+  WholeStageCodegen (11)
+    HashAggregate [segment,count] [count(1),num_customers,segment_base,count]
+      InputAdapter
+        Exchange [segment] #1
+          WholeStageCodegen (10)
+            HashAggregate [segment] [count,count]
+              HashAggregate [c_customer_sk,sum] [sum(UnscaledValue(ss_ext_sales_price)),segment,sum]
+                InputAdapter
+                  Exchange [c_customer_sk] #2
                     WholeStageCodegen (9)
                       HashAggregate [c_customer_sk,ss_ext_sales_price] [sum,sum]
                         Project [c_customer_sk,ss_ext_sales_price]
@@ -18,54 +18,52 @@ WholeStageCodegen (10)
                                   BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
                                     Project [c_customer_sk,c_current_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
                                       BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                        ColumnarToRow
+                                        HashAggregate [c_customer_sk,c_current_addr_sk]
                                           InputAdapter
-                                            CometHashAggregate [c_customer_sk,c_current_addr_sk]
-                                              CometColumnarExchange [c_customer_sk,c_current_addr_sk] #3
-                                                RowToColumnar
-                                                  WholeStageCodegen (4)
-                                                    HashAggregate [c_customer_sk,c_current_addr_sk]
-                                                      Project [c_customer_sk,c_current_addr_sk]
-                                                        BroadcastHashJoin [customer_sk,c_customer_sk]
-                                                          Project [customer_sk]
-                                                            BroadcastHashJoin [sold_date_sk,d_date_sk]
-                                                              Project [sold_date_sk,customer_sk]
-                                                                BroadcastHashJoin [item_sk,i_item_sk]
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometUnion
-                                                                        CometProject [cs_sold_date_sk,cs_bill_customer_sk,cs_item_sk] [sold_date_sk,customer_sk,item_sk]
-                                                                          CometFilter [cs_item_sk,cs_bill_customer_sk]
-                                                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
-                                                                              SubqueryBroadcast [d_date_sk] #1
-                                                                                BroadcastExchange #4
-                                                                                  WholeStageCodegen (1)
-                                                                                    ColumnarToRow
-                                                                                      InputAdapter
-                                                                                        CometProject [d_date_sk]
-                                                                                          CometFilter [d_moy,d_year,d_date_sk]
-                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                                        CometProject [ws_sold_date_sk,ws_bill_customer_sk,ws_item_sk] [sold_date_sk,customer_sk,item_sk]
-                                                                          CometFilter [ws_item_sk,ws_bill_customer_sk]
-                                                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sold_date_sk]
-                                                                              ReusedSubquery [d_date_sk] #1
-                                                                  InputAdapter
-                                                                    BroadcastExchange #5
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometProject [i_item_sk]
-                                                                              CometFilter [i_category,i_class,i_item_sk]
-                                                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
+                                            Exchange [c_customer_sk,c_current_addr_sk] #3
+                                              WholeStageCodegen (4)
+                                                HashAggregate [c_customer_sk,c_current_addr_sk]
+                                                  Project [c_customer_sk,c_current_addr_sk]
+                                                    BroadcastHashJoin [customer_sk,c_customer_sk]
+                                                      Project [customer_sk]
+                                                        BroadcastHashJoin [sold_date_sk,d_date_sk]
+                                                          Project [sold_date_sk,customer_sk]
+                                                            BroadcastHashJoin [item_sk,i_item_sk]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometUnion
+                                                                    CometProject [cs_sold_date_sk,cs_bill_customer_sk,cs_item_sk] [sold_date_sk,customer_sk,item_sk]
+                                                                      CometFilter [cs_item_sk,cs_bill_customer_sk]
+                                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
+                                                                          SubqueryBroadcast [d_date_sk] #1
+                                                                            BroadcastExchange #4
+                                                                              WholeStageCodegen (1)
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometProject [d_date_sk]
+                                                                                      CometFilter [d_moy,d_year,d_date_sk]
+                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                    CometProject [ws_sold_date_sk,ws_bill_customer_sk,ws_item_sk] [sold_date_sk,customer_sk,item_sk]
+                                                                      CometFilter [ws_item_sk,ws_bill_customer_sk]
+                                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_sold_date_sk]
+                                                                          ReusedSubquery [d_date_sk] #1
                                                               InputAdapter
-                                                                ReusedExchange [d_date_sk] #4
+                                                                BroadcastExchange #5
+                                                                  WholeStageCodegen (1)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [i_item_sk]
+                                                                          CometFilter [i_category,i_class,i_item_sk]
+                                                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
                                                           InputAdapter
-                                                            BroadcastExchange #6
-                                                              WholeStageCodegen (3)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [c_customer_sk,c_current_addr_sk]
-                                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                                            ReusedExchange [d_date_sk] #4
+                                                      InputAdapter
+                                                        BroadcastExchange #6
+                                                          WholeStageCodegen (3)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [c_customer_sk,c_current_addr_sk]
+                                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                                         InputAdapter
                                           BroadcastExchange #7
                                             WholeStageCodegen (5)
@@ -85,7 +83,7 @@ WholeStageCodegen (10)
                                                                         ColumnarToRow
                                                                           InputAdapter
                                                                             CometHashAggregate [(d_month_seq + 1)]
-                                                                              CometColumnarExchange [(d_month_seq + 1)] #9
+                                                                              CometExchange [(d_month_seq + 1)] #9
                                                                                 CometHashAggregate [(d_month_seq + 1)]
                                                                                   CometProject [d_month_seq] [(d_month_seq + 1)]
                                                                                     CometFilter [d_year,d_moy]
@@ -95,7 +93,7 @@ WholeStageCodegen (10)
                                                                         ColumnarToRow
                                                                           InputAdapter
                                                                             CometHashAggregate [(d_month_seq + 3)]
-                                                                              CometColumnarExchange [(d_month_seq + 3)] #10
+                                                                              CometExchange [(d_month_seq + 3)] #10
                                                                                 CometHashAggregate [(d_month_seq + 3)]
                                                                                   CometProject [d_month_seq] [(d_month_seq + 3)]
                                                                                     CometFilter [d_year,d_moy]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt
index 9dc4ba9896..2efd757741 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/explain.txt
@@ -1,27 +1,25 @@
 == Physical Plan ==
-* ColumnarToRow (23)
-+- CometTakeOrderedAndProject (22)
-   +- CometHashAggregate (21)
-      +- CometColumnarExchange (20)
-         +- RowToColumnar (19)
-            +- * HashAggregate (18)
-               +- * Project (17)
-                  +- * BroadcastHashJoin Inner BuildRight (16)
-                     :- * Project (10)
-                     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :- * ColumnarToRow (4)
-                     :     :  +- CometProject (3)
-                     :     :     +- CometFilter (2)
-                     :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
-                     :     +- BroadcastExchange (8)
-                     :        +- * ColumnarToRow (7)
-                     :           +- CometFilter (6)
-                     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                     +- BroadcastExchange (15)
-                        +- * ColumnarToRow (14)
-                           +- CometProject (13)
-                              +- CometFilter (12)
-                                 +- CometScan parquet spark_catalog.default.item (11)
+TakeOrderedAndProject (21)
++- * HashAggregate (20)
+   +- Exchange (19)
+      +- * HashAggregate (18)
+         +- * Project (17)
+            +- * BroadcastHashJoin Inner BuildRight (16)
+               :- * Project (10)
+               :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :- * ColumnarToRow (4)
+               :     :  +- CometProject (3)
+               :     :     +- CometFilter (2)
+               :     :        +- CometScan parquet spark_catalog.default.date_dim (1)
+               :     +- BroadcastExchange (8)
+               :        +- * ColumnarToRow (7)
+               :           +- CometFilter (6)
+               :              +- CometScan parquet spark_catalog.default.store_sales (5)
+               +- BroadcastExchange (15)
+                  +- * ColumnarToRow (14)
+                     +- CometProject (13)
+                        +- CometFilter (12)
+                           +- CometScan parquet spark_catalog.default.item (11)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -110,22 +108,18 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#11]
 Results [3]: [i_brand#9, i_brand_id#8, sum#12]
 
-(19) RowToColumnar
+(19) Exchange
 Input [3]: [i_brand#9, i_brand_id#8, sum#12]
+Arguments: hashpartitioning(i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) CometColumnarExchange
-Input [3]: [i_brand#9, i_brand_id#8, sum#12]
-Arguments: hashpartitioning(i_brand#9, i_brand_id#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(21) CometHashAggregate
+(20) HashAggregate [codegen id : 4]
 Input [3]: [i_brand#9, i_brand_id#8, sum#12]
 Keys [2]: [i_brand#9, i_brand_id#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#13]
+Results [3]: [i_brand_id#8 AS brand_id#14, i_brand#9 AS brand#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#13,17,2) AS ext_price#16]
 
-(22) CometTakeOrderedAndProject
-Input [3]: [brand_id#13, brand#14, ext_price#15]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ext_price#15 DESC NULLS LAST,brand_id#13 ASC NULLS FIRST], output=[brand_id#13,brand#14,ext_price#15]), 100, [ext_price#15 DESC NULLS LAST, brand_id#13 ASC NULLS FIRST], [brand_id#13, brand#14, ext_price#15]
-
-(23) ColumnarToRow [codegen id : 4]
-Input [3]: [brand_id#13, brand#14, ext_price#15]
+(21) TakeOrderedAndProject
+Input [3]: [brand_id#14, brand#15, ext_price#16]
+Arguments: 100, [ext_price#16 DESC NULLS LAST, brand_id#14 ASC NULLS FIRST], [brand_id#14, brand#15, ext_price#16]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt
index 368ca6f56a..7a0fe88633 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q55/simplified.txt
@@ -1,33 +1,31 @@
-WholeStageCodegen (4)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ext_price,brand_id,brand]
-        CometHashAggregate [i_brand,i_brand_id,sum]
-          CometColumnarExchange [i_brand,i_brand_id] #1
-            RowToColumnar
-              WholeStageCodegen (3)
-                HashAggregate [i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
-                  Project [ss_ext_sales_price,i_brand_id,i_brand]
-                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                      Project [ss_item_sk,ss_ext_sales_price]
-                        BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
-                          ColumnarToRow
-                            InputAdapter
-                              CometProject [d_date_sk]
-                                CometFilter [d_moy,d_year,d_date_sk]
-                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                          InputAdapter
-                            BroadcastExchange #2
-                              WholeStageCodegen (1)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+TakeOrderedAndProject [ext_price,brand_id,brand]
+  WholeStageCodegen (4)
+    HashAggregate [i_brand,i_brand_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),brand_id,brand,ext_price,sum]
+      InputAdapter
+        Exchange [i_brand,i_brand_id] #1
+          WholeStageCodegen (3)
+            HashAggregate [i_brand,i_brand_id,ss_ext_sales_price] [sum,sum]
+              Project [ss_ext_sales_price,i_brand_id,i_brand]
+                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                  Project [ss_item_sk,ss_ext_sales_price]
+                    BroadcastHashJoin [d_date_sk,ss_sold_date_sk]
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [d_date_sk]
+                            CometFilter [d_moy,d_year,d_date_sk]
+                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                       InputAdapter
-                        BroadcastExchange #3
-                          WholeStageCodegen (2)
+                        BroadcastExchange #2
+                          WholeStageCodegen (1)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [i_item_sk,i_brand_id,i_brand]
-                                  CometFilter [i_manager_id,i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
+                                CometFilter [ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                  InputAdapter
+                    BroadcastExchange #3
+                      WholeStageCodegen (2)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [i_item_sk,i_brand_id,i_brand]
+                              CometFilter [i_manager_id,i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_brand,i_manager_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt
index 15d5137015..0fb6eb172f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/explain.txt
@@ -1,71 +1,67 @@
 == Physical Plan ==
-* ColumnarToRow (67)
-+- CometTakeOrderedAndProject (66)
-   +- CometHashAggregate (65)
-      +- CometColumnarExchange (64)
-         +- CometHashAggregate (63)
-            +- CometUnion (62)
-               :- CometHashAggregate (29)
-               :  +- CometColumnarExchange (28)
-               :     +- RowToColumnar (27)
-               :        +- * HashAggregate (26)
-               :           +- * Project (25)
-               :              +- * BroadcastHashJoin Inner BuildRight (24)
-               :                 :- * Project (13)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :                 :     :- * Project (6)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :                 :     :     :- * ColumnarToRow (3)
-               :                 :     :     :  +- CometFilter (2)
-               :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                 :     :     +- ReusedExchange (4)
-               :                 :     +- BroadcastExchange (11)
-               :                 :        +- * ColumnarToRow (10)
-               :                 :           +- CometProject (9)
-               :                 :              +- CometFilter (8)
-               :                 :                 +- CometScan parquet spark_catalog.default.customer_address (7)
-               :                 +- BroadcastExchange (23)
-               :                    +- * BroadcastHashJoin LeftSemi BuildRight (22)
-               :                       :- * ColumnarToRow (16)
-               :                       :  +- CometFilter (15)
-               :                       :     +- CometScan parquet spark_catalog.default.item (14)
-               :                       +- BroadcastExchange (21)
-               :                          +- * ColumnarToRow (20)
-               :                             +- CometProject (19)
-               :                                +- CometFilter (18)
-               :                                   +- CometScan parquet spark_catalog.default.item (17)
-               :- CometHashAggregate (45)
-               :  +- CometColumnarExchange (44)
-               :     +- RowToColumnar (43)
-               :        +- * HashAggregate (42)
-               :           +- * Project (41)
-               :              +- * BroadcastHashJoin Inner BuildRight (40)
-               :                 :- * Project (38)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (37)
-               :                 :     :- * Project (35)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-               :                 :     :     :- * ColumnarToRow (32)
-               :                 :     :     :  +- CometFilter (31)
-               :                 :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
-               :                 :     :     +- ReusedExchange (33)
-               :                 :     +- ReusedExchange (36)
-               :                 +- ReusedExchange (39)
-               +- CometHashAggregate (61)
-                  +- CometColumnarExchange (60)
-                     +- RowToColumnar (59)
-                        +- * HashAggregate (58)
-                           +- * Project (57)
-                              +- * BroadcastHashJoin Inner BuildRight (56)
-                                 :- * Project (54)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (53)
-                                 :     :- * Project (51)
-                                 :     :  +- * BroadcastHashJoin Inner BuildRight (50)
-                                 :     :     :- * ColumnarToRow (48)
-                                 :     :     :  +- CometFilter (47)
-                                 :     :     :     +- CometScan parquet spark_catalog.default.web_sales (46)
-                                 :     :     +- ReusedExchange (49)
-                                 :     +- ReusedExchange (52)
-                                 +- ReusedExchange (55)
+TakeOrderedAndProject (63)
++- * HashAggregate (62)
+   +- Exchange (61)
+      +- * HashAggregate (60)
+         +- Union (59)
+            :- * HashAggregate (28)
+            :  +- Exchange (27)
+            :     +- * HashAggregate (26)
+            :        +- * Project (25)
+            :           +- * BroadcastHashJoin Inner BuildRight (24)
+            :              :- * Project (13)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (12)
+            :              :     :- * Project (6)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+            :              :     :     :- * ColumnarToRow (3)
+            :              :     :     :  +- CometFilter (2)
+            :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :              :     :     +- ReusedExchange (4)
+            :              :     +- BroadcastExchange (11)
+            :              :        +- * ColumnarToRow (10)
+            :              :           +- CometProject (9)
+            :              :              +- CometFilter (8)
+            :              :                 +- CometScan parquet spark_catalog.default.customer_address (7)
+            :              +- BroadcastExchange (23)
+            :                 +- * BroadcastHashJoin LeftSemi BuildRight (22)
+            :                    :- * ColumnarToRow (16)
+            :                    :  +- CometFilter (15)
+            :                    :     +- CometScan parquet spark_catalog.default.item (14)
+            :                    +- BroadcastExchange (21)
+            :                       +- * ColumnarToRow (20)
+            :                          +- CometProject (19)
+            :                             +- CometFilter (18)
+            :                                +- CometScan parquet spark_catalog.default.item (17)
+            :- * HashAggregate (43)
+            :  +- Exchange (42)
+            :     +- * HashAggregate (41)
+            :        +- * Project (40)
+            :           +- * BroadcastHashJoin Inner BuildRight (39)
+            :              :- * Project (37)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (36)
+            :              :     :- * Project (34)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (33)
+            :              :     :     :- * ColumnarToRow (31)
+            :              :     :     :  +- CometFilter (30)
+            :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (29)
+            :              :     :     +- ReusedExchange (32)
+            :              :     +- ReusedExchange (35)
+            :              +- ReusedExchange (38)
+            +- * HashAggregate (58)
+               +- Exchange (57)
+                  +- * HashAggregate (56)
+                     +- * Project (55)
+                        +- * BroadcastHashJoin Inner BuildRight (54)
+                           :- * Project (52)
+                           :  +- * BroadcastHashJoin Inner BuildRight (51)
+                           :     :- * Project (49)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (48)
+                           :     :     :- * ColumnarToRow (46)
+                           :     :     :  +- CometFilter (45)
+                           :     :     :     +- CometScan parquet spark_catalog.default.web_sales (44)
+                           :     :     +- ReusedExchange (47)
+                           :     +- ReusedExchange (50)
+                           +- ReusedExchange (53)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -83,7 +79,7 @@ Condition : (isnotnull(ss_addr_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_addr_sk#2, ss_ext_sales_price#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 72]
+(4) ReusedExchange [Reuses operator id: 68]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -191,224 +187,219 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#3))]
 Aggregate Attributes [1]: [sum#13]
 Results [2]: [i_item_id#10, sum#14]
 
-(27) RowToColumnar
+(27) Exchange
 Input [2]: [i_item_id#10, sum#14]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [2]: [i_item_id#10, sum#14]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 6]
 Input [2]: [i_item_id#10, sum#14]
 Keys [1]: [i_item_id#10]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#3))#15]
+Results [2]: [i_item_id#10, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#15,17,2) AS total_sales#16]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+Output [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#18), dynamicpruningexpression(cs_sold_date_sk#18 IN dynamicpruning#19)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#20), dynamicpruningexpression(cs_sold_date_sk#20 IN dynamicpruning#21)]
 PushedFilters: [IsNotNull(cs_bill_addr_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_addr_sk:int,cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(31) CometFilter
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
-Condition : (isnotnull(cs_bill_addr_sk#15) AND isnotnull(cs_item_sk#16))
+(30) CometFilter
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+Condition : (isnotnull(cs_bill_addr_sk#17) AND isnotnull(cs_item_sk#18))
 
-(32) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+(31) ColumnarToRow [codegen id : 11]
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
 
-(33) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#20]
+(32) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#22]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#18]
-Right keys [1]: [d_date_sk#20]
+(33) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_sold_date_sk#20]
+Right keys [1]: [d_date_sk#22]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [3]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17]
-Input [5]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18, d_date_sk#20]
+(34) Project [codegen id : 11]
+Output [3]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19]
+Input [5]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20, d_date_sk#22]
 
-(36) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#21]
+(35) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#23]
 
-(37) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_bill_addr_sk#15]
-Right keys [1]: [ca_address_sk#21]
+(36) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_bill_addr_sk#17]
+Right keys [1]: [ca_address_sk#23]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
-Output [2]: [cs_item_sk#16, cs_ext_sales_price#17]
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, ca_address_sk#21]
+(37) Project [codegen id : 11]
+Output [2]: [cs_item_sk#18, cs_ext_sales_price#19]
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, ca_address_sk#23]
 
-(39) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#22, i_item_id#23]
+(38) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#24, i_item_id#25]
 
-(40) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_item_sk#16]
-Right keys [1]: [i_item_sk#22]
+(39) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_item_sk#18]
+Right keys [1]: [i_item_sk#24]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 10]
-Output [2]: [cs_ext_sales_price#17, i_item_id#23]
-Input [4]: [cs_item_sk#16, cs_ext_sales_price#17, i_item_sk#22, i_item_id#23]
-
-(42) HashAggregate [codegen id : 10]
-Input [2]: [cs_ext_sales_price#17, i_item_id#23]
-Keys [1]: [i_item_id#23]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#17))]
-Aggregate Attributes [1]: [sum#24]
-Results [2]: [i_item_id#23, sum#25]
+(40) Project [codegen id : 11]
+Output [2]: [cs_ext_sales_price#19, i_item_id#25]
+Input [4]: [cs_item_sk#18, cs_ext_sales_price#19, i_item_sk#24, i_item_id#25]
 
-(43) RowToColumnar
-Input [2]: [i_item_id#23, sum#25]
+(41) HashAggregate [codegen id : 11]
+Input [2]: [cs_ext_sales_price#19, i_item_id#25]
+Keys [1]: [i_item_id#25]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#19))]
+Aggregate Attributes [1]: [sum#26]
+Results [2]: [i_item_id#25, sum#27]
 
-(44) CometColumnarExchange
-Input [2]: [i_item_id#23, sum#25]
-Arguments: hashpartitioning(i_item_id#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(42) Exchange
+Input [2]: [i_item_id#25, sum#27]
+Arguments: hashpartitioning(i_item_id#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(45) CometHashAggregate
-Input [2]: [i_item_id#23, sum#25]
-Keys [1]: [i_item_id#23]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#17))]
+(43) HashAggregate [codegen id : 12]
+Input [2]: [i_item_id#25, sum#27]
+Keys [1]: [i_item_id#25]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#19))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#19))#28]
+Results [2]: [i_item_id#25, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#19))#28,17,2) AS total_sales#29]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+Output [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#29), dynamicpruningexpression(ws_sold_date_sk#29 IN dynamicpruning#30)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk), IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(47) CometFilter
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
-Condition : (isnotnull(ws_bill_addr_sk#27) AND isnotnull(ws_item_sk#26))
+(45) CometFilter
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+Condition : (isnotnull(ws_bill_addr_sk#31) AND isnotnull(ws_item_sk#30))
 
-(48) ColumnarToRow [codegen id : 15]
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+(46) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
 
-(49) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#31]
+(47) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#35]
 
-(50) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_sold_date_sk#29]
-Right keys [1]: [d_date_sk#31]
+(48) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#33]
+Right keys [1]: [d_date_sk#35]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 15]
-Output [3]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28]
-Input [5]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29, d_date_sk#31]
+(49) Project [codegen id : 17]
+Output [3]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32]
+Input [5]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33, d_date_sk#35]
 
-(52) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#32]
+(50) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#36]
 
-(53) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_bill_addr_sk#27]
-Right keys [1]: [ca_address_sk#32]
+(51) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_bill_addr_sk#31]
+Right keys [1]: [ca_address_sk#36]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 15]
-Output [2]: [ws_item_sk#26, ws_ext_sales_price#28]
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ca_address_sk#32]
+(52) Project [codegen id : 17]
+Output [2]: [ws_item_sk#30, ws_ext_sales_price#32]
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ca_address_sk#36]
 
-(55) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#33, i_item_id#34]
+(53) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#37, i_item_id#38]
 
-(56) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_item_sk#26]
-Right keys [1]: [i_item_sk#33]
+(54) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_item_sk#30]
+Right keys [1]: [i_item_sk#37]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 15]
-Output [2]: [ws_ext_sales_price#28, i_item_id#34]
-Input [4]: [ws_item_sk#26, ws_ext_sales_price#28, i_item_sk#33, i_item_id#34]
+(55) Project [codegen id : 17]
+Output [2]: [ws_ext_sales_price#32, i_item_id#38]
+Input [4]: [ws_item_sk#30, ws_ext_sales_price#32, i_item_sk#37, i_item_id#38]
 
-(58) HashAggregate [codegen id : 15]
-Input [2]: [ws_ext_sales_price#28, i_item_id#34]
-Keys [1]: [i_item_id#34]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#28))]
-Aggregate Attributes [1]: [sum#35]
-Results [2]: [i_item_id#34, sum#36]
+(56) HashAggregate [codegen id : 17]
+Input [2]: [ws_ext_sales_price#32, i_item_id#38]
+Keys [1]: [i_item_id#38]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#32))]
+Aggregate Attributes [1]: [sum#39]
+Results [2]: [i_item_id#38, sum#40]
 
-(59) RowToColumnar
-Input [2]: [i_item_id#34, sum#36]
+(57) Exchange
+Input [2]: [i_item_id#38, sum#40]
+Arguments: hashpartitioning(i_item_id#38, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(60) CometColumnarExchange
-Input [2]: [i_item_id#34, sum#36]
-Arguments: hashpartitioning(i_item_id#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(58) HashAggregate [codegen id : 18]
+Input [2]: [i_item_id#38, sum#40]
+Keys [1]: [i_item_id#38]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#32))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#32))#41]
+Results [2]: [i_item_id#38, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#32))#41,17,2) AS total_sales#42]
 
-(61) CometHashAggregate
-Input [2]: [i_item_id#34, sum#36]
-Keys [1]: [i_item_id#34]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#28))]
+(59) Union
 
-(62) CometUnion
-Child 0 Input [2]: [i_item_id#10, total_sales#37]
-Child 1 Input [2]: [i_item_id#23, total_sales#38]
-Child 2 Input [2]: [i_item_id#34, total_sales#39]
-
-(63) CometHashAggregate
-Input [2]: [i_item_id#10, total_sales#37]
+(60) HashAggregate [codegen id : 19]
+Input [2]: [i_item_id#10, total_sales#16]
 Keys [1]: [i_item_id#10]
-Functions [1]: [partial_sum(total_sales#37)]
+Functions [1]: [partial_sum(total_sales#16)]
+Aggregate Attributes [2]: [sum#43, isEmpty#44]
+Results [3]: [i_item_id#10, sum#45, isEmpty#46]
 
-(64) CometColumnarExchange
-Input [3]: [i_item_id#10, sum#40, isEmpty#41]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(61) Exchange
+Input [3]: [i_item_id#10, sum#45, isEmpty#46]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(65) CometHashAggregate
-Input [3]: [i_item_id#10, sum#40, isEmpty#41]
+(62) HashAggregate [codegen id : 20]
+Input [3]: [i_item_id#10, sum#45, isEmpty#46]
 Keys [1]: [i_item_id#10]
-Functions [1]: [sum(total_sales#37)]
-
-(66) CometTakeOrderedAndProject
-Input [2]: [i_item_id#10, total_sales#42]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_sales#42 ASC NULLS FIRST], output=[i_item_id#10,total_sales#42]), 100, [total_sales#42 ASC NULLS FIRST], [i_item_id#10, total_sales#42]
+Functions [1]: [sum(total_sales#16)]
+Aggregate Attributes [1]: [sum(total_sales#16)#47]
+Results [2]: [i_item_id#10, sum(total_sales#16)#47 AS total_sales#48]
 
-(67) ColumnarToRow [codegen id : 16]
-Input [2]: [i_item_id#10, total_sales#42]
+(63) TakeOrderedAndProject
+Input [2]: [i_item_id#10, total_sales#48]
+Arguments: 100, [total_sales#48 ASC NULLS FIRST], [i_item_id#10, total_sales#48]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (72)
-+- * ColumnarToRow (71)
-   +- CometProject (70)
-      +- CometFilter (69)
-         +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (68)
++- * ColumnarToRow (67)
+   +- CometProject (66)
+      +- CometFilter (65)
+         +- CometScan parquet spark_catalog.default.date_dim (64)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#6, d_year#43, d_moy#44]
+Output [3]: [d_date_sk#6, d_year#49, d_moy#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,2), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(69) CometFilter
-Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
-Condition : ((((isnotnull(d_year#43) AND isnotnull(d_moy#44)) AND (d_year#43 = 2001)) AND (d_moy#44 = 2)) AND isnotnull(d_date_sk#6))
+(65) CometFilter
+Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
+Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 2001)) AND (d_moy#50 = 2)) AND isnotnull(d_date_sk#6))
 
-(70) CometProject
-Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
+(66) CometProject
+Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(71) ColumnarToRow [codegen id : 1]
+(67) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(72) BroadcastExchange
+(68) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 29 Hosting Expression = cs_sold_date_sk#20 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#29 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 44 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt
index 68bd217820..f781ed1f7b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q56/simplified.txt
@@ -1,101 +1,105 @@
-WholeStageCodegen (16)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [total_sales,i_item_id]
-        CometHashAggregate [i_item_id,sum,isEmpty]
-          CometColumnarExchange [i_item_id] #1
-            CometHashAggregate [i_item_id,total_sales]
-              CometUnion
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #2
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
-                          Project [ss_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              Project [ss_item_sk,ss_ext_sales_price]
-                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                  Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_addr_sk,ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_year,d_moy,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                  InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+TakeOrderedAndProject [total_sales,i_item_id]
+  WholeStageCodegen (20)
+    HashAggregate [i_item_id,sum,isEmpty] [sum(total_sales),total_sales,sum,isEmpty]
+      InputAdapter
+        Exchange [i_item_id] #1
+          WholeStageCodegen (19)
+            HashAggregate [i_item_id,total_sales] [sum,isEmpty,sum,isEmpty]
+              InputAdapter
+                Union
+                  WholeStageCodegen (6)
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #2
+                          WholeStageCodegen (5)
+                            HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
+                              Project [ss_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                      Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_addr_sk,ss_item_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            CometProject [ca_address_sk]
-                                              CometFilter [ca_gmt_offset,ca_address_sk]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (4)
-                                    BroadcastHashJoin [i_item_id,i_item_id]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        BroadcastExchange #6
-                                          WholeStageCodegen (3)
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (2)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [i_item_id]
-                                                  CometFilter [i_color]
-                                                    CometScan parquet spark_catalog.default.item [i_item_id,i_color]
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #7
-                    RowToColumnar
-                      WholeStageCodegen (10)
-                        HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
-                          Project [cs_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [cs_item_sk,i_item_sk]
-                              Project [cs_item_sk,cs_ext_sales_price]
-                                BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
-                                  Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [cs_bill_addr_sk,cs_item_sk]
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                                CometProject [ca_address_sk]
+                                                  CometFilter [ca_gmt_offset,ca_address_sk]
+                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                                  InputAdapter
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (4)
+                                        BroadcastHashJoin [i_item_id,i_item_id]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [i_item_sk]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (3)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [i_item_id]
+                                                      CometFilter [i_color]
+                                                        CometScan parquet spark_catalog.default.item [i_item_id,i_color]
+                  WholeStageCodegen (12)
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #7
+                          WholeStageCodegen (11)
+                            HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
+                              Project [cs_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                  Project [cs_item_sk,cs_ext_sales_price]
+                                    BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
+                                      Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_bill_addr_sk,cs_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                        ReusedExchange [ca_address_sk] #4
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #4
-                              InputAdapter
-                                ReusedExchange [i_item_sk,i_item_id] #5
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #8
-                    RowToColumnar
-                      WholeStageCodegen (15)
-                        HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
-                          Project [ws_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [ws_item_sk,i_item_sk]
-                              Project [ws_item_sk,ws_ext_sales_price]
-                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                  Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_addr_sk,ws_item_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                    ReusedExchange [i_item_sk,i_item_id] #5
+                  WholeStageCodegen (18)
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #8
+                          WholeStageCodegen (17)
+                            HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
+                              Project [ws_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                  Project [ws_item_sk,ws_ext_sales_price]
+                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                      Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_addr_sk,ws_item_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                        ReusedExchange [ca_address_sk] #4
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #4
-                              InputAdapter
-                                ReusedExchange [i_item_sk,i_item_id] #5
+                                    ReusedExchange [i_item_sk,i_item_id] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt
index 70e5ea9d45..8302389585 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-TakeOrderedAndProject (47)
-+- * Project (46)
-   +- * BroadcastHashJoin Inner BuildRight (45)
-      :- * Project (38)
-      :  +- * BroadcastHashJoin Inner BuildRight (37)
-      :     :- * Project (30)
-      :     :  +- * Filter (29)
-      :     :     +- Window (28)
-      :     :        +- * Filter (27)
-      :     :           +- Window (26)
-      :     :              +- * ColumnarToRow (25)
-      :     :                 +- CometSort (24)
-      :     :                    +- CometColumnarExchange (23)
-      :     :                       +- CometHashAggregate (22)
-      :     :                          +- CometColumnarExchange (21)
-      :     :                             +- RowToColumnar (20)
-      :     :                                +- * HashAggregate (19)
-      :     :                                   +- * Project (18)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                         :- * Project (12)
-      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                         :     :- * Project (9)
-      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                         :     :     :- * ColumnarToRow (3)
-      :     :                                         :     :     :  +- CometFilter (2)
-      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                         :     :     +- BroadcastExchange (7)
-      :     :                                         :     :        +- * ColumnarToRow (6)
-      :     :                                         :     :           +- CometFilter (5)
-      :     :                                         :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
-      :     :                                         :     +- ReusedExchange (10)
-      :     :                                         +- BroadcastExchange (16)
-      :     :                                            +- * ColumnarToRow (15)
-      :     :                                               +- CometFilter (14)
-      :     :                                                  +- CometScan parquet spark_catalog.default.call_center (13)
-      :     +- BroadcastExchange (36)
-      :        +- * Project (35)
-      :           +- Window (34)
-      :              +- * ColumnarToRow (33)
-      :                 +- CometSort (32)
-      :                    +- ReusedExchange (31)
-      +- BroadcastExchange (44)
-         +- * Project (43)
-            +- Window (42)
-               +- * ColumnarToRow (41)
-                  +- CometSort (40)
-                     +- ReusedExchange (39)
+TakeOrderedAndProject (45)
++- * Project (44)
+   +- * BroadcastHashJoin Inner BuildRight (43)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * Project (28)
+      :     :  +- * Filter (27)
+      :     :     +- Window (26)
+      :     :        +- * Filter (25)
+      :     :           +- Window (24)
+      :     :              +- * Sort (23)
+      :     :                 +- Exchange (22)
+      :     :                    +- * HashAggregate (21)
+      :     :                       +- Exchange (20)
+      :     :                          +- * HashAggregate (19)
+      :     :                             +- * Project (18)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                   :- * Project (12)
+      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                   :     :- * Project (9)
+      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                   :     :     :- * ColumnarToRow (3)
+      :     :                                   :     :     :  +- CometFilter (2)
+      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                   :     :     +- BroadcastExchange (7)
+      :     :                                   :     :        +- * ColumnarToRow (6)
+      :     :                                   :     :           +- CometFilter (5)
+      :     :                                   :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
+      :     :                                   :     +- ReusedExchange (10)
+      :     :                                   +- BroadcastExchange (16)
+      :     :                                      +- * ColumnarToRow (15)
+      :     :                                         +- CometFilter (14)
+      :     :                                            +- CometScan parquet spark_catalog.default.call_center (13)
+      :     +- BroadcastExchange (35)
+      :        +- * Project (34)
+      :           +- Window (33)
+      :              +- * Sort (32)
+      :                 +- Exchange (31)
+      :                    +- * HashAggregate (30)
+      :                       +- ReusedExchange (29)
+      +- BroadcastExchange (42)
+         +- * Project (41)
+            +- Window (40)
+               +- * Sort (39)
+                  +- ReusedExchange (38)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -91,7 +89,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, cs_call_center_sk#4, cs_sales_price#6, cs_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, cs_call_center_sk#4, cs_item_sk#5, cs_sales_price#6, cs_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 51]
+(10) ReusedExchange [Reuses operator id: 49]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -139,124 +137,125 @@ Functions [1]: [partial_sum(UnscaledValue(cs_sales_price#6))]
 Aggregate Attributes [1]: [sum#14]
 Results [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 
-(20) RowToColumnar
+(20) Exchange
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 Keys [5]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(cs_sales_price#6))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#6))#16]
+Results [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS sum_sales#17, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS _w0#18]
 
-(23) CometColumnarExchange
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(22) Exchange
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(24) CometSort
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-Arguments: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(23) Sort [codegen id : 6]
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
 
-(25) ColumnarToRow [codegen id : 5]
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-
-(26) Window
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#18], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(24) Window
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(27) Filter [codegen id : 6]
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
+(25) Filter [codegen id : 7]
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(28) Window
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
-Arguments: [avg(_w0#17) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#19], [i_category#3, i_brand#2, cc_name#13, d_year#10]
-
-(29) Filter [codegen id : 19]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
-Condition : ((isnotnull(avg_monthly_sales#19) AND (avg_monthly_sales#19 > 0.000000)) AND CASE WHEN (avg_monthly_sales#19 > 0.000000) THEN ((abs((sum_sales#16 - avg_monthly_sales#19)) / avg_monthly_sales#19) > 0.1000000000000000) END)
-
-(30) Project [codegen id : 19]
-Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
-
-(31) ReusedExchange [Reuses operator id: 23]
-Output [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-
-(32) CometSort
-Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-Arguments: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16], [i_category#20 ASC NULLS FIRST, i_brand#21 ASC NULLS FIRST, cc_name#22 ASC NULLS FIRST, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
-
-(33) ColumnarToRow [codegen id : 11]
-Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-
-(34) Window
-Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-Arguments: [rank(d_year#23, d_moy#24) windowspecdefinition(i_category#20, i_brand#21, cc_name#22, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#25], [i_category#20, i_brand#21, cc_name#22], [d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
-
-(35) Project [codegen id : 12]
-Output [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#16 AS sum_sales#26, rn#25]
-Input [7]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16, rn#25]
-
-(36) BroadcastExchange
-Input [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=5]
-
-(37) BroadcastHashJoin [codegen id : 19]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
-Right keys [4]: [i_category#20, i_brand#21, cc_name#22, (rn#25 + 1)]
+(26) Window
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, cc_name#13, d_year#10]
+
+(27) Filter [codegen id : 22]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
+
+(28) Project [codegen id : 22]
+Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+
+(29) ReusedExchange [Reuses operator id: 20]
+Output [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
+
+(30) HashAggregate [codegen id : 12]
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
+Keys [5]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25]
+Functions [1]: [sum(UnscaledValue(cs_sales_price#27))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#27))#16]
+Results [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, MakeDecimal(sum(UnscaledValue(cs_sales_price#27))#16,17,2) AS sum_sales#17]
+
+(31) Exchange
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
+Arguments: hashpartitioning(i_category#21, i_brand#22, cc_name#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(32) Sort [codegen id : 13]
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
+Arguments: [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, cc_name#23 ASC NULLS FIRST, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST], false, 0
+
+(33) Window
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
+Arguments: [rank(d_year#24, d_moy#25) windowspecdefinition(i_category#21, i_brand#22, cc_name#23, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#28], [i_category#21, i_brand#22, cc_name#23], [d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST]
+
+(34) Project [codegen id : 14]
+Output [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#17 AS sum_sales#29, rn#28]
+Input [7]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17, rn#28]
+
+(35) BroadcastExchange
+Input [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=6]
+
+(36) BroadcastHashJoin [codegen id : 22]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
+Right keys [4]: [i_category#21, i_brand#22, cc_name#23, (rn#28 + 1)]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 19]
-Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26]
-Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
-
-(39) ReusedExchange [Reuses operator id: 23]
-Output [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+(37) Project [codegen id : 22]
+Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29]
+Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
 
-(40) CometSort
-Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
-Arguments: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16], [i_category#27 ASC NULLS FIRST, i_brand#28 ASC NULLS FIRST, cc_name#29 ASC NULLS FIRST, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
+(38) ReusedExchange [Reuses operator id: 31]
+Output [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
 
-(41) ColumnarToRow [codegen id : 17]
-Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+(39) Sort [codegen id : 20]
+Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [i_category#30 ASC NULLS FIRST, i_brand#31 ASC NULLS FIRST, cc_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST], false, 0
 
-(42) Window
-Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
-Arguments: [rank(d_year#30, d_moy#31) windowspecdefinition(i_category#27, i_brand#28, cc_name#29, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#32], [i_category#27, i_brand#28, cc_name#29], [d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
+(40) Window
+Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#30, i_brand#31, cc_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#30, i_brand#31, cc_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
 
-(43) Project [codegen id : 18]
-Output [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#16 AS sum_sales#33, rn#32]
-Input [7]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16, rn#32]
+(41) Project [codegen id : 21]
+Output [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#17 AS sum_sales#36, rn#35]
+Input [7]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
 
-(44) BroadcastExchange
-Input [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=6]
+(42) BroadcastExchange
+Input [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=7]
 
-(45) BroadcastHashJoin [codegen id : 19]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
-Right keys [4]: [i_category#27, i_brand#28, cc_name#29, (rn#32 - 1)]
+(43) BroadcastHashJoin [codegen id : 22]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
+Right keys [4]: [i_category#30, i_brand#31, cc_name#32, (rn#35 - 1)]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 19]
-Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, sum_sales#26 AS psum#34, sum_sales#33 AS nsum#35]
-Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26, i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
+(44) Project [codegen id : 22]
+Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#29 AS psum#37, sum_sales#36 AS nsum#38]
+Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29, i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
 
-(47) TakeOrderedAndProject
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
-Arguments: 100, [(sum_sales#16 - avg_monthly_sales#19) ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
+(45) TakeOrderedAndProject
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST], [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = cs_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (51)
-+- * ColumnarToRow (50)
-   +- CometFilter (49)
-      +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometFilter (47)
+      +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -266,15 +265,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(49) CometFilter
+(47) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(50) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(51) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt
index b9bd07df45..3bc01343ae 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q57/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,cc_name,i_category,i_brand,d_year,d_moy,psum,nsum]
-  WholeStageCodegen (19)
+  WholeStageCodegen (22)
     Project [i_category,i_brand,cc_name,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,cc_name,rn,i_category,i_brand,cc_name,rn]
         Project [i_category,i_brand,cc_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,cc_name,i_category,i_brand,d_
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,cc_name,d_year]
-                    WholeStageCodegen (6)
+                    WholeStageCodegen (7)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,cc_name]
-                            WholeStageCodegen (5)
-                              ColumnarToRow
+                            WholeStageCodegen (6)
+                              Sort [i_category,i_brand,cc_name,d_year,d_moy]
                                 InputAdapter
-                                  CometSort [i_category,i_brand,cc_name,d_year,d_moy]
-                                    CometColumnarExchange [i_category,i_brand,cc_name] #1
-                                      CometHashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum]
-                                        CometColumnarExchange [i_category,i_brand,cc_name,d_year,d_moy] #2
-                                          RowToColumnar
+                                  Exchange [i_category,i_brand,cc_name] #1
+                                    WholeStageCodegen (5)
+                                      HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,_w0,sum]
+                                        InputAdapter
+                                          Exchange [i_category,i_brand,cc_name,d_year,d_moy] #2
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,cs_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,cs_sales_price,d_year,d_moy,cc_name]
@@ -57,23 +57,25 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,cc_name,i_category,i_brand,d_
                                                                 CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (12)
+                WholeStageCodegen (14)
                   Project [i_category,i_brand,cc_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,cc_name]
-                        WholeStageCodegen (11)
-                          ColumnarToRow
+                        WholeStageCodegen (13)
+                          Sort [i_category,i_brand,cc_name,d_year,d_moy]
                             InputAdapter
-                              CometSort [i_category,i_brand,cc_name,d_year,d_moy]
-                                ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
+                              Exchange [i_category,i_brand,cc_name] #7
+                                WholeStageCodegen (12)
+                                  HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,sum]
+                                    InputAdapter
+                                      ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum] #2
         InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (18)
+          BroadcastExchange #8
+            WholeStageCodegen (21)
               Project [i_category,i_brand,cc_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,cc_name]
-                    WholeStageCodegen (17)
-                      ColumnarToRow
+                    WholeStageCodegen (20)
+                      Sort [i_category,i_brand,cc_name,d_year,d_moy]
                         InputAdapter
-                          CometSort [i_category,i_brand,cc_name,d_year,d_moy]
-                            ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
+                          ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
index d31d811d90..e3b68cabe2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/explain.txt
@@ -1,59 +1,53 @@
 == Physical Plan ==
-TakeOrderedAndProject (55)
-+- * Project (54)
-   +- * BroadcastHashJoin Inner BuildRight (53)
-      :- * Project (36)
-      :  +- * BroadcastHashJoin Inner BuildRight (35)
-      :     :- * ColumnarToRow (18)
-      :     :  +- CometFilter (17)
-      :     :     +- CometHashAggregate (16)
-      :     :        +- CometColumnarExchange (15)
-      :     :           +- RowToColumnar (14)
-      :     :              +- * HashAggregate (13)
-      :     :                 +- * Project (12)
-      :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                       :- * Project (9)
-      :     :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                       :     :- * ColumnarToRow (3)
-      :     :                       :     :  +- CometFilter (2)
-      :     :                       :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :                       :     +- BroadcastExchange (7)
-      :     :                       :        +- * ColumnarToRow (6)
-      :     :                       :           +- CometFilter (5)
-      :     :                       :              +- CometScan parquet spark_catalog.default.item (4)
-      :     :                       +- ReusedExchange (10)
-      :     +- BroadcastExchange (34)
-      :        +- * ColumnarToRow (33)
-      :           +- CometFilter (32)
-      :              +- CometHashAggregate (31)
-      :                 +- CometColumnarExchange (30)
-      :                    +- RowToColumnar (29)
-      :                       +- * HashAggregate (28)
-      :                          +- * Project (27)
-      :                             +- * BroadcastHashJoin Inner BuildRight (26)
-      :                                :- * Project (24)
-      :                                :  +- * BroadcastHashJoin Inner BuildRight (23)
-      :                                :     :- * ColumnarToRow (21)
-      :                                :     :  +- CometFilter (20)
-      :                                :     :     +- CometScan parquet spark_catalog.default.catalog_sales (19)
-      :                                :     +- ReusedExchange (22)
-      :                                +- ReusedExchange (25)
-      +- BroadcastExchange (52)
-         +- * ColumnarToRow (51)
-            +- CometFilter (50)
-               +- CometHashAggregate (49)
-                  +- CometColumnarExchange (48)
-                     +- RowToColumnar (47)
-                        +- * HashAggregate (46)
-                           +- * Project (45)
-                              +- * BroadcastHashJoin Inner BuildRight (44)
-                                 :- * Project (42)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (41)
-                                 :     :- * ColumnarToRow (39)
-                                 :     :  +- CometFilter (38)
-                                 :     :     +- CometScan parquet spark_catalog.default.web_sales (37)
-                                 :     +- ReusedExchange (40)
-                                 +- ReusedExchange (43)
+TakeOrderedAndProject (49)
++- * Project (48)
+   +- * BroadcastHashJoin Inner BuildRight (47)
+      :- * Project (32)
+      :  +- * BroadcastHashJoin Inner BuildRight (31)
+      :     :- * Filter (16)
+      :     :  +- * HashAggregate (15)
+      :     :     +- Exchange (14)
+      :     :        +- * HashAggregate (13)
+      :     :           +- * Project (12)
+      :     :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                 :- * Project (9)
+      :     :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                 :     :- * ColumnarToRow (3)
+      :     :                 :     :  +- CometFilter (2)
+      :     :                 :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :                 :     +- BroadcastExchange (7)
+      :     :                 :        +- * ColumnarToRow (6)
+      :     :                 :           +- CometFilter (5)
+      :     :                 :              +- CometScan parquet spark_catalog.default.item (4)
+      :     :                 +- ReusedExchange (10)
+      :     +- BroadcastExchange (30)
+      :        +- * Filter (29)
+      :           +- * HashAggregate (28)
+      :              +- Exchange (27)
+      :                 +- * HashAggregate (26)
+      :                    +- * Project (25)
+      :                       +- * BroadcastHashJoin Inner BuildRight (24)
+      :                          :- * Project (22)
+      :                          :  +- * BroadcastHashJoin Inner BuildRight (21)
+      :                          :     :- * ColumnarToRow (19)
+      :                          :     :  +- CometFilter (18)
+      :                          :     :     +- CometScan parquet spark_catalog.default.catalog_sales (17)
+      :                          :     +- ReusedExchange (20)
+      :                          +- ReusedExchange (23)
+      +- BroadcastExchange (46)
+         +- * Filter (45)
+            +- * HashAggregate (44)
+               +- Exchange (43)
+                  +- * HashAggregate (42)
+                     +- * Project (41)
+                        +- * BroadcastHashJoin Inner BuildRight (40)
+                           :- * Project (38)
+                           :  +- * BroadcastHashJoin Inner BuildRight (37)
+                           :     :- * ColumnarToRow (35)
+                           :     :  +- CometFilter (34)
+                           :     :     +- CometScan parquet spark_catalog.default.web_sales (33)
+                           :     +- ReusedExchange (36)
+                           +- ReusedExchange (39)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -99,7 +93,7 @@ Join condition: None
 Output [3]: [ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_id#6]
 Input [5]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#5, i_item_id#6]
 
-(10) ReusedExchange [Reuses operator id: 66]
+(10) ReusedExchange [Reuses operator id: 60]
 Output [1]: [d_date_sk#7]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -119,284 +113,272 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#8]
 Results [2]: [i_item_id#6, sum#9]
 
-(14) RowToColumnar
+(14) Exchange
 Input [2]: [i_item_id#6, sum#9]
+Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [2]: [i_item_id#6, sum#9]
-Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 15]
 Input [2]: [i_item_id#6, sum#9]
 Keys [1]: [i_item_id#6]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#10]
+Results [2]: [i_item_id#6 AS item_id#11, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#10,17,2) AS ss_item_rev#12]
 
-(17) CometFilter
-Input [2]: [item_id#10, ss_item_rev#11]
-Condition : isnotnull(ss_item_rev#11)
-
-(18) ColumnarToRow [codegen id : 15]
-Input [2]: [item_id#10, ss_item_rev#11]
+(16) Filter [codegen id : 15]
+Input [2]: [item_id#11, ss_item_rev#12]
+Condition : isnotnull(ss_item_rev#12)
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14]
+Output [3]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#14), dynamicpruningexpression(cs_sold_date_sk#14 IN dynamicpruning#15)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#15), dynamicpruningexpression(cs_sold_date_sk#15 IN dynamicpruning#16)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(20) CometFilter
-Input [3]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14]
-Condition : isnotnull(cs_item_sk#12)
+(18) CometFilter
+Input [3]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15]
+Condition : isnotnull(cs_item_sk#13)
 
-(21) ColumnarToRow [codegen id : 8]
-Input [3]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14]
+(19) ColumnarToRow [codegen id : 8]
+Input [3]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15]
 
-(22) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#16, i_item_id#17]
+(20) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#17, i_item_id#18]
 
-(23) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [cs_item_sk#12]
-Right keys [1]: [i_item_sk#16]
+(21) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [cs_item_sk#13]
+Right keys [1]: [i_item_sk#17]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 8]
-Output [3]: [cs_ext_sales_price#13, cs_sold_date_sk#14, i_item_id#17]
-Input [5]: [cs_item_sk#12, cs_ext_sales_price#13, cs_sold_date_sk#14, i_item_sk#16, i_item_id#17]
+(22) Project [codegen id : 8]
+Output [3]: [cs_ext_sales_price#14, cs_sold_date_sk#15, i_item_id#18]
+Input [5]: [cs_item_sk#13, cs_ext_sales_price#14, cs_sold_date_sk#15, i_item_sk#17, i_item_id#18]
 
-(25) ReusedExchange [Reuses operator id: 66]
-Output [1]: [d_date_sk#18]
+(23) ReusedExchange [Reuses operator id: 60]
+Output [1]: [d_date_sk#19]
 
-(26) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [cs_sold_date_sk#14]
-Right keys [1]: [d_date_sk#18]
+(24) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [cs_sold_date_sk#15]
+Right keys [1]: [d_date_sk#19]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 8]
-Output [2]: [cs_ext_sales_price#13, i_item_id#17]
-Input [4]: [cs_ext_sales_price#13, cs_sold_date_sk#14, i_item_id#17, d_date_sk#18]
-
-(28) HashAggregate [codegen id : 8]
-Input [2]: [cs_ext_sales_price#13, i_item_id#17]
-Keys [1]: [i_item_id#17]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#13))]
-Aggregate Attributes [1]: [sum#19]
-Results [2]: [i_item_id#17, sum#20]
-
-(29) RowToColumnar
-Input [2]: [i_item_id#17, sum#20]
-
-(30) CometColumnarExchange
-Input [2]: [i_item_id#17, sum#20]
-Arguments: hashpartitioning(i_item_id#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(31) CometHashAggregate
-Input [2]: [i_item_id#17, sum#20]
-Keys [1]: [i_item_id#17]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#13))]
-
-(32) CometFilter
-Input [2]: [item_id#21, cs_item_rev#22]
-Condition : isnotnull(cs_item_rev#22)
-
-(33) ColumnarToRow [codegen id : 9]
-Input [2]: [item_id#21, cs_item_rev#22]
-
-(34) BroadcastExchange
-Input [2]: [item_id#21, cs_item_rev#22]
+(25) Project [codegen id : 8]
+Output [2]: [cs_ext_sales_price#14, i_item_id#18]
+Input [4]: [cs_ext_sales_price#14, cs_sold_date_sk#15, i_item_id#18, d_date_sk#19]
+
+(26) HashAggregate [codegen id : 8]
+Input [2]: [cs_ext_sales_price#14, i_item_id#18]
+Keys [1]: [i_item_id#18]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#14))]
+Aggregate Attributes [1]: [sum#20]
+Results [2]: [i_item_id#18, sum#21]
+
+(27) Exchange
+Input [2]: [i_item_id#18, sum#21]
+Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+
+(28) HashAggregate [codegen id : 9]
+Input [2]: [i_item_id#18, sum#21]
+Keys [1]: [i_item_id#18]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#14))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#14))#22]
+Results [2]: [i_item_id#18 AS item_id#23, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#14))#22,17,2) AS cs_item_rev#24]
+
+(29) Filter [codegen id : 9]
+Input [2]: [item_id#23, cs_item_rev#24]
+Condition : isnotnull(cs_item_rev#24)
+
+(30) BroadcastExchange
+Input [2]: [item_id#23, cs_item_rev#24]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=4]
 
-(35) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [item_id#10]
-Right keys [1]: [item_id#21]
+(31) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [item_id#11]
+Right keys [1]: [item_id#23]
 Join type: Inner
-Join condition: ((((cast(ss_item_rev#11 as decimal(19,3)) >= (0.9 * cs_item_rev#22)) AND (cast(ss_item_rev#11 as decimal(20,3)) <= (1.1 * cs_item_rev#22))) AND (cast(cs_item_rev#22 as decimal(19,3)) >= (0.9 * ss_item_rev#11))) AND (cast(cs_item_rev#22 as decimal(20,3)) <= (1.1 * ss_item_rev#11)))
+Join condition: ((((cast(ss_item_rev#12 as decimal(19,3)) >= (0.9 * cs_item_rev#24)) AND (cast(ss_item_rev#12 as decimal(20,3)) <= (1.1 * cs_item_rev#24))) AND (cast(cs_item_rev#24 as decimal(19,3)) >= (0.9 * ss_item_rev#12))) AND (cast(cs_item_rev#24 as decimal(20,3)) <= (1.1 * ss_item_rev#12)))
 
-(36) Project [codegen id : 15]
-Output [3]: [item_id#10, ss_item_rev#11, cs_item_rev#22]
-Input [4]: [item_id#10, ss_item_rev#11, item_id#21, cs_item_rev#22]
+(32) Project [codegen id : 15]
+Output [3]: [item_id#11, ss_item_rev#12, cs_item_rev#24]
+Input [4]: [item_id#11, ss_item_rev#12, item_id#23, cs_item_rev#24]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25]
+Output [3]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#25), dynamicpruningexpression(ws_sold_date_sk#25 IN dynamicpruning#26)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#27), dynamicpruningexpression(ws_sold_date_sk#27 IN dynamicpruning#28)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(38) CometFilter
-Input [3]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25]
-Condition : isnotnull(ws_item_sk#23)
+(34) CometFilter
+Input [3]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27]
+Condition : isnotnull(ws_item_sk#25)
 
-(39) ColumnarToRow [codegen id : 13]
-Input [3]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25]
+(35) ColumnarToRow [codegen id : 13]
+Input [3]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27]
 
-(40) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#27, i_item_id#28]
+(36) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#29, i_item_id#30]
 
-(41) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ws_item_sk#23]
-Right keys [1]: [i_item_sk#27]
+(37) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ws_item_sk#25]
+Right keys [1]: [i_item_sk#29]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 13]
-Output [3]: [ws_ext_sales_price#24, ws_sold_date_sk#25, i_item_id#28]
-Input [5]: [ws_item_sk#23, ws_ext_sales_price#24, ws_sold_date_sk#25, i_item_sk#27, i_item_id#28]
+(38) Project [codegen id : 13]
+Output [3]: [ws_ext_sales_price#26, ws_sold_date_sk#27, i_item_id#30]
+Input [5]: [ws_item_sk#25, ws_ext_sales_price#26, ws_sold_date_sk#27, i_item_sk#29, i_item_id#30]
 
-(43) ReusedExchange [Reuses operator id: 66]
-Output [1]: [d_date_sk#29]
+(39) ReusedExchange [Reuses operator id: 60]
+Output [1]: [d_date_sk#31]
 
-(44) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ws_sold_date_sk#25]
-Right keys [1]: [d_date_sk#29]
+(40) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ws_sold_date_sk#27]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 13]
-Output [2]: [ws_ext_sales_price#24, i_item_id#28]
-Input [4]: [ws_ext_sales_price#24, ws_sold_date_sk#25, i_item_id#28, d_date_sk#29]
-
-(46) HashAggregate [codegen id : 13]
-Input [2]: [ws_ext_sales_price#24, i_item_id#28]
-Keys [1]: [i_item_id#28]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#24))]
-Aggregate Attributes [1]: [sum#30]
-Results [2]: [i_item_id#28, sum#31]
-
-(47) RowToColumnar
-Input [2]: [i_item_id#28, sum#31]
-
-(48) CometColumnarExchange
-Input [2]: [i_item_id#28, sum#31]
-Arguments: hashpartitioning(i_item_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(49) CometHashAggregate
-Input [2]: [i_item_id#28, sum#31]
-Keys [1]: [i_item_id#28]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#24))]
-
-(50) CometFilter
-Input [2]: [item_id#32, ws_item_rev#33]
-Condition : isnotnull(ws_item_rev#33)
-
-(51) ColumnarToRow [codegen id : 14]
-Input [2]: [item_id#32, ws_item_rev#33]
-
-(52) BroadcastExchange
-Input [2]: [item_id#32, ws_item_rev#33]
+(41) Project [codegen id : 13]
+Output [2]: [ws_ext_sales_price#26, i_item_id#30]
+Input [4]: [ws_ext_sales_price#26, ws_sold_date_sk#27, i_item_id#30, d_date_sk#31]
+
+(42) HashAggregate [codegen id : 13]
+Input [2]: [ws_ext_sales_price#26, i_item_id#30]
+Keys [1]: [i_item_id#30]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#26))]
+Aggregate Attributes [1]: [sum#32]
+Results [2]: [i_item_id#30, sum#33]
+
+(43) Exchange
+Input [2]: [i_item_id#30, sum#33]
+Arguments: hashpartitioning(i_item_id#30, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(44) HashAggregate [codegen id : 14]
+Input [2]: [i_item_id#30, sum#33]
+Keys [1]: [i_item_id#30]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#26))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#26))#34]
+Results [2]: [i_item_id#30 AS item_id#35, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#26))#34,17,2) AS ws_item_rev#36]
+
+(45) Filter [codegen id : 14]
+Input [2]: [item_id#35, ws_item_rev#36]
+Condition : isnotnull(ws_item_rev#36)
+
+(46) BroadcastExchange
+Input [2]: [item_id#35, ws_item_rev#36]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=6]
 
-(53) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [item_id#10]
-Right keys [1]: [item_id#32]
+(47) BroadcastHashJoin [codegen id : 15]
+Left keys [1]: [item_id#11]
+Right keys [1]: [item_id#35]
 Join type: Inner
-Join condition: ((((((((cast(ss_item_rev#11 as decimal(19,3)) >= (0.9 * ws_item_rev#33)) AND (cast(ss_item_rev#11 as decimal(20,3)) <= (1.1 * ws_item_rev#33))) AND (cast(cs_item_rev#22 as decimal(19,3)) >= (0.9 * ws_item_rev#33))) AND (cast(cs_item_rev#22 as decimal(20,3)) <= (1.1 * ws_item_rev#33))) AND (cast(ws_item_rev#33 as decimal(19,3)) >= (0.9 * ss_item_rev#11))) AND (cast(ws_item_rev#33 as decimal(20,3)) <= (1.1 * ss_item_rev#11))) AND (cast(ws_item_rev#33 as decimal(19,3)) >= (0.9 * cs_item_rev#22))) AND (cast(ws_item_rev#33 as decimal(20,3)) <= (1.1 * cs_item_rev#22)))
+Join condition: ((((((((cast(ss_item_rev#12 as decimal(19,3)) >= (0.9 * ws_item_rev#36)) AND (cast(ss_item_rev#12 as decimal(20,3)) <= (1.1 * ws_item_rev#36))) AND (cast(cs_item_rev#24 as decimal(19,3)) >= (0.9 * ws_item_rev#36))) AND (cast(cs_item_rev#24 as decimal(20,3)) <= (1.1 * ws_item_rev#36))) AND (cast(ws_item_rev#36 as decimal(19,3)) >= (0.9 * ss_item_rev#12))) AND (cast(ws_item_rev#36 as decimal(20,3)) <= (1.1 * ss_item_rev#12))) AND (cast(ws_item_rev#36 as decimal(19,3)) >= (0.9 * cs_item_rev#24))) AND (cast(ws_item_rev#36 as decimal(20,3)) <= (1.1 * cs_item_rev#24)))
 
-(54) Project [codegen id : 15]
-Output [8]: [item_id#10, ss_item_rev#11, (((ss_item_rev#11 / ((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33)) / 3) * 100) AS ss_dev#34, cs_item_rev#22, (((cs_item_rev#22 / ((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33)) / 3) * 100) AS cs_dev#35, ws_item_rev#33, (((ws_item_rev#33 / ((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33)) / 3) * 100) AS ws_dev#36, (((ss_item_rev#11 + cs_item_rev#22) + ws_item_rev#33) / 3) AS average#37]
-Input [5]: [item_id#10, ss_item_rev#11, cs_item_rev#22, item_id#32, ws_item_rev#33]
+(48) Project [codegen id : 15]
+Output [8]: [item_id#11, ss_item_rev#12, (((ss_item_rev#12 / ((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36)) / 3) * 100) AS ss_dev#37, cs_item_rev#24, (((cs_item_rev#24 / ((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36)) / 3) * 100) AS cs_dev#38, ws_item_rev#36, (((ws_item_rev#36 / ((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36)) / 3) * 100) AS ws_dev#39, (((ss_item_rev#12 + cs_item_rev#24) + ws_item_rev#36) / 3) AS average#40]
+Input [5]: [item_id#11, ss_item_rev#12, cs_item_rev#24, item_id#35, ws_item_rev#36]
 
-(55) TakeOrderedAndProject
-Input [8]: [item_id#10, ss_item_rev#11, ss_dev#34, cs_item_rev#22, cs_dev#35, ws_item_rev#33, ws_dev#36, average#37]
-Arguments: 100, [item_id#10 ASC NULLS FIRST, ss_item_rev#11 ASC NULLS FIRST], [item_id#10, ss_item_rev#11, ss_dev#34, cs_item_rev#22, cs_dev#35, ws_item_rev#33, ws_dev#36, average#37]
+(49) TakeOrderedAndProject
+Input [8]: [item_id#11, ss_item_rev#12, ss_dev#37, cs_item_rev#24, cs_dev#38, ws_item_rev#36, ws_dev#39, average#40]
+Arguments: 100, [item_id#11 ASC NULLS FIRST, ss_item_rev#12 ASC NULLS FIRST], [item_id#11, ss_item_rev#12, ss_dev#37, cs_item_rev#24, cs_dev#38, ws_item_rev#36, ws_dev#39, average#40]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (66)
-+- * Project (65)
-   +- * BroadcastHashJoin LeftSemi BuildRight (64)
-      :- * ColumnarToRow (58)
-      :  +- CometFilter (57)
-      :     +- CometScan parquet spark_catalog.default.date_dim (56)
-      +- BroadcastExchange (63)
-         +- * ColumnarToRow (62)
-            +- CometProject (61)
-               +- CometFilter (60)
-                  +- CometScan parquet spark_catalog.default.date_dim (59)
+BroadcastExchange (60)
++- * Project (59)
+   +- * BroadcastHashJoin LeftSemi BuildRight (58)
+      :- * ColumnarToRow (52)
+      :  +- CometFilter (51)
+      :     +- CometScan parquet spark_catalog.default.date_dim (50)
+      +- BroadcastExchange (57)
+         +- * ColumnarToRow (56)
+            +- CometProject (55)
+               +- CometFilter (54)
+                  +- CometScan parquet spark_catalog.default.date_dim (53)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_date#38]
+Output [2]: [d_date_sk#7, d_date#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(57) CometFilter
-Input [2]: [d_date_sk#7, d_date#38]
+(51) CometFilter
+Input [2]: [d_date_sk#7, d_date#41]
 Condition : isnotnull(d_date_sk#7)
 
-(58) ColumnarToRow [codegen id : 2]
-Input [2]: [d_date_sk#7, d_date#38]
+(52) ColumnarToRow [codegen id : 2]
+Input [2]: [d_date_sk#7, d_date#41]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#39, d_week_seq#40]
+Output [2]: [d_date#42, d_week_seq#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq)]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(60) CometFilter
-Input [2]: [d_date#39, d_week_seq#40]
-Condition : (isnotnull(d_week_seq#40) AND (d_week_seq#40 = Subquery scalar-subquery#41, [id=#42]))
+(54) CometFilter
+Input [2]: [d_date#42, d_week_seq#43]
+Condition : (isnotnull(d_week_seq#43) AND (d_week_seq#43 = Subquery scalar-subquery#44, [id=#45]))
 
-(61) CometProject
-Input [2]: [d_date#39, d_week_seq#40]
-Arguments: [d_date#39], [d_date#39]
+(55) CometProject
+Input [2]: [d_date#42, d_week_seq#43]
+Arguments: [d_date#42], [d_date#42]
 
-(62) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date#39]
+(56) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date#42]
 
-(63) BroadcastExchange
-Input [1]: [d_date#39]
+(57) BroadcastExchange
+Input [1]: [d_date#42]
 Arguments: HashedRelationBroadcastMode(List(input[0, date, true]),false), [plan_id=7]
 
-(64) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [d_date#38]
-Right keys [1]: [d_date#39]
+(58) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [d_date#41]
+Right keys [1]: [d_date#42]
 Join type: LeftSemi
 Join condition: None
 
-(65) Project [codegen id : 2]
+(59) Project [codegen id : 2]
 Output [1]: [d_date_sk#7]
-Input [2]: [d_date_sk#7, d_date#38]
+Input [2]: [d_date_sk#7, d_date#41]
 
-(66) BroadcastExchange
+(60) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 60 Hosting Expression = Subquery scalar-subquery#41, [id=#42]
-* ColumnarToRow (70)
-+- CometProject (69)
-   +- CometFilter (68)
-      +- CometScan parquet spark_catalog.default.date_dim (67)
+Subquery:2 Hosting operator id = 54 Hosting Expression = Subquery scalar-subquery#44, [id=#45]
+* ColumnarToRow (64)
++- CometProject (63)
+   +- CometFilter (62)
+      +- CometScan parquet spark_catalog.default.date_dim (61)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#43, d_week_seq#44]
+Output [2]: [d_date#46, d_week_seq#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), EqualTo(d_date,2000-01-03)]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(68) CometFilter
-Input [2]: [d_date#43, d_week_seq#44]
-Condition : (isnotnull(d_date#43) AND (d_date#43 = 2000-01-03))
+(62) CometFilter
+Input [2]: [d_date#46, d_week_seq#47]
+Condition : (isnotnull(d_date#46) AND (d_date#46 = 2000-01-03))
 
-(69) CometProject
-Input [2]: [d_date#43, d_week_seq#44]
-Arguments: [d_week_seq#44], [d_week_seq#44]
+(63) CometProject
+Input [2]: [d_date#46, d_week_seq#47]
+Arguments: [d_week_seq#47], [d_week_seq#47]
 
-(70) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#44]
+(64) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#47]
 
-Subquery:3 Hosting operator id = 19 Hosting Expression = cs_sold_date_sk#14 IN dynamicpruning#4
+Subquery:3 Hosting operator id = 17 Hosting Expression = cs_sold_date_sk#15 IN dynamicpruning#4
 
-Subquery:4 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#25 IN dynamicpruning#4
+Subquery:4 Hosting operator id = 33 Hosting Expression = ws_sold_date_sk#27 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt
index 63eb226bb0..d3bb0dc388 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q58/simplified.txt
@@ -4,100 +4,94 @@ TakeOrderedAndProject [item_id,ss_item_rev,ss_dev,cs_item_rev,cs_dev,ws_item_rev
       BroadcastHashJoin [item_id,item_id,ss_item_rev,ws_item_rev,cs_item_rev]
         Project [item_id,ss_item_rev,cs_item_rev]
           BroadcastHashJoin [item_id,item_id,ss_item_rev,cs_item_rev]
-            ColumnarToRow
-              InputAdapter
-                CometFilter [ss_item_rev]
-                  CometHashAggregate [i_item_id,sum]
-                    CometColumnarExchange [i_item_id] #1
-                      RowToColumnar
-                        WholeStageCodegen (4)
-                          HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
-                            Project [ss_ext_sales_price,i_item_id]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id]
-                                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_item_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (2)
-                                                  Project [d_date_sk]
-                                                    BroadcastHashJoin [d_date,d_date]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                      InputAdapter
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date]
-                                                                  CometFilter [d_week_seq]
-                                                                    Subquery #2
-                                                                      WholeStageCodegen (1)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometProject [d_week_seq]
-                                                                              CometFilter [d_date]
-                                                                                CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
-                                    InputAdapter
-                                      BroadcastExchange #4
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [i_item_sk,i_item_id]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+            Filter [ss_item_rev]
+              HashAggregate [i_item_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),item_id,ss_item_rev,sum]
+                InputAdapter
+                  Exchange [i_item_id] #1
+                    WholeStageCodegen (4)
+                      HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
+                        Project [ss_ext_sales_price,i_item_id]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id]
+                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (2)
+                                              Project [d_date_sk]
+                                                BroadcastHashJoin [d_date,d_date]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [d_date_sk]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                  InputAdapter
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date]
+                                                              CometFilter [d_week_seq]
+                                                                Subquery #2
+                                                                  WholeStageCodegen (1)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [d_week_seq]
+                                                                          CometFilter [d_date]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  BroadcastExchange #4
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_item_sk,i_item_id]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #2
             InputAdapter
               BroadcastExchange #5
                 WholeStageCodegen (9)
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [cs_item_rev]
-                        CometHashAggregate [i_item_id,sum]
-                          CometColumnarExchange [i_item_id] #6
-                            RowToColumnar
-                              WholeStageCodegen (8)
-                                HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
-                                  Project [cs_ext_sales_price,i_item_id]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      Project [cs_ext_sales_price,cs_sold_date_sk,i_item_id]
-                                        BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [i_item_sk,i_item_id] #4
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #2
-        InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (14)
-              ColumnarToRow
-                InputAdapter
-                  CometFilter [ws_item_rev]
-                    CometHashAggregate [i_item_id,sum]
-                      CometColumnarExchange [i_item_id] #8
-                        RowToColumnar
-                          WholeStageCodegen (13)
-                            HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
-                              Project [ws_ext_sales_price,i_item_id]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  Project [ws_ext_sales_price,ws_sold_date_sk,i_item_id]
-                                    BroadcastHashJoin [ws_item_sk,i_item_sk]
+                  Filter [cs_item_rev]
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),item_id,cs_item_rev,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #6
+                          WholeStageCodegen (8)
+                            HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
+                              Project [cs_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                  Project [cs_ext_sales_price,cs_sold_date_sk,i_item_id]
+                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [ws_item_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                          CometFilter [cs_item_sk]
+                                            CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
                                               ReusedSubquery [d_date_sk] #1
                                       InputAdapter
                                         ReusedExchange [i_item_sk,i_item_id] #4
                                   InputAdapter
                                     ReusedExchange [d_date_sk] #2
+        InputAdapter
+          BroadcastExchange #7
+            WholeStageCodegen (14)
+              Filter [ws_item_rev]
+                HashAggregate [i_item_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),item_id,ws_item_rev,sum]
+                  InputAdapter
+                    Exchange [i_item_id] #8
+                      WholeStageCodegen (13)
+                        HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
+                          Project [ws_ext_sales_price,i_item_id]
+                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                              Project [ws_ext_sales_price,ws_sold_date_sk,i_item_id]
+                                BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ws_item_sk]
+                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                          ReusedSubquery [d_date_sk] #1
+                                  InputAdapter
+                                    ReusedExchange [i_item_sk,i_item_id] #4
+                              InputAdapter
+                                ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt
index d2241863e3..62b3f58686 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/explain.txt
@@ -1,51 +1,48 @@
 == Physical Plan ==
-TakeOrderedAndProject (47)
-+- * Project (46)
-   +- * BroadcastHashJoin Inner BuildRight (45)
-      :- * Project (27)
-      :  +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :- * Project (20)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-      :     :     :- * ColumnarToRow (14)
-      :     :     :  +- CometHashAggregate (13)
-      :     :     :     +- CometColumnarExchange (12)
-      :     :     :        +- RowToColumnar (11)
-      :     :     :           +- * HashAggregate (10)
-      :     :     :              +- * Project (9)
-      :     :     :                 +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :     :                    :- * ColumnarToRow (3)
-      :     :     :                    :  +- CometFilter (2)
-      :     :     :                    :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :     :                    +- BroadcastExchange (7)
-      :     :     :                       +- * ColumnarToRow (6)
-      :     :     :                          +- CometFilter (5)
-      :     :     :                             +- CometScan parquet spark_catalog.default.date_dim (4)
-      :     :     +- BroadcastExchange (18)
-      :     :        +- * ColumnarToRow (17)
-      :     :           +- CometFilter (16)
-      :     :              +- CometScan parquet spark_catalog.default.store (15)
-      :     +- BroadcastExchange (25)
-      :        +- * ColumnarToRow (24)
-      :           +- CometProject (23)
-      :              +- CometFilter (22)
-      :                 +- CometScan parquet spark_catalog.default.date_dim (21)
-      +- BroadcastExchange (44)
-         +- * Project (43)
-            +- * BroadcastHashJoin Inner BuildRight (42)
-               :- * Project (36)
-               :  +- * BroadcastHashJoin Inner BuildRight (35)
-               :     :- * ColumnarToRow (30)
-               :     :  +- CometHashAggregate (29)
-               :     :     +- ReusedExchange (28)
-               :     +- BroadcastExchange (34)
-               :        +- * ColumnarToRow (33)
-               :           +- CometFilter (32)
-               :              +- CometScan parquet spark_catalog.default.store (31)
-               +- BroadcastExchange (41)
-                  +- * ColumnarToRow (40)
-                     +- CometProject (39)
-                        +- CometFilter (38)
-                           +- CometScan parquet spark_catalog.default.date_dim (37)
+TakeOrderedAndProject (44)
++- * Project (43)
+   +- * BroadcastHashJoin Inner BuildRight (42)
+      :- * Project (25)
+      :  +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :- * Project (18)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :     :- * HashAggregate (12)
+      :     :     :  +- Exchange (11)
+      :     :     :     +- * HashAggregate (10)
+      :     :     :        +- * Project (9)
+      :     :     :           +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :     :              :- * ColumnarToRow (3)
+      :     :     :              :  +- CometFilter (2)
+      :     :     :              :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :     :              +- BroadcastExchange (7)
+      :     :     :                 +- * ColumnarToRow (6)
+      :     :     :                    +- CometFilter (5)
+      :     :     :                       +- CometScan parquet spark_catalog.default.date_dim (4)
+      :     :     +- BroadcastExchange (16)
+      :     :        +- * ColumnarToRow (15)
+      :     :           +- CometFilter (14)
+      :     :              +- CometScan parquet spark_catalog.default.store (13)
+      :     +- BroadcastExchange (23)
+      :        +- * ColumnarToRow (22)
+      :           +- CometProject (21)
+      :              +- CometFilter (20)
+      :                 +- CometScan parquet spark_catalog.default.date_dim (19)
+      +- BroadcastExchange (41)
+         +- * Project (40)
+            +- * BroadcastHashJoin Inner BuildRight (39)
+               :- * Project (33)
+               :  +- * BroadcastHashJoin Inner BuildRight (32)
+               :     :- * HashAggregate (27)
+               :     :  +- ReusedExchange (26)
+               :     +- BroadcastExchange (31)
+               :        +- * ColumnarToRow (30)
+               :           +- CometFilter (29)
+               :              +- CometScan parquet spark_catalog.default.store (28)
+               +- BroadcastExchange (38)
+                  +- * ColumnarToRow (37)
+                     +- CometProject (36)
+                        +- CometFilter (35)
+                           +- CometScan parquet spark_catalog.default.date_dim (34)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -98,167 +95,162 @@ Functions [7]: [partial_sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) T
 Aggregate Attributes [7]: [sum#7, sum#8, sum#9, sum#10, sum#11, sum#12, sum#13]
 Results [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
 
-(11) RowToColumnar
+(11) Exchange
 Input [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
+Arguments: hashpartitioning(d_week_seq#5, ss_store_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(12) CometColumnarExchange
-Input [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
-Arguments: hashpartitioning(d_week_seq#5, ss_store_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(13) CometHashAggregate
+(12) HashAggregate [codegen id : 10]
 Input [9]: [d_week_seq#5, ss_store_sk#1, sum#14, sum#15, sum#16, sum#17, sum#18, sum#19, sum#20]
 Keys [2]: [d_week_seq#5, ss_store_sk#1]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))]
-
-(14) ColumnarToRow [codegen id : 10]
-Input [9]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27]
+Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27]
+Results [9]: [d_week_seq#5, ss_store_sk#1, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21,17,2) AS sun_sales#28, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22,17,2) AS mon_sales#29, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23,17,2) AS tue_sales#30, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24,17,2) AS wed_sales#31, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25,17,2) AS thu_sales#32, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26,17,2) AS fri_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27,17,2) AS sat_sales#34]
 
 (unknown) Scan parquet spark_catalog.default.store
-Output [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
+Output [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_id)]
 ReadSchema: struct<s_store_sk:int,s_store_id:string,s_store_name:string>
 
-(16) CometFilter
-Input [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
-Condition : (isnotnull(s_store_sk#28) AND isnotnull(s_store_id#29))
+(14) CometFilter
+Input [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
+Condition : (isnotnull(s_store_sk#35) AND isnotnull(s_store_id#36))
 
-(17) ColumnarToRow [codegen id : 3]
-Input [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
+(15) ColumnarToRow [codegen id : 3]
+Input [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
 
-(18) BroadcastExchange
-Input [3]: [s_store_sk#28, s_store_id#29, s_store_name#30]
+(16) BroadcastExchange
+Input [3]: [s_store_sk#35, s_store_id#36, s_store_name#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(19) BroadcastHashJoin [codegen id : 10]
+(17) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ss_store_sk#1]
-Right keys [1]: [s_store_sk#28]
+Right keys [1]: [s_store_sk#35]
 Join type: Inner
 Join condition: None
 
-(20) Project [codegen id : 10]
-Output [10]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#29, s_store_name#30]
-Input [12]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_sk#28, s_store_id#29, s_store_name#30]
+(18) Project [codegen id : 10]
+Output [10]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#36, s_store_name#37]
+Input [12]: [d_week_seq#5, ss_store_sk#1, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_sk#35, s_store_id#36, s_store_name#37]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_month_seq#31, d_week_seq#32]
+Output [2]: [d_month_seq#38, d_week_seq#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_month_seq:int,d_week_seq:int>
 
-(22) CometFilter
-Input [2]: [d_month_seq#31, d_week_seq#32]
-Condition : (((isnotnull(d_month_seq#31) AND (d_month_seq#31 >= 1212)) AND (d_month_seq#31 <= 1223)) AND isnotnull(d_week_seq#32))
+(20) CometFilter
+Input [2]: [d_month_seq#38, d_week_seq#39]
+Condition : (((isnotnull(d_month_seq#38) AND (d_month_seq#38 >= 1212)) AND (d_month_seq#38 <= 1223)) AND isnotnull(d_week_seq#39))
 
-(23) CometProject
-Input [2]: [d_month_seq#31, d_week_seq#32]
-Arguments: [d_week_seq#32], [d_week_seq#32]
+(21) CometProject
+Input [2]: [d_month_seq#38, d_week_seq#39]
+Arguments: [d_week_seq#39], [d_week_seq#39]
 
-(24) ColumnarToRow [codegen id : 4]
-Input [1]: [d_week_seq#32]
+(22) ColumnarToRow [codegen id : 4]
+Input [1]: [d_week_seq#39]
 
-(25) BroadcastExchange
-Input [1]: [d_week_seq#32]
+(23) BroadcastExchange
+Input [1]: [d_week_seq#39]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(26) BroadcastHashJoin [codegen id : 10]
+(24) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [d_week_seq#5]
-Right keys [1]: [d_week_seq#32]
+Right keys [1]: [d_week_seq#39]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 10]
-Output [10]: [s_store_name#30 AS s_store_name1#33, d_week_seq#5 AS d_week_seq1#34, s_store_id#29 AS s_store_id1#35, sun_sales#21 AS sun_sales1#36, mon_sales#22 AS mon_sales1#37, tue_sales#23 AS tue_sales1#38, wed_sales#24 AS wed_sales1#39, thu_sales#25 AS thu_sales1#40, fri_sales#26 AS fri_sales1#41, sat_sales#27 AS sat_sales1#42]
-Input [11]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#29, s_store_name#30, d_week_seq#32]
+(25) Project [codegen id : 10]
+Output [10]: [s_store_name#37 AS s_store_name1#40, d_week_seq#5 AS d_week_seq1#41, s_store_id#36 AS s_store_id1#42, sun_sales#28 AS sun_sales1#43, mon_sales#29 AS mon_sales1#44, tue_sales#30 AS tue_sales1#45, wed_sales#31 AS wed_sales1#46, thu_sales#32 AS thu_sales1#47, fri_sales#33 AS fri_sales1#48, sat_sales#34 AS sat_sales1#49]
+Input [11]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#36, s_store_name#37, d_week_seq#39]
 
-(28) ReusedExchange [Reuses operator id: 12]
-Output [9]: [d_week_seq#5, ss_store_sk#1, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
+(26) ReusedExchange [Reuses operator id: 11]
+Output [9]: [d_week_seq#5, ss_store_sk#1, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
 
-(29) CometHashAggregate
-Input [9]: [d_week_seq#5, ss_store_sk#1, sum#43, sum#44, sum#45, sum#46, sum#47, sum#48, sum#49]
+(27) HashAggregate [codegen id : 9]
+Input [9]: [d_week_seq#5, ss_store_sk#1, sum#50, sum#51, sum#52, sum#53, sum#54, sum#55, sum#56]
 Keys [2]: [d_week_seq#5, ss_store_sk#1]
 Functions [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END)), sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))]
-
-(30) ColumnarToRow [codegen id : 9]
-Input [9]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27]
+Aggregate Attributes [7]: [sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26, sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27]
+Results [9]: [d_week_seq#5, ss_store_sk#1, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Sunday   ) THEN ss_sales_price#2 END))#21,17,2) AS sun_sales#28, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Monday   ) THEN ss_sales_price#2 END))#22,17,2) AS mon_sales#29, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Tuesday  ) THEN ss_sales_price#2 END))#23,17,2) AS tue_sales#30, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Wednesday) THEN ss_sales_price#2 END))#24,17,2) AS wed_sales#31, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Thursday ) THEN ss_sales_price#2 END))#25,17,2) AS thu_sales#32, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Friday   ) THEN ss_sales_price#2 END))#26,17,2) AS fri_sales#33, MakeDecimal(sum(UnscaledValue(CASE WHEN (d_day_name#6 = Saturday ) THEN ss_sales_price#2 END))#27,17,2) AS sat_sales#34]
 
 (unknown) Scan parquet spark_catalog.default.store
-Output [2]: [s_store_sk#50, s_store_id#51]
+Output [2]: [s_store_sk#57, s_store_id#58]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_id)]
 ReadSchema: struct<s_store_sk:int,s_store_id:string>
 
-(32) CometFilter
-Input [2]: [s_store_sk#50, s_store_id#51]
-Condition : (isnotnull(s_store_sk#50) AND isnotnull(s_store_id#51))
+(29) CometFilter
+Input [2]: [s_store_sk#57, s_store_id#58]
+Condition : (isnotnull(s_store_sk#57) AND isnotnull(s_store_id#58))
 
-(33) ColumnarToRow [codegen id : 7]
-Input [2]: [s_store_sk#50, s_store_id#51]
+(30) ColumnarToRow [codegen id : 7]
+Input [2]: [s_store_sk#57, s_store_id#58]
 
-(34) BroadcastExchange
-Input [2]: [s_store_sk#50, s_store_id#51]
+(31) BroadcastExchange
+Input [2]: [s_store_sk#57, s_store_id#58]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(35) BroadcastHashJoin [codegen id : 9]
+(32) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_store_sk#1]
-Right keys [1]: [s_store_sk#50]
+Right keys [1]: [s_store_sk#57]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 9]
-Output [9]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#51]
-Input [11]: [d_week_seq#5, ss_store_sk#1, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_sk#50, s_store_id#51]
+(33) Project [codegen id : 9]
+Output [9]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#58]
+Input [11]: [d_week_seq#5, ss_store_sk#1, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_sk#57, s_store_id#58]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_month_seq#52, d_week_seq#53]
+Output [2]: [d_month_seq#59, d_week_seq#60]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1224), LessThanOrEqual(d_month_seq,1235), IsNotNull(d_week_seq)]
 ReadSchema: struct<d_month_seq:int,d_week_seq:int>
 
-(38) CometFilter
-Input [2]: [d_month_seq#52, d_week_seq#53]
-Condition : (((isnotnull(d_month_seq#52) AND (d_month_seq#52 >= 1224)) AND (d_month_seq#52 <= 1235)) AND isnotnull(d_week_seq#53))
+(35) CometFilter
+Input [2]: [d_month_seq#59, d_week_seq#60]
+Condition : (((isnotnull(d_month_seq#59) AND (d_month_seq#59 >= 1224)) AND (d_month_seq#59 <= 1235)) AND isnotnull(d_week_seq#60))
 
-(39) CometProject
-Input [2]: [d_month_seq#52, d_week_seq#53]
-Arguments: [d_week_seq#53], [d_week_seq#53]
+(36) CometProject
+Input [2]: [d_month_seq#59, d_week_seq#60]
+Arguments: [d_week_seq#60], [d_week_seq#60]
 
-(40) ColumnarToRow [codegen id : 8]
-Input [1]: [d_week_seq#53]
+(37) ColumnarToRow [codegen id : 8]
+Input [1]: [d_week_seq#60]
 
-(41) BroadcastExchange
-Input [1]: [d_week_seq#53]
+(38) BroadcastExchange
+Input [1]: [d_week_seq#60]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
-(42) BroadcastHashJoin [codegen id : 9]
+(39) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [d_week_seq#5]
-Right keys [1]: [d_week_seq#53]
+Right keys [1]: [d_week_seq#60]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 9]
-Output [9]: [d_week_seq#5 AS d_week_seq2#54, s_store_id#51 AS s_store_id2#55, sun_sales#21 AS sun_sales2#56, mon_sales#22 AS mon_sales2#57, tue_sales#23 AS tue_sales2#58, wed_sales#24 AS wed_sales2#59, thu_sales#25 AS thu_sales2#60, fri_sales#26 AS fri_sales2#61, sat_sales#27 AS sat_sales2#62]
-Input [10]: [d_week_seq#5, sun_sales#21, mon_sales#22, tue_sales#23, wed_sales#24, thu_sales#25, fri_sales#26, sat_sales#27, s_store_id#51, d_week_seq#53]
+(40) Project [codegen id : 9]
+Output [9]: [d_week_seq#5 AS d_week_seq2#61, s_store_id#58 AS s_store_id2#62, sun_sales#28 AS sun_sales2#63, mon_sales#29 AS mon_sales2#64, tue_sales#30 AS tue_sales2#65, wed_sales#31 AS wed_sales2#66, thu_sales#32 AS thu_sales2#67, fri_sales#33 AS fri_sales2#68, sat_sales#34 AS sat_sales2#69]
+Input [10]: [d_week_seq#5, sun_sales#28, mon_sales#29, tue_sales#30, wed_sales#31, thu_sales#32, fri_sales#33, sat_sales#34, s_store_id#58, d_week_seq#60]
 
-(44) BroadcastExchange
-Input [9]: [d_week_seq2#54, s_store_id2#55, sun_sales2#56, mon_sales2#57, tue_sales2#58, wed_sales2#59, thu_sales2#60, fri_sales2#61, sat_sales2#62]
+(41) BroadcastExchange
+Input [9]: [d_week_seq2#61, s_store_id2#62, sun_sales2#63, mon_sales2#64, tue_sales2#65, wed_sales2#66, thu_sales2#67, fri_sales2#68, sat_sales2#69]
 Arguments: HashedRelationBroadcastMode(List(input[1, string, true], (input[0, int, true] - 52)),false), [plan_id=7]
 
-(45) BroadcastHashJoin [codegen id : 10]
-Left keys [2]: [s_store_id1#35, d_week_seq1#34]
-Right keys [2]: [s_store_id2#55, (d_week_seq2#54 - 52)]
+(42) BroadcastHashJoin [codegen id : 10]
+Left keys [2]: [s_store_id1#42, d_week_seq1#41]
+Right keys [2]: [s_store_id2#62, (d_week_seq2#61 - 52)]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 10]
-Output [10]: [s_store_name1#33, s_store_id1#35, d_week_seq1#34, (sun_sales1#36 / sun_sales2#56) AS (sun_sales1 / sun_sales2)#63, (mon_sales1#37 / mon_sales2#57) AS (mon_sales1 / mon_sales2)#64, (tue_sales1#38 / tue_sales2#58) AS (tue_sales1 / tue_sales2)#65, (wed_sales1#39 / wed_sales2#59) AS (wed_sales1 / wed_sales2)#66, (thu_sales1#40 / thu_sales2#60) AS (thu_sales1 / thu_sales2)#67, (fri_sales1#41 / fri_sales2#61) AS (fri_sales1 / fri_sales2)#68, (sat_sales1#42 / sat_sales2#62) AS (sat_sales1 / sat_sales2)#69]
-Input [19]: [s_store_name1#33, d_week_seq1#34, s_store_id1#35, sun_sales1#36, mon_sales1#37, tue_sales1#38, wed_sales1#39, thu_sales1#40, fri_sales1#41, sat_sales1#42, d_week_seq2#54, s_store_id2#55, sun_sales2#56, mon_sales2#57, tue_sales2#58, wed_sales2#59, thu_sales2#60, fri_sales2#61, sat_sales2#62]
+(43) Project [codegen id : 10]
+Output [10]: [s_store_name1#40, s_store_id1#42, d_week_seq1#41, (sun_sales1#43 / sun_sales2#63) AS (sun_sales1 / sun_sales2)#70, (mon_sales1#44 / mon_sales2#64) AS (mon_sales1 / mon_sales2)#71, (tue_sales1#45 / tue_sales2#65) AS (tue_sales1 / tue_sales2)#72, (wed_sales1#46 / wed_sales2#66) AS (wed_sales1 / wed_sales2)#73, (thu_sales1#47 / thu_sales2#67) AS (thu_sales1 / thu_sales2)#74, (fri_sales1#48 / fri_sales2#68) AS (fri_sales1 / fri_sales2)#75, (sat_sales1#49 / sat_sales2#69) AS (sat_sales1 / sat_sales2)#76]
+Input [19]: [s_store_name1#40, d_week_seq1#41, s_store_id1#42, sun_sales1#43, mon_sales1#44, tue_sales1#45, wed_sales1#46, thu_sales1#47, fri_sales1#48, sat_sales1#49, d_week_seq2#61, s_store_id2#62, sun_sales2#63, mon_sales2#64, tue_sales2#65, wed_sales2#66, thu_sales2#67, fri_sales2#68, sat_sales2#69]
 
-(47) TakeOrderedAndProject
-Input [10]: [s_store_name1#33, s_store_id1#35, d_week_seq1#34, (sun_sales1 / sun_sales2)#63, (mon_sales1 / mon_sales2)#64, (tue_sales1 / tue_sales2)#65, (wed_sales1 / wed_sales2)#66, (thu_sales1 / thu_sales2)#67, (fri_sales1 / fri_sales2)#68, (sat_sales1 / sat_sales2)#69]
-Arguments: 100, [s_store_name1#33 ASC NULLS FIRST, s_store_id1#35 ASC NULLS FIRST, d_week_seq1#34 ASC NULLS FIRST], [s_store_name1#33, s_store_id1#35, d_week_seq1#34, (sun_sales1 / sun_sales2)#63, (mon_sales1 / mon_sales2)#64, (tue_sales1 / tue_sales2)#65, (wed_sales1 / wed_sales2)#66, (thu_sales1 / thu_sales2)#67, (fri_sales1 / fri_sales2)#68, (sat_sales1 / sat_sales2)#69]
+(44) TakeOrderedAndProject
+Input [10]: [s_store_name1#40, s_store_id1#42, d_week_seq1#41, (sun_sales1 / sun_sales2)#70, (mon_sales1 / mon_sales2)#71, (tue_sales1 / tue_sales2)#72, (wed_sales1 / wed_sales2)#73, (thu_sales1 / thu_sales2)#74, (fri_sales1 / fri_sales2)#75, (sat_sales1 / sat_sales2)#76]
+Arguments: 100, [s_store_name1#40 ASC NULLS FIRST, s_store_id1#42 ASC NULLS FIRST, d_week_seq1#41 ASC NULLS FIRST], [s_store_name1#40, s_store_id1#42, d_week_seq1#41, (sun_sales1 / sun_sales2)#70, (mon_sales1 / mon_sales2)#71, (tue_sales1 / tue_sales2)#72, (wed_sales1 / wed_sales2)#73, (thu_sales1 / thu_sales2)#74, (fri_sales1 / fri_sales2)#75, (sat_sales1 / sat_sales2)#76]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt
index 6a17e8b98b..9ad61e946e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q59/simplified.txt
@@ -6,26 +6,24 @@ TakeOrderedAndProject [s_store_name1,s_store_id1,d_week_seq1,(sun_sales1 / sun_s
           BroadcastHashJoin [d_week_seq,d_week_seq]
             Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,s_store_id,s_store_name]
               BroadcastHashJoin [ss_store_sk,s_store_sk]
-                ColumnarToRow
+                HashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN ss_sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
                   InputAdapter
-                    CometHashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum]
-                      CometColumnarExchange [d_week_seq,ss_store_sk] #1
-                        RowToColumnar
-                          WholeStageCodegen (2)
-                            HashAggregate [d_week_seq,ss_store_sk,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                              Project [ss_store_sk,ss_sales_price,d_week_seq,d_day_name]
-                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ss_store_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [d_date_sk,d_week_seq]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
+                    Exchange [d_week_seq,ss_store_sk] #1
+                      WholeStageCodegen (2)
+                        HashAggregate [d_week_seq,ss_store_sk,d_day_name,ss_sales_price] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+                          Project [ss_store_sk,ss_sales_price,d_week_seq,d_day_name]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [ss_store_sk]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_sales_price,ss_sold_date_sk]
+                              InputAdapter
+                                BroadcastExchange #2
+                                  WholeStageCodegen (1)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [d_date_sk,d_week_seq]
+                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq,d_day_name]
                 InputAdapter
                   BroadcastExchange #3
                     WholeStageCodegen (3)
@@ -48,10 +46,9 @@ TakeOrderedAndProject [s_store_name1,s_store_id1,d_week_seq1,(sun_sales1 / sun_s
                 BroadcastHashJoin [d_week_seq,d_week_seq]
                   Project [d_week_seq,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,s_store_id]
                     BroadcastHashJoin [ss_store_sk,s_store_sk]
-                      ColumnarToRow
+                      HashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] [sum(UnscaledValue(CASE WHEN (d_day_name = Sunday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Monday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Tuesday  ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Wednesday) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Thursday ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Friday   ) THEN ss_sales_price END)),sum(UnscaledValue(CASE WHEN (d_day_name = Saturday ) THEN ss_sales_price END)),sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales,sum,sum,sum,sum,sum,sum,sum]
                         InputAdapter
-                          CometHashAggregate [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum]
-                            ReusedExchange [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] #1
+                          ReusedExchange [d_week_seq,ss_store_sk,sum,sum,sum,sum,sum,sum,sum] #1
                       InputAdapter
                         BroadcastExchange #6
                           WholeStageCodegen (7)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt
index 6ae031c893..5f34aa3df9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/explain.txt
@@ -1,45 +1,43 @@
 == Physical Plan ==
-* ColumnarToRow (41)
-+- CometTakeOrderedAndProject (40)
-   +- CometFilter (39)
-      +- CometHashAggregate (38)
-         +- CometColumnarExchange (37)
-            +- RowToColumnar (36)
-               +- * HashAggregate (35)
-                  +- * Project (34)
-                     +- * BroadcastHashJoin Inner BuildRight (33)
-                        :- * Project (18)
-                        :  +- * BroadcastHashJoin Inner BuildRight (17)
-                        :     :- * Project (15)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                        :     :     :- * Project (9)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                        :     :     :     :- * ColumnarToRow (3)
-                        :     :     :     :  +- CometFilter (2)
-                        :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
-                        :     :     :     +- BroadcastExchange (7)
-                        :     :     :        +- * ColumnarToRow (6)
-                        :     :     :           +- CometFilter (5)
-                        :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                        :     :     +- BroadcastExchange (13)
-                        :     :        +- * ColumnarToRow (12)
-                        :     :           +- CometFilter (11)
-                        :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
-                        :     +- ReusedExchange (16)
-                        +- BroadcastExchange (32)
-                           +- * Project (31)
-                              +- * BroadcastHashJoin Inner BuildRight (30)
-                                 :- * ColumnarToRow (21)
-                                 :  +- CometFilter (20)
-                                 :     +- CometScan parquet spark_catalog.default.item (19)
-                                 +- BroadcastExchange (29)
-                                    +- * ColumnarToRow (28)
-                                       +- CometFilter (27)
-                                          +- CometHashAggregate (26)
-                                             +- CometColumnarExchange (25)
-                                                +- CometHashAggregate (24)
-                                                   +- CometFilter (23)
-                                                      +- CometScan parquet spark_catalog.default.item (22)
+TakeOrderedAndProject (39)
++- * Filter (38)
+   +- * HashAggregate (37)
+      +- Exchange (36)
+         +- * HashAggregate (35)
+            +- * Project (34)
+               +- * BroadcastHashJoin Inner BuildRight (33)
+                  :- * Project (18)
+                  :  +- * BroadcastHashJoin Inner BuildRight (17)
+                  :     :- * Project (15)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :     :     :- * Project (9)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
+                  :     :     :     +- BroadcastExchange (7)
+                  :     :     :        +- * ColumnarToRow (6)
+                  :     :     :           +- CometFilter (5)
+                  :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                  :     :     +- BroadcastExchange (13)
+                  :     :        +- * ColumnarToRow (12)
+                  :     :           +- CometFilter (11)
+                  :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
+                  :     +- ReusedExchange (16)
+                  +- BroadcastExchange (32)
+                     +- * Project (31)
+                        +- * BroadcastHashJoin Inner BuildRight (30)
+                           :- * ColumnarToRow (21)
+                           :  +- CometFilter (20)
+                           :     +- CometScan parquet spark_catalog.default.item (19)
+                           +- BroadcastExchange (29)
+                              +- * ColumnarToRow (28)
+                                 +- CometFilter (27)
+                                    +- CometHashAggregate (26)
+                                       +- CometExchange (25)
+                                          +- CometHashAggregate (24)
+                                             +- CometFilter (23)
+                                                +- CometScan parquet spark_catalog.default.item (22)
 
 
 (unknown) Scan parquet spark_catalog.default.customer_address
@@ -113,7 +111,7 @@ Join condition: None
 Output [3]: [ca_state#2, ss_item_sk#5, ss_sold_date_sk#7]
 Input [5]: [ca_state#2, c_customer_sk#3, ss_item_sk#5, ss_customer_sk#6, ss_sold_date_sk#7]
 
-(16) ReusedExchange [Reuses operator id: 46]
+(16) ReusedExchange [Reuses operator id: 44]
 Output [1]: [d_date_sk#9]
 
 (17) BroadcastHashJoin [codegen id : 6]
@@ -156,9 +154,9 @@ Input [2]: [i_current_price#13, i_category#14]
 Keys [1]: [i_category#14]
 Functions [1]: [partial_avg(UnscaledValue(i_current_price#13))]
 
-(25) CometColumnarExchange
+(25) CometExchange
 Input [3]: [i_category#14, sum#15, count#16]
-Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
 (26) CometHashAggregate
 Input [3]: [i_category#14, sum#15, count#16]
@@ -207,101 +205,97 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#18]
 Results [2]: [ca_state#2, count#19]
 
-(36) RowToColumnar
+(36) Exchange
 Input [2]: [ca_state#2, count#19]
+Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(37) CometColumnarExchange
-Input [2]: [ca_state#2, count#19]
-Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(38) CometHashAggregate
+(37) HashAggregate [codegen id : 7]
 Input [2]: [ca_state#2, count#19]
 Keys [1]: [ca_state#2]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#20]
+Results [2]: [ca_state#2 AS state#21, count(1)#20 AS cnt#22]
 
-(39) CometFilter
-Input [2]: [state#20, cnt#21]
-Condition : (cnt#21 >= 10)
-
-(40) CometTakeOrderedAndProject
-Input [2]: [state#20, cnt#21]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[cnt#21 ASC NULLS FIRST], output=[state#20,cnt#21]), 100, [cnt#21 ASC NULLS FIRST], [state#20, cnt#21]
+(38) Filter [codegen id : 7]
+Input [2]: [state#21, cnt#22]
+Condition : (cnt#22 >= 10)
 
-(41) ColumnarToRow [codegen id : 7]
-Input [2]: [state#20, cnt#21]
+(39) TakeOrderedAndProject
+Input [2]: [state#21, cnt#22]
+Arguments: 100, [cnt#22 ASC NULLS FIRST], [state#21, cnt#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 10 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (46)
-+- * ColumnarToRow (45)
-   +- CometProject (44)
-      +- CometFilter (43)
-         +- CometScan parquet spark_catalog.default.date_dim (42)
+BroadcastExchange (44)
++- * ColumnarToRow (43)
+   +- CometProject (42)
+      +- CometFilter (41)
+         +- CometScan parquet spark_catalog.default.date_dim (40)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#9, d_month_seq#22]
+Output [2]: [d_date_sk#9, d_month_seq#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(43) CometFilter
-Input [2]: [d_date_sk#9, d_month_seq#22]
-Condition : ((isnotnull(d_month_seq#22) AND (d_month_seq#22 = Subquery scalar-subquery#23, [id=#24])) AND isnotnull(d_date_sk#9))
+(41) CometFilter
+Input [2]: [d_date_sk#9, d_month_seq#23]
+Condition : ((isnotnull(d_month_seq#23) AND (d_month_seq#23 = Subquery scalar-subquery#24, [id=#25])) AND isnotnull(d_date_sk#9))
 
-(44) CometProject
-Input [2]: [d_date_sk#9, d_month_seq#22]
+(42) CometProject
+Input [2]: [d_date_sk#9, d_month_seq#23]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(45) ColumnarToRow [codegen id : 1]
+(43) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(46) BroadcastExchange
+(44) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 43 Hosting Expression = Subquery scalar-subquery#23, [id=#24]
-* ColumnarToRow (53)
-+- CometHashAggregate (52)
-   +- CometColumnarExchange (51)
-      +- CometHashAggregate (50)
-         +- CometProject (49)
-            +- CometFilter (48)
-               +- CometScan parquet spark_catalog.default.date_dim (47)
+Subquery:2 Hosting operator id = 41 Hosting Expression = Subquery scalar-subquery#24, [id=#25]
+* ColumnarToRow (51)
++- CometHashAggregate (50)
+   +- CometExchange (49)
+      +- CometHashAggregate (48)
+         +- CometProject (47)
+            +- CometFilter (46)
+               +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#25, d_year#26, d_moy#27]
+Output [3]: [d_month_seq#26, d_year#27, d_moy#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,1)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(48) CometFilter
-Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
-Condition : (((isnotnull(d_year#26) AND isnotnull(d_moy#27)) AND (d_year#26 = 2000)) AND (d_moy#27 = 1))
+(46) CometFilter
+Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
+Condition : (((isnotnull(d_year#27) AND isnotnull(d_moy#28)) AND (d_year#27 = 2000)) AND (d_moy#28 = 1))
 
-(49) CometProject
-Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
-Arguments: [d_month_seq#25], [d_month_seq#25]
+(47) CometProject
+Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
+Arguments: [d_month_seq#26], [d_month_seq#26]
 
-(50) CometHashAggregate
-Input [1]: [d_month_seq#25]
-Keys [1]: [d_month_seq#25]
+(48) CometHashAggregate
+Input [1]: [d_month_seq#26]
+Keys [1]: [d_month_seq#26]
 Functions: []
 
-(51) CometColumnarExchange
-Input [1]: [d_month_seq#25]
-Arguments: hashpartitioning(d_month_seq#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(49) CometExchange
+Input [1]: [d_month_seq#26]
+Arguments: hashpartitioning(d_month_seq#26, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
 
-(52) CometHashAggregate
-Input [1]: [d_month_seq#25]
-Keys [1]: [d_month_seq#25]
+(50) CometHashAggregate
+Input [1]: [d_month_seq#26]
+Keys [1]: [d_month_seq#26]
 Functions: []
 
-(53) ColumnarToRow [codegen id : 1]
-Input [1]: [d_month_seq#25]
+(51) ColumnarToRow [codegen id : 1]
+Input [1]: [d_month_seq#26]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt
index b855d42f90..24a40f8040 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q6/simplified.txt
@@ -1,76 +1,74 @@
-WholeStageCodegen (7)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [cnt,state]
-        CometFilter [cnt]
-          CometHashAggregate [ca_state,count]
-            CometColumnarExchange [ca_state] #1
-              RowToColumnar
-                WholeStageCodegen (6)
-                  HashAggregate [ca_state] [count,count]
-                    Project [ca_state]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ca_state,ss_item_sk]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ca_state,ss_item_sk,ss_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                Project [ca_state,c_customer_sk]
-                                  BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                                    InputAdapter
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_current_addr_sk,c_customer_sk]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+TakeOrderedAndProject [cnt,state]
+  WholeStageCodegen (7)
+    Filter [cnt]
+      HashAggregate [ca_state,count] [count(1),state,cnt,count]
+        InputAdapter
+          Exchange [ca_state] #1
+            WholeStageCodegen (6)
+              HashAggregate [ca_state] [count,count]
+                Project [ca_state]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ca_state,ss_item_sk]
+                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                        Project [ca_state,ss_item_sk,ss_sold_date_sk]
+                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                            Project [ca_state,c_customer_sk]
+                              BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (2)
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (1)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [ss_customer_sk,ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #4
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_month_seq,d_date_sk]
-                                                            Subquery #2
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometHashAggregate [d_month_seq]
-                                                                      CometColumnarExchange [d_month_seq] #5
-                                                                        CometHashAggregate [d_month_seq]
-                                                                          CometProject [d_month_seq]
-                                                                            CometFilter [d_year,d_moy]
-                                                                              CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                          CometFilter [c_current_addr_sk,c_customer_sk]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk] #4
-                        InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (5)
-                              Project [i_item_sk]
-                                BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [i_current_price,i_category,i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
-                                  InputAdapter
-                                    BroadcastExchange #7
-                                      WholeStageCodegen (4)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [avg(i_current_price)]
-                                              CometHashAggregate [i_category,sum,count]
-                                                CometColumnarExchange [i_category] #8
-                                                  CometHashAggregate [i_category,i_current_price]
-                                                    CometFilter [i_category]
-                                                      CometScan parquet spark_catalog.default.item [i_current_price,i_category]
+                                      CometFilter [ss_customer_sk,ss_item_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_month_seq,d_date_sk]
+                                                        Subquery #2
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometHashAggregate [d_month_seq]
+                                                                  CometExchange [d_month_seq] #5
+                                                                    CometHashAggregate [d_month_seq]
+                                                                      CometProject [d_month_seq]
+                                                                        CometFilter [d_year,d_moy]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                        InputAdapter
+                          ReusedExchange [d_date_sk] #4
+                    InputAdapter
+                      BroadcastExchange #6
+                        WholeStageCodegen (5)
+                          Project [i_item_sk]
+                            BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [i_current_price,i_category,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
+                              InputAdapter
+                                BroadcastExchange #7
+                                  WholeStageCodegen (4)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [avg(i_current_price)]
+                                          CometHashAggregate [i_category,sum,count]
+                                            CometExchange [i_category] #8
+                                              CometHashAggregate [i_category,i_current_price]
+                                                CometFilter [i_category]
+                                                  CometScan parquet spark_catalog.default.item [i_current_price,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt
index accdce467d..8885bc8e5b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/explain.txt
@@ -1,71 +1,67 @@
 == Physical Plan ==
-* ColumnarToRow (67)
-+- CometTakeOrderedAndProject (66)
-   +- CometHashAggregate (65)
-      +- CometColumnarExchange (64)
-         +- CometHashAggregate (63)
-            +- CometUnion (62)
-               :- CometHashAggregate (29)
-               :  +- CometColumnarExchange (28)
-               :     +- RowToColumnar (27)
-               :        +- * HashAggregate (26)
-               :           +- * Project (25)
-               :              +- * BroadcastHashJoin Inner BuildRight (24)
-               :                 :- * Project (13)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :                 :     :- * Project (6)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :                 :     :     :- * ColumnarToRow (3)
-               :                 :     :     :  +- CometFilter (2)
-               :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                 :     :     +- ReusedExchange (4)
-               :                 :     +- BroadcastExchange (11)
-               :                 :        +- * ColumnarToRow (10)
-               :                 :           +- CometProject (9)
-               :                 :              +- CometFilter (8)
-               :                 :                 +- CometScan parquet spark_catalog.default.customer_address (7)
-               :                 +- BroadcastExchange (23)
-               :                    +- * BroadcastHashJoin LeftSemi BuildRight (22)
-               :                       :- * ColumnarToRow (16)
-               :                       :  +- CometFilter (15)
-               :                       :     +- CometScan parquet spark_catalog.default.item (14)
-               :                       +- BroadcastExchange (21)
-               :                          +- * ColumnarToRow (20)
-               :                             +- CometProject (19)
-               :                                +- CometFilter (18)
-               :                                   +- CometScan parquet spark_catalog.default.item (17)
-               :- CometHashAggregate (45)
-               :  +- CometColumnarExchange (44)
-               :     +- RowToColumnar (43)
-               :        +- * HashAggregate (42)
-               :           +- * Project (41)
-               :              +- * BroadcastHashJoin Inner BuildRight (40)
-               :                 :- * Project (38)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (37)
-               :                 :     :- * Project (35)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-               :                 :     :     :- * ColumnarToRow (32)
-               :                 :     :     :  +- CometFilter (31)
-               :                 :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
-               :                 :     :     +- ReusedExchange (33)
-               :                 :     +- ReusedExchange (36)
-               :                 +- ReusedExchange (39)
-               +- CometHashAggregate (61)
-                  +- CometColumnarExchange (60)
-                     +- RowToColumnar (59)
-                        +- * HashAggregate (58)
-                           +- * Project (57)
-                              +- * BroadcastHashJoin Inner BuildRight (56)
-                                 :- * Project (54)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (53)
-                                 :     :- * Project (51)
-                                 :     :  +- * BroadcastHashJoin Inner BuildRight (50)
-                                 :     :     :- * ColumnarToRow (48)
-                                 :     :     :  +- CometFilter (47)
-                                 :     :     :     +- CometScan parquet spark_catalog.default.web_sales (46)
-                                 :     :     +- ReusedExchange (49)
-                                 :     +- ReusedExchange (52)
-                                 +- ReusedExchange (55)
+TakeOrderedAndProject (63)
++- * HashAggregate (62)
+   +- Exchange (61)
+      +- * HashAggregate (60)
+         +- Union (59)
+            :- * HashAggregate (28)
+            :  +- Exchange (27)
+            :     +- * HashAggregate (26)
+            :        +- * Project (25)
+            :           +- * BroadcastHashJoin Inner BuildRight (24)
+            :              :- * Project (13)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (12)
+            :              :     :- * Project (6)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+            :              :     :     :- * ColumnarToRow (3)
+            :              :     :     :  +- CometFilter (2)
+            :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :              :     :     +- ReusedExchange (4)
+            :              :     +- BroadcastExchange (11)
+            :              :        +- * ColumnarToRow (10)
+            :              :           +- CometProject (9)
+            :              :              +- CometFilter (8)
+            :              :                 +- CometScan parquet spark_catalog.default.customer_address (7)
+            :              +- BroadcastExchange (23)
+            :                 +- * BroadcastHashJoin LeftSemi BuildRight (22)
+            :                    :- * ColumnarToRow (16)
+            :                    :  +- CometFilter (15)
+            :                    :     +- CometScan parquet spark_catalog.default.item (14)
+            :                    +- BroadcastExchange (21)
+            :                       +- * ColumnarToRow (20)
+            :                          +- CometProject (19)
+            :                             +- CometFilter (18)
+            :                                +- CometScan parquet spark_catalog.default.item (17)
+            :- * HashAggregate (43)
+            :  +- Exchange (42)
+            :     +- * HashAggregate (41)
+            :        +- * Project (40)
+            :           +- * BroadcastHashJoin Inner BuildRight (39)
+            :              :- * Project (37)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (36)
+            :              :     :- * Project (34)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (33)
+            :              :     :     :- * ColumnarToRow (31)
+            :              :     :     :  +- CometFilter (30)
+            :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (29)
+            :              :     :     +- ReusedExchange (32)
+            :              :     +- ReusedExchange (35)
+            :              +- ReusedExchange (38)
+            +- * HashAggregate (58)
+               +- Exchange (57)
+                  +- * HashAggregate (56)
+                     +- * Project (55)
+                        +- * BroadcastHashJoin Inner BuildRight (54)
+                           :- * Project (52)
+                           :  +- * BroadcastHashJoin Inner BuildRight (51)
+                           :     :- * Project (49)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (48)
+                           :     :     :- * ColumnarToRow (46)
+                           :     :     :  +- CometFilter (45)
+                           :     :     :     +- CometScan parquet spark_catalog.default.web_sales (44)
+                           :     :     +- ReusedExchange (47)
+                           :     +- ReusedExchange (50)
+                           +- ReusedExchange (53)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -83,7 +79,7 @@ Condition : (isnotnull(ss_addr_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_addr_sk#2, ss_ext_sales_price#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 72]
+(4) ReusedExchange [Reuses operator id: 68]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -191,224 +187,219 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#3))]
 Aggregate Attributes [1]: [sum#13]
 Results [2]: [i_item_id#10, sum#14]
 
-(27) RowToColumnar
+(27) Exchange
 Input [2]: [i_item_id#10, sum#14]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [2]: [i_item_id#10, sum#14]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 6]
 Input [2]: [i_item_id#10, sum#14]
 Keys [1]: [i_item_id#10]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#3))#15]
+Results [2]: [i_item_id#10, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#15,17,2) AS total_sales#16]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+Output [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#18), dynamicpruningexpression(cs_sold_date_sk#18 IN dynamicpruning#19)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#20), dynamicpruningexpression(cs_sold_date_sk#20 IN dynamicpruning#21)]
 PushedFilters: [IsNotNull(cs_bill_addr_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_addr_sk:int,cs_item_sk:int,cs_ext_sales_price:decimal(7,2)>
 
-(31) CometFilter
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
-Condition : (isnotnull(cs_bill_addr_sk#15) AND isnotnull(cs_item_sk#16))
+(30) CometFilter
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
+Condition : (isnotnull(cs_bill_addr_sk#17) AND isnotnull(cs_item_sk#18))
 
-(32) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18]
+(31) ColumnarToRow [codegen id : 11]
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20]
 
-(33) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#20]
+(32) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#22]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#18]
-Right keys [1]: [d_date_sk#20]
+(33) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_sold_date_sk#20]
+Right keys [1]: [d_date_sk#22]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [3]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17]
-Input [5]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, cs_sold_date_sk#18, d_date_sk#20]
+(34) Project [codegen id : 11]
+Output [3]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19]
+Input [5]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, cs_sold_date_sk#20, d_date_sk#22]
 
-(36) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#21]
+(35) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#23]
 
-(37) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_bill_addr_sk#15]
-Right keys [1]: [ca_address_sk#21]
+(36) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_bill_addr_sk#17]
+Right keys [1]: [ca_address_sk#23]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
-Output [2]: [cs_item_sk#16, cs_ext_sales_price#17]
-Input [4]: [cs_bill_addr_sk#15, cs_item_sk#16, cs_ext_sales_price#17, ca_address_sk#21]
+(37) Project [codegen id : 11]
+Output [2]: [cs_item_sk#18, cs_ext_sales_price#19]
+Input [4]: [cs_bill_addr_sk#17, cs_item_sk#18, cs_ext_sales_price#19, ca_address_sk#23]
 
-(39) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#22, i_item_id#23]
+(38) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#24, i_item_id#25]
 
-(40) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_item_sk#16]
-Right keys [1]: [i_item_sk#22]
+(39) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_item_sk#18]
+Right keys [1]: [i_item_sk#24]
 Join type: Inner
 Join condition: None
 
-(41) Project [codegen id : 10]
-Output [2]: [cs_ext_sales_price#17, i_item_id#23]
-Input [4]: [cs_item_sk#16, cs_ext_sales_price#17, i_item_sk#22, i_item_id#23]
-
-(42) HashAggregate [codegen id : 10]
-Input [2]: [cs_ext_sales_price#17, i_item_id#23]
-Keys [1]: [i_item_id#23]
-Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#17))]
-Aggregate Attributes [1]: [sum#24]
-Results [2]: [i_item_id#23, sum#25]
+(40) Project [codegen id : 11]
+Output [2]: [cs_ext_sales_price#19, i_item_id#25]
+Input [4]: [cs_item_sk#18, cs_ext_sales_price#19, i_item_sk#24, i_item_id#25]
 
-(43) RowToColumnar
-Input [2]: [i_item_id#23, sum#25]
+(41) HashAggregate [codegen id : 11]
+Input [2]: [cs_ext_sales_price#19, i_item_id#25]
+Keys [1]: [i_item_id#25]
+Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#19))]
+Aggregate Attributes [1]: [sum#26]
+Results [2]: [i_item_id#25, sum#27]
 
-(44) CometColumnarExchange
-Input [2]: [i_item_id#23, sum#25]
-Arguments: hashpartitioning(i_item_id#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(42) Exchange
+Input [2]: [i_item_id#25, sum#27]
+Arguments: hashpartitioning(i_item_id#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(45) CometHashAggregate
-Input [2]: [i_item_id#23, sum#25]
-Keys [1]: [i_item_id#23]
-Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#17))]
+(43) HashAggregate [codegen id : 12]
+Input [2]: [i_item_id#25, sum#27]
+Keys [1]: [i_item_id#25]
+Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#19))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#19))#28]
+Results [2]: [i_item_id#25, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#19))#28,17,2) AS total_sales#29]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+Output [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#29), dynamicpruningexpression(ws_sold_date_sk#29 IN dynamicpruning#30)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
 PushedFilters: [IsNotNull(ws_bill_addr_sk), IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_addr_sk:int,ws_ext_sales_price:decimal(7,2)>
 
-(47) CometFilter
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
-Condition : (isnotnull(ws_bill_addr_sk#27) AND isnotnull(ws_item_sk#26))
+(45) CometFilter
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
+Condition : (isnotnull(ws_bill_addr_sk#31) AND isnotnull(ws_item_sk#30))
 
-(48) ColumnarToRow [codegen id : 15]
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29]
+(46) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33]
 
-(49) ReusedExchange [Reuses operator id: 72]
-Output [1]: [d_date_sk#31]
+(47) ReusedExchange [Reuses operator id: 68]
+Output [1]: [d_date_sk#35]
 
-(50) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_sold_date_sk#29]
-Right keys [1]: [d_date_sk#31]
+(48) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#33]
+Right keys [1]: [d_date_sk#35]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 15]
-Output [3]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28]
-Input [5]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ws_sold_date_sk#29, d_date_sk#31]
+(49) Project [codegen id : 17]
+Output [3]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32]
+Input [5]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ws_sold_date_sk#33, d_date_sk#35]
 
-(52) ReusedExchange [Reuses operator id: 11]
-Output [1]: [ca_address_sk#32]
+(50) ReusedExchange [Reuses operator id: 11]
+Output [1]: [ca_address_sk#36]
 
-(53) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_bill_addr_sk#27]
-Right keys [1]: [ca_address_sk#32]
+(51) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_bill_addr_sk#31]
+Right keys [1]: [ca_address_sk#36]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 15]
-Output [2]: [ws_item_sk#26, ws_ext_sales_price#28]
-Input [4]: [ws_item_sk#26, ws_bill_addr_sk#27, ws_ext_sales_price#28, ca_address_sk#32]
+(52) Project [codegen id : 17]
+Output [2]: [ws_item_sk#30, ws_ext_sales_price#32]
+Input [4]: [ws_item_sk#30, ws_bill_addr_sk#31, ws_ext_sales_price#32, ca_address_sk#36]
 
-(55) ReusedExchange [Reuses operator id: 23]
-Output [2]: [i_item_sk#33, i_item_id#34]
+(53) ReusedExchange [Reuses operator id: 23]
+Output [2]: [i_item_sk#37, i_item_id#38]
 
-(56) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ws_item_sk#26]
-Right keys [1]: [i_item_sk#33]
+(54) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_item_sk#30]
+Right keys [1]: [i_item_sk#37]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 15]
-Output [2]: [ws_ext_sales_price#28, i_item_id#34]
-Input [4]: [ws_item_sk#26, ws_ext_sales_price#28, i_item_sk#33, i_item_id#34]
+(55) Project [codegen id : 17]
+Output [2]: [ws_ext_sales_price#32, i_item_id#38]
+Input [4]: [ws_item_sk#30, ws_ext_sales_price#32, i_item_sk#37, i_item_id#38]
 
-(58) HashAggregate [codegen id : 15]
-Input [2]: [ws_ext_sales_price#28, i_item_id#34]
-Keys [1]: [i_item_id#34]
-Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#28))]
-Aggregate Attributes [1]: [sum#35]
-Results [2]: [i_item_id#34, sum#36]
+(56) HashAggregate [codegen id : 17]
+Input [2]: [ws_ext_sales_price#32, i_item_id#38]
+Keys [1]: [i_item_id#38]
+Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#32))]
+Aggregate Attributes [1]: [sum#39]
+Results [2]: [i_item_id#38, sum#40]
 
-(59) RowToColumnar
-Input [2]: [i_item_id#34, sum#36]
+(57) Exchange
+Input [2]: [i_item_id#38, sum#40]
+Arguments: hashpartitioning(i_item_id#38, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(60) CometColumnarExchange
-Input [2]: [i_item_id#34, sum#36]
-Arguments: hashpartitioning(i_item_id#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(58) HashAggregate [codegen id : 18]
+Input [2]: [i_item_id#38, sum#40]
+Keys [1]: [i_item_id#38]
+Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#32))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#32))#41]
+Results [2]: [i_item_id#38, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#32))#41,17,2) AS total_sales#42]
 
-(61) CometHashAggregate
-Input [2]: [i_item_id#34, sum#36]
-Keys [1]: [i_item_id#34]
-Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#28))]
+(59) Union
 
-(62) CometUnion
-Child 0 Input [2]: [i_item_id#10, total_sales#37]
-Child 1 Input [2]: [i_item_id#23, total_sales#38]
-Child 2 Input [2]: [i_item_id#34, total_sales#39]
-
-(63) CometHashAggregate
-Input [2]: [i_item_id#10, total_sales#37]
+(60) HashAggregate [codegen id : 19]
+Input [2]: [i_item_id#10, total_sales#16]
 Keys [1]: [i_item_id#10]
-Functions [1]: [partial_sum(total_sales#37)]
+Functions [1]: [partial_sum(total_sales#16)]
+Aggregate Attributes [2]: [sum#43, isEmpty#44]
+Results [3]: [i_item_id#10, sum#45, isEmpty#46]
 
-(64) CometColumnarExchange
-Input [3]: [i_item_id#10, sum#40, isEmpty#41]
-Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(61) Exchange
+Input [3]: [i_item_id#10, sum#45, isEmpty#46]
+Arguments: hashpartitioning(i_item_id#10, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(65) CometHashAggregate
-Input [3]: [i_item_id#10, sum#40, isEmpty#41]
+(62) HashAggregate [codegen id : 20]
+Input [3]: [i_item_id#10, sum#45, isEmpty#46]
 Keys [1]: [i_item_id#10]
-Functions [1]: [sum(total_sales#37)]
-
-(66) CometTakeOrderedAndProject
-Input [2]: [i_item_id#10, total_sales#42]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#10 ASC NULLS FIRST,total_sales#42 ASC NULLS FIRST], output=[i_item_id#10,total_sales#42]), 100, [i_item_id#10 ASC NULLS FIRST, total_sales#42 ASC NULLS FIRST], [i_item_id#10, total_sales#42]
+Functions [1]: [sum(total_sales#16)]
+Aggregate Attributes [1]: [sum(total_sales#16)#47]
+Results [2]: [i_item_id#10, sum(total_sales#16)#47 AS total_sales#48]
 
-(67) ColumnarToRow [codegen id : 16]
-Input [2]: [i_item_id#10, total_sales#42]
+(63) TakeOrderedAndProject
+Input [2]: [i_item_id#10, total_sales#48]
+Arguments: 100, [i_item_id#10 ASC NULLS FIRST, total_sales#48 ASC NULLS FIRST], [i_item_id#10, total_sales#48]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (72)
-+- * ColumnarToRow (71)
-   +- CometProject (70)
-      +- CometFilter (69)
-         +- CometScan parquet spark_catalog.default.date_dim (68)
+BroadcastExchange (68)
++- * ColumnarToRow (67)
+   +- CometProject (66)
+      +- CometFilter (65)
+         +- CometScan parquet spark_catalog.default.date_dim (64)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#6, d_year#43, d_moy#44]
+Output [3]: [d_date_sk#6, d_year#49, d_moy#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,9), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(69) CometFilter
-Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
-Condition : ((((isnotnull(d_year#43) AND isnotnull(d_moy#44)) AND (d_year#43 = 1998)) AND (d_moy#44 = 9)) AND isnotnull(d_date_sk#6))
+(65) CometFilter
+Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
+Condition : ((((isnotnull(d_year#49) AND isnotnull(d_moy#50)) AND (d_year#49 = 1998)) AND (d_moy#50 = 9)) AND isnotnull(d_date_sk#6))
 
-(70) CometProject
-Input [3]: [d_date_sk#6, d_year#43, d_moy#44]
+(66) CometProject
+Input [3]: [d_date_sk#6, d_year#49, d_moy#50]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(71) ColumnarToRow [codegen id : 1]
+(67) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(72) BroadcastExchange
+(68) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 29 Hosting Expression = cs_sold_date_sk#20 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 46 Hosting Expression = ws_sold_date_sk#29 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 44 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt
index bad7cbf2b4..b010414a86 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q60/simplified.txt
@@ -1,101 +1,105 @@
-WholeStageCodegen (16)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,total_sales]
-        CometHashAggregate [i_item_id,sum,isEmpty]
-          CometColumnarExchange [i_item_id] #1
-            CometHashAggregate [i_item_id,total_sales]
-              CometUnion
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #2
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
-                          Project [ss_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              Project [ss_item_sk,ss_ext_sales_price]
-                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                  Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_addr_sk,ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #3
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_year,d_moy,d_date_sk]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk] #3
-                                  InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (2)
-                                        ColumnarToRow
+TakeOrderedAndProject [i_item_id,total_sales]
+  WholeStageCodegen (20)
+    HashAggregate [i_item_id,sum,isEmpty] [sum(total_sales),total_sales,sum,isEmpty]
+      InputAdapter
+        Exchange [i_item_id] #1
+          WholeStageCodegen (19)
+            HashAggregate [i_item_id,total_sales] [sum,isEmpty,sum,isEmpty]
+              InputAdapter
+                Union
+                  WholeStageCodegen (6)
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ss_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #2
+                          WholeStageCodegen (5)
+                            HashAggregate [i_item_id,ss_ext_sales_price] [sum,sum]
+                              Project [ss_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                      Project [ss_item_sk,ss_addr_sk,ss_ext_sales_price]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_addr_sk,ss_item_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_addr_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                  SubqueryBroadcast [d_date_sk] #1
+                                                    BroadcastExchange #3
+                                                      WholeStageCodegen (1)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [d_date_sk]
+                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                           InputAdapter
-                                            CometProject [ca_address_sk]
-                                              CometFilter [ca_gmt_offset,ca_address_sk]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (4)
-                                    BroadcastHashJoin [i_item_id,i_item_id]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        BroadcastExchange #6
-                                          WholeStageCodegen (3)
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (2)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [i_item_id]
-                                                  CometFilter [i_category]
-                                                    CometScan parquet spark_catalog.default.item [i_item_id,i_category]
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #7
-                    RowToColumnar
-                      WholeStageCodegen (10)
-                        HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
-                          Project [cs_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [cs_item_sk,i_item_sk]
-                              Project [cs_item_sk,cs_ext_sales_price]
-                                BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
-                                  Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [cs_bill_addr_sk,cs_item_sk]
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                                CometProject [ca_address_sk]
+                                                  CometFilter [ca_gmt_offset,ca_address_sk]
+                                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                                  InputAdapter
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (4)
+                                        BroadcastHashJoin [i_item_id,i_item_id]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [i_item_sk]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                                          InputAdapter
+                                            BroadcastExchange #6
+                                              WholeStageCodegen (3)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [i_item_id]
+                                                      CometFilter [i_category]
+                                                        CometScan parquet spark_catalog.default.item [i_item_id,i_category]
+                  WholeStageCodegen (12)
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(cs_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #7
+                          WholeStageCodegen (11)
+                            HashAggregate [i_item_id,cs_ext_sales_price] [sum,sum]
+                              Project [cs_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                  Project [cs_item_sk,cs_ext_sales_price]
+                                    BroadcastHashJoin [cs_bill_addr_sk,ca_address_sk]
+                                      Project [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [cs_bill_addr_sk,cs_item_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                        ReusedExchange [ca_address_sk] #4
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #4
-                              InputAdapter
-                                ReusedExchange [i_item_sk,i_item_id] #5
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #8
-                    RowToColumnar
-                      WholeStageCodegen (15)
-                        HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
-                          Project [ws_ext_sales_price,i_item_id]
-                            BroadcastHashJoin [ws_item_sk,i_item_sk]
-                              Project [ws_item_sk,ws_ext_sales_price]
-                                BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
-                                  Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ws_bill_addr_sk,ws_item_sk]
-                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                    ReusedExchange [i_item_sk,i_item_id] #5
+                  WholeStageCodegen (18)
+                    HashAggregate [i_item_id,sum] [sum(UnscaledValue(ws_ext_sales_price)),total_sales,sum]
+                      InputAdapter
+                        Exchange [i_item_id] #8
+                          WholeStageCodegen (17)
+                            HashAggregate [i_item_id,ws_ext_sales_price] [sum,sum]
+                              Project [ws_ext_sales_price,i_item_id]
+                                BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                  Project [ws_item_sk,ws_ext_sales_price]
+                                    BroadcastHashJoin [ws_bill_addr_sk,ca_address_sk]
+                                      Project [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_bill_addr_sk,ws_item_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk] #3
+                                        ReusedExchange [ca_address_sk] #4
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #4
-                              InputAdapter
-                                ReusedExchange [i_item_sk,i_item_id] #5
+                                    ReusedExchange [i_item_sk,i_item_id] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt
index 69767b1f68..ee9a8409a2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/explain.txt
@@ -1,75 +1,71 @@
 == Physical Plan ==
-* Project (71)
-+- * BroadcastNestedLoopJoin Inner BuildRight (70)
-   :- * ColumnarToRow (45)
-   :  +- CometHashAggregate (44)
-   :     +- CometColumnarExchange (43)
-   :        +- RowToColumnar (42)
-   :           +- * HashAggregate (41)
-   :              +- * Project (40)
-   :                 +- * BroadcastHashJoin Inner BuildRight (39)
-   :                    :- * Project (33)
-   :                    :  +- * BroadcastHashJoin Inner BuildRight (32)
-   :                    :     :- * Project (26)
-   :                    :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-   :                    :     :     :- * Project (20)
-   :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-   :                    :     :     :     :- * Project (17)
-   :                    :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-   :                    :     :     :     :     :- * Project (10)
-   :                    :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-   :                    :     :     :     :     :     :- * ColumnarToRow (3)
-   :                    :     :     :     :     :     :  +- CometFilter (2)
-   :                    :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :                    :     :     :     :     :     +- BroadcastExchange (8)
-   :                    :     :     :     :     :        +- * ColumnarToRow (7)
-   :                    :     :     :     :     :           +- CometProject (6)
-   :                    :     :     :     :     :              +- CometFilter (5)
-   :                    :     :     :     :     :                 +- CometScan parquet spark_catalog.default.store (4)
-   :                    :     :     :     :     +- BroadcastExchange (15)
-   :                    :     :     :     :        +- * ColumnarToRow (14)
-   :                    :     :     :     :           +- CometProject (13)
-   :                    :     :     :     :              +- CometFilter (12)
-   :                    :     :     :     :                 +- CometScan parquet spark_catalog.default.promotion (11)
-   :                    :     :     :     +- ReusedExchange (18)
-   :                    :     :     +- BroadcastExchange (24)
-   :                    :     :        +- * ColumnarToRow (23)
-   :                    :     :           +- CometFilter (22)
-   :                    :     :              +- CometScan parquet spark_catalog.default.customer (21)
-   :                    :     +- BroadcastExchange (31)
-   :                    :        +- * ColumnarToRow (30)
-   :                    :           +- CometProject (29)
-   :                    :              +- CometFilter (28)
-   :                    :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-   :                    +- BroadcastExchange (38)
-   :                       +- * ColumnarToRow (37)
-   :                          +- CometProject (36)
-   :                             +- CometFilter (35)
-   :                                +- CometScan parquet spark_catalog.default.item (34)
-   +- BroadcastExchange (69)
-      +- * ColumnarToRow (68)
-         +- CometHashAggregate (67)
-            +- CometColumnarExchange (66)
-               +- RowToColumnar (65)
-                  +- * HashAggregate (64)
-                     +- * Project (63)
-                        +- * BroadcastHashJoin Inner BuildRight (62)
-                           :- * Project (60)
-                           :  +- * BroadcastHashJoin Inner BuildRight (59)
-                           :     :- * Project (57)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (56)
-                           :     :     :- * Project (54)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
-                           :     :     :     :- * Project (51)
-                           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (50)
-                           :     :     :     :     :- * ColumnarToRow (48)
-                           :     :     :     :     :  +- CometFilter (47)
-                           :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (46)
-                           :     :     :     :     +- ReusedExchange (49)
-                           :     :     :     +- ReusedExchange (52)
-                           :     :     +- ReusedExchange (55)
-                           :     +- ReusedExchange (58)
-                           +- ReusedExchange (61)
+* Project (67)
++- * BroadcastNestedLoopJoin Inner BuildRight (66)
+   :- * HashAggregate (43)
+   :  +- Exchange (42)
+   :     +- * HashAggregate (41)
+   :        +- * Project (40)
+   :           +- * BroadcastHashJoin Inner BuildRight (39)
+   :              :- * Project (33)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (32)
+   :              :     :- * Project (26)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+   :              :     :     :- * Project (20)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+   :              :     :     :     :- * Project (17)
+   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+   :              :     :     :     :     :- * Project (10)
+   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+   :              :     :     :     :     :     :- * ColumnarToRow (3)
+   :              :     :     :     :     :     :  +- CometFilter (2)
+   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :              :     :     :     :     :     +- BroadcastExchange (8)
+   :              :     :     :     :     :        +- * ColumnarToRow (7)
+   :              :     :     :     :     :           +- CometProject (6)
+   :              :     :     :     :     :              +- CometFilter (5)
+   :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.store (4)
+   :              :     :     :     :     +- BroadcastExchange (15)
+   :              :     :     :     :        +- * ColumnarToRow (14)
+   :              :     :     :     :           +- CometProject (13)
+   :              :     :     :     :              +- CometFilter (12)
+   :              :     :     :     :                 +- CometScan parquet spark_catalog.default.promotion (11)
+   :              :     :     :     +- ReusedExchange (18)
+   :              :     :     +- BroadcastExchange (24)
+   :              :     :        +- * ColumnarToRow (23)
+   :              :     :           +- CometFilter (22)
+   :              :     :              +- CometScan parquet spark_catalog.default.customer (21)
+   :              :     +- BroadcastExchange (31)
+   :              :        +- * ColumnarToRow (30)
+   :              :           +- CometProject (29)
+   :              :              +- CometFilter (28)
+   :              :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+   :              +- BroadcastExchange (38)
+   :                 +- * ColumnarToRow (37)
+   :                    +- CometProject (36)
+   :                       +- CometFilter (35)
+   :                          +- CometScan parquet spark_catalog.default.item (34)
+   +- BroadcastExchange (65)
+      +- * HashAggregate (64)
+         +- Exchange (63)
+            +- * HashAggregate (62)
+               +- * Project (61)
+                  +- * BroadcastHashJoin Inner BuildRight (60)
+                     :- * Project (58)
+                     :  +- * BroadcastHashJoin Inner BuildRight (57)
+                     :     :- * Project (55)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
+                     :     :     :- * Project (52)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (51)
+                     :     :     :     :- * Project (49)
+                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (48)
+                     :     :     :     :     :- * ColumnarToRow (46)
+                     :     :     :     :     :  +- CometFilter (45)
+                     :     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (44)
+                     :     :     :     :     +- ReusedExchange (47)
+                     :     :     :     +- ReusedExchange (50)
+                     :     :     +- ReusedExchange (53)
+                     :     +- ReusedExchange (56)
+                     +- ReusedExchange (59)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -151,7 +147,7 @@ Join condition: None
 Output [4]: [ss_item_sk#1, ss_customer_sk#2, ss_ext_sales_price#5, ss_sold_date_sk#6]
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_promo_sk#4, ss_ext_sales_price#5, ss_sold_date_sk#6, p_promo_sk#10]
 
-(18) ReusedExchange [Reuses operator id: 76]
+(18) ReusedExchange [Reuses operator id: 72]
 Output [1]: [d_date_sk#14]
 
 (19) BroadcastHashJoin [codegen id : 7]
@@ -263,167 +259,159 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#5))]
 Aggregate Attributes [1]: [sum#21]
 Results [1]: [sum#22]
 
-(42) RowToColumnar
+(42) Exchange
 Input [1]: [sum#22]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
 
-(43) CometColumnarExchange
-Input [1]: [sum#22]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(44) CometHashAggregate
+(43) HashAggregate [codegen id : 15]
 Input [1]: [sum#22]
 Keys: []
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#5))]
-
-(45) ColumnarToRow [codegen id : 15]
-Input [1]: [promotions#23]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#5))#23]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#5))#23,17,2) AS promotions#24]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [5]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
+Output [5]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#28), dynamicpruningexpression(ss_sold_date_sk#28 IN dynamicpruning#29)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#29), dynamicpruningexpression(ss_sold_date_sk#29 IN dynamicpruning#30)]
 PushedFilters: [IsNotNull(ss_store_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_store_sk:int,ss_ext_sales_price:decimal(7,2)>
 
-(47) CometFilter
-Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
-Condition : ((isnotnull(ss_store_sk#26) AND isnotnull(ss_customer_sk#25)) AND isnotnull(ss_item_sk#24))
+(45) CometFilter
+Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29]
+Condition : ((isnotnull(ss_store_sk#27) AND isnotnull(ss_customer_sk#26)) AND isnotnull(ss_item_sk#25))
 
-(48) ColumnarToRow [codegen id : 13]
-Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28]
+(46) ColumnarToRow [codegen id : 13]
+Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29]
 
-(49) ReusedExchange [Reuses operator id: 8]
-Output [1]: [s_store_sk#30]
+(47) ReusedExchange [Reuses operator id: 8]
+Output [1]: [s_store_sk#31]
 
-(50) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_store_sk#26]
-Right keys [1]: [s_store_sk#30]
+(48) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_store_sk#27]
+Right keys [1]: [s_store_sk#31]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 13]
-Output [4]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27, ss_sold_date_sk#28]
-Input [6]: [ss_item_sk#24, ss_customer_sk#25, ss_store_sk#26, ss_ext_sales_price#27, ss_sold_date_sk#28, s_store_sk#30]
+(49) Project [codegen id : 13]
+Output [4]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28, ss_sold_date_sk#29]
+Input [6]: [ss_item_sk#25, ss_customer_sk#26, ss_store_sk#27, ss_ext_sales_price#28, ss_sold_date_sk#29, s_store_sk#31]
 
-(52) ReusedExchange [Reuses operator id: 76]
-Output [1]: [d_date_sk#31]
+(50) ReusedExchange [Reuses operator id: 72]
+Output [1]: [d_date_sk#32]
 
-(53) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_sold_date_sk#28]
-Right keys [1]: [d_date_sk#31]
+(51) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_sold_date_sk#29]
+Right keys [1]: [d_date_sk#32]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 13]
-Output [3]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27]
-Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27, ss_sold_date_sk#28, d_date_sk#31]
+(52) Project [codegen id : 13]
+Output [3]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28]
+Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28, ss_sold_date_sk#29, d_date_sk#32]
 
-(55) ReusedExchange [Reuses operator id: 24]
-Output [2]: [c_customer_sk#32, c_current_addr_sk#33]
+(53) ReusedExchange [Reuses operator id: 24]
+Output [2]: [c_customer_sk#33, c_current_addr_sk#34]
 
-(56) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_customer_sk#25]
-Right keys [1]: [c_customer_sk#32]
+(54) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_customer_sk#26]
+Right keys [1]: [c_customer_sk#33]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 13]
-Output [3]: [ss_item_sk#24, ss_ext_sales_price#27, c_current_addr_sk#33]
-Input [5]: [ss_item_sk#24, ss_customer_sk#25, ss_ext_sales_price#27, c_customer_sk#32, c_current_addr_sk#33]
+(55) Project [codegen id : 13]
+Output [3]: [ss_item_sk#25, ss_ext_sales_price#28, c_current_addr_sk#34]
+Input [5]: [ss_item_sk#25, ss_customer_sk#26, ss_ext_sales_price#28, c_customer_sk#33, c_current_addr_sk#34]
 
-(58) ReusedExchange [Reuses operator id: 31]
-Output [1]: [ca_address_sk#34]
+(56) ReusedExchange [Reuses operator id: 31]
+Output [1]: [ca_address_sk#35]
 
-(59) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [c_current_addr_sk#33]
-Right keys [1]: [ca_address_sk#34]
+(57) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [c_current_addr_sk#34]
+Right keys [1]: [ca_address_sk#35]
 Join type: Inner
 Join condition: None
 
-(60) Project [codegen id : 13]
-Output [2]: [ss_item_sk#24, ss_ext_sales_price#27]
-Input [4]: [ss_item_sk#24, ss_ext_sales_price#27, c_current_addr_sk#33, ca_address_sk#34]
+(58) Project [codegen id : 13]
+Output [2]: [ss_item_sk#25, ss_ext_sales_price#28]
+Input [4]: [ss_item_sk#25, ss_ext_sales_price#28, c_current_addr_sk#34, ca_address_sk#35]
 
-(61) ReusedExchange [Reuses operator id: 38]
-Output [1]: [i_item_sk#35]
+(59) ReusedExchange [Reuses operator id: 38]
+Output [1]: [i_item_sk#36]
 
-(62) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_item_sk#24]
-Right keys [1]: [i_item_sk#35]
+(60) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_item_sk#25]
+Right keys [1]: [i_item_sk#36]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 13]
-Output [1]: [ss_ext_sales_price#27]
-Input [3]: [ss_item_sk#24, ss_ext_sales_price#27, i_item_sk#35]
+(61) Project [codegen id : 13]
+Output [1]: [ss_ext_sales_price#28]
+Input [3]: [ss_item_sk#25, ss_ext_sales_price#28, i_item_sk#36]
 
-(64) HashAggregate [codegen id : 13]
-Input [1]: [ss_ext_sales_price#27]
+(62) HashAggregate [codegen id : 13]
+Input [1]: [ss_ext_sales_price#28]
 Keys: []
-Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#27))]
-Aggregate Attributes [1]: [sum#36]
-Results [1]: [sum#37]
+Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#28))]
+Aggregate Attributes [1]: [sum#37]
+Results [1]: [sum#38]
 
-(65) RowToColumnar
-Input [1]: [sum#37]
+(63) Exchange
+Input [1]: [sum#38]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(66) CometColumnarExchange
-Input [1]: [sum#37]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(67) CometHashAggregate
-Input [1]: [sum#37]
+(64) HashAggregate [codegen id : 14]
+Input [1]: [sum#38]
 Keys: []
-Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#27))]
-
-(68) ColumnarToRow [codegen id : 14]
-Input [1]: [total#38]
+Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#28))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#28))#39]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#28))#39,17,2) AS total#40]
 
-(69) BroadcastExchange
-Input [1]: [total#38]
+(65) BroadcastExchange
+Input [1]: [total#40]
 Arguments: IdentityBroadcastMode, [plan_id=8]
 
-(70) BroadcastNestedLoopJoin [codegen id : 15]
+(66) BroadcastNestedLoopJoin [codegen id : 15]
 Join type: Inner
 Join condition: None
 
-(71) Project [codegen id : 15]
-Output [3]: [promotions#23, total#38, ((cast(promotions#23 as decimal(15,4)) / cast(total#38 as decimal(15,4))) * 100) AS ((CAST(promotions AS DECIMAL(15,4)) / CAST(total AS DECIMAL(15,4))) * 100)#39]
-Input [2]: [promotions#23, total#38]
+(67) Project [codegen id : 15]
+Output [3]: [promotions#24, total#40, ((cast(promotions#24 as decimal(15,4)) / cast(total#40 as decimal(15,4))) * 100) AS ((CAST(promotions AS DECIMAL(15,4)) / CAST(total AS DECIMAL(15,4))) * 100)#41]
+Input [2]: [promotions#24, total#40]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (76)
-+- * ColumnarToRow (75)
-   +- CometProject (74)
-      +- CometFilter (73)
-         +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (72)
++- * ColumnarToRow (71)
+   +- CometProject (70)
+      +- CometFilter (69)
+         +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#14, d_year#40, d_moy#41]
+Output [3]: [d_date_sk#14, d_year#42, d_moy#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(73) CometFilter
-Input [3]: [d_date_sk#14, d_year#40, d_moy#41]
-Condition : ((((isnotnull(d_year#40) AND isnotnull(d_moy#41)) AND (d_year#40 = 1998)) AND (d_moy#41 = 11)) AND isnotnull(d_date_sk#14))
+(69) CometFilter
+Input [3]: [d_date_sk#14, d_year#42, d_moy#43]
+Condition : ((((isnotnull(d_year#42) AND isnotnull(d_moy#43)) AND (d_year#42 = 1998)) AND (d_moy#43 = 11)) AND isnotnull(d_date_sk#14))
 
-(74) CometProject
-Input [3]: [d_date_sk#14, d_year#40, d_moy#41]
+(70) CometProject
+Input [3]: [d_date_sk#14, d_year#42, d_moy#43]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(75) ColumnarToRow [codegen id : 1]
+(71) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(76) BroadcastExchange
+(72) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-Subquery:2 Hosting operator id = 46 Hosting Expression = ss_sold_date_sk#28 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 44 Hosting Expression = ss_sold_date_sk#29 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt
index ddedbe1379..2c3d07ac64 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q61/simplified.txt
@@ -1,110 +1,106 @@
 WholeStageCodegen (15)
   Project [promotions,total]
     BroadcastNestedLoopJoin
-      ColumnarToRow
+      HashAggregate [sum] [sum(UnscaledValue(ss_ext_sales_price)),promotions,sum]
         InputAdapter
-          CometHashAggregate [sum]
-            CometColumnarExchange #1
-              RowToColumnar
-                WholeStageCodegen (7)
-                  HashAggregate [ss_ext_sales_price] [sum,sum]
-                    Project [ss_ext_sales_price]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ss_item_sk,ss_ext_sales_price]
-                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                            Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
-                              BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
-                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                    Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                      BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                        Project [ss_item_sk,ss_customer_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_store_sk,ss_promo_sk,ss_customer_sk,ss_item_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #2
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                            InputAdapter
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [s_store_sk]
-                                                        CometFilter [s_gmt_offset,s_store_sk]
-                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_gmt_offset]
+          Exchange #1
+            WholeStageCodegen (7)
+              HashAggregate [ss_ext_sales_price] [sum,sum]
+                Project [ss_ext_sales_price]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ss_item_sk,ss_ext_sales_price]
+                      BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                        Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
+                          BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                            Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                  BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                    Project [ss_item_sk,ss_customer_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ss_store_sk,ss_promo_sk,ss_customer_sk,ss_item_sk]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                         InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
+                                          BroadcastExchange #3
+                                            WholeStageCodegen (1)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometProject [p_promo_sk]
-                                                    CometFilter [p_channel_dmail,p_channel_email,p_channel_tv,p_promo_sk]
-                                                      CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_dmail,p_channel_email,p_channel_tv]
+                                                  CometProject [s_store_sk]
+                                                    CometFilter [s_gmt_offset,s_store_sk]
+                                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_gmt_offset]
                                     InputAdapter
-                                      ReusedExchange [d_date_sk] #2
+                                      BroadcastExchange #4
+                                        WholeStageCodegen (2)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [p_promo_sk]
+                                                CometFilter [p_channel_dmail,p_channel_email,p_channel_tv,p_promo_sk]
+                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_dmail,p_channel_email,p_channel_tv]
                                 InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (4)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [c_customer_sk,c_current_addr_sk]
-                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (5)
+                              BroadcastExchange #5
+                                WholeStageCodegen (4)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [ca_address_sk]
-                                        CometFilter [ca_gmt_offset,ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                                      CometFilter [c_customer_sk,c_current_addr_sk]
+                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (6)
+                          BroadcastExchange #6
+                            WholeStageCodegen (5)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [i_item_sk]
-                                    CometFilter [i_category,i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
+                                  CometProject [ca_address_sk]
+                                    CometFilter [ca_gmt_offset,ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_gmt_offset]
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (6)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [i_item_sk]
+                                CometFilter [i_category,i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
       InputAdapter
         BroadcastExchange #8
           WholeStageCodegen (14)
-            ColumnarToRow
+            HashAggregate [sum] [sum(UnscaledValue(ss_ext_sales_price)),total,sum]
               InputAdapter
-                CometHashAggregate [sum]
-                  CometColumnarExchange #9
-                    RowToColumnar
-                      WholeStageCodegen (13)
-                        HashAggregate [ss_ext_sales_price] [sum,sum]
-                          Project [ss_ext_sales_price]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              Project [ss_item_sk,ss_ext_sales_price]
-                                BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                  Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
-                                    BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                      Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_store_sk,ss_customer_sk,ss_item_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [s_store_sk] #3
+                Exchange #9
+                  WholeStageCodegen (13)
+                    HashAggregate [ss_ext_sales_price] [sum,sum]
+                      Project [ss_ext_sales_price]
+                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                          Project [ss_item_sk,ss_ext_sales_price]
+                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                              Project [ss_item_sk,ss_ext_sales_price,c_current_addr_sk]
+                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                  Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      Project [ss_item_sk,ss_customer_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ss_store_sk,ss_customer_sk,ss_item_sk]
+                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
                                           InputAdapter
-                                            ReusedExchange [d_date_sk] #2
+                                            ReusedExchange [s_store_sk] #3
                                       InputAdapter
-                                        ReusedExchange [c_customer_sk,c_current_addr_sk] #5
+                                        ReusedExchange [d_date_sk] #2
                                   InputAdapter
-                                    ReusedExchange [ca_address_sk] #6
+                                    ReusedExchange [c_customer_sk,c_current_addr_sk] #5
                               InputAdapter
-                                ReusedExchange [i_item_sk] #7
+                                ReusedExchange [ca_address_sk] #6
+                          InputAdapter
+                            ReusedExchange [i_item_sk] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt
index 427bce7dff..82ded1c507 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/explain.txt
@@ -1,38 +1,36 @@
 == Physical Plan ==
-* ColumnarToRow (34)
-+- CometTakeOrderedAndProject (33)
-   +- CometHashAggregate (32)
-      +- CometColumnarExchange (31)
-         +- RowToColumnar (30)
-            +- * HashAggregate (29)
-               +- * Project (28)
-                  +- * BroadcastHashJoin Inner BuildRight (27)
-                     :- * Project (21)
-                     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :     :- * Project (15)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :- * Project (9)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                     :     :     :     +- BroadcastExchange (7)
-                     :     :     :        +- * ColumnarToRow (6)
-                     :     :     :           +- CometFilter (5)
-                     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-                     :     :     +- BroadcastExchange (13)
-                     :     :        +- * ColumnarToRow (12)
-                     :     :           +- CometFilter (11)
-                     :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
-                     :     +- BroadcastExchange (19)
-                     :        +- * ColumnarToRow (18)
-                     :           +- CometFilter (17)
-                     :              +- CometScan parquet spark_catalog.default.web_site (16)
-                     +- BroadcastExchange (26)
-                        +- * ColumnarToRow (25)
-                           +- CometProject (24)
-                              +- CometFilter (23)
-                                 +- CometScan parquet spark_catalog.default.date_dim (22)
+TakeOrderedAndProject (32)
++- * HashAggregate (31)
+   +- Exchange (30)
+      +- * HashAggregate (29)
+         +- * Project (28)
+            +- * BroadcastHashJoin Inner BuildRight (27)
+               :- * Project (21)
+               :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :     :- * Project (15)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :- * Project (9)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :  +- CometFilter (2)
+               :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+               :     :     :     +- BroadcastExchange (7)
+               :     :     :        +- * ColumnarToRow (6)
+               :     :     :           +- CometFilter (5)
+               :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+               :     :     +- BroadcastExchange (13)
+               :     :        +- * ColumnarToRow (12)
+               :     :           +- CometFilter (11)
+               :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
+               :     +- BroadcastExchange (19)
+               :        +- * ColumnarToRow (18)
+               :           +- CometFilter (17)
+               :              +- CometScan parquet spark_catalog.default.web_site (16)
+               +- BroadcastExchange (26)
+                  +- * ColumnarToRow (25)
+                     +- CometProject (24)
+                        +- CometFilter (23)
+                           +- CometScan parquet spark_catalog.default.date_dim (22)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -172,22 +170,18 @@ Functions [5]: [partial_sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <
 Aggregate Attributes [5]: [sum#15, sum#16, sum#17, sum#18, sum#19]
 Results [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 
-(30) RowToColumnar
+(30) Exchange
 Input [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, web_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(31) CometColumnarExchange
-Input [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, web_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(32) CometHashAggregate
+(31) HashAggregate [codegen id : 6]
 Input [8]: [_groupingexpression#14, sm_type#9, web_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 Keys [3]: [_groupingexpression#14, sm_type#9, web_name#11]
 Functions [5]: [sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END), sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 30) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END), sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 60) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END), sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 90) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END), sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)]
+Aggregate Attributes [5]: [sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 30) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 60) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 90) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28, sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29]
+Results [8]: [_groupingexpression#14 AS substr(w_warehouse_name, 1, 20)#30, sm_type#9, web_name#11, sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25 AS 30 days #31, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 30) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26 AS 31 - 60 days #32, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 60) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27 AS 61 - 90 days #33, sum(CASE WHEN (((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 90) AND ((ws_ship_date_sk#1 - ws_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28 AS 91 - 120 days #34, sum(CASE WHEN ((ws_ship_date_sk#1 - ws_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29 AS >120 days #35]
 
-(33) CometTakeOrderedAndProject
-Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, web_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST,sm_type#9 ASC NULLS FIRST,web_name#11 ASC NULLS FIRST], output=[substr(w_warehouse_name, 1, 20)#25,sm_type#9,web_name#11,30 days #26,31 - 60 days #27,61 - 90 days #28,91 - 120 days #29,>120 days #30]), 100, [substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, web_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#25, sm_type#9, web_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
-
-(34) ColumnarToRow [codegen id : 6]
-Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, web_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
+(32) TakeOrderedAndProject
+Input [8]: [substr(w_warehouse_name, 1, 20)#30, sm_type#9, web_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
+Arguments: 100, [substr(w_warehouse_name, 1, 20)#30 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, web_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#30, sm_type#9, web_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt
index 4fe012742f..5ae522ce1c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q62/simplified.txt
@@ -1,50 +1,48 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,web_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
-        CometHashAggregate [_groupingexpression,sm_type,web_name,sum,sum,sum,sum,sum]
-          CometColumnarExchange [_groupingexpression,sm_type,web_name] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                HashAggregate [_groupingexpression,sm_type,web_name,ws_ship_date_sk,ws_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                  Project [ws_ship_date_sk,ws_sold_date_sk,sm_type,web_name,w_warehouse_name]
-                    BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
-                      Project [ws_ship_date_sk,ws_sold_date_sk,w_warehouse_name,sm_type,web_name]
-                        BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                          Project [ws_ship_date_sk,ws_web_site_sk,ws_sold_date_sk,w_warehouse_name,sm_type]
-                            BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
-                              Project [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_sold_date_sk,w_warehouse_name]
-                                BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ws_warehouse_sk,ws_ship_mode_sk,ws_web_site_sk,ws_ship_date_sk]
-                                        CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_sold_date_sk]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [w_warehouse_sk]
-                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+TakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,web_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
+  WholeStageCodegen (6)
+    HashAggregate [_groupingexpression,sm_type,web_name,sum,sum,sum,sum,sum] [sum(CASE WHEN ((ws_ship_date_sk - ws_sold_date_sk) <= 30) THEN 1 ELSE 0 END),sum(CASE WHEN (((ws_ship_date_sk - ws_sold_date_sk) > 30) AND ((ws_ship_date_sk - ws_sold_date_sk) <= 60)) THEN 1 ELSE 0 END),sum(CASE WHEN (((ws_ship_date_sk - ws_sold_date_sk) > 60) AND ((ws_ship_date_sk - ws_sold_date_sk) <= 90)) THEN 1 ELSE 0 END),sum(CASE WHEN (((ws_ship_date_sk - ws_sold_date_sk) > 90) AND ((ws_ship_date_sk - ws_sold_date_sk) <= 120)) THEN 1 ELSE 0 END),sum(CASE WHEN ((ws_ship_date_sk - ws_sold_date_sk) > 120) THEN 1 ELSE 0 END),substr(w_warehouse_name, 1, 20),30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ,sum,sum,sum,sum,sum]
+      InputAdapter
+        Exchange [_groupingexpression,sm_type,web_name] #1
+          WholeStageCodegen (5)
+            HashAggregate [_groupingexpression,sm_type,web_name,ws_ship_date_sk,ws_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+              Project [ws_ship_date_sk,ws_sold_date_sk,sm_type,web_name,w_warehouse_name]
+                BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
+                  Project [ws_ship_date_sk,ws_sold_date_sk,w_warehouse_name,sm_type,web_name]
+                    BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                      Project [ws_ship_date_sk,ws_web_site_sk,ws_sold_date_sk,w_warehouse_name,sm_type]
+                        BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
+                          Project [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_sold_date_sk,w_warehouse_name]
+                            BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [ws_warehouse_sk,ws_ship_mode_sk,ws_web_site_sk,ws_ship_date_sk]
+                                    CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_web_site_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_sold_date_sk]
                               InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (2)
+                                BroadcastExchange #2
+                                  WholeStageCodegen (1)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [sm_ship_mode_sk]
-                                          CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
+                                        CometFilter [w_warehouse_sk]
+                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (3)
+                            BroadcastExchange #3
+                              WholeStageCodegen (2)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [web_site_sk]
-                                      CometScan parquet spark_catalog.default.web_site [web_site_sk,web_name]
+                                    CometFilter [sm_ship_mode_sk]
+                                      CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (4)
+                        BroadcastExchange #4
+                          WholeStageCodegen (3)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [d_date_sk]
-                                  CometFilter [d_month_seq,d_date_sk]
-                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                CometFilter [web_site_sk]
+                                  CometScan parquet spark_catalog.default.web_site [web_site_sk,web_name]
+                  InputAdapter
+                    BroadcastExchange #5
+                      WholeStageCodegen (4)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [d_date_sk]
+                              CometFilter [d_month_seq,d_date_sk]
+                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt
index 18ed395704..458a35b388 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/explain.txt
@@ -1,34 +1,32 @@
 == Physical Plan ==
-TakeOrderedAndProject (30)
-+- * Project (29)
-   +- * Filter (28)
-      +- Window (27)
-         +- * ColumnarToRow (26)
-            +- CometSort (25)
-               +- CometColumnarExchange (24)
-                  +- CometHashAggregate (23)
-                     +- CometColumnarExchange (22)
-                        +- RowToColumnar (21)
-                           +- * HashAggregate (20)
-                              +- * Project (19)
-                                 +- * BroadcastHashJoin Inner BuildRight (18)
-                                    :- * Project (13)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (12)
-                                    :     :- * Project (10)
-                                    :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                                    :     :     :- * ColumnarToRow (4)
-                                    :     :     :  +- CometProject (3)
-                                    :     :     :     +- CometFilter (2)
-                                    :     :     :        +- CometScan parquet spark_catalog.default.item (1)
-                                    :     :     +- BroadcastExchange (8)
-                                    :     :        +- * ColumnarToRow (7)
-                                    :     :           +- CometFilter (6)
-                                    :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
-                                    :     +- ReusedExchange (11)
-                                    +- BroadcastExchange (17)
-                                       +- * ColumnarToRow (16)
-                                          +- CometFilter (15)
-                                             +- CometScan parquet spark_catalog.default.store (14)
+TakeOrderedAndProject (28)
++- * Project (27)
+   +- * Filter (26)
+      +- Window (25)
+         +- * Sort (24)
+            +- Exchange (23)
+               +- * HashAggregate (22)
+                  +- Exchange (21)
+                     +- * HashAggregate (20)
+                        +- * Project (19)
+                           +- * BroadcastHashJoin Inner BuildRight (18)
+                              :- * Project (13)
+                              :  +- * BroadcastHashJoin Inner BuildRight (12)
+                              :     :- * Project (10)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+                              :     :     :- * ColumnarToRow (4)
+                              :     :     :  +- CometProject (3)
+                              :     :     :     +- CometFilter (2)
+                              :     :     :        +- CometScan parquet spark_catalog.default.item (1)
+                              :     :     +- BroadcastExchange (8)
+                              :     :        +- * ColumnarToRow (7)
+                              :     :           +- CometFilter (6)
+                              :     :              +- CometScan parquet spark_catalog.default.store_sales (5)
+                              :     +- ReusedExchange (11)
+                              +- BroadcastExchange (17)
+                                 +- * ColumnarToRow (16)
+                                    +- CometFilter (15)
+                                       +- CometScan parquet spark_catalog.default.store (14)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -78,7 +76,7 @@ Join condition: None
 Output [4]: [i_manager_id#5, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 Input [6]: [i_item_sk#1, i_manager_id#5, ss_item_sk#10, ss_store_sk#11, ss_sales_price#12, ss_sold_date_sk#13]
 
-(11) ReusedExchange [Reuses operator id: 35]
+(11) ReusedExchange [Reuses operator id: 33]
 Output [2]: [d_date_sk#15, d_moy#16]
 
 (12) BroadcastHashJoin [codegen id : 4]
@@ -126,74 +124,70 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#12))]
 Aggregate Attributes [1]: [sum#18]
 Results [3]: [i_manager_id#5, d_moy#16, sum#19]
 
-(21) RowToColumnar
+(21) Exchange
 Input [3]: [i_manager_id#5, d_moy#16, sum#19]
+Arguments: hashpartitioning(i_manager_id#5, d_moy#16, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) CometColumnarExchange
-Input [3]: [i_manager_id#5, d_moy#16, sum#19]
-Arguments: hashpartitioning(i_manager_id#5, d_moy#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 5]
 Input [3]: [i_manager_id#5, d_moy#16, sum#19]
 Keys [2]: [i_manager_id#5, d_moy#16]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#12))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#12))#20]
+Results [3]: [i_manager_id#5, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS sum_sales#21, MakeDecimal(sum(UnscaledValue(ss_sales_price#12))#20,17,2) AS _w0#22]
 
-(24) CometColumnarExchange
-Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
-Arguments: hashpartitioning(i_manager_id#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(25) CometSort
-Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
-Arguments: [i_manager_id#5, sum_sales#20, _w0#21], [i_manager_id#5 ASC NULLS FIRST]
+(23) Exchange
+Input [3]: [i_manager_id#5, sum_sales#21, _w0#22]
+Arguments: hashpartitioning(i_manager_id#5, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(26) ColumnarToRow [codegen id : 5]
-Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
+(24) Sort [codegen id : 6]
+Input [3]: [i_manager_id#5, sum_sales#21, _w0#22]
+Arguments: [i_manager_id#5 ASC NULLS FIRST], false, 0
 
-(27) Window
-Input [3]: [i_manager_id#5, sum_sales#20, _w0#21]
-Arguments: [avg(_w0#21) windowspecdefinition(i_manager_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#22], [i_manager_id#5]
+(25) Window
+Input [3]: [i_manager_id#5, sum_sales#21, _w0#22]
+Arguments: [avg(_w0#22) windowspecdefinition(i_manager_id#5, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#23], [i_manager_id#5]
 
-(28) Filter [codegen id : 6]
-Input [4]: [i_manager_id#5, sum_sales#20, _w0#21, avg_monthly_sales#22]
-Condition : CASE WHEN (avg_monthly_sales#22 > 0.000000) THEN ((abs((sum_sales#20 - avg_monthly_sales#22)) / avg_monthly_sales#22) > 0.1000000000000000) ELSE false END
+(26) Filter [codegen id : 7]
+Input [4]: [i_manager_id#5, sum_sales#21, _w0#22, avg_monthly_sales#23]
+Condition : CASE WHEN (avg_monthly_sales#23 > 0.000000) THEN ((abs((sum_sales#21 - avg_monthly_sales#23)) / avg_monthly_sales#23) > 0.1000000000000000) ELSE false END
 
-(29) Project [codegen id : 6]
-Output [3]: [i_manager_id#5, sum_sales#20, avg_monthly_sales#22]
-Input [4]: [i_manager_id#5, sum_sales#20, _w0#21, avg_monthly_sales#22]
+(27) Project [codegen id : 7]
+Output [3]: [i_manager_id#5, sum_sales#21, avg_monthly_sales#23]
+Input [4]: [i_manager_id#5, sum_sales#21, _w0#22, avg_monthly_sales#23]
 
-(30) TakeOrderedAndProject
-Input [3]: [i_manager_id#5, sum_sales#20, avg_monthly_sales#22]
-Arguments: 100, [i_manager_id#5 ASC NULLS FIRST, avg_monthly_sales#22 ASC NULLS FIRST, sum_sales#20 ASC NULLS FIRST], [i_manager_id#5, sum_sales#20, avg_monthly_sales#22]
+(28) TakeOrderedAndProject
+Input [3]: [i_manager_id#5, sum_sales#21, avg_monthly_sales#23]
+Arguments: 100, [i_manager_id#5 ASC NULLS FIRST, avg_monthly_sales#23 ASC NULLS FIRST, sum_sales#21 ASC NULLS FIRST], [i_manager_id#5, sum_sales#21, avg_monthly_sales#23]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = ss_sold_date_sk#13 IN dynamicpruning#14
-BroadcastExchange (35)
-+- * ColumnarToRow (34)
-   +- CometProject (33)
-      +- CometFilter (32)
-         +- CometScan parquet spark_catalog.default.date_dim (31)
+BroadcastExchange (33)
++- * ColumnarToRow (32)
+   +- CometProject (31)
+      +- CometFilter (30)
+         +- CometScan parquet spark_catalog.default.date_dim (29)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#15, d_month_seq#23, d_moy#16]
+Output [3]: [d_date_sk#15, d_month_seq#24, d_moy#16]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [In(d_month_seq, [1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_moy:int>
 
-(32) CometFilter
-Input [3]: [d_date_sk#15, d_month_seq#23, d_moy#16]
-Condition : (d_month_seq#23 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
+(30) CometFilter
+Input [3]: [d_date_sk#15, d_month_seq#24, d_moy#16]
+Condition : (d_month_seq#24 INSET 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211 AND isnotnull(d_date_sk#15))
 
-(33) CometProject
-Input [3]: [d_date_sk#15, d_month_seq#23, d_moy#16]
+(31) CometProject
+Input [3]: [d_date_sk#15, d_month_seq#24, d_moy#16]
 Arguments: [d_date_sk#15, d_moy#16], [d_date_sk#15, d_moy#16]
 
-(34) ColumnarToRow [codegen id : 1]
+(32) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#15, d_moy#16]
 
-(35) BroadcastExchange
+(33) BroadcastExchange
 Input [2]: [d_date_sk#15, d_moy#16]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt
index cd9cffbd1c..7f6f8c1370 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q63/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [i_manager_id,avg_monthly_sales,sum_sales]
-  WholeStageCodegen (6)
+  WholeStageCodegen (7)
     Project [i_manager_id,sum_sales,avg_monthly_sales]
       Filter [avg_monthly_sales,sum_sales]
         InputAdapter
           Window [_w0,i_manager_id]
-            WholeStageCodegen (5)
-              ColumnarToRow
+            WholeStageCodegen (6)
+              Sort [i_manager_id]
                 InputAdapter
-                  CometSort [i_manager_id]
-                    CometColumnarExchange [i_manager_id] #1
-                      CometHashAggregate [i_manager_id,d_moy,sum]
-                        CometColumnarExchange [i_manager_id,d_moy] #2
-                          RowToColumnar
+                  Exchange [i_manager_id] #1
+                    WholeStageCodegen (5)
+                      HashAggregate [i_manager_id,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
+                        InputAdapter
+                          Exchange [i_manager_id,d_moy] #2
                             WholeStageCodegen (4)
                               HashAggregate [i_manager_id,d_moy,ss_sales_price] [sum,sum]
                                 Project [i_manager_id,ss_sales_price,d_moy]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt
index 5f442e277a..c6911fbe5a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/explain.txt
@@ -1,195 +1,187 @@
 == Physical Plan ==
-* ColumnarToRow (191)
-+- CometSort (190)
-   +- CometColumnarExchange (189)
-      +- RowToColumnar (188)
-         +- * Project (187)
-            +- * SortMergeJoin Inner (186)
-               :- * ColumnarToRow (113)
-               :  +- CometSort (112)
-               :     +- CometColumnarExchange (111)
-               :        +- RowToColumnar (110)
-               :           +- * HashAggregate (109)
-               :              +- * HashAggregate (108)
-               :                 +- * Project (107)
-               :                    +- * BroadcastHashJoin Inner BuildRight (106)
-               :                       :- * Project (100)
-               :                       :  +- * BroadcastHashJoin Inner BuildRight (99)
-               :                       :     :- * Project (97)
-               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (96)
-               :                       :     :     :- * Project (91)
-               :                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (90)
-               :                       :     :     :     :- * Project (88)
-               :                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (87)
-               :                       :     :     :     :     :- * Project (82)
-               :                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (81)
-               :                       :     :     :     :     :     :- * Project (79)
-               :                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (78)
-               :                       :     :     :     :     :     :     :- * Project (73)
-               :                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (72)
-               :                       :     :     :     :     :     :     :     :- * Project (67)
-               :                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (66)
-               :                       :     :     :     :     :     :     :     :     :- * Project (64)
-               :                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (63)
-               :                       :     :     :     :     :     :     :     :     :     :- * Project (58)
-               :                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
-               :                       :     :     :     :     :     :     :     :     :     :     :- * Project (55)
-               :                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (49)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (48)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (43)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (42)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (37)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (36)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (34)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (33)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (32)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (13)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (12)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (11)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (10)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (9)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (4)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (3)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (2)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (8)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (7)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (6)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (5)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (31)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (30)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (29)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (28)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometColumnarExchange (27)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (26)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (25)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (24)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (18)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometColumnarExchange (17)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (16)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (15)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (14)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (23)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometColumnarExchange (22)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (21)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (20)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (19)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (35)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (41)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (40)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (39)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (38)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (47)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (46)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (45)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (44)
-               :                       :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (53)
-               :                       :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (52)
-               :                       :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (51)
-               :                       :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (50)
-               :                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (56)
-               :                       :     :     :     :     :     :     :     :     :     +- BroadcastExchange (62)
-               :                       :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (61)
-               :                       :     :     :     :     :     :     :     :     :           +- CometFilter (60)
-               :                       :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (59)
-               :                       :     :     :     :     :     :     :     :     +- ReusedExchange (65)
-               :                       :     :     :     :     :     :     :     +- BroadcastExchange (71)
-               :                       :     :     :     :     :     :     :        +- * ColumnarToRow (70)
-               :                       :     :     :     :     :     :     :           +- CometFilter (69)
-               :                       :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (68)
-               :                       :     :     :     :     :     :     +- BroadcastExchange (77)
-               :                       :     :     :     :     :     :        +- * ColumnarToRow (76)
-               :                       :     :     :     :     :     :           +- CometFilter (75)
-               :                       :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (74)
-               :                       :     :     :     :     :     +- ReusedExchange (80)
-               :                       :     :     :     :     +- BroadcastExchange (86)
-               :                       :     :     :     :        +- * ColumnarToRow (85)
-               :                       :     :     :     :           +- CometFilter (84)
-               :                       :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (83)
-               :                       :     :     :     +- ReusedExchange (89)
-               :                       :     :     +- BroadcastExchange (95)
-               :                       :     :        +- * ColumnarToRow (94)
-               :                       :     :           +- CometFilter (93)
-               :                       :     :              +- CometScan parquet spark_catalog.default.income_band (92)
-               :                       :     +- ReusedExchange (98)
-               :                       +- BroadcastExchange (105)
-               :                          +- * ColumnarToRow (104)
-               :                             +- CometProject (103)
-               :                                +- CometFilter (102)
-               :                                   +- CometScan parquet spark_catalog.default.item (101)
-               +- * ColumnarToRow (185)
-                  +- CometSort (184)
-                     +- CometColumnarExchange (183)
-                        +- RowToColumnar (182)
-                           +- * HashAggregate (181)
-                              +- * HashAggregate (180)
-                                 +- * Project (179)
-                                    +- * BroadcastHashJoin Inner BuildRight (178)
-                                       :- * Project (176)
-                                       :  +- * BroadcastHashJoin Inner BuildRight (175)
-                                       :     :- * Project (173)
-                                       :     :  +- * BroadcastHashJoin Inner BuildRight (172)
-                                       :     :     :- * Project (170)
-                                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (169)
-                                       :     :     :     :- * Project (167)
-                                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (166)
-                                       :     :     :     :     :- * Project (164)
-                                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (163)
-                                       :     :     :     :     :     :- * Project (161)
-                                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (160)
-                                       :     :     :     :     :     :     :- * Project (158)
-                                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (157)
-                                       :     :     :     :     :     :     :     :- * Project (155)
-                                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (154)
-                                       :     :     :     :     :     :     :     :     :- * Project (152)
-                                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (151)
-                                       :     :     :     :     :     :     :     :     :     :- * Project (149)
-                                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (148)
-                                       :     :     :     :     :     :     :     :     :     :     :- * Project (146)
-                                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (145)
-                                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (143)
-                                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (142)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (140)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (139)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (137)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (136)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (134)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (133)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (132)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (126)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (125)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (124)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (123)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (122)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (117)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (116)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (115)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (114)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (121)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (120)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (119)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (118)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (131)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (130)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (129)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (128)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (127)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (135)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (138)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (141)
-                                       :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (144)
-                                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (147)
-                                       :     :     :     :     :     :     :     :     :     +- ReusedExchange (150)
-                                       :     :     :     :     :     :     :     :     +- ReusedExchange (153)
-                                       :     :     :     :     :     :     :     +- ReusedExchange (156)
-                                       :     :     :     :     :     :     +- ReusedExchange (159)
-                                       :     :     :     :     :     +- ReusedExchange (162)
-                                       :     :     :     :     +- ReusedExchange (165)
-                                       :     :     :     +- ReusedExchange (168)
-                                       :     :     +- ReusedExchange (171)
-                                       :     +- ReusedExchange (174)
-                                       +- ReusedExchange (177)
+* Sort (183)
++- Exchange (182)
+   +- * Project (181)
+      +- * SortMergeJoin Inner (180)
+         :- * Sort (110)
+         :  +- Exchange (109)
+         :     +- * HashAggregate (108)
+         :        +- * HashAggregate (107)
+         :           +- * Project (106)
+         :              +- * BroadcastHashJoin Inner BuildRight (105)
+         :                 :- * Project (99)
+         :                 :  +- * BroadcastHashJoin Inner BuildRight (98)
+         :                 :     :- * Project (96)
+         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (95)
+         :                 :     :     :- * Project (90)
+         :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (89)
+         :                 :     :     :     :- * Project (87)
+         :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
+         :                 :     :     :     :     :- * Project (81)
+         :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (80)
+         :                 :     :     :     :     :     :- * Project (78)
+         :                 :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (77)
+         :                 :     :     :     :     :     :     :- * Project (72)
+         :                 :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (71)
+         :                 :     :     :     :     :     :     :     :- * Project (66)
+         :                 :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (65)
+         :                 :     :     :     :     :     :     :     :     :- * Project (63)
+         :                 :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (62)
+         :                 :     :     :     :     :     :     :     :     :     :- * Project (57)
+         :                 :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+         :                 :     :     :     :     :     :     :     :     :     :     :- * Project (54)
+         :                 :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :- * Project (48)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (47)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (42)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (41)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (36)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (35)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (33)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (32)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (12)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (11)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (10)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (9)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (4)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (3)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (2)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (8)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (7)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (6)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (31)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (30)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (29)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (28)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (27)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometExchange (26)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (25)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (24)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (23)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (17)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometExchange (16)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (15)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (14)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (13)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (22)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometExchange (21)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (20)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (19)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (18)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (34)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (40)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (39)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (38)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (37)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (46)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (45)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (44)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (43)
+         :                 :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (52)
+         :                 :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (51)
+         :                 :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (50)
+         :                 :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (49)
+         :                 :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (55)
+         :                 :     :     :     :     :     :     :     :     :     +- BroadcastExchange (61)
+         :                 :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (60)
+         :                 :     :     :     :     :     :     :     :     :           +- CometFilter (59)
+         :                 :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (58)
+         :                 :     :     :     :     :     :     :     :     +- ReusedExchange (64)
+         :                 :     :     :     :     :     :     :     +- BroadcastExchange (70)
+         :                 :     :     :     :     :     :     :        +- * ColumnarToRow (69)
+         :                 :     :     :     :     :     :     :           +- CometFilter (68)
+         :                 :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (67)
+         :                 :     :     :     :     :     :     +- BroadcastExchange (76)
+         :                 :     :     :     :     :     :        +- * ColumnarToRow (75)
+         :                 :     :     :     :     :     :           +- CometFilter (74)
+         :                 :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (73)
+         :                 :     :     :     :     :     +- ReusedExchange (79)
+         :                 :     :     :     :     +- BroadcastExchange (85)
+         :                 :     :     :     :        +- * ColumnarToRow (84)
+         :                 :     :     :     :           +- CometFilter (83)
+         :                 :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (82)
+         :                 :     :     :     +- ReusedExchange (88)
+         :                 :     :     +- BroadcastExchange (94)
+         :                 :     :        +- * ColumnarToRow (93)
+         :                 :     :           +- CometFilter (92)
+         :                 :     :              +- CometScan parquet spark_catalog.default.income_band (91)
+         :                 :     +- ReusedExchange (97)
+         :                 +- BroadcastExchange (104)
+         :                    +- * ColumnarToRow (103)
+         :                       +- CometProject (102)
+         :                          +- CometFilter (101)
+         :                             +- CometScan parquet spark_catalog.default.item (100)
+         +- * Sort (179)
+            +- Exchange (178)
+               +- * HashAggregate (177)
+                  +- * HashAggregate (176)
+                     +- * Project (175)
+                        +- * BroadcastHashJoin Inner BuildRight (174)
+                           :- * Project (172)
+                           :  +- * BroadcastHashJoin Inner BuildRight (171)
+                           :     :- * Project (169)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (168)
+                           :     :     :- * Project (166)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (165)
+                           :     :     :     :- * Project (163)
+                           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (162)
+                           :     :     :     :     :- * Project (160)
+                           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (159)
+                           :     :     :     :     :     :- * Project (157)
+                           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (156)
+                           :     :     :     :     :     :     :- * Project (154)
+                           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (153)
+                           :     :     :     :     :     :     :     :- * Project (151)
+                           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (150)
+                           :     :     :     :     :     :     :     :     :- * Project (148)
+                           :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (147)
+                           :     :     :     :     :     :     :     :     :     :- * Project (145)
+                           :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (144)
+                           :     :     :     :     :     :     :     :     :     :     :- * Project (142)
+                           :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (141)
+                           :     :     :     :     :     :     :     :     :     :     :     :- * Project (139)
+                           :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (138)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (136)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (135)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (133)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (132)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (130)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (129)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (122)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (121)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (120)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (119)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (114)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (113)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (112)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (111)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (118)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (117)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (116)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (115)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (128)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (127)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (126)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (125)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (124)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (123)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (131)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (134)
+                           :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (137)
+                           :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (140)
+                           :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (143)
+                           :     :     :     :     :     :     :     :     :     +- ReusedExchange (146)
+                           :     :     :     :     :     :     :     :     +- ReusedExchange (149)
+                           :     :     :     :     :     :     :     +- ReusedExchange (152)
+                           :     :     :     :     :     :     +- ReusedExchange (155)
+                           :     :     :     :     :     +- ReusedExchange (158)
+                           :     :     :     :     +- ReusedExchange (161)
+                           :     :     :     +- ReusedExchange (164)
+                           :     :     +- ReusedExchange (167)
+                           :     +- ReusedExchange (170)
+                           +- ReusedExchange (173)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -239,16 +231,13 @@ Join condition: None
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_ticket_number#8, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, sr_item_sk#14, sr_ticket_number#15]
 
-(11) RowToColumnar
+(11) Exchange
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(12) CometColumnarExchange
+(12) Sort [codegen id : 3]
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(13) CometSort
-Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1 ASC NULLS FIRST]
+Arguments: [ss_item_sk#1 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
@@ -257,19 +246,19 @@ Location [not included in comparison]/{warehouse_dir}/catalog_sales]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_order_number)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_ext_list_price:decimal(7,2)>
 
-(15) CometFilter
+(14) CometFilter
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Condition : (isnotnull(cs_item_sk#17) AND isnotnull(cs_order_number#18))
 
-(16) CometProject
+(15) CometProject
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 
-(17) CometColumnarExchange
+(16) CometExchange
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
-Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
-(18) CometSort
+(17) CometSort
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17 ASC NULLS FIRST, cs_order_number#18 ASC NULLS FIRST]
 
@@ -280,79 +269,80 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_refunded_cash:decimal(7,2),cr_reversed_charge:decimal(7,2),cr_store_credit:decimal(7,2)>
 
-(20) CometFilter
+(19) CometFilter
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Condition : (isnotnull(cr_item_sk#21) AND isnotnull(cr_order_number#22))
 
-(21) CometProject
+(20) CometProject
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(22) CometColumnarExchange
+(21) CometExchange
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
-Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
 
-(23) CometSort
+(22) CometSort
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21 ASC NULLS FIRST, cr_order_number#22 ASC NULLS FIRST]
 
-(24) CometSortMergeJoin
+(23) CometSortMergeJoin
 Left output [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Right output [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_order_number#18], [cr_item_sk#21, cr_order_number#22], Inner
 
-(25) CometProject
+(24) CometProject
 Input [8]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(26) CometHashAggregate
+(25) CometHashAggregate
 Input [5]: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [partial_sum(UnscaledValue(cs_ext_list_price#19)), partial_sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(27) CometColumnarExchange
+(26) CometExchange
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
-Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
-(28) CometHashAggregate
+(27) CometHashAggregate
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#19)), sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(29) CometFilter
+(28) CometFilter
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(30) CometProject
+(29) CometProject
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Arguments: [cs_item_sk#17], [cs_item_sk#17]
 
-(31) CometSort
+(30) CometSort
 Input [1]: [cs_item_sk#17]
 Arguments: [cs_item_sk#17], [cs_item_sk#17 ASC NULLS FIRST]
 
-(32) CometSortMergeJoin
-Left output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Right output [1]: [cs_item_sk#17]
-Arguments: [ss_item_sk#1], [cs_item_sk#17], Inner
+(31) ColumnarToRow [codegen id : 4]
+Input [1]: [cs_item_sk#17]
 
-(33) CometProject
-Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, cs_item_sk#17]
-Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+(32) SortMergeJoin [codegen id : 20]
+Left keys [1]: [ss_item_sk#1]
+Right keys [1]: [cs_item_sk#17]
+Join type: Inner
+Join condition: None
 
-(34) ColumnarToRow [codegen id : 18]
-Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+(33) Project [codegen id : 20]
+Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, cs_item_sk#17]
 
-(35) ReusedExchange [Reuses operator id: 195]
+(34) ReusedExchange [Reuses operator id: 187]
 Output [2]: [d_date_sk#32, d_year#33]
 
-(36) BroadcastHashJoin [codegen id : 18]
+(35) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_sold_date_sk#12]
 Right keys [1]: [d_date_sk#32]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 18]
+(36) Project [codegen id : 20]
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33]
 Input [13]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, d_date_sk#32, d_year#33]
 
@@ -363,24 +353,24 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_name), IsNotNull(s_zip)]
 ReadSchema: struct<s_store_sk:int,s_store_name:string,s_zip:string>
 
-(39) CometFilter
+(38) CometFilter
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Condition : ((isnotnull(s_store_sk#34) AND isnotnull(s_store_name#35)) AND isnotnull(s_zip#36))
 
-(40) ColumnarToRow [codegen id : 4]
+(39) ColumnarToRow [codegen id : 6]
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 
-(41) BroadcastExchange
+(40) BroadcastExchange
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(42) BroadcastHashJoin [codegen id : 18]
+(41) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_store_sk#6]
 Right keys [1]: [s_store_sk#34]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 18]
+(42) Project [codegen id : 20]
 Output [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_sk#34, s_store_name#35, s_zip#36]
 
@@ -391,24 +381,24 @@ Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_first_sales_date_sk), IsNotNull(c_first_shipto_date_sk), IsNotNull(c_current_cdemo_sk), IsNotNull(c_current_hdemo_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_cdemo_sk:int,c_current_hdemo_sk:int,c_current_addr_sk:int,c_first_shipto_date_sk:int,c_first_sales_date_sk:int>
 
-(45) CometFilter
+(44) CometFilter
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Condition : (((((isnotnull(c_customer_sk#37) AND isnotnull(c_first_sales_date_sk#42)) AND isnotnull(c_first_shipto_date_sk#41)) AND isnotnull(c_current_cdemo_sk#38)) AND isnotnull(c_current_hdemo_sk#39)) AND isnotnull(c_current_addr_sk#40))
 
-(46) ColumnarToRow [codegen id : 5]
+(45) ColumnarToRow [codegen id : 7]
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
-(47) BroadcastExchange
+(46) BroadcastExchange
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(48) BroadcastHashJoin [codegen id : 18]
+(47) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#37]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 18]
+(48) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Input [18]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
@@ -419,37 +409,37 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(51) CometFilter
+(50) CometFilter
 Input [2]: [d_date_sk#43, d_year#44]
 Condition : isnotnull(d_date_sk#43)
 
-(52) ColumnarToRow [codegen id : 6]
+(51) ColumnarToRow [codegen id : 8]
 Input [2]: [d_date_sk#43, d_year#44]
 
-(53) BroadcastExchange
+(52) BroadcastExchange
 Input [2]: [d_date_sk#43, d_year#44]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(54) BroadcastHashJoin [codegen id : 18]
+(53) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_first_sales_date_sk#42]
 Right keys [1]: [d_date_sk#43]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 18]
+(54) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42, d_date_sk#43, d_year#44]
 
-(56) ReusedExchange [Reuses operator id: 53]
+(55) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#45, d_year#46]
 
-(57) BroadcastHashJoin [codegen id : 18]
+(56) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_first_shipto_date_sk#41]
 Right keys [1]: [d_date_sk#45]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 18]
+(57) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44, d_date_sk#45, d_year#46]
 
@@ -460,37 +450,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_demographics]
 PushedFilters: [IsNotNull(cd_demo_sk), IsNotNull(cd_marital_status)]
 ReadSchema: struct<cd_demo_sk:int,cd_marital_status:string>
 
-(60) CometFilter
+(59) CometFilter
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Condition : (isnotnull(cd_demo_sk#47) AND isnotnull(cd_marital_status#48))
 
-(61) ColumnarToRow [codegen id : 8]
+(60) ColumnarToRow [codegen id : 10]
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 
-(62) BroadcastExchange
+(61) BroadcastExchange
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(63) BroadcastHashJoin [codegen id : 18]
+(62) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_cdemo_sk#3]
 Right keys [1]: [cd_demo_sk#47]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 18]
+(63) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_demo_sk#47, cd_marital_status#48]
 
-(65) ReusedExchange [Reuses operator id: 62]
+(64) ReusedExchange [Reuses operator id: 61]
 Output [2]: [cd_demo_sk#49, cd_marital_status#50]
 
-(66) BroadcastHashJoin [codegen id : 18]
+(65) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_current_cdemo_sk#38]
 Right keys [1]: [cd_demo_sk#49]
 Join type: Inner
 Join condition: NOT (cd_marital_status#48 = cd_marital_status#50)
 
-(67) Project [codegen id : 18]
+(66) Project [codegen id : 20]
 Output [14]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48, cd_demo_sk#49, cd_marital_status#50]
 
@@ -501,24 +491,24 @@ Location [not included in comparison]/{warehouse_dir}/promotion]
 PushedFilters: [IsNotNull(p_promo_sk)]
 ReadSchema: struct<p_promo_sk:int>
 
-(69) CometFilter
+(68) CometFilter
 Input [1]: [p_promo_sk#51]
 Condition : isnotnull(p_promo_sk#51)
 
-(70) ColumnarToRow [codegen id : 10]
+(69) ColumnarToRow [codegen id : 12]
 Input [1]: [p_promo_sk#51]
 
-(71) BroadcastExchange
+(70) BroadcastExchange
 Input [1]: [p_promo_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-(72) BroadcastHashJoin [codegen id : 18]
+(71) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_promo_sk#7]
 Right keys [1]: [p_promo_sk#51]
 Join type: Inner
 Join condition: None
 
-(73) Project [codegen id : 18]
+(72) Project [codegen id : 20]
 Output [13]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, p_promo_sk#51]
 
@@ -529,37 +519,37 @@ Location [not included in comparison]/{warehouse_dir}/household_demographics]
 PushedFilters: [IsNotNull(hd_demo_sk), IsNotNull(hd_income_band_sk)]
 ReadSchema: struct<hd_demo_sk:int,hd_income_band_sk:int>
 
-(75) CometFilter
+(74) CometFilter
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Condition : (isnotnull(hd_demo_sk#52) AND isnotnull(hd_income_band_sk#53))
 
-(76) ColumnarToRow [codegen id : 11]
+(75) ColumnarToRow [codegen id : 13]
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 
-(77) BroadcastExchange
+(76) BroadcastExchange
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=11]
 
-(78) BroadcastHashJoin [codegen id : 18]
+(77) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_hdemo_sk#4]
 Right keys [1]: [hd_demo_sk#52]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 18]
+(78) Project [codegen id : 20]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_demo_sk#52, hd_income_band_sk#53]
 
-(80) ReusedExchange [Reuses operator id: 77]
+(79) ReusedExchange [Reuses operator id: 76]
 Output [2]: [hd_demo_sk#54, hd_income_band_sk#55]
 
-(81) BroadcastHashJoin [codegen id : 18]
+(80) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_current_hdemo_sk#39]
 Right keys [1]: [hd_demo_sk#54]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 18]
+(81) Project [codegen id : 20]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55]
 Input [15]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_demo_sk#54, hd_income_band_sk#55]
 
@@ -570,37 +560,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_street_number:string,ca_street_name:string,ca_city:string,ca_zip:string>
 
-(84) CometFilter
+(83) CometFilter
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Condition : isnotnull(ca_address_sk#56)
 
-(85) ColumnarToRow [codegen id : 13]
+(84) ColumnarToRow [codegen id : 15]
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(86) BroadcastExchange
+(85) BroadcastExchange
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-(87) BroadcastHashJoin [codegen id : 18]
+(86) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_addr_sk#5]
 Right keys [1]: [ca_address_sk#56]
 Join type: Inner
 Join condition: None
 
-(88) Project [codegen id : 18]
+(87) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Input [18]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(89) ReusedExchange [Reuses operator id: 86]
+(88) ReusedExchange [Reuses operator id: 85]
 Output [5]: [ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
-(90) BroadcastHashJoin [codegen id : 18]
+(89) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_current_addr_sk#40]
 Right keys [1]: [ca_address_sk#61]
 Join type: Inner
 Join condition: None
 
-(91) Project [codegen id : 18]
+(90) Project [codegen id : 20]
 Output [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [21]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
@@ -611,37 +601,37 @@ Location [not included in comparison]/{warehouse_dir}/income_band]
 PushedFilters: [IsNotNull(ib_income_band_sk)]
 ReadSchema: struct<ib_income_band_sk:int>
 
-(93) CometFilter
+(92) CometFilter
 Input [1]: [ib_income_band_sk#66]
 Condition : isnotnull(ib_income_band_sk#66)
 
-(94) ColumnarToRow [codegen id : 15]
+(93) ColumnarToRow [codegen id : 17]
 Input [1]: [ib_income_band_sk#66]
 
-(95) BroadcastExchange
+(94) BroadcastExchange
 Input [1]: [ib_income_band_sk#66]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(96) BroadcastHashJoin [codegen id : 18]
+(95) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [hd_income_band_sk#53]
 Right keys [1]: [ib_income_band_sk#66]
 Join type: Inner
 Join condition: None
 
-(97) Project [codegen id : 18]
+(96) Project [codegen id : 20]
 Output [18]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [20]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#66]
 
-(98) ReusedExchange [Reuses operator id: 95]
+(97) ReusedExchange [Reuses operator id: 94]
 Output [1]: [ib_income_band_sk#67]
 
-(99) BroadcastHashJoin [codegen id : 18]
+(98) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [hd_income_band_sk#55]
 Right keys [1]: [ib_income_band_sk#67]
 Join type: Inner
 Join condition: None
 
-(100) Project [codegen id : 18]
+(99) Project [codegen id : 20]
 Output [17]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#67]
 
@@ -652,58 +642,52 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_current_price), In(i_color, [burlywood           ,floral              ,indian              ,medium              ,purple              ,spring              ]), GreaterThanOrEqual(i_current_price,64.00), LessThanOrEqual(i_current_price,74.00), GreaterThanOrEqual(i_current_price,65.00), LessThanOrEqual(i_current_price,79.00), IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_color:string,i_product_name:string>
 
-(102) CometFilter
+(101) CometFilter
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Condition : ((((((isnotnull(i_current_price#69) AND i_color#70 IN (purple              ,burlywood           ,indian              ,spring              ,floral              ,medium              )) AND (i_current_price#69 >= 64.00)) AND (i_current_price#69 <= 74.00)) AND (i_current_price#69 >= 65.00)) AND (i_current_price#69 <= 79.00)) AND isnotnull(i_item_sk#68))
 
-(103) CometProject
+(102) CometProject
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Arguments: [i_item_sk#68, i_product_name#71], [i_item_sk#68, i_product_name#71]
 
-(104) ColumnarToRow [codegen id : 17]
+(103) ColumnarToRow [codegen id : 19]
 Input [2]: [i_item_sk#68, i_product_name#71]
 
-(105) BroadcastExchange
+(104) BroadcastExchange
 Input [2]: [i_item_sk#68, i_product_name#71]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
-(106) BroadcastHashJoin [codegen id : 18]
+(105) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#68]
 Join type: Inner
 Join condition: None
 
-(107) Project [codegen id : 18]
+(106) Project [codegen id : 20]
 Output [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 
-(108) HashAggregate [codegen id : 18]
+(107) HashAggregate [codegen id : 20]
 Input [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#9)), partial_sum(UnscaledValue(ss_list_price#10)), partial_sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count#72, sum#73, sum#74, sum#75]
 Results [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 
-(109) HashAggregate [codegen id : 18]
+(108) HashAggregate [codegen id : 20]
 Input [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#9)), sum(UnscaledValue(ss_list_price#10)), sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#9))#81, sum(UnscaledValue(ss_list_price#10))#82, sum(UnscaledValue(ss_coupon_amt#11))#83]
 Results [17]: [i_product_name#71 AS product_name#84, i_item_sk#68 AS item_sk#85, s_store_name#35 AS store_name#86, s_zip#36 AS store_zip#87, ca_street_number#57 AS b_street_number#88, ca_street_name#58 AS b_streen_name#89, ca_city#59 AS b_city#90, ca_zip#60 AS b_zip#91, ca_street_number#62 AS c_street_number#92, ca_street_name#63 AS c_street_name#93, ca_city#64 AS c_city#94, ca_zip#65 AS c_zip#95, d_year#33 AS syear#96, count(1)#80 AS cnt#97, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#9))#81,17,2) AS s1#98, MakeDecimal(sum(UnscaledValue(ss_list_price#10))#82,17,2) AS s2#99, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#11))#83,17,2) AS s3#100]
 
-(110) RowToColumnar
-Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-
-(111) CometColumnarExchange
+(109) Exchange
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(112) CometSort
-Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100], [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST]
-
-(113) ColumnarToRow [codegen id : 19]
+(110) Sort [codegen id : 21]
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
+Arguments: [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
@@ -713,14 +697,14 @@ PartitionFilters: [isnotnull(ss_sold_date_sk#112), dynamicpruningexpression(ss_s
 PushedFilters: [IsNotNull(ss_item_sk), IsNotNull(ss_ticket_number), IsNotNull(ss_store_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_cdemo_sk), IsNotNull(ss_promo_sk), IsNotNull(ss_hdemo_sk), IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_cdemo_sk:int,ss_hdemo_sk:int,ss_addr_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_number:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(115) CometFilter
+(112) CometFilter
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Condition : (((((((isnotnull(ss_item_sk#101) AND isnotnull(ss_ticket_number#108)) AND isnotnull(ss_store_sk#106)) AND isnotnull(ss_customer_sk#102)) AND isnotnull(ss_cdemo_sk#103)) AND isnotnull(ss_promo_sk#107)) AND isnotnull(ss_hdemo_sk#104)) AND isnotnull(ss_addr_sk#105))
 
-(116) ColumnarToRow [codegen id : 20]
+(113) ColumnarToRow [codegen id : 22]
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 
-(117) BroadcastExchange
+(114) BroadcastExchange
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, false] as bigint), 32) | (cast(input[7, int, false] as bigint) & 4294967295))),false), [plan_id=16]
 
@@ -731,324 +715,310 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_item_sk), IsNotNull(sr_ticket_number)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int>
 
-(119) CometFilter
+(116) CometFilter
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Condition : (isnotnull(sr_item_sk#114) AND isnotnull(sr_ticket_number#115))
 
-(120) CometProject
+(117) CometProject
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Arguments: [sr_item_sk#114, sr_ticket_number#115], [sr_item_sk#114, sr_ticket_number#115]
 
-(121) ColumnarToRow
+(118) ColumnarToRow
 Input [2]: [sr_item_sk#114, sr_ticket_number#115]
 
-(122) BroadcastHashJoin [codegen id : 21]
+(119) BroadcastHashJoin [codegen id : 23]
 Left keys [2]: [ss_item_sk#101, ss_ticket_number#108]
 Right keys [2]: [sr_item_sk#114, sr_ticket_number#115]
 Join type: Inner
 Join condition: None
 
-(123) Project [codegen id : 21]
+(120) Project [codegen id : 23]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, sr_item_sk#114, sr_ticket_number#115]
 
-(124) RowToColumnar
-Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-
-(125) CometColumnarExchange
+(121) Exchange
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
+Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, [plan_id=17]
 
-(126) CometSort
+(122) Sort [codegen id : 24]
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101 ASC NULLS FIRST]
+Arguments: [ss_item_sk#101 ASC NULLS FIRST], false, 0
 
-(127) ReusedExchange [Reuses operator id: 27]
+(123) ReusedExchange [Reuses operator id: 26]
 Output [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 
-(128) CometHashAggregate
+(124) CometHashAggregate
 Input [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 Keys [1]: [cs_item_sk#117]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#121)), sum(((cr_refunded_cash#122 + cr_reversed_charge#123) + cr_store_credit#124))]
 
-(129) CometFilter
+(125) CometFilter
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(130) CometProject
+(126) CometProject
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Arguments: [cs_item_sk#117], [cs_item_sk#117]
 
-(131) CometSort
+(127) CometSort
 Input [1]: [cs_item_sk#117]
 Arguments: [cs_item_sk#117], [cs_item_sk#117 ASC NULLS FIRST]
 
-(132) CometSortMergeJoin
-Left output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Right output [1]: [cs_item_sk#117]
-Arguments: [ss_item_sk#101], [cs_item_sk#117], Inner
+(128) ColumnarToRow [codegen id : 25]
+Input [1]: [cs_item_sk#117]
 
-(133) CometProject
-Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, cs_item_sk#117]
-Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+(129) SortMergeJoin [codegen id : 41]
+Left keys [1]: [ss_item_sk#101]
+Right keys [1]: [cs_item_sk#117]
+Join type: Inner
+Join condition: None
 
-(134) ColumnarToRow [codegen id : 37]
-Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+(130) Project [codegen id : 41]
+Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, cs_item_sk#117]
 
-(135) ReusedExchange [Reuses operator id: 199]
+(131) ReusedExchange [Reuses operator id: 191]
 Output [2]: [d_date_sk#125, d_year#126]
 
-(136) BroadcastHashJoin [codegen id : 37]
+(132) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_sold_date_sk#112]
 Right keys [1]: [d_date_sk#125]
 Join type: Inner
 Join condition: None
 
-(137) Project [codegen id : 37]
+(133) Project [codegen id : 41]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126]
 Input [13]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, d_date_sk#125, d_year#126]
 
-(138) ReusedExchange [Reuses operator id: 41]
+(134) ReusedExchange [Reuses operator id: 40]
 Output [3]: [s_store_sk#127, s_store_name#128, s_zip#129]
 
-(139) BroadcastHashJoin [codegen id : 37]
+(135) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_store_sk#106]
 Right keys [1]: [s_store_sk#127]
 Join type: Inner
 Join condition: None
 
-(140) Project [codegen id : 37]
+(136) Project [codegen id : 41]
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_sk#127, s_store_name#128, s_zip#129]
 
-(141) ReusedExchange [Reuses operator id: 47]
+(137) ReusedExchange [Reuses operator id: 46]
 Output [6]: [c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(142) BroadcastHashJoin [codegen id : 37]
+(138) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_customer_sk#102]
 Right keys [1]: [c_customer_sk#130]
 Join type: Inner
 Join condition: None
 
-(143) Project [codegen id : 37]
+(139) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 Input [18]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(144) ReusedExchange [Reuses operator id: 53]
+(140) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#136, d_year#137]
 
-(145) BroadcastHashJoin [codegen id : 37]
+(141) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_first_sales_date_sk#135]
 Right keys [1]: [d_date_sk#136]
 Join type: Inner
 Join condition: None
 
-(146) Project [codegen id : 37]
+(142) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135, d_date_sk#136, d_year#137]
 
-(147) ReusedExchange [Reuses operator id: 53]
+(143) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#138, d_year#139]
 
-(148) BroadcastHashJoin [codegen id : 37]
+(144) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_first_shipto_date_sk#134]
 Right keys [1]: [d_date_sk#138]
 Join type: Inner
 Join condition: None
 
-(149) Project [codegen id : 37]
+(145) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137, d_date_sk#138, d_year#139]
 
-(150) ReusedExchange [Reuses operator id: 62]
+(146) ReusedExchange [Reuses operator id: 61]
 Output [2]: [cd_demo_sk#140, cd_marital_status#141]
 
-(151) BroadcastHashJoin [codegen id : 37]
+(147) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_cdemo_sk#103]
 Right keys [1]: [cd_demo_sk#140]
 Join type: Inner
 Join condition: None
 
-(152) Project [codegen id : 37]
+(148) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_demo_sk#140, cd_marital_status#141]
 
-(153) ReusedExchange [Reuses operator id: 62]
+(149) ReusedExchange [Reuses operator id: 61]
 Output [2]: [cd_demo_sk#142, cd_marital_status#143]
 
-(154) BroadcastHashJoin [codegen id : 37]
+(150) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_current_cdemo_sk#131]
 Right keys [1]: [cd_demo_sk#142]
 Join type: Inner
 Join condition: NOT (cd_marital_status#141 = cd_marital_status#143)
 
-(155) Project [codegen id : 37]
+(151) Project [codegen id : 41]
 Output [14]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141, cd_demo_sk#142, cd_marital_status#143]
 
-(156) ReusedExchange [Reuses operator id: 71]
+(152) ReusedExchange [Reuses operator id: 70]
 Output [1]: [p_promo_sk#144]
 
-(157) BroadcastHashJoin [codegen id : 37]
+(153) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_promo_sk#107]
 Right keys [1]: [p_promo_sk#144]
 Join type: Inner
 Join condition: None
 
-(158) Project [codegen id : 37]
+(154) Project [codegen id : 41]
 Output [13]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, p_promo_sk#144]
 
-(159) ReusedExchange [Reuses operator id: 77]
+(155) ReusedExchange [Reuses operator id: 76]
 Output [2]: [hd_demo_sk#145, hd_income_band_sk#146]
 
-(160) BroadcastHashJoin [codegen id : 37]
+(156) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_hdemo_sk#104]
 Right keys [1]: [hd_demo_sk#145]
 Join type: Inner
 Join condition: None
 
-(161) Project [codegen id : 37]
+(157) Project [codegen id : 41]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_demo_sk#145, hd_income_band_sk#146]
 
-(162) ReusedExchange [Reuses operator id: 77]
+(158) ReusedExchange [Reuses operator id: 76]
 Output [2]: [hd_demo_sk#147, hd_income_band_sk#148]
 
-(163) BroadcastHashJoin [codegen id : 37]
+(159) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_current_hdemo_sk#132]
 Right keys [1]: [hd_demo_sk#147]
 Join type: Inner
 Join condition: None
 
-(164) Project [codegen id : 37]
+(160) Project [codegen id : 41]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148]
 Input [15]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_demo_sk#147, hd_income_band_sk#148]
 
-(165) ReusedExchange [Reuses operator id: 86]
+(161) ReusedExchange [Reuses operator id: 85]
 Output [5]: [ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(166) BroadcastHashJoin [codegen id : 37]
+(162) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_addr_sk#105]
 Right keys [1]: [ca_address_sk#149]
 Join type: Inner
 Join condition: None
 
-(167) Project [codegen id : 37]
+(163) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 Input [18]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(168) ReusedExchange [Reuses operator id: 86]
+(164) ReusedExchange [Reuses operator id: 85]
 Output [5]: [ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(169) BroadcastHashJoin [codegen id : 37]
+(165) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_current_addr_sk#133]
 Right keys [1]: [ca_address_sk#154]
 Join type: Inner
 Join condition: None
 
-(170) Project [codegen id : 37]
+(166) Project [codegen id : 41]
 Output [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [21]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(171) ReusedExchange [Reuses operator id: 95]
+(167) ReusedExchange [Reuses operator id: 94]
 Output [1]: [ib_income_band_sk#159]
 
-(172) BroadcastHashJoin [codegen id : 37]
+(168) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [hd_income_band_sk#146]
 Right keys [1]: [ib_income_band_sk#159]
 Join type: Inner
 Join condition: None
 
-(173) Project [codegen id : 37]
+(169) Project [codegen id : 41]
 Output [18]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [20]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#159]
 
-(174) ReusedExchange [Reuses operator id: 95]
+(170) ReusedExchange [Reuses operator id: 94]
 Output [1]: [ib_income_band_sk#160]
 
-(175) BroadcastHashJoin [codegen id : 37]
+(171) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [hd_income_band_sk#148]
 Right keys [1]: [ib_income_band_sk#160]
 Join type: Inner
 Join condition: None
 
-(176) Project [codegen id : 37]
+(172) Project [codegen id : 41]
 Output [17]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#160]
 
-(177) ReusedExchange [Reuses operator id: 105]
+(173) ReusedExchange [Reuses operator id: 104]
 Output [2]: [i_item_sk#161, i_product_name#162]
 
-(178) BroadcastHashJoin [codegen id : 37]
+(174) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_item_sk#101]
 Right keys [1]: [i_item_sk#161]
 Join type: Inner
 Join condition: None
 
-(179) Project [codegen id : 37]
+(175) Project [codegen id : 41]
 Output [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 
-(180) HashAggregate [codegen id : 37]
+(176) HashAggregate [codegen id : 41]
 Input [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#109)), partial_sum(UnscaledValue(ss_list_price#110)), partial_sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count#72, sum#163, sum#164, sum#165]
 Results [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 
-(181) HashAggregate [codegen id : 37]
+(177) HashAggregate [codegen id : 41]
 Input [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#109)), sum(UnscaledValue(ss_list_price#110)), sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#109))#81, sum(UnscaledValue(ss_list_price#110))#82, sum(UnscaledValue(ss_coupon_amt#111))#83]
 Results [8]: [i_item_sk#161 AS item_sk#169, s_store_name#128 AS store_name#170, s_zip#129 AS store_zip#171, d_year#126 AS syear#172, count(1)#80 AS cnt#173, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#109))#81,17,2) AS s1#174, MakeDecimal(sum(UnscaledValue(ss_list_price#110))#82,17,2) AS s2#175, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#111))#83,17,2) AS s3#176]
 
-(182) RowToColumnar
+(178) Exchange
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
+Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, [plan_id=18]
 
-(183) CometColumnarExchange
+(179) Sort [codegen id : 42]
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
+Arguments: [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST], false, 0
 
-(184) CometSort
-Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176], [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST]
-
-(185) ColumnarToRow [codegen id : 38]
-Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-
-(186) SortMergeJoin [codegen id : 39]
+(180) SortMergeJoin [codegen id : 43]
 Left keys [3]: [item_sk#85, store_name#86, store_zip#87]
 Right keys [3]: [item_sk#169, store_name#170, store_zip#171]
 Join type: Inner
 Join condition: (cnt#173 <= cnt#97)
 
-(187) Project [codegen id : 39]
+(181) Project [codegen id : 43]
 Output [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
 Input [25]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
 
-(188) RowToColumnar
-Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-
-(189) CometColumnarExchange
-Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=19]
-
-(190) CometSort
+(182) Exchange
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173], [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST]
+Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=19]
 
-(191) ColumnarToRow [codegen id : 40]
+(183) Sort [codegen id : 44]
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
+Arguments: [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (195)
-+- * ColumnarToRow (194)
-   +- CometFilter (193)
-      +- CometScan parquet spark_catalog.default.date_dim (192)
+BroadcastExchange (187)
++- * ColumnarToRow (186)
+   +- CometFilter (185)
+      +- CometScan parquet spark_catalog.default.date_dim (184)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1058,22 +1028,22 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(193) CometFilter
+(185) CometFilter
 Input [2]: [d_date_sk#32, d_year#33]
 Condition : ((isnotnull(d_year#33) AND (d_year#33 = 1999)) AND isnotnull(d_date_sk#32))
 
-(194) ColumnarToRow [codegen id : 1]
+(186) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#32, d_year#33]
 
-(195) BroadcastExchange
+(187) BroadcastExchange
 Input [2]: [d_date_sk#32, d_year#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=20]
 
-Subquery:2 Hosting operator id = 114 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
-BroadcastExchange (199)
-+- * ColumnarToRow (198)
-   +- CometFilter (197)
-      +- CometScan parquet spark_catalog.default.date_dim (196)
+Subquery:2 Hosting operator id = 111 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
+BroadcastExchange (191)
++- * ColumnarToRow (190)
+   +- CometFilter (189)
+      +- CometScan parquet spark_catalog.default.date_dim (188)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1083,14 +1053,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(197) CometFilter
+(189) CometFilter
 Input [2]: [d_date_sk#125, d_year#126]
 Condition : ((isnotnull(d_year#126) AND (d_year#126 = 2000)) AND isnotnull(d_date_sk#125))
 
-(198) ColumnarToRow [codegen id : 1]
+(190) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#125, d_year#126]
 
-(199) BroadcastExchange
+(191) BroadcastExchange
 Input [2]: [d_date_sk#125, d_year#126]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=21]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt
index a11dd2497a..9529a3b000 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q64/simplified.txt
@@ -1,276 +1,278 @@
-WholeStageCodegen (40)
-  ColumnarToRow
+WholeStageCodegen (44)
+  Sort [product_name,store_name,cnt]
     InputAdapter
-      CometSort [product_name,store_name,cnt]
-        CometColumnarExchange [product_name,store_name,cnt] #1
-          RowToColumnar
-            WholeStageCodegen (39)
-              Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
-                SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
-                  InputAdapter
-                    WholeStageCodegen (19)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [item_sk,store_name,store_zip]
-                            CometColumnarExchange [item_sk,store_name,store_zip] #2
-                              RowToColumnar
-                                WholeStageCodegen (18)
-                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                                  ColumnarToRow
+      Exchange [product_name,store_name,cnt] #1
+        WholeStageCodegen (43)
+          Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
+            SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
+              InputAdapter
+                WholeStageCodegen (21)
+                  Sort [item_sk,store_name,store_zip]
+                    InputAdapter
+                      Exchange [item_sk,store_name,store_zip] #2
+                        WholeStageCodegen (20)
+                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                              InputAdapter
+                                                                                                WholeStageCodegen (3)
+                                                                                                  Sort [ss_item_sk]
                                                                                                     InputAdapter
-                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                                          CometSort [ss_item_sk]
-                                                                                                            CometColumnarExchange [ss_item_sk] #3
-                                                                                                              RowToColumnar
-                                                                                                                WholeStageCodegen (2)
-                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                      Exchange [ss_item_sk] #3
+                                                                                                        WholeStageCodegen (2)
+                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                              InputAdapter
+                                                                                                                BroadcastExchange #4
+                                                                                                                  WholeStageCodegen (1)
+                                                                                                                    ColumnarToRow
                                                                                                                       InputAdapter
-                                                                                                                        BroadcastExchange #4
-                                                                                                                          WholeStageCodegen (1)
-                                                                                                                            ColumnarToRow
-                                                                                                                              InputAdapter
-                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                                    SubqueryBroadcast [d_date_sk] #1
-                                                                                                                                      BroadcastExchange #5
-                                                                                                                                        WholeStageCodegen (1)
-                                                                                                                                          ColumnarToRow
-                                                                                                                                            InputAdapter
-                                                                                                                                              CometFilter [d_year,d_date_sk]
-                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                                      ColumnarToRow
-                                                                                                                        InputAdapter
-                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                                                                                          CometSort [cs_item_sk]
-                                                                                                            CometProject [cs_item_sk]
-                                                                                                              CometFilter [sale,refund]
-                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                                  CometColumnarExchange [cs_item_sk] #6
-                                                                                                                    CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                      CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                        CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                                                                                                                          CometSort [cs_item_sk,cs_order_number]
-                                                                                                                            CometColumnarExchange [cs_item_sk,cs_order_number] #7
-                                                                                                                              CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
-                                                                                                                                CometFilter [cs_item_sk,cs_order_number]
-                                                                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
-                                                                                                                          CometSort [cr_item_sk,cr_order_number]
-                                                                                                                            CometColumnarExchange [cr_item_sk,cr_order_number] #8
-                                                                                                                              CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                                CometFilter [cr_item_sk,cr_order_number]
-                                                                                                                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
-                                                                                                  InputAdapter
-                                                                                                    ReusedExchange [d_date_sk,d_year] #5
+                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                            SubqueryBroadcast [d_date_sk] #1
+                                                                                                                              BroadcastExchange #5
+                                                                                                                                WholeStageCodegen (1)
+                                                                                                                                  ColumnarToRow
+                                                                                                                                    InputAdapter
+                                                                                                                                      CometFilter [d_year,d_date_sk]
+                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                              ColumnarToRow
+                                                                                                                InputAdapter
+                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                                                                               InputAdapter
-                                                                                                BroadcastExchange #9
-                                                                                                  WholeStageCodegen (4)
-                                                                                                    ColumnarToRow
-                                                                                                      InputAdapter
-                                                                                                        CometFilter [s_store_sk,s_store_name,s_zip]
-                                                                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
+                                                                                                WholeStageCodegen (4)
+                                                                                                  ColumnarToRow
+                                                                                                    InputAdapter
+                                                                                                      CometSort [cs_item_sk]
+                                                                                                        CometProject [cs_item_sk]
+                                                                                                          CometFilter [sale,refund]
+                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                              CometExchange [cs_item_sk] #6
+                                                                                                                CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                  CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                    CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                                                                                                                      CometSort [cs_item_sk,cs_order_number]
+                                                                                                                        CometExchange [cs_item_sk,cs_order_number] #7
+                                                                                                                          CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
+                                                                                                                            CometFilter [cs_item_sk,cs_order_number]
+                                                                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
+                                                                                                                      CometSort [cr_item_sk,cr_order_number]
+                                                                                                                        CometExchange [cr_item_sk,cr_order_number] #8
+                                                                                                                          CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                            CometFilter [cr_item_sk,cr_order_number]
+                                                                                                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
                                                                                           InputAdapter
-                                                                                            BroadcastExchange #10
-                                                                                              WholeStageCodegen (5)
-                                                                                                ColumnarToRow
-                                                                                                  InputAdapter
-                                                                                                    CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
-                                                                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                            ReusedExchange [d_date_sk,d_year] #5
                                                                                       InputAdapter
-                                                                                        BroadcastExchange #11
+                                                                                        BroadcastExchange #9
                                                                                           WholeStageCodegen (6)
                                                                                             ColumnarToRow
                                                                                               InputAdapter
-                                                                                                CometFilter [d_date_sk]
-                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                CometFilter [s_store_sk,s_store_name,s_zip]
+                                                                                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
                                                                                   InputAdapter
-                                                                                    ReusedExchange [d_date_sk,d_year] #11
+                                                                                    BroadcastExchange #10
+                                                                                      WholeStageCodegen (7)
+                                                                                        ColumnarToRow
+                                                                                          InputAdapter
+                                                                                            CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
+                                                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
                                                                               InputAdapter
-                                                                                BroadcastExchange #12
+                                                                                BroadcastExchange #11
                                                                                   WholeStageCodegen (8)
                                                                                     ColumnarToRow
                                                                                       InputAdapter
-                                                                                        CometFilter [cd_demo_sk,cd_marital_status]
-                                                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                                                        CometFilter [d_date_sk]
+                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                           InputAdapter
-                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                            ReusedExchange [d_date_sk,d_year] #11
                                                                       InputAdapter
-                                                                        BroadcastExchange #13
+                                                                        BroadcastExchange #12
                                                                           WholeStageCodegen (10)
                                                                             ColumnarToRow
                                                                               InputAdapter
-                                                                                CometFilter [p_promo_sk]
-                                                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                                                                                CometFilter [cd_demo_sk,cd_marital_status]
+                                                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                                                   InputAdapter
-                                                                    BroadcastExchange #14
-                                                                      WholeStageCodegen (11)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [hd_demo_sk,hd_income_band_sk]
-                                                                              CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
+                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                               InputAdapter
-                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                                BroadcastExchange #13
+                                                                  WholeStageCodegen (12)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometFilter [p_promo_sk]
+                                                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
                                                           InputAdapter
-                                                            BroadcastExchange #15
+                                                            BroadcastExchange #14
                                                               WholeStageCodegen (13)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [ca_address_sk]
-                                                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                                    CometFilter [hd_demo_sk,hd_income_band_sk]
+                                                                      CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
                                                       InputAdapter
-                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                   InputAdapter
-                                                    BroadcastExchange #16
+                                                    BroadcastExchange #15
                                                       WholeStageCodegen (15)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ib_income_band_sk]
-                                                              CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
+                                                            CometFilter [ca_address_sk]
+                                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
                                               InputAdapter
-                                                ReusedExchange [ib_income_band_sk] #16
+                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                           InputAdapter
-                                            BroadcastExchange #17
+                                            BroadcastExchange #16
                                               WholeStageCodegen (17)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometProject [i_item_sk,i_product_name]
-                                                      CometFilter [i_current_price,i_color,i_item_sk]
-                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
-                  InputAdapter
-                    WholeStageCodegen (38)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [item_sk,store_name,store_zip]
-                            CometColumnarExchange [item_sk,store_name,store_zip] #18
-                              RowToColumnar
-                                WholeStageCodegen (37)
-                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                                  ColumnarToRow
+                                                    CometFilter [ib_income_band_sk]
+                                                      CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
+                                      InputAdapter
+                                        ReusedExchange [ib_income_band_sk] #16
+                                  InputAdapter
+                                    BroadcastExchange #17
+                                      WholeStageCodegen (19)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [i_item_sk,i_product_name]
+                                              CometFilter [i_current_price,i_color,i_item_sk]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
+              InputAdapter
+                WholeStageCodegen (42)
+                  Sort [item_sk,store_name,store_zip]
+                    InputAdapter
+                      Exchange [item_sk,store_name,store_zip] #18
+                        WholeStageCodegen (41)
+                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                              InputAdapter
+                                                                                                WholeStageCodegen (24)
+                                                                                                  Sort [ss_item_sk]
                                                                                                     InputAdapter
-                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                                          CometSort [ss_item_sk]
-                                                                                                            CometColumnarExchange [ss_item_sk] #19
-                                                                                                              RowToColumnar
-                                                                                                                WholeStageCodegen (21)
-                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                      Exchange [ss_item_sk] #19
+                                                                                                        WholeStageCodegen (23)
+                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                              InputAdapter
+                                                                                                                BroadcastExchange #20
+                                                                                                                  WholeStageCodegen (22)
+                                                                                                                    ColumnarToRow
                                                                                                                       InputAdapter
-                                                                                                                        BroadcastExchange #20
-                                                                                                                          WholeStageCodegen (20)
-                                                                                                                            ColumnarToRow
-                                                                                                                              InputAdapter
-                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                                    SubqueryBroadcast [d_date_sk] #2
-                                                                                                                                      BroadcastExchange #21
-                                                                                                                                        WholeStageCodegen (1)
-                                                                                                                                          ColumnarToRow
-                                                                                                                                            InputAdapter
-                                                                                                                                              CometFilter [d_year,d_date_sk]
-                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                                      ColumnarToRow
-                                                                                                                        InputAdapter
-                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                                                                                          CometSort [cs_item_sk]
-                                                                                                            CometProject [cs_item_sk]
-                                                                                                              CometFilter [sale,refund]
-                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                                  ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
-                                                                                                  InputAdapter
-                                                                                                    ReusedExchange [d_date_sk,d_year] #21
+                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                            SubqueryBroadcast [d_date_sk] #2
+                                                                                                                              BroadcastExchange #21
+                                                                                                                                WholeStageCodegen (1)
+                                                                                                                                  ColumnarToRow
+                                                                                                                                    InputAdapter
+                                                                                                                                      CometFilter [d_year,d_date_sk]
+                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                              ColumnarToRow
+                                                                                                                InputAdapter
+                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                                                                               InputAdapter
-                                                                                                ReusedExchange [s_store_sk,s_store_name,s_zip] #9
+                                                                                                WholeStageCodegen (25)
+                                                                                                  ColumnarToRow
+                                                                                                    InputAdapter
+                                                                                                      CometSort [cs_item_sk]
+                                                                                                        CometProject [cs_item_sk]
+                                                                                                          CometFilter [sale,refund]
+                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                              ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
                                                                                           InputAdapter
-                                                                                            ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
+                                                                                            ReusedExchange [d_date_sk,d_year] #21
                                                                                       InputAdapter
-                                                                                        ReusedExchange [d_date_sk,d_year] #11
+                                                                                        ReusedExchange [s_store_sk,s_store_name,s_zip] #9
                                                                                   InputAdapter
-                                                                                    ReusedExchange [d_date_sk,d_year] #11
+                                                                                    ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
                                                                               InputAdapter
-                                                                                ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                                ReusedExchange [d_date_sk,d_year] #11
                                                                           InputAdapter
-                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                            ReusedExchange [d_date_sk,d_year] #11
                                                                       InputAdapter
-                                                                        ReusedExchange [p_promo_sk] #13
+                                                                        ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                   InputAdapter
-                                                                    ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                               InputAdapter
-                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                                ReusedExchange [p_promo_sk] #13
                                                           InputAdapter
-                                                            ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                            ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                       InputAdapter
-                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                   InputAdapter
-                                                    ReusedExchange [ib_income_band_sk] #16
+                                                    ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                               InputAdapter
-                                                ReusedExchange [ib_income_band_sk] #16
+                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                           InputAdapter
-                                            ReusedExchange [i_item_sk,i_product_name] #17
+                                            ReusedExchange [ib_income_band_sk] #16
+                                      InputAdapter
+                                        ReusedExchange [ib_income_band_sk] #16
+                                  InputAdapter
+                                    ReusedExchange [i_item_sk,i_product_name] #17
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt
index 3ef59799a9..1a06f27fb9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/explain.txt
@@ -1,47 +1,43 @@
 == Physical Plan ==
-TakeOrderedAndProject (43)
-+- * Project (42)
-   +- * BroadcastHashJoin Inner BuildRight (41)
-      :- * Project (24)
-      :  +- * BroadcastHashJoin Inner BuildRight (23)
-      :     :- * Project (18)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+TakeOrderedAndProject (39)
++- * Project (38)
+   +- * BroadcastHashJoin Inner BuildRight (37)
+      :- * Project (22)
+      :  +- * BroadcastHashJoin Inner BuildRight (21)
+      :     :- * Project (16)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (15)
       :     :     :- * ColumnarToRow (3)
       :     :     :  +- CometFilter (2)
       :     :     :     +- CometScan parquet spark_catalog.default.store (1)
-      :     :     +- BroadcastExchange (16)
-      :     :        +- * ColumnarToRow (15)
-      :     :           +- CometFilter (14)
-      :     :              +- CometHashAggregate (13)
-      :     :                 +- CometColumnarExchange (12)
-      :     :                    +- RowToColumnar (11)
-      :     :                       +- * HashAggregate (10)
-      :     :                          +- * Project (9)
-      :     :                             +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                :- * ColumnarToRow (6)
-      :     :                                :  +- CometFilter (5)
-      :     :                                :     +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :                                +- ReusedExchange (7)
-      :     +- BroadcastExchange (22)
-      :        +- * ColumnarToRow (21)
-      :           +- CometFilter (20)
-      :              +- CometScan parquet spark_catalog.default.item (19)
-      +- BroadcastExchange (40)
-         +- * ColumnarToRow (39)
-            +- CometFilter (38)
-               +- CometHashAggregate (37)
-                  +- CometColumnarExchange (36)
-                     +- CometHashAggregate (35)
-                        +- CometHashAggregate (34)
-                           +- CometColumnarExchange (33)
-                              +- RowToColumnar (32)
-                                 +- * HashAggregate (31)
-                                    +- * Project (30)
-                                       +- * BroadcastHashJoin Inner BuildRight (29)
-                                          :- * ColumnarToRow (27)
-                                          :  +- CometFilter (26)
-                                          :     +- CometScan parquet spark_catalog.default.store_sales (25)
-                                          +- ReusedExchange (28)
+      :     :     +- BroadcastExchange (14)
+      :     :        +- * Filter (13)
+      :     :           +- * HashAggregate (12)
+      :     :              +- Exchange (11)
+      :     :                 +- * HashAggregate (10)
+      :     :                    +- * Project (9)
+      :     :                       +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                          :- * ColumnarToRow (6)
+      :     :                          :  +- CometFilter (5)
+      :     :                          :     +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :                          +- ReusedExchange (7)
+      :     +- BroadcastExchange (20)
+      :        +- * ColumnarToRow (19)
+      :           +- CometFilter (18)
+      :              +- CometScan parquet spark_catalog.default.item (17)
+      +- BroadcastExchange (36)
+         +- * Filter (35)
+            +- * HashAggregate (34)
+               +- Exchange (33)
+                  +- * HashAggregate (32)
+                     +- * HashAggregate (31)
+                        +- Exchange (30)
+                           +- * HashAggregate (29)
+                              +- * Project (28)
+                                 +- * BroadcastHashJoin Inner BuildRight (27)
+                                    :- * ColumnarToRow (25)
+                                    :  +- CometFilter (24)
+                                    :     +- CometScan parquet spark_catalog.default.store_sales (23)
+                                    +- ReusedExchange (26)
 
 
 (unknown) Scan parquet spark_catalog.default.store
@@ -55,7 +51,7 @@ ReadSchema: struct<s_store_sk:int,s_store_name:string>
 Input [2]: [s_store_sk#1, s_store_name#2]
 Condition : isnotnull(s_store_sk#1)
 
-(3) ColumnarToRow [codegen id : 8]
+(3) ColumnarToRow [codegen id : 9]
 Input [2]: [s_store_sk#1, s_store_name#2]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -73,7 +69,7 @@ Condition : (isnotnull(ss_store_sk#4) AND isnotnull(ss_item_sk#3))
 (6) ColumnarToRow [codegen id : 2]
 Input [4]: [ss_item_sk#3, ss_store_sk#4, ss_sales_price#5, ss_sold_date_sk#6]
 
-(7) ReusedExchange [Reuses operator id: 48]
+(7) ReusedExchange [Reuses operator id: 44]
 Output [1]: [d_date_sk#8]
 
 (8) BroadcastHashJoin [codegen id : 2]
@@ -93,185 +89,181 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#5))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
 
-(11) RowToColumnar
+(11) Exchange
 Input [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
+Arguments: hashpartitioning(ss_store_sk#4, ss_item_sk#3, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(12) CometColumnarExchange
-Input [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
-Arguments: hashpartitioning(ss_store_sk#4, ss_item_sk#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
-
-(13) CometHashAggregate
+(12) HashAggregate [codegen id : 3]
 Input [3]: [ss_store_sk#4, ss_item_sk#3, sum#10]
 Keys [2]: [ss_store_sk#4, ss_item_sk#3]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#5))#11]
+Results [3]: [ss_store_sk#4, ss_item_sk#3, MakeDecimal(sum(UnscaledValue(ss_sales_price#5))#11,17,2) AS revenue#12]
 
-(14) CometFilter
-Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#11]
-Condition : isnotnull(revenue#11)
+(13) Filter [codegen id : 3]
+Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#12]
+Condition : isnotnull(revenue#12)
 
-(15) ColumnarToRow [codegen id : 3]
-Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#11]
-
-(16) BroadcastExchange
-Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#11]
+(14) BroadcastExchange
+Input [3]: [ss_store_sk#4, ss_item_sk#3, revenue#12]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=2]
 
-(17) BroadcastHashJoin [codegen id : 8]
+(15) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [s_store_sk#1]
 Right keys [1]: [ss_store_sk#4]
 Join type: Inner
 Join condition: None
 
-(18) Project [codegen id : 8]
-Output [4]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#11]
-Input [5]: [s_store_sk#1, s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#11]
+(16) Project [codegen id : 9]
+Output [4]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#12]
+Input [5]: [s_store_sk#1, s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#12]
 
 (unknown) Scan parquet spark_catalog.default.item
-Output [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+Output [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_item_desc:string,i_current_price:decimal(7,2),i_wholesale_cost:decimal(7,2),i_brand:string>
 
-(20) CometFilter
-Input [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
-Condition : isnotnull(i_item_sk#12)
+(18) CometFilter
+Input [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+Condition : isnotnull(i_item_sk#13)
 
-(21) ColumnarToRow [codegen id : 4]
-Input [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+(19) ColumnarToRow [codegen id : 4]
+Input [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
 
-(22) BroadcastExchange
-Input [5]: [i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+(20) BroadcastExchange
+Input [5]: [i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(23) BroadcastHashJoin [codegen id : 8]
+(21) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_item_sk#3]
-Right keys [1]: [i_item_sk#12]
+Right keys [1]: [i_item_sk#13]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 8]
-Output [7]: [s_store_name#2, ss_store_sk#4, revenue#11, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
-Input [9]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#11, i_item_sk#12, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+(22) Project [codegen id : 9]
+Output [7]: [s_store_name#2, ss_store_sk#4, revenue#12, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+Input [9]: [s_store_name#2, ss_store_sk#4, ss_item_sk#3, revenue#12, i_item_sk#13, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20]
+Output [4]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#20), dynamicpruningexpression(ss_sold_date_sk#20 IN dynamicpruning#21)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#21), dynamicpruningexpression(ss_sold_date_sk#21 IN dynamicpruning#22)]
 PushedFilters: [IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_store_sk:int,ss_sales_price:decimal(7,2)>
 
-(26) CometFilter
-Input [4]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20]
-Condition : isnotnull(ss_store_sk#18)
+(24) CometFilter
+Input [4]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21]
+Condition : isnotnull(ss_store_sk#19)
 
-(27) ColumnarToRow [codegen id : 6]
-Input [4]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20]
+(25) ColumnarToRow [codegen id : 6]
+Input [4]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21]
 
-(28) ReusedExchange [Reuses operator id: 48]
-Output [1]: [d_date_sk#22]
+(26) ReusedExchange [Reuses operator id: 44]
+Output [1]: [d_date_sk#23]
 
-(29) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#20]
-Right keys [1]: [d_date_sk#22]
+(27) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#21]
+Right keys [1]: [d_date_sk#23]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [3]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19]
-Input [5]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19, ss_sold_date_sk#20, d_date_sk#22]
-
-(31) HashAggregate [codegen id : 6]
-Input [3]: [ss_item_sk#17, ss_store_sk#18, ss_sales_price#19]
-Keys [2]: [ss_store_sk#18, ss_item_sk#17]
-Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#19))]
-Aggregate Attributes [1]: [sum#23]
-Results [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
-
-(32) RowToColumnar
-Input [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
-
-(33) CometColumnarExchange
-Input [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
-Arguments: hashpartitioning(ss_store_sk#18, ss_item_sk#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [3]: [ss_store_sk#18, ss_item_sk#17, sum#24]
-Keys [2]: [ss_store_sk#18, ss_item_sk#17]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#19))]
-
-(35) CometHashAggregate
-Input [2]: [ss_store_sk#18, revenue#25]
-Keys [1]: [ss_store_sk#18]
-Functions [1]: [partial_avg(revenue#25)]
-
-(36) CometColumnarExchange
-Input [3]: [ss_store_sk#18, sum#26, count#27]
-Arguments: hashpartitioning(ss_store_sk#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(37) CometHashAggregate
-Input [3]: [ss_store_sk#18, sum#26, count#27]
-Keys [1]: [ss_store_sk#18]
-Functions [1]: [avg(revenue#25)]
-
-(38) CometFilter
-Input [2]: [ss_store_sk#18, ave#28]
-Condition : isnotnull(ave#28)
-
-(39) ColumnarToRow [codegen id : 7]
-Input [2]: [ss_store_sk#18, ave#28]
-
-(40) BroadcastExchange
-Input [2]: [ss_store_sk#18, ave#28]
+(28) Project [codegen id : 6]
+Output [3]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20]
+Input [5]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20, ss_sold_date_sk#21, d_date_sk#23]
+
+(29) HashAggregate [codegen id : 6]
+Input [3]: [ss_item_sk#18, ss_store_sk#19, ss_sales_price#20]
+Keys [2]: [ss_store_sk#19, ss_item_sk#18]
+Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#20))]
+Aggregate Attributes [1]: [sum#24]
+Results [3]: [ss_store_sk#19, ss_item_sk#18, sum#25]
+
+(30) Exchange
+Input [3]: [ss_store_sk#19, ss_item_sk#18, sum#25]
+Arguments: hashpartitioning(ss_store_sk#19, ss_item_sk#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 7]
+Input [3]: [ss_store_sk#19, ss_item_sk#18, sum#25]
+Keys [2]: [ss_store_sk#19, ss_item_sk#18]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#20))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#20))#26]
+Results [2]: [ss_store_sk#19, MakeDecimal(sum(UnscaledValue(ss_sales_price#20))#26,17,2) AS revenue#27]
+
+(32) HashAggregate [codegen id : 7]
+Input [2]: [ss_store_sk#19, revenue#27]
+Keys [1]: [ss_store_sk#19]
+Functions [1]: [partial_avg(revenue#27)]
+Aggregate Attributes [2]: [sum#28, count#29]
+Results [3]: [ss_store_sk#19, sum#30, count#31]
+
+(33) Exchange
+Input [3]: [ss_store_sk#19, sum#30, count#31]
+Arguments: hashpartitioning(ss_store_sk#19, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(34) HashAggregate [codegen id : 8]
+Input [3]: [ss_store_sk#19, sum#30, count#31]
+Keys [1]: [ss_store_sk#19]
+Functions [1]: [avg(revenue#27)]
+Aggregate Attributes [1]: [avg(revenue#27)#32]
+Results [2]: [ss_store_sk#19, avg(revenue#27)#32 AS ave#33]
+
+(35) Filter [codegen id : 8]
+Input [2]: [ss_store_sk#19, ave#33]
+Condition : isnotnull(ave#33)
+
+(36) BroadcastExchange
+Input [2]: [ss_store_sk#19, ave#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
-(41) BroadcastHashJoin [codegen id : 8]
+(37) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_store_sk#4]
-Right keys [1]: [ss_store_sk#18]
+Right keys [1]: [ss_store_sk#19]
 Join type: Inner
-Join condition: (cast(revenue#11 as decimal(23,7)) <= (0.1 * ave#28))
+Join condition: (cast(revenue#12 as decimal(23,7)) <= (0.1 * ave#33))
 
-(42) Project [codegen id : 8]
-Output [6]: [s_store_name#2, i_item_desc#13, revenue#11, i_current_price#14, i_wholesale_cost#15, i_brand#16]
-Input [9]: [s_store_name#2, ss_store_sk#4, revenue#11, i_item_desc#13, i_current_price#14, i_wholesale_cost#15, i_brand#16, ss_store_sk#18, ave#28]
+(38) Project [codegen id : 9]
+Output [6]: [s_store_name#2, i_item_desc#14, revenue#12, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+Input [9]: [s_store_name#2, ss_store_sk#4, revenue#12, i_item_desc#14, i_current_price#15, i_wholesale_cost#16, i_brand#17, ss_store_sk#19, ave#33]
 
-(43) TakeOrderedAndProject
-Input [6]: [s_store_name#2, i_item_desc#13, revenue#11, i_current_price#14, i_wholesale_cost#15, i_brand#16]
-Arguments: 100, [s_store_name#2 ASC NULLS FIRST, i_item_desc#13 ASC NULLS FIRST], [s_store_name#2, i_item_desc#13, revenue#11, i_current_price#14, i_wholesale_cost#15, i_brand#16]
+(39) TakeOrderedAndProject
+Input [6]: [s_store_name#2, i_item_desc#14, revenue#12, i_current_price#15, i_wholesale_cost#16, i_brand#17]
+Arguments: 100, [s_store_name#2 ASC NULLS FIRST, i_item_desc#14 ASC NULLS FIRST], [s_store_name#2, i_item_desc#14, revenue#12, i_current_price#15, i_wholesale_cost#16, i_brand#17]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (44)
++- * ColumnarToRow (43)
+   +- CometProject (42)
+      +- CometFilter (41)
+         +- CometScan parquet spark_catalog.default.date_dim (40)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#8, d_month_seq#29]
+Output [2]: [d_date_sk#8, d_month_seq#34]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1176), LessThanOrEqual(d_month_seq,1187), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(45) CometFilter
-Input [2]: [d_date_sk#8, d_month_seq#29]
-Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1176)) AND (d_month_seq#29 <= 1187)) AND isnotnull(d_date_sk#8))
+(41) CometFilter
+Input [2]: [d_date_sk#8, d_month_seq#34]
+Condition : (((isnotnull(d_month_seq#34) AND (d_month_seq#34 >= 1176)) AND (d_month_seq#34 <= 1187)) AND isnotnull(d_date_sk#8))
 
-(46) CometProject
-Input [2]: [d_date_sk#8, d_month_seq#29]
+(42) CometProject
+Input [2]: [d_date_sk#8, d_month_seq#34]
 Arguments: [d_date_sk#8], [d_date_sk#8]
 
-(47) ColumnarToRow [codegen id : 1]
+(43) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#8]
 
-(48) BroadcastExchange
+(44) BroadcastExchange
 Input [1]: [d_date_sk#8]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 25 Hosting Expression = ss_sold_date_sk#20 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 23 Hosting Expression = ss_sold_date_sk#21 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt
index 5a65234a30..33b695e811 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q65/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [s_store_name,i_item_desc,revenue,i_current_price,i_wholesale_cost,i_brand]
-  WholeStageCodegen (8)
+  WholeStageCodegen (9)
     Project [s_store_name,i_item_desc,revenue,i_current_price,i_wholesale_cost,i_brand]
       BroadcastHashJoin [ss_store_sk,ss_store_sk,revenue,ave]
         Project [s_store_name,ss_store_sk,revenue,i_item_desc,i_current_price,i_wholesale_cost,i_brand]
@@ -13,30 +13,28 @@ TakeOrderedAndProject [s_store_name,i_item_desc,revenue,i_current_price,i_wholes
                 InputAdapter
                   BroadcastExchange #1
                     WholeStageCodegen (3)
-                      ColumnarToRow
-                        InputAdapter
-                          CometFilter [revenue]
-                            CometHashAggregate [ss_store_sk,ss_item_sk,sum]
-                              CometColumnarExchange [ss_store_sk,ss_item_sk] #2
-                                RowToColumnar
-                                  WholeStageCodegen (2)
-                                    HashAggregate [ss_store_sk,ss_item_sk,ss_sales_price] [sum,sum]
-                                      Project [ss_item_sk,ss_store_sk,ss_sales_price]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_store_sk,ss_item_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_sales_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_month_seq,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                      Filter [revenue]
+                        HashAggregate [ss_store_sk,ss_item_sk,sum] [sum(UnscaledValue(ss_sales_price)),revenue,sum]
+                          InputAdapter
+                            Exchange [ss_store_sk,ss_item_sk] #2
+                              WholeStageCodegen (2)
+                                HashAggregate [ss_store_sk,ss_item_sk,ss_sales_price] [sum,sum]
+                                  Project [ss_item_sk,ss_store_sk,ss_sales_price]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_store_sk,ss_item_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_sales_price,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_month_seq,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
             InputAdapter
               BroadcastExchange #4
                 WholeStageCodegen (4)
@@ -46,16 +44,16 @@ TakeOrderedAndProject [s_store_name,i_item_desc,revenue,i_current_price,i_wholes
                         CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc,i_current_price,i_wholesale_cost,i_brand]
         InputAdapter
           BroadcastExchange #5
-            WholeStageCodegen (7)
-              ColumnarToRow
-                InputAdapter
-                  CometFilter [ave]
-                    CometHashAggregate [ss_store_sk,sum,count]
-                      CometColumnarExchange [ss_store_sk] #6
-                        CometHashAggregate [ss_store_sk,revenue]
-                          CometHashAggregate [ss_store_sk,ss_item_sk,sum]
-                            CometColumnarExchange [ss_store_sk,ss_item_sk] #7
-                              RowToColumnar
+            WholeStageCodegen (8)
+              Filter [ave]
+                HashAggregate [ss_store_sk,sum,count] [avg(revenue),ave,sum,count]
+                  InputAdapter
+                    Exchange [ss_store_sk] #6
+                      WholeStageCodegen (7)
+                        HashAggregate [ss_store_sk,revenue] [sum,count,sum,count]
+                          HashAggregate [ss_store_sk,ss_item_sk,sum] [sum(UnscaledValue(ss_sales_price)),revenue,sum]
+                            InputAdapter
+                              Exchange [ss_store_sk,ss_item_sk] #7
                                 WholeStageCodegen (6)
                                   HashAggregate [ss_store_sk,ss_item_sk,ss_sales_price] [sum,sum]
                                     Project [ss_item_sk,ss_store_sk,ss_sales_price]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt
index f4614e57bf..41e783d134 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/explain.txt
@@ -1,59 +1,56 @@
 == Physical Plan ==
-* ColumnarToRow (55)
-+- CometTakeOrderedAndProject (54)
-   +- CometHashAggregate (53)
-      +- CometColumnarExchange (52)
-         +- CometHashAggregate (51)
-            +- CometUnion (50)
-               :- CometHashAggregate (30)
-               :  +- CometColumnarExchange (29)
-               :     +- RowToColumnar (28)
-               :        +- * HashAggregate (27)
-               :           +- * Project (26)
-               :              +- * BroadcastHashJoin Inner BuildRight (25)
-               :                 :- * Project (19)
-               :                 :  +- * BroadcastHashJoin Inner BuildRight (18)
-               :                 :     :- * Project (12)
-               :                 :     :  +- * BroadcastHashJoin Inner BuildRight (11)
-               :                 :     :     :- * Project (9)
-               :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-               :                 :     :     :     :- * ColumnarToRow (3)
-               :                 :     :     :     :  +- CometFilter (2)
-               :                 :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-               :                 :     :     :     +- BroadcastExchange (7)
-               :                 :     :     :        +- * ColumnarToRow (6)
-               :                 :     :     :           +- CometFilter (5)
-               :                 :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-               :                 :     :     +- ReusedExchange (10)
-               :                 :     +- BroadcastExchange (17)
-               :                 :        +- * ColumnarToRow (16)
-               :                 :           +- CometProject (15)
-               :                 :              +- CometFilter (14)
-               :                 :                 +- CometScan parquet spark_catalog.default.time_dim (13)
-               :                 +- BroadcastExchange (24)
-               :                    +- * ColumnarToRow (23)
-               :                       +- CometProject (22)
-               :                          +- CometFilter (21)
-               :                             +- CometScan parquet spark_catalog.default.ship_mode (20)
-               +- CometHashAggregate (49)
-                  +- CometColumnarExchange (48)
-                     +- RowToColumnar (47)
-                        +- * HashAggregate (46)
-                           +- * Project (45)
-                              +- * BroadcastHashJoin Inner BuildRight (44)
-                                 :- * Project (42)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (41)
-                                 :     :- * Project (39)
-                                 :     :  +- * BroadcastHashJoin Inner BuildRight (38)
-                                 :     :     :- * Project (36)
-                                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (35)
-                                 :     :     :     :- * ColumnarToRow (33)
-                                 :     :     :     :  +- CometFilter (32)
-                                 :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (31)
-                                 :     :     :     +- ReusedExchange (34)
-                                 :     :     +- ReusedExchange (37)
-                                 :     +- ReusedExchange (40)
-                                 +- ReusedExchange (43)
+TakeOrderedAndProject (52)
++- * HashAggregate (51)
+   +- Exchange (50)
+      +- * HashAggregate (49)
+         +- Union (48)
+            :- * HashAggregate (29)
+            :  +- Exchange (28)
+            :     +- * HashAggregate (27)
+            :        +- * Project (26)
+            :           +- * BroadcastHashJoin Inner BuildRight (25)
+            :              :- * Project (19)
+            :              :  +- * BroadcastHashJoin Inner BuildRight (18)
+            :              :     :- * Project (12)
+            :              :     :  +- * BroadcastHashJoin Inner BuildRight (11)
+            :              :     :     :- * Project (9)
+            :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+            :              :     :     :     :- * ColumnarToRow (3)
+            :              :     :     :     :  +- CometFilter (2)
+            :              :     :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+            :              :     :     :     +- BroadcastExchange (7)
+            :              :     :     :        +- * ColumnarToRow (6)
+            :              :     :     :           +- CometFilter (5)
+            :              :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+            :              :     :     +- ReusedExchange (10)
+            :              :     +- BroadcastExchange (17)
+            :              :        +- * ColumnarToRow (16)
+            :              :           +- CometProject (15)
+            :              :              +- CometFilter (14)
+            :              :                 +- CometScan parquet spark_catalog.default.time_dim (13)
+            :              +- BroadcastExchange (24)
+            :                 +- * ColumnarToRow (23)
+            :                    +- CometProject (22)
+            :                       +- CometFilter (21)
+            :                          +- CometScan parquet spark_catalog.default.ship_mode (20)
+            +- * HashAggregate (47)
+               +- Exchange (46)
+                  +- * HashAggregate (45)
+                     +- * Project (44)
+                        +- * BroadcastHashJoin Inner BuildRight (43)
+                           :- * Project (41)
+                           :  +- * BroadcastHashJoin Inner BuildRight (40)
+                           :     :- * Project (38)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+                           :     :     :- * Project (35)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+                           :     :     :     :- * ColumnarToRow (32)
+                           :     :     :     :  +- CometFilter (31)
+                           :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (30)
+                           :     :     :     +- ReusedExchange (33)
+                           :     :     +- ReusedExchange (36)
+                           :     +- ReusedExchange (39)
+                           +- ReusedExchange (42)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -99,7 +96,7 @@ Join condition: None
 Output [12]: [ws_sold_time_sk#1, ws_ship_mode_sk#2, ws_quantity#4, ws_ext_sales_price#5, ws_net_paid#6, ws_sold_date_sk#7, w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15]
 Input [14]: [ws_sold_time_sk#1, ws_ship_mode_sk#2, ws_warehouse_sk#3, ws_quantity#4, ws_ext_sales_price#5, ws_net_paid#6, ws_sold_date_sk#7, w_warehouse_sk#9, w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15]
 
-(10) ReusedExchange [Reuses operator id: 59]
+(10) ReusedExchange [Reuses operator id: 56]
 Output [3]: [d_date_sk#16, d_year#17, d_moy#18]
 
 (11) BroadcastHashJoin [codegen id : 5]
@@ -183,136 +180,133 @@ Functions [24]: [partial_sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5
 Aggregate Attributes [48]: [sum#23, isEmpty#24, sum#25, isEmpty#26, sum#27, isEmpty#28, sum#29, isEmpty#30, sum#31, isEmpty#32, sum#33, isEmpty#34, sum#35, isEmpty#36, sum#37, isEmpty#38, sum#39, isEmpty#40, sum#41, isEmpty#42, sum#43, isEmpty#44, sum#45, isEmpty#46, sum#47, isEmpty#48, sum#49, isEmpty#50, sum#51, isEmpty#52, sum#53, isEmpty#54, sum#55, isEmpty#56, sum#57, isEmpty#58, sum#59, isEmpty#60, sum#61, isEmpty#62, sum#63, isEmpty#64, sum#65, isEmpty#66, sum#67, isEmpty#68, sum#69, isEmpty#70]
 Results [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
 
-(28) RowToColumnar
+(28) Exchange
 Input [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
+Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometColumnarExchange
-Input [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
-Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 6]
 Input [55]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17, sum#71, isEmpty#72, sum#73, isEmpty#74, sum#75, isEmpty#76, sum#77, isEmpty#78, sum#79, isEmpty#80, sum#81, isEmpty#82, sum#83, isEmpty#84, sum#85, isEmpty#86, sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98, sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110, sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116, sum#117, isEmpty#118]
 Keys [7]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, d_year#17]
 Functions [24]: [sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 2) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 3) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 4) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 5) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 6) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 7) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 8) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 9) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 10) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 11) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 12) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 1) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 2) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 3) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 4) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 5) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 6) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 7) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 8) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 9) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 10) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 11) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#18 = 12) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)]
+Aggregate Attributes [24]: [sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#119, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#120, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#121, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#122, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#123, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#124, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#125, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#126, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#127, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#128, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#129, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#130, sum(CASE WHEN (d_moy#18 = 1) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#131, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#132, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#133, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#134, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#135, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#136, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#137, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#138, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#139, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#140, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#141, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#142]
+Results [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, DHL,BARIAN AS ship_carriers#143, d_year#17 AS year#144, sum(CASE WHEN (d_moy#18 = 1) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#119 AS jan_sales#145, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#120 AS feb_sales#146, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#121 AS mar_sales#147, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#122 AS apr_sales#148, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#123 AS may_sales#149, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#124 AS jun_sales#150, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#125 AS jul_sales#151, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#126 AS aug_sales#152, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#127 AS sep_sales#153, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#128 AS oct_sales#154, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#129 AS nov_sales#155, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_ext_sales_price#5 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#130 AS dec_sales#156, sum(CASE WHEN (d_moy#18 = 1) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#131 AS jan_net#157, sum(CASE WHEN (d_moy#18 = 2) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#132 AS feb_net#158, sum(CASE WHEN (d_moy#18 = 3) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#133 AS mar_net#159, sum(CASE WHEN (d_moy#18 = 4) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#134 AS apr_net#160, sum(CASE WHEN (d_moy#18 = 5) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#135 AS may_net#161, sum(CASE WHEN (d_moy#18 = 6) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#136 AS jun_net#162, sum(CASE WHEN (d_moy#18 = 7) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#137 AS jul_net#163, sum(CASE WHEN (d_moy#18 = 8) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#138 AS aug_net#164, sum(CASE WHEN (d_moy#18 = 9) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#139 AS sep_net#165, sum(CASE WHEN (d_moy#18 = 10) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#140 AS oct_net#166, sum(CASE WHEN (d_moy#18 = 11) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#141 AS nov_net#167, sum(CASE WHEN (d_moy#18 = 12) THEN (ws_net_paid#6 * cast(ws_quantity#4 as decimal(10,0))) ELSE 0.00 END)#142 AS dec_net#168]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [7]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125]
+Output [7]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#125), dynamicpruningexpression(cs_sold_date_sk#125 IN dynamicpruning#126)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#175), dynamicpruningexpression(cs_sold_date_sk#175 IN dynamicpruning#176)]
 PushedFilters: [IsNotNull(cs_warehouse_sk), IsNotNull(cs_sold_time_sk), IsNotNull(cs_ship_mode_sk)]
 ReadSchema: struct<cs_sold_time_sk:int,cs_ship_mode_sk:int,cs_warehouse_sk:int,cs_quantity:int,cs_sales_price:decimal(7,2),cs_net_paid_inc_tax:decimal(7,2)>
 
-(32) CometFilter
-Input [7]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125]
-Condition : ((isnotnull(cs_warehouse_sk#121) AND isnotnull(cs_sold_time_sk#119)) AND isnotnull(cs_ship_mode_sk#120))
+(31) CometFilter
+Input [7]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175]
+Condition : ((isnotnull(cs_warehouse_sk#171) AND isnotnull(cs_sold_time_sk#169)) AND isnotnull(cs_ship_mode_sk#170))
 
-(33) ColumnarToRow [codegen id : 10]
-Input [7]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125]
+(32) ColumnarToRow [codegen id : 11]
+Input [7]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175]
 
-(34) ReusedExchange [Reuses operator id: 7]
-Output [7]: [w_warehouse_sk#127, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133]
+(33) ReusedExchange [Reuses operator id: 7]
+Output [7]: [w_warehouse_sk#177, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183]
 
-(35) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_warehouse_sk#121]
-Right keys [1]: [w_warehouse_sk#127]
+(34) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_warehouse_sk#171]
+Right keys [1]: [w_warehouse_sk#177]
 Join type: Inner
 Join condition: None
 
-(36) Project [codegen id : 10]
-Output [12]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133]
-Input [14]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_warehouse_sk#121, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125, w_warehouse_sk#127, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133]
+(35) Project [codegen id : 11]
+Output [12]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183]
+Input [14]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_warehouse_sk#171, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175, w_warehouse_sk#177, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183]
 
-(37) ReusedExchange [Reuses operator id: 59]
-Output [3]: [d_date_sk#134, d_year#135, d_moy#136]
+(36) ReusedExchange [Reuses operator id: 56]
+Output [3]: [d_date_sk#184, d_year#185, d_moy#186]
 
-(38) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#125]
-Right keys [1]: [d_date_sk#134]
+(37) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_sold_date_sk#175]
+Right keys [1]: [d_date_sk#184]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 10]
-Output [13]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
-Input [15]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, cs_sold_date_sk#125, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_date_sk#134, d_year#135, d_moy#136]
+(38) Project [codegen id : 11]
+Output [13]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
+Input [15]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, cs_sold_date_sk#175, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_date_sk#184, d_year#185, d_moy#186]
 
-(40) ReusedExchange [Reuses operator id: 17]
-Output [1]: [t_time_sk#137]
+(39) ReusedExchange [Reuses operator id: 17]
+Output [1]: [t_time_sk#187]
 
-(41) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_time_sk#119]
-Right keys [1]: [t_time_sk#137]
+(40) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_sold_time_sk#169]
+Right keys [1]: [t_time_sk#187]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
-Output [12]: [cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
-Input [14]: [cs_sold_time_sk#119, cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136, t_time_sk#137]
+(41) Project [codegen id : 11]
+Output [12]: [cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
+Input [14]: [cs_sold_time_sk#169, cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186, t_time_sk#187]
 
-(43) ReusedExchange [Reuses operator id: 24]
-Output [1]: [sm_ship_mode_sk#138]
+(42) ReusedExchange [Reuses operator id: 24]
+Output [1]: [sm_ship_mode_sk#188]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_ship_mode_sk#120]
-Right keys [1]: [sm_ship_mode_sk#138]
+(43) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [cs_ship_mode_sk#170]
+Right keys [1]: [sm_ship_mode_sk#188]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [11]: [cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
-Input [13]: [cs_ship_mode_sk#120, cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136, sm_ship_mode_sk#138]
-
-(46) HashAggregate [codegen id : 10]
-Input [11]: [cs_quantity#122, cs_sales_price#123, cs_net_paid_inc_tax#124, w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, d_moy#136]
-Keys [7]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135]
-Functions [24]: [partial_sum(CASE WHEN (d_moy#136 = 1) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 2) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 3) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 4) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 5) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 6) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 7) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 8) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 9) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 10) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 11) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 12) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 1) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 2) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 3) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 4) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 5) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 6) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 7) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 8) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 9) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 10) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 11) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#136 = 12) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END)]
-Aggregate Attributes [48]: [sum#139, isEmpty#140, sum#141, isEmpty#142, sum#143, isEmpty#144, sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150, sum#151, isEmpty#152, sum#153, isEmpty#154, sum#155, isEmpty#156, sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162, sum#163, isEmpty#164, sum#165, isEmpty#166, sum#167, isEmpty#168, sum#169, isEmpty#170, sum#171, isEmpty#172, sum#173, isEmpty#174, sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180, sum#181, isEmpty#182, sum#183, isEmpty#184, sum#185, isEmpty#186]
-Results [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
-
-(47) RowToColumnar
-Input [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
-
-(48) CometColumnarExchange
-Input [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
-Arguments: hashpartitioning(w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(49) CometHashAggregate
-Input [55]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135, sum#187, isEmpty#188, sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234]
-Keys [7]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, d_year#135]
-Functions [24]: [sum(CASE WHEN (d_moy#136 = 1) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 2) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 3) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 4) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 5) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 6) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 7) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 8) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 9) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 10) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 11) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 12) THEN (cs_sales_price#123 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 1) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 2) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 3) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 4) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 5) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 6) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 7) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 8) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 9) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 10) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 11) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#136 = 12) THEN (cs_net_paid_inc_tax#124 * cast(cs_quantity#122 as decimal(10,0))) ELSE 0.00 END)]
-
-(50) CometUnion
-Child 0 Input [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#237, feb_sales#238, mar_sales#239, apr_sales#240, may_sales#241, jun_sales#242, jul_sales#243, aug_sales#244, sep_sales#245, oct_sales#246, nov_sales#247, dec_sales#248, jan_net#249, feb_net#250, mar_net#251, apr_net#252, may_net#253, jun_net#254, jul_net#255, aug_net#256, sep_net#257, oct_net#258, nov_net#259, dec_net#260]
-Child 1 Input [32]: [w_warehouse_name#128, w_warehouse_sq_ft#129, w_city#130, w_county#131, w_state#132, w_country#133, ship_carriers#261, year#262, jan_sales#263, feb_sales#264, mar_sales#265, apr_sales#266, may_sales#267, jun_sales#268, jul_sales#269, aug_sales#270, sep_sales#271, oct_sales#272, nov_sales#273, dec_sales#274, jan_net#275, feb_net#276, mar_net#277, apr_net#278, may_net#279, jun_net#280, jul_net#281, aug_net#282, sep_net#283, oct_net#284, nov_net#285, dec_net#286]
-
-(51) CometHashAggregate
-Input [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#237, feb_sales#238, mar_sales#239, apr_sales#240, may_sales#241, jun_sales#242, jul_sales#243, aug_sales#244, sep_sales#245, oct_sales#246, nov_sales#247, dec_sales#248, jan_net#249, feb_net#250, mar_net#251, apr_net#252, may_net#253, jun_net#254, jul_net#255, aug_net#256, sep_net#257, oct_net#258, nov_net#259, dec_net#260]
-Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236]
-Functions [36]: [partial_sum(jan_sales#237), partial_sum(feb_sales#238), partial_sum(mar_sales#239), partial_sum(apr_sales#240), partial_sum(may_sales#241), partial_sum(jun_sales#242), partial_sum(jul_sales#243), partial_sum(aug_sales#244), partial_sum(sep_sales#245), partial_sum(oct_sales#246), partial_sum(nov_sales#247), partial_sum(dec_sales#248), partial_sum((jan_sales#237 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((feb_sales#238 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((mar_sales#239 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((apr_sales#240 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((may_sales#241 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jun_sales#242 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jul_sales#243 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((aug_sales#244 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((sep_sales#245 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((oct_sales#246 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((nov_sales#247 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((dec_sales#248 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum(jan_net#249), partial_sum(feb_net#250), partial_sum(mar_net#251), partial_sum(apr_net#252), partial_sum(may_net#253), partial_sum(jun_net#254), partial_sum(jul_net#255), partial_sum(aug_net#256), partial_sum(sep_net#257), partial_sum(oct_net#258), partial_sum(nov_net#259), partial_sum(dec_net#260)]
-
-(52) CometColumnarExchange
-Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, sum#287, isEmpty#288, sum#289, isEmpty#290, sum#291, isEmpty#292, sum#293, isEmpty#294, sum#295, isEmpty#296, sum#297, isEmpty#298, sum#299, isEmpty#300, sum#301, isEmpty#302, sum#303, isEmpty#304, sum#305, isEmpty#306, sum#307, isEmpty#308, sum#309, isEmpty#310, sum#311, isEmpty#312, sum#313, isEmpty#314, sum#315, isEmpty#316, sum#317, isEmpty#318, sum#319, isEmpty#320, sum#321, isEmpty#322, sum#323, isEmpty#324, sum#325, isEmpty#326, sum#327, isEmpty#328, sum#329, isEmpty#330, sum#331, isEmpty#332, sum#333, isEmpty#334, sum#335, isEmpty#336, sum#337, isEmpty#338, sum#339, isEmpty#340, sum#341, isEmpty#342, sum#343, isEmpty#344, sum#345, isEmpty#346, sum#347, isEmpty#348, sum#349, isEmpty#350, sum#351, isEmpty#352, sum#353, isEmpty#354, sum#355, isEmpty#356, sum#357, isEmpty#358]
-Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(53) CometHashAggregate
-Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, sum#287, isEmpty#288, sum#289, isEmpty#290, sum#291, isEmpty#292, sum#293, isEmpty#294, sum#295, isEmpty#296, sum#297, isEmpty#298, sum#299, isEmpty#300, sum#301, isEmpty#302, sum#303, isEmpty#304, sum#305, isEmpty#306, sum#307, isEmpty#308, sum#309, isEmpty#310, sum#311, isEmpty#312, sum#313, isEmpty#314, sum#315, isEmpty#316, sum#317, isEmpty#318, sum#319, isEmpty#320, sum#321, isEmpty#322, sum#323, isEmpty#324, sum#325, isEmpty#326, sum#327, isEmpty#328, sum#329, isEmpty#330, sum#331, isEmpty#332, sum#333, isEmpty#334, sum#335, isEmpty#336, sum#337, isEmpty#338, sum#339, isEmpty#340, sum#341, isEmpty#342, sum#343, isEmpty#344, sum#345, isEmpty#346, sum#347, isEmpty#348, sum#349, isEmpty#350, sum#351, isEmpty#352, sum#353, isEmpty#354, sum#355, isEmpty#356, sum#357, isEmpty#358]
-Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236]
-Functions [36]: [sum(jan_sales#237), sum(feb_sales#238), sum(mar_sales#239), sum(apr_sales#240), sum(may_sales#241), sum(jun_sales#242), sum(jul_sales#243), sum(aug_sales#244), sum(sep_sales#245), sum(oct_sales#246), sum(nov_sales#247), sum(dec_sales#248), sum((jan_sales#237 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((feb_sales#238 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((mar_sales#239 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((apr_sales#240 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((may_sales#241 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jun_sales#242 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jul_sales#243 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((aug_sales#244 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((sep_sales#245 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((oct_sales#246 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((nov_sales#247 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((dec_sales#248 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum(jan_net#249), sum(feb_net#250), sum(mar_net#251), sum(apr_net#252), sum(may_net#253), sum(jun_net#254), sum(jul_net#255), sum(aug_net#256), sum(sep_net#257), sum(oct_net#258), sum(nov_net#259), sum(dec_net#260)]
-
-(54) CometTakeOrderedAndProject
-Input [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#359, feb_sales#360, mar_sales#361, apr_sales#362, may_sales#363, jun_sales#364, jul_sales#365, aug_sales#366, sep_sales#367, oct_sales#368, nov_sales#369, dec_sales#370, jan_sales_per_sq_foot#371, feb_sales_per_sq_foot#372, mar_sales_per_sq_foot#373, apr_sales_per_sq_foot#374, may_sales_per_sq_foot#375, jun_sales_per_sq_foot#376, jul_sales_per_sq_foot#377, aug_sales_per_sq_foot#378, sep_sales_per_sq_foot#379, oct_sales_per_sq_foot#380, nov_sales_per_sq_foot#381, dec_sales_per_sq_foot#382, jan_net#383, feb_net#384, mar_net#385, apr_net#386, may_net#387, jun_net#388, jul_net#389, aug_net#390, sep_net#391, oct_net#392, nov_net#393, dec_net#394]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[w_warehouse_name#10 ASC NULLS FIRST], output=[w_warehouse_name#10,w_warehouse_sq_ft#11,w_city#12,w_county#13,w_state#14,w_country#15,ship_carriers#235,year#236,jan_sales#359,feb_sales#360,mar_sales#361,apr_sales#362,may_sales#363,jun_sales#364,jul_sales#365,aug_sales#366,sep_sales#367,oct_sales#368,nov_sales#369,dec_sales#370,jan_sales_per_sq_foot#371,feb_sales_per_sq_foot#372,mar_sales_per_sq_foot#373,apr_sales_per_sq_foot#374,may_sales_per_sq_foot#375,jun_sales_per_sq_foot#376,jul_sales_per_sq_foot#377,aug_sales_per_sq_foot#378,sep_sales_per_sq_foot#379,oct_sales_per_sq_foot#380,nov_sales_per_sq_foot#381,dec_sales_per_sq_foot#382,jan_net#383,feb_net#384,mar_net#385,apr_net#386,may_net#387,jun_net#388,jul_net#389,aug_net#390,sep_net#391,oct_net#392,nov_net#393,dec_net#394]), 100, [w_warehouse_name#10 ASC NULLS FIRST], [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#359, feb_sales#360, mar_sales#361, apr_sales#362, may_sales#363, jun_sales#364, jul_sales#365, aug_sales#366, sep_sales#367, oct_sales#368, nov_sales#369, dec_sales#370, jan_sales_per_sq_foot#371, feb_sales_per_sq_foot#372, mar_sales_per_sq_foot#373, apr_sales_per_sq_foot#374, may_sales_per_sq_foot#375, jun_sales_per_sq_foot#376, jul_sales_per_sq_foot#377, aug_sales_per_sq_foot#378, sep_sales_per_sq_foot#379, oct_sales_per_sq_foot#380, nov_sales_per_sq_foot#381, dec_sales_per_sq_foot#382, jan_net#383, feb_net#384, mar_net#385, apr_net#386, may_net#387, jun_net#388, jul_net#389, aug_net#390, sep_net#391, oct_net#392, nov_net#393, dec_net#394]
-
-(55) ColumnarToRow [codegen id : 11]
-Input [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#235, year#236, jan_sales#359, feb_sales#360, mar_sales#361, apr_sales#362, may_sales#363, jun_sales#364, jul_sales#365, aug_sales#366, sep_sales#367, oct_sales#368, nov_sales#369, dec_sales#370, jan_sales_per_sq_foot#371, feb_sales_per_sq_foot#372, mar_sales_per_sq_foot#373, apr_sales_per_sq_foot#374, may_sales_per_sq_foot#375, jun_sales_per_sq_foot#376, jul_sales_per_sq_foot#377, aug_sales_per_sq_foot#378, sep_sales_per_sq_foot#379, oct_sales_per_sq_foot#380, nov_sales_per_sq_foot#381, dec_sales_per_sq_foot#382, jan_net#383, feb_net#384, mar_net#385, apr_net#386, may_net#387, jun_net#388, jul_net#389, aug_net#390, sep_net#391, oct_net#392, nov_net#393, dec_net#394]
+(44) Project [codegen id : 11]
+Output [11]: [cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
+Input [13]: [cs_ship_mode_sk#170, cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186, sm_ship_mode_sk#188]
+
+(45) HashAggregate [codegen id : 11]
+Input [11]: [cs_quantity#172, cs_sales_price#173, cs_net_paid_inc_tax#174, w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, d_moy#186]
+Keys [7]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185]
+Functions [24]: [partial_sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), partial_sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)]
+Aggregate Attributes [48]: [sum#189, isEmpty#190, sum#191, isEmpty#192, sum#193, isEmpty#194, sum#195, isEmpty#196, sum#197, isEmpty#198, sum#199, isEmpty#200, sum#201, isEmpty#202, sum#203, isEmpty#204, sum#205, isEmpty#206, sum#207, isEmpty#208, sum#209, isEmpty#210, sum#211, isEmpty#212, sum#213, isEmpty#214, sum#215, isEmpty#216, sum#217, isEmpty#218, sum#219, isEmpty#220, sum#221, isEmpty#222, sum#223, isEmpty#224, sum#225, isEmpty#226, sum#227, isEmpty#228, sum#229, isEmpty#230, sum#231, isEmpty#232, sum#233, isEmpty#234, sum#235, isEmpty#236]
+Results [55]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, sum#237, isEmpty#238, sum#239, isEmpty#240, sum#241, isEmpty#242, sum#243, isEmpty#244, sum#245, isEmpty#246, sum#247, isEmpty#248, sum#249, isEmpty#250, sum#251, isEmpty#252, sum#253, isEmpty#254, sum#255, isEmpty#256, sum#257, isEmpty#258, sum#259, isEmpty#260, sum#261, isEmpty#262, sum#263, isEmpty#264, sum#265, isEmpty#266, sum#267, isEmpty#268, sum#269, isEmpty#270, sum#271, isEmpty#272, sum#273, isEmpty#274, sum#275, isEmpty#276, sum#277, isEmpty#278, sum#279, isEmpty#280, sum#281, isEmpty#282, sum#283, isEmpty#284]
+
+(46) Exchange
+Input [55]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, sum#237, isEmpty#238, sum#239, isEmpty#240, sum#241, isEmpty#242, sum#243, isEmpty#244, sum#245, isEmpty#246, sum#247, isEmpty#248, sum#249, isEmpty#250, sum#251, isEmpty#252, sum#253, isEmpty#254, sum#255, isEmpty#256, sum#257, isEmpty#258, sum#259, isEmpty#260, sum#261, isEmpty#262, sum#263, isEmpty#264, sum#265, isEmpty#266, sum#267, isEmpty#268, sum#269, isEmpty#270, sum#271, isEmpty#272, sum#273, isEmpty#274, sum#275, isEmpty#276, sum#277, isEmpty#278, sum#279, isEmpty#280, sum#281, isEmpty#282, sum#283, isEmpty#284]
+Arguments: hashpartitioning(w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(47) HashAggregate [codegen id : 12]
+Input [55]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185, sum#237, isEmpty#238, sum#239, isEmpty#240, sum#241, isEmpty#242, sum#243, isEmpty#244, sum#245, isEmpty#246, sum#247, isEmpty#248, sum#249, isEmpty#250, sum#251, isEmpty#252, sum#253, isEmpty#254, sum#255, isEmpty#256, sum#257, isEmpty#258, sum#259, isEmpty#260, sum#261, isEmpty#262, sum#263, isEmpty#264, sum#265, isEmpty#266, sum#267, isEmpty#268, sum#269, isEmpty#270, sum#271, isEmpty#272, sum#273, isEmpty#274, sum#275, isEmpty#276, sum#277, isEmpty#278, sum#279, isEmpty#280, sum#281, isEmpty#282, sum#283, isEmpty#284]
+Keys [7]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, d_year#185]
+Functions [24]: [sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END), sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)]
+Aggregate Attributes [24]: [sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#285, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#286, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#287, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#288, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#289, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#290, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#291, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#292, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#293, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#294, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#295, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#296, sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#297, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#298, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#299, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#300, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#301, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#302, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#303, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#304, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#305, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#306, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#307, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#308]
+Results [32]: [w_warehouse_name#178, w_warehouse_sq_ft#179, w_city#180, w_county#181, w_state#182, w_country#183, DHL,BARIAN AS ship_carriers#309, d_year#185 AS year#310, sum(CASE WHEN (d_moy#186 = 1) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#285 AS jan_sales#311, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#286 AS feb_sales#312, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#287 AS mar_sales#313, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#288 AS apr_sales#314, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#289 AS may_sales#315, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#290 AS jun_sales#316, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#291 AS jul_sales#317, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#292 AS aug_sales#318, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#293 AS sep_sales#319, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#294 AS oct_sales#320, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#295 AS nov_sales#321, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_sales_price#173 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#296 AS dec_sales#322, sum(CASE WHEN (d_moy#186 = 1) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#297 AS jan_net#323, sum(CASE WHEN (d_moy#186 = 2) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#298 AS feb_net#324, sum(CASE WHEN (d_moy#186 = 3) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#299 AS mar_net#325, sum(CASE WHEN (d_moy#186 = 4) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#300 AS apr_net#326, sum(CASE WHEN (d_moy#186 = 5) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#301 AS may_net#327, sum(CASE WHEN (d_moy#186 = 6) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#302 AS jun_net#328, sum(CASE WHEN (d_moy#186 = 7) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#303 AS jul_net#329, sum(CASE WHEN (d_moy#186 = 8) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#304 AS aug_net#330, sum(CASE WHEN (d_moy#186 = 9) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#305 AS sep_net#331, sum(CASE WHEN (d_moy#186 = 10) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#306 AS oct_net#332, sum(CASE WHEN (d_moy#186 = 11) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#307 AS nov_net#333, sum(CASE WHEN (d_moy#186 = 12) THEN (cs_net_paid_inc_tax#174 * cast(cs_quantity#172 as decimal(10,0))) ELSE 0.00 END)#308 AS dec_net#334]
+
+(48) Union
+
+(49) HashAggregate [codegen id : 13]
+Input [32]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, jan_sales#145, feb_sales#146, mar_sales#147, apr_sales#148, may_sales#149, jun_sales#150, jul_sales#151, aug_sales#152, sep_sales#153, oct_sales#154, nov_sales#155, dec_sales#156, jan_net#157, feb_net#158, mar_net#159, apr_net#160, may_net#161, jun_net#162, jul_net#163, aug_net#164, sep_net#165, oct_net#166, nov_net#167, dec_net#168]
+Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144]
+Functions [36]: [partial_sum(jan_sales#145), partial_sum(feb_sales#146), partial_sum(mar_sales#147), partial_sum(apr_sales#148), partial_sum(may_sales#149), partial_sum(jun_sales#150), partial_sum(jul_sales#151), partial_sum(aug_sales#152), partial_sum(sep_sales#153), partial_sum(oct_sales#154), partial_sum(nov_sales#155), partial_sum(dec_sales#156), partial_sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), partial_sum(jan_net#157), partial_sum(feb_net#158), partial_sum(mar_net#159), partial_sum(apr_net#160), partial_sum(may_net#161), partial_sum(jun_net#162), partial_sum(jul_net#163), partial_sum(aug_net#164), partial_sum(sep_net#165), partial_sum(oct_net#166), partial_sum(nov_net#167), partial_sum(dec_net#168)]
+Aggregate Attributes [72]: [sum#335, isEmpty#336, sum#337, isEmpty#338, sum#339, isEmpty#340, sum#341, isEmpty#342, sum#343, isEmpty#344, sum#345, isEmpty#346, sum#347, isEmpty#348, sum#349, isEmpty#350, sum#351, isEmpty#352, sum#353, isEmpty#354, sum#355, isEmpty#356, sum#357, isEmpty#358, sum#359, isEmpty#360, sum#361, isEmpty#362, sum#363, isEmpty#364, sum#365, isEmpty#366, sum#367, isEmpty#368, sum#369, isEmpty#370, sum#371, isEmpty#372, sum#373, isEmpty#374, sum#375, isEmpty#376, sum#377, isEmpty#378, sum#379, isEmpty#380, sum#381, isEmpty#382, sum#383, isEmpty#384, sum#385, isEmpty#386, sum#387, isEmpty#388, sum#389, isEmpty#390, sum#391, isEmpty#392, sum#393, isEmpty#394, sum#395, isEmpty#396, sum#397, isEmpty#398, sum#399, isEmpty#400, sum#401, isEmpty#402, sum#403, isEmpty#404, sum#405, isEmpty#406]
+Results [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum#407, isEmpty#408, sum#409, isEmpty#410, sum#411, isEmpty#412, sum#413, isEmpty#414, sum#415, isEmpty#416, sum#417, isEmpty#418, sum#419, isEmpty#420, sum#421, isEmpty#422, sum#423, isEmpty#424, sum#425, isEmpty#426, sum#427, isEmpty#428, sum#429, isEmpty#430, sum#431, isEmpty#432, sum#433, isEmpty#434, sum#435, isEmpty#436, sum#437, isEmpty#438, sum#439, isEmpty#440, sum#441, isEmpty#442, sum#443, isEmpty#444, sum#445, isEmpty#446, sum#447, isEmpty#448, sum#449, isEmpty#450, sum#451, isEmpty#452, sum#453, isEmpty#454, sum#455, isEmpty#456, sum#457, isEmpty#458, sum#459, isEmpty#460, sum#461, isEmpty#462, sum#463, isEmpty#464, sum#465, isEmpty#466, sum#467, isEmpty#468, sum#469, isEmpty#470, sum#471, isEmpty#472, sum#473, isEmpty#474, sum#475, isEmpty#476, sum#477, isEmpty#478]
+
+(50) Exchange
+Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum#407, isEmpty#408, sum#409, isEmpty#410, sum#411, isEmpty#412, sum#413, isEmpty#414, sum#415, isEmpty#416, sum#417, isEmpty#418, sum#419, isEmpty#420, sum#421, isEmpty#422, sum#423, isEmpty#424, sum#425, isEmpty#426, sum#427, isEmpty#428, sum#429, isEmpty#430, sum#431, isEmpty#432, sum#433, isEmpty#434, sum#435, isEmpty#436, sum#437, isEmpty#438, sum#439, isEmpty#440, sum#441, isEmpty#442, sum#443, isEmpty#444, sum#445, isEmpty#446, sum#447, isEmpty#448, sum#449, isEmpty#450, sum#451, isEmpty#452, sum#453, isEmpty#454, sum#455, isEmpty#456, sum#457, isEmpty#458, sum#459, isEmpty#460, sum#461, isEmpty#462, sum#463, isEmpty#464, sum#465, isEmpty#466, sum#467, isEmpty#468, sum#469, isEmpty#470, sum#471, isEmpty#472, sum#473, isEmpty#474, sum#475, isEmpty#476, sum#477, isEmpty#478]
+Arguments: hashpartitioning(w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(51) HashAggregate [codegen id : 14]
+Input [80]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum#407, isEmpty#408, sum#409, isEmpty#410, sum#411, isEmpty#412, sum#413, isEmpty#414, sum#415, isEmpty#416, sum#417, isEmpty#418, sum#419, isEmpty#420, sum#421, isEmpty#422, sum#423, isEmpty#424, sum#425, isEmpty#426, sum#427, isEmpty#428, sum#429, isEmpty#430, sum#431, isEmpty#432, sum#433, isEmpty#434, sum#435, isEmpty#436, sum#437, isEmpty#438, sum#439, isEmpty#440, sum#441, isEmpty#442, sum#443, isEmpty#444, sum#445, isEmpty#446, sum#447, isEmpty#448, sum#449, isEmpty#450, sum#451, isEmpty#452, sum#453, isEmpty#454, sum#455, isEmpty#456, sum#457, isEmpty#458, sum#459, isEmpty#460, sum#461, isEmpty#462, sum#463, isEmpty#464, sum#465, isEmpty#466, sum#467, isEmpty#468, sum#469, isEmpty#470, sum#471, isEmpty#472, sum#473, isEmpty#474, sum#475, isEmpty#476, sum#477, isEmpty#478]
+Keys [8]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144]
+Functions [36]: [sum(jan_sales#145), sum(feb_sales#146), sum(mar_sales#147), sum(apr_sales#148), sum(may_sales#149), sum(jun_sales#150), sum(jul_sales#151), sum(aug_sales#152), sum(sep_sales#153), sum(oct_sales#154), sum(nov_sales#155), sum(dec_sales#156), sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0)))), sum(jan_net#157), sum(feb_net#158), sum(mar_net#159), sum(apr_net#160), sum(may_net#161), sum(jun_net#162), sum(jul_net#163), sum(aug_net#164), sum(sep_net#165), sum(oct_net#166), sum(nov_net#167), sum(dec_net#168)]
+Aggregate Attributes [36]: [sum(jan_sales#145)#479, sum(feb_sales#146)#480, sum(mar_sales#147)#481, sum(apr_sales#148)#482, sum(may_sales#149)#483, sum(jun_sales#150)#484, sum(jul_sales#151)#485, sum(aug_sales#152)#486, sum(sep_sales#153)#487, sum(oct_sales#154)#488, sum(nov_sales#155)#489, sum(dec_sales#156)#490, sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#491, sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#492, sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#493, sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#494, sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#495, sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#496, sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#497, sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#498, sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#499, sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#500, sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#501, sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#502, sum(jan_net#157)#503, sum(feb_net#158)#504, sum(mar_net#159)#505, sum(apr_net#160)#506, sum(may_net#161)#507, sum(jun_net#162)#508, sum(jul_net#163)#509, sum(aug_net#164)#510, sum(sep_net#165)#511, sum(oct_net#166)#512, sum(nov_net#167)#513, sum(dec_net#168)#514]
+Results [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, sum(jan_sales#145)#479 AS jan_sales#515, sum(feb_sales#146)#480 AS feb_sales#516, sum(mar_sales#147)#481 AS mar_sales#517, sum(apr_sales#148)#482 AS apr_sales#518, sum(may_sales#149)#483 AS may_sales#519, sum(jun_sales#150)#484 AS jun_sales#520, sum(jul_sales#151)#485 AS jul_sales#521, sum(aug_sales#152)#486 AS aug_sales#522, sum(sep_sales#153)#487 AS sep_sales#523, sum(oct_sales#154)#488 AS oct_sales#524, sum(nov_sales#155)#489 AS nov_sales#525, sum(dec_sales#156)#490 AS dec_sales#526, sum((jan_sales#145 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#491 AS jan_sales_per_sq_foot#527, sum((feb_sales#146 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#492 AS feb_sales_per_sq_foot#528, sum((mar_sales#147 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#493 AS mar_sales_per_sq_foot#529, sum((apr_sales#148 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#494 AS apr_sales_per_sq_foot#530, sum((may_sales#149 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#495 AS may_sales_per_sq_foot#531, sum((jun_sales#150 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#496 AS jun_sales_per_sq_foot#532, sum((jul_sales#151 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#497 AS jul_sales_per_sq_foot#533, sum((aug_sales#152 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#498 AS aug_sales_per_sq_foot#534, sum((sep_sales#153 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#499 AS sep_sales_per_sq_foot#535, sum((oct_sales#154 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#500 AS oct_sales_per_sq_foot#536, sum((nov_sales#155 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#501 AS nov_sales_per_sq_foot#537, sum((dec_sales#156 / cast(w_warehouse_sq_ft#11 as decimal(10,0))))#502 AS dec_sales_per_sq_foot#538, sum(jan_net#157)#503 AS jan_net#539, sum(feb_net#158)#504 AS feb_net#540, sum(mar_net#159)#505 AS mar_net#541, sum(apr_net#160)#506 AS apr_net#542, sum(may_net#161)#507 AS may_net#543, sum(jun_net#162)#508 AS jun_net#544, sum(jul_net#163)#509 AS jul_net#545, sum(aug_net#164)#510 AS aug_net#546, sum(sep_net#165)#511 AS sep_net#547, sum(oct_net#166)#512 AS oct_net#548, sum(nov_net#167)#513 AS nov_net#549, sum(dec_net#168)#514 AS dec_net#550]
+
+(52) TakeOrderedAndProject
+Input [44]: [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, jan_sales#515, feb_sales#516, mar_sales#517, apr_sales#518, may_sales#519, jun_sales#520, jul_sales#521, aug_sales#522, sep_sales#523, oct_sales#524, nov_sales#525, dec_sales#526, jan_sales_per_sq_foot#527, feb_sales_per_sq_foot#528, mar_sales_per_sq_foot#529, apr_sales_per_sq_foot#530, may_sales_per_sq_foot#531, jun_sales_per_sq_foot#532, jul_sales_per_sq_foot#533, aug_sales_per_sq_foot#534, sep_sales_per_sq_foot#535, oct_sales_per_sq_foot#536, nov_sales_per_sq_foot#537, dec_sales_per_sq_foot#538, jan_net#539, feb_net#540, mar_net#541, apr_net#542, may_net#543, jun_net#544, jul_net#545, aug_net#546, sep_net#547, oct_net#548, nov_net#549, dec_net#550]
+Arguments: 100, [w_warehouse_name#10 ASC NULLS FIRST], [w_warehouse_name#10, w_warehouse_sq_ft#11, w_city#12, w_county#13, w_state#14, w_country#15, ship_carriers#143, year#144, jan_sales#515, feb_sales#516, mar_sales#517, apr_sales#518, may_sales#519, jun_sales#520, jul_sales#521, aug_sales#522, sep_sales#523, oct_sales#524, nov_sales#525, dec_sales#526, jan_sales_per_sq_foot#527, feb_sales_per_sq_foot#528, mar_sales_per_sq_foot#529, apr_sales_per_sq_foot#530, may_sales_per_sq_foot#531, jun_sales_per_sq_foot#532, jul_sales_per_sq_foot#533, aug_sales_per_sq_foot#534, sep_sales_per_sq_foot#535, oct_sales_per_sq_foot#536, nov_sales_per_sq_foot#537, dec_sales_per_sq_foot#538, jan_net#539, feb_net#540, mar_net#541, apr_net#542, may_net#543, jun_net#544, jul_net#545, aug_net#546, sep_net#547, oct_net#548, nov_net#549, dec_net#550]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (59)
-+- * ColumnarToRow (58)
-   +- CometFilter (57)
-      +- CometScan parquet spark_catalog.default.date_dim (56)
+BroadcastExchange (56)
++- * ColumnarToRow (55)
+   +- CometFilter (54)
+      +- CometScan parquet spark_catalog.default.date_dim (53)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -322,17 +316,17 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(57) CometFilter
+(54) CometFilter
 Input [3]: [d_date_sk#16, d_year#17, d_moy#18]
 Condition : ((isnotnull(d_year#17) AND (d_year#17 = 2001)) AND isnotnull(d_date_sk#16))
 
-(58) ColumnarToRow [codegen id : 1]
+(55) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#16, d_year#17, d_moy#18]
 
-(59) BroadcastExchange
+(56) BroadcastExchange
 Input [3]: [d_date_sk#16, d_year#17, d_moy#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 31 Hosting Expression = cs_sold_date_sk#125 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 30 Hosting Expression = cs_sold_date_sk#175 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt
index 025a2b9d4d..8ed74582f0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q66/simplified.txt
@@ -1,83 +1,86 @@
-WholeStageCodegen (11)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_sales_per_sq_foot,feb_sales_per_sq_foot,mar_sales_per_sq_foot,apr_sales_per_sq_foot,may_sales_per_sq_foot,jun_sales_per_sq_foot,jul_sales_per_sq_foot,aug_sales_per_sq_foot,sep_sales_per_sq_foot,oct_sales_per_sq_foot,nov_sales_per_sq_foot,dec_sales_per_sq_foot,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net]
-        CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-          CometColumnarExchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year] #1
-            CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net]
-              CometUnion
-                CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #2
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,ws_ext_sales_price,ws_quantity,ws_net_paid] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                          Project [ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                            BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
-                              Project [ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
-                                  Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
-                                        BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_warehouse_sk,ws_sold_time_sk,ws_ship_mode_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+TakeOrderedAndProject [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_sales_per_sq_foot,feb_sales_per_sq_foot,mar_sales_per_sq_foot,apr_sales_per_sq_foot,may_sales_per_sq_foot,jun_sales_per_sq_foot,jul_sales_per_sq_foot,aug_sales_per_sq_foot,sep_sales_per_sq_foot,oct_sales_per_sq_foot,nov_sales_per_sq_foot,dec_sales_per_sq_foot,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net]
+  WholeStageCodegen (14)
+    HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(jan_sales),sum(feb_sales),sum(mar_sales),sum(apr_sales),sum(may_sales),sum(jun_sales),sum(jul_sales),sum(aug_sales),sum(sep_sales),sum(oct_sales),sum(nov_sales),sum(dec_sales),sum((jan_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((feb_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((mar_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((apr_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((may_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((jun_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((jul_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((aug_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((sep_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((oct_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((nov_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum((dec_sales / cast(w_warehouse_sq_ft as decimal(10,0)))),sum(jan_net),sum(feb_net),sum(mar_net),sum(apr_net),sum(may_net),sum(jun_net),sum(jul_net),sum(aug_net),sum(sep_net),sum(oct_net),sum(nov_net),sum(dec_net),jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_sales_per_sq_foot,feb_sales_per_sq_foot,mar_sales_per_sq_foot,apr_sales_per_sq_foot,may_sales_per_sq_foot,jun_sales_per_sq_foot,jul_sales_per_sq_foot,aug_sales_per_sq_foot,sep_sales_per_sq_foot,oct_sales_per_sq_foot,nov_sales_per_sq_foot,dec_sales_per_sq_foot,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+      InputAdapter
+        Exchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year] #1
+          WholeStageCodegen (13)
+            HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+              InputAdapter
+                Union
+                  WholeStageCodegen (6)
+                    HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(CASE WHEN (d_moy = 1) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (ws_ext_sales_price * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 1) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (ws_net_paid * cast(ws_quantity as decimal(10,0))) ELSE 0.00 END),ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #2
+                          WholeStageCodegen (5)
+                            HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,ws_ext_sales_price,ws_quantity,ws_net_paid] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              Project [ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                BroadcastHashJoin [ws_ship_mode_sk,sm_ship_mode_sk]
+                                  Project [ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                    BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
+                                      Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          Project [ws_sold_time_sk,ws_ship_mode_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
+                                            BroadcastHashJoin [ws_warehouse_sk,w_warehouse_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ws_warehouse_sk,ws_sold_time_sk,ws_ship_mode_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_mode_sk,ws_warehouse_sk,ws_quantity,ws_ext_sales_price,ws_net_paid,ws_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [d_year,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                              InputAdapter
+                                                BroadcastExchange #4
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [w_warehouse_sk]
+                                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
                                           InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [w_warehouse_sk]
-                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
+                                            ReusedExchange [d_date_sk,d_year,d_moy] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year,d_moy] #3
+                                        BroadcastExchange #5
+                                          WholeStageCodegen (3)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [t_time_sk]
+                                                  CometFilter [t_time,t_time_sk]
+                                                    CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_time]
                                   InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (3)
+                                    BroadcastExchange #6
+                                      WholeStageCodegen (4)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [t_time_sk]
-                                              CometFilter [t_time,t_time_sk]
-                                                CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_time]
-                              InputAdapter
-                                BroadcastExchange #6
-                                  WholeStageCodegen (4)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [sm_ship_mode_sk]
-                                          CometFilter [sm_carrier,sm_ship_mode_sk]
-                                            CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_carrier]
-                CometHashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #7
-                    RowToColumnar
-                      WholeStageCodegen (10)
-                        HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,cs_sales_price,cs_quantity,cs_net_paid_inc_tax] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                          Project [cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                            BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
-                              Project [cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                BroadcastHashJoin [cs_sold_time_sk,t_time_sk]
-                                  Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
-                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                      Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
-                                        BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [cs_warehouse_sk,cs_sold_time_sk,cs_ship_mode_sk]
-                                                CometScan parquet spark_catalog.default.catalog_sales [cs_sold_time_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
+                                            CometProject [sm_ship_mode_sk]
+                                              CometFilter [sm_carrier,sm_ship_mode_sk]
+                                                CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_carrier]
+                  WholeStageCodegen (12)
+                    HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(CASE WHEN (d_moy = 1) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (cs_sales_price * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 1) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 2) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 3) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 4) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 5) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 6) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 7) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 8) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 9) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 10) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 11) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),sum(CASE WHEN (d_moy = 12) THEN (cs_net_paid_inc_tax * cast(cs_quantity as decimal(10,0))) ELSE 0.00 END),ship_carriers,year,jan_sales,feb_sales,mar_sales,apr_sales,may_sales,jun_sales,jul_sales,aug_sales,sep_sales,oct_sales,nov_sales,dec_sales,jan_net,feb_net,mar_net,apr_net,may_net,jun_net,jul_net,aug_net,sep_net,oct_net,nov_net,dec_net,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year] #7
+                          WholeStageCodegen (11)
+                            HashAggregate [w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy,cs_sales_price,cs_quantity,cs_net_paid_inc_tax] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              Project [cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
+                                  Project [cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                    BroadcastHashJoin [cs_sold_time_sk,t_time_sk]
+                                      Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country,d_year,d_moy]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          Project [cs_sold_time_sk,cs_ship_mode_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country]
+                                            BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [cs_warehouse_sk,cs_sold_time_sk,cs_ship_mode_sk]
+                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_sold_time_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_quantity,cs_sales_price,cs_net_paid_inc_tax,cs_sold_date_sk]
+                                                      ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country] #4
                                           InputAdapter
-                                            ReusedExchange [w_warehouse_sk,w_warehouse_name,w_warehouse_sq_ft,w_city,w_county,w_state,w_country] #4
+                                            ReusedExchange [d_date_sk,d_year,d_moy] #3
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year,d_moy] #3
+                                        ReusedExchange [t_time_sk] #5
                                   InputAdapter
-                                    ReusedExchange [t_time_sk] #5
-                              InputAdapter
-                                ReusedExchange [sm_ship_mode_sk] #6
+                                    ReusedExchange [sm_ship_mode_sk] #6
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt
index fc5ae3bc19..5dabc82d2c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/explain.txt
@@ -1,33 +1,31 @@
 == Physical Plan ==
-TakeOrderedAndProject (29)
-+- * Filter (28)
-   +- Window (27)
-      +- * ColumnarToRow (26)
-         +- CometSort (25)
-            +- CometColumnarExchange (24)
-               +- CometHashAggregate (23)
-                  +- CometColumnarExchange (22)
-                     +- RowToColumnar (21)
-                        +- * HashAggregate (20)
-                           +- * Expand (19)
-                              +- * Project (18)
-                                 +- * BroadcastHashJoin Inner BuildRight (17)
-                                    :- * Project (12)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (11)
-                                    :     :- * Project (6)
-                                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                                    :     :     :- * ColumnarToRow (3)
-                                    :     :     :  +- CometFilter (2)
-                                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                                    :     :     +- ReusedExchange (4)
-                                    :     +- BroadcastExchange (10)
-                                    :        +- * ColumnarToRow (9)
-                                    :           +- CometFilter (8)
-                                    :              +- CometScan parquet spark_catalog.default.store (7)
-                                    +- BroadcastExchange (16)
-                                       +- * ColumnarToRow (15)
-                                          +- CometFilter (14)
-                                             +- CometScan parquet spark_catalog.default.item (13)
+TakeOrderedAndProject (27)
++- * Filter (26)
+   +- Window (25)
+      +- * Sort (24)
+         +- Exchange (23)
+            +- * HashAggregate (22)
+               +- Exchange (21)
+                  +- * HashAggregate (20)
+                     +- * Expand (19)
+                        +- * Project (18)
+                           +- * BroadcastHashJoin Inner BuildRight (17)
+                              :- * Project (12)
+                              :  +- * BroadcastHashJoin Inner BuildRight (11)
+                              :     :- * Project (6)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                              :     :     :- * ColumnarToRow (3)
+                              :     :     :  +- CometFilter (2)
+                              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     :     +- ReusedExchange (4)
+                              :     +- BroadcastExchange (10)
+                              :        +- * ColumnarToRow (9)
+                              :           +- CometFilter (8)
+                              :              +- CometScan parquet spark_catalog.default.store (7)
+                              +- BroadcastExchange (16)
+                                 +- * ColumnarToRow (15)
+                                    +- CometFilter (14)
+                                       +- CometScan parquet spark_catalog.default.item (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -45,7 +43,7 @@ Condition : (isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_quantity#3, ss_sales_price#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 34]
+(4) ReusedExchange [Reuses operator id: 32]
 Output [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -125,70 +123,66 @@ Functions [1]: [partial_sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as d
 Aggregate Attributes [2]: [sum#27, isEmpty#28]
 Results [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
 
-(21) RowToColumnar
+(21) Exchange
 Input [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
+Arguments: hashpartitioning(i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) CometColumnarExchange
-Input [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
-Arguments: hashpartitioning(i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 5]
 Input [11]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26, sum#29, isEmpty#30]
 Keys [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, spark_grouping_id#26]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#31]
+Results [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#31 AS sumsales#32]
 
-(24) CometColumnarExchange
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
-Arguments: hashpartitioning(i_category#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(25) CometSort
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
-Arguments: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31], [i_category#18 ASC NULLS FIRST, sumsales#31 DESC NULLS LAST]
+(23) Exchange
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32]
+Arguments: hashpartitioning(i_category#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(26) ColumnarToRow [codegen id : 5]
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
+(24) Sort [codegen id : 6]
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32]
+Arguments: [i_category#18 ASC NULLS FIRST, sumsales#32 DESC NULLS LAST], false, 0
 
-(27) Window
-Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31]
-Arguments: [rank(sumsales#31) windowspecdefinition(i_category#18, sumsales#31 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#32], [i_category#18], [sumsales#31 DESC NULLS LAST]
+(25) Window
+Input [9]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32]
+Arguments: [rank(sumsales#32) windowspecdefinition(i_category#18, sumsales#32 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#33], [i_category#18], [sumsales#32 DESC NULLS LAST]
 
-(28) Filter [codegen id : 6]
-Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31, rk#32]
-Condition : (rk#32 <= 100)
+(26) Filter [codegen id : 7]
+Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32, rk#33]
+Condition : (rk#33 <= 100)
 
-(29) TakeOrderedAndProject
-Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31, rk#32]
-Arguments: 100, [i_category#18 ASC NULLS FIRST, i_class#19 ASC NULLS FIRST, i_brand#20 ASC NULLS FIRST, i_product_name#21 ASC NULLS FIRST, d_year#22 ASC NULLS FIRST, d_qoy#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, s_store_id#25 ASC NULLS FIRST, sumsales#31 ASC NULLS FIRST, rk#32 ASC NULLS FIRST], [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#31, rk#32]
+(27) TakeOrderedAndProject
+Input [10]: [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32, rk#33]
+Arguments: 100, [i_category#18 ASC NULLS FIRST, i_class#19 ASC NULLS FIRST, i_brand#20 ASC NULLS FIRST, i_product_name#21 ASC NULLS FIRST, d_year#22 ASC NULLS FIRST, d_qoy#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, s_store_id#25 ASC NULLS FIRST, sumsales#32 ASC NULLS FIRST, rk#33 ASC NULLS FIRST], [i_category#18, i_class#19, i_brand#20, i_product_name#21, d_year#22, d_qoy#23, d_moy#24, s_store_id#25, sumsales#32, rk#33]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (34)
-+- * ColumnarToRow (33)
-   +- CometProject (32)
-      +- CometFilter (31)
-         +- CometScan parquet spark_catalog.default.date_dim (30)
+BroadcastExchange (32)
++- * ColumnarToRow (31)
+   +- CometProject (30)
+      +- CometFilter (29)
+         +- CometScan parquet spark_catalog.default.date_dim (28)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [5]: [d_date_sk#7, d_month_seq#33, d_year#8, d_moy#9, d_qoy#10]
+Output [5]: [d_date_sk#7, d_month_seq#34, d_year#8, d_moy#9, d_qoy#10]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_year:int,d_moy:int,d_qoy:int>
 
-(31) CometFilter
-Input [5]: [d_date_sk#7, d_month_seq#33, d_year#8, d_moy#9, d_qoy#10]
-Condition : (((isnotnull(d_month_seq#33) AND (d_month_seq#33 >= 1200)) AND (d_month_seq#33 <= 1211)) AND isnotnull(d_date_sk#7))
+(29) CometFilter
+Input [5]: [d_date_sk#7, d_month_seq#34, d_year#8, d_moy#9, d_qoy#10]
+Condition : (((isnotnull(d_month_seq#34) AND (d_month_seq#34 >= 1200)) AND (d_month_seq#34 <= 1211)) AND isnotnull(d_date_sk#7))
 
-(32) CometProject
-Input [5]: [d_date_sk#7, d_month_seq#33, d_year#8, d_moy#9, d_qoy#10]
+(30) CometProject
+Input [5]: [d_date_sk#7, d_month_seq#34, d_year#8, d_moy#9, d_qoy#10]
 Arguments: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10], [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(33) ColumnarToRow [codegen id : 1]
+(31) ColumnarToRow [codegen id : 1]
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(34) BroadcastExchange
+(32) BroadcastExchange
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt
index 3fd090f51e..119ae71840 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q67/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,rk]
-  WholeStageCodegen (6)
+  WholeStageCodegen (7)
     Filter [rk]
       InputAdapter
         Window [sumsales,i_category]
-          WholeStageCodegen (5)
-            ColumnarToRow
+          WholeStageCodegen (6)
+            Sort [i_category,sumsales]
               InputAdapter
-                CometSort [i_category,sumsales]
-                  CometColumnarExchange [i_category] #1
-                    CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id,sum,isEmpty]
-                      CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id] #2
-                        RowToColumnar
+                Exchange [i_category] #1
+                  WholeStageCodegen (5)
+                    HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                      InputAdapter
+                        Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id] #2
                           WholeStageCodegen (4)
                             HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,spark_grouping_id,ss_sales_price,ss_quantity] [sum,isEmpty,sum,isEmpty]
                               Expand [ss_quantity,ss_sales_price,i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt
index 5b01bcc0da..d87d02e87b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/explain.txt
@@ -1,45 +1,43 @@
 == Physical Plan ==
-TakeOrderedAndProject (41)
-+- * Project (40)
-   +- * BroadcastHashJoin Inner BuildRight (39)
-      :- * Project (37)
-      :  +- * BroadcastHashJoin Inner BuildRight (36)
-      :     :- * ColumnarToRow (31)
-      :     :  +- CometHashAggregate (30)
-      :     :     +- CometColumnarExchange (29)
-      :     :        +- RowToColumnar (28)
-      :     :           +- * HashAggregate (27)
-      :     :              +- * Project (26)
-      :     :                 +- * BroadcastHashJoin Inner BuildRight (25)
-      :     :                    :- * Project (20)
-      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (19)
-      :     :                    :     :- * Project (13)
-      :     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :     :                    :     :     :- * Project (6)
-      :     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :                    :     :     :     :- * ColumnarToRow (3)
-      :     :                    :     :     :     :  +- CometFilter (2)
-      :     :                    :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :     :                    :     :     :     +- ReusedExchange (4)
-      :     :                    :     :     +- BroadcastExchange (11)
-      :     :                    :     :        +- * ColumnarToRow (10)
-      :     :                    :     :           +- CometProject (9)
-      :     :                    :     :              +- CometFilter (8)
-      :     :                    :     :                 +- CometScan parquet spark_catalog.default.store (7)
-      :     :                    :     +- BroadcastExchange (18)
-      :     :                    :        +- * ColumnarToRow (17)
-      :     :                    :           +- CometProject (16)
-      :     :                    :              +- CometFilter (15)
-      :     :                    :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
-      :     :                    +- BroadcastExchange (24)
-      :     :                       +- * ColumnarToRow (23)
-      :     :                          +- CometFilter (22)
-      :     :                             +- CometScan parquet spark_catalog.default.customer_address (21)
-      :     +- BroadcastExchange (35)
-      :        +- * ColumnarToRow (34)
-      :           +- CometFilter (33)
-      :              +- CometScan parquet spark_catalog.default.customer (32)
-      +- ReusedExchange (38)
+TakeOrderedAndProject (39)
++- * Project (38)
+   +- * BroadcastHashJoin Inner BuildRight (37)
+      :- * Project (35)
+      :  +- * BroadcastHashJoin Inner BuildRight (34)
+      :     :- * HashAggregate (29)
+      :     :  +- Exchange (28)
+      :     :     +- * HashAggregate (27)
+      :     :        +- * Project (26)
+      :     :           +- * BroadcastHashJoin Inner BuildRight (25)
+      :     :              :- * Project (20)
+      :     :              :  +- * BroadcastHashJoin Inner BuildRight (19)
+      :     :              :     :- * Project (13)
+      :     :              :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :     :              :     :     :- * Project (6)
+      :     :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :              :     :     :     :- * ColumnarToRow (3)
+      :     :              :     :     :     :  +- CometFilter (2)
+      :     :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :              :     :     :     +- ReusedExchange (4)
+      :     :              :     :     +- BroadcastExchange (11)
+      :     :              :     :        +- * ColumnarToRow (10)
+      :     :              :     :           +- CometProject (9)
+      :     :              :     :              +- CometFilter (8)
+      :     :              :     :                 +- CometScan parquet spark_catalog.default.store (7)
+      :     :              :     +- BroadcastExchange (18)
+      :     :              :        +- * ColumnarToRow (17)
+      :     :              :           +- CometProject (16)
+      :     :              :              +- CometFilter (15)
+      :     :              :                 +- CometScan parquet spark_catalog.default.household_demographics (14)
+      :     :              +- BroadcastExchange (24)
+      :     :                 +- * ColumnarToRow (23)
+      :     :                    +- CometFilter (22)
+      :     :                       +- CometScan parquet spark_catalog.default.customer_address (21)
+      :     +- BroadcastExchange (33)
+      :        +- * ColumnarToRow (32)
+      :           +- CometFilter (31)
+      :              +- CometScan parquet spark_catalog.default.customer (30)
+      +- ReusedExchange (36)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -57,7 +55,7 @@ Condition : (((isnotnull(ss_store_sk#4) AND isnotnull(ss_hdemo_sk#2)) AND isnotn
 (3) ColumnarToRow [codegen id : 5]
 Input [9]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_store_sk#4, ss_ticket_number#5, ss_ext_sales_price#6, ss_ext_list_price#7, ss_ext_tax#8, ss_sold_date_sk#9]
 
-(4) ReusedExchange [Reuses operator id: 46]
+(4) ReusedExchange [Reuses operator id: 44]
 Output [1]: [d_date_sk#11]
 
 (5) BroadcastHashJoin [codegen id : 5]
@@ -169,95 +167,91 @@ Functions [3]: [partial_sum(UnscaledValue(ss_ext_sales_price#6)), partial_sum(Un
 Aggregate Attributes [3]: [sum#19, sum#20, sum#21]
 Results [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
 
-(28) RowToColumnar
+(28) Exchange
 Input [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometColumnarExchange
-Input [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 8]
 Input [7]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18, sum#22, sum#23, sum#24]
 Keys [4]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, ca_city#18]
 Functions [3]: [sum(UnscaledValue(ss_ext_sales_price#6)), sum(UnscaledValue(ss_ext_list_price#7)), sum(UnscaledValue(ss_ext_tax#8))]
-
-(31) ColumnarToRow [codegen id : 8]
-Input [6]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#25, extended_price#26, list_price#27, extended_tax#28]
+Aggregate Attributes [3]: [sum(UnscaledValue(ss_ext_sales_price#6))#25, sum(UnscaledValue(ss_ext_list_price#7))#26, sum(UnscaledValue(ss_ext_tax#8))#27]
+Results [6]: [ss_ticket_number#5, ss_customer_sk#1, ca_city#18 AS bought_city#28, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#6))#25,17,2) AS extended_price#29, MakeDecimal(sum(UnscaledValue(ss_ext_list_price#7))#26,17,2) AS list_price#30, MakeDecimal(sum(UnscaledValue(ss_ext_tax#8))#27,17,2) AS extended_tax#31]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
+Output [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_addr_sk:int,c_first_name:string,c_last_name:string>
 
-(33) CometFilter
-Input [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
-Condition : (isnotnull(c_customer_sk#29) AND isnotnull(c_current_addr_sk#30))
+(31) CometFilter
+Input [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
+Condition : (isnotnull(c_customer_sk#32) AND isnotnull(c_current_addr_sk#33))
 
-(34) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
+(32) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
 
-(35) BroadcastExchange
-Input [4]: [c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
+(33) BroadcastExchange
+Input [4]: [c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=5]
 
-(36) BroadcastHashJoin [codegen id : 8]
+(34) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#29]
+Right keys [1]: [c_customer_sk#32]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
-Output [8]: [ss_ticket_number#5, bought_city#25, extended_price#26, list_price#27, extended_tax#28, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
-Input [10]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#25, extended_price#26, list_price#27, extended_tax#28, c_customer_sk#29, c_current_addr_sk#30, c_first_name#31, c_last_name#32]
+(35) Project [codegen id : 8]
+Output [8]: [ss_ticket_number#5, bought_city#28, extended_price#29, list_price#30, extended_tax#31, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
+Input [10]: [ss_ticket_number#5, ss_customer_sk#1, bought_city#28, extended_price#29, list_price#30, extended_tax#31, c_customer_sk#32, c_current_addr_sk#33, c_first_name#34, c_last_name#35]
 
-(38) ReusedExchange [Reuses operator id: 24]
-Output [2]: [ca_address_sk#33, ca_city#34]
+(36) ReusedExchange [Reuses operator id: 24]
+Output [2]: [ca_address_sk#36, ca_city#37]
 
-(39) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [c_current_addr_sk#30]
-Right keys [1]: [ca_address_sk#33]
+(37) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [c_current_addr_sk#33]
+Right keys [1]: [ca_address_sk#36]
 Join type: Inner
-Join condition: NOT (ca_city#34 = bought_city#25)
+Join condition: NOT (ca_city#37 = bought_city#28)
 
-(40) Project [codegen id : 8]
-Output [8]: [c_last_name#32, c_first_name#31, ca_city#34, bought_city#25, ss_ticket_number#5, extended_price#26, extended_tax#28, list_price#27]
-Input [10]: [ss_ticket_number#5, bought_city#25, extended_price#26, list_price#27, extended_tax#28, c_current_addr_sk#30, c_first_name#31, c_last_name#32, ca_address_sk#33, ca_city#34]
+(38) Project [codegen id : 8]
+Output [8]: [c_last_name#35, c_first_name#34, ca_city#37, bought_city#28, ss_ticket_number#5, extended_price#29, extended_tax#31, list_price#30]
+Input [10]: [ss_ticket_number#5, bought_city#28, extended_price#29, list_price#30, extended_tax#31, c_current_addr_sk#33, c_first_name#34, c_last_name#35, ca_address_sk#36, ca_city#37]
 
-(41) TakeOrderedAndProject
-Input [8]: [c_last_name#32, c_first_name#31, ca_city#34, bought_city#25, ss_ticket_number#5, extended_price#26, extended_tax#28, list_price#27]
-Arguments: 100, [c_last_name#32 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#32, c_first_name#31, ca_city#34, bought_city#25, ss_ticket_number#5, extended_price#26, extended_tax#28, list_price#27]
+(39) TakeOrderedAndProject
+Input [8]: [c_last_name#35, c_first_name#34, ca_city#37, bought_city#28, ss_ticket_number#5, extended_price#29, extended_tax#31, list_price#30]
+Arguments: 100, [c_last_name#35 ASC NULLS FIRST, ss_ticket_number#5 ASC NULLS FIRST], [c_last_name#35, c_first_name#34, ca_city#37, bought_city#28, ss_ticket_number#5, extended_price#29, extended_tax#31, list_price#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (46)
-+- * ColumnarToRow (45)
-   +- CometProject (44)
-      +- CometFilter (43)
-         +- CometScan parquet spark_catalog.default.date_dim (42)
+BroadcastExchange (44)
++- * ColumnarToRow (43)
+   +- CometProject (42)
+      +- CometFilter (41)
+         +- CometScan parquet spark_catalog.default.date_dim (40)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#11, d_year#35, d_dom#36]
+Output [3]: [d_date_sk#11, d_year#38, d_dom#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_dom), GreaterThanOrEqual(d_dom,1), LessThanOrEqual(d_dom,2), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(43) CometFilter
-Input [3]: [d_date_sk#11, d_year#35, d_dom#36]
-Condition : ((((isnotnull(d_dom#36) AND (d_dom#36 >= 1)) AND (d_dom#36 <= 2)) AND d_year#35 IN (1999,2000,2001)) AND isnotnull(d_date_sk#11))
+(41) CometFilter
+Input [3]: [d_date_sk#11, d_year#38, d_dom#39]
+Condition : ((((isnotnull(d_dom#39) AND (d_dom#39 >= 1)) AND (d_dom#39 <= 2)) AND d_year#38 IN (1999,2000,2001)) AND isnotnull(d_date_sk#11))
 
-(44) CometProject
-Input [3]: [d_date_sk#11, d_year#35, d_dom#36]
+(42) CometProject
+Input [3]: [d_date_sk#11, d_year#38, d_dom#39]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(45) ColumnarToRow [codegen id : 1]
+(43) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(46) BroadcastExchange
+(44) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt
index a4396d582b..f2680bebb0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q68/simplified.txt
@@ -4,58 +4,56 @@ TakeOrderedAndProject [c_last_name,ss_ticket_number,c_first_name,ca_city,bought_
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk,ca_city,bought_city]
         Project [ss_ticket_number,bought_city,extended_price,list_price,extended_tax,c_current_addr_sk,c_first_name,c_last_name]
           BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-            ColumnarToRow
+            HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(UnscaledValue(ss_ext_list_price)),sum(UnscaledValue(ss_ext_tax)),bought_city,extended_price,list_price,extended_tax,sum,sum,sum]
               InputAdapter
-                CometHashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,sum,sum,sum]
-                  CometColumnarExchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax] [sum,sum,sum,sum,sum,sum]
-                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ca_city]
-                            BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                              Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
-                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
-                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                      Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #2
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_dom,d_year,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #2
+                Exchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city] #1
+                  WholeStageCodegen (5)
+                    HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax] [sum,sum,sum,sum,sum,sum]
+                      Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ca_city]
+                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                          Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
+                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                              Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
+                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_addr_sk,ss_customer_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_ext_sales_price,ss_ext_list_price,ss_ext_tax,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #2
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_dom,d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
                                       InputAdapter
-                                        BroadcastExchange #3
-                                          WholeStageCodegen (2)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [s_store_sk]
-                                                  CometFilter [s_city,s_store_sk]
-                                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
+                                        ReusedExchange [d_date_sk] #2
                                   InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (3)
+                                    BroadcastExchange #3
+                                      WholeStageCodegen (2)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [hd_demo_sk]
-                                              CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                                            CometProject [s_store_sk]
+                                              CometFilter [s_city,s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_city]
                               InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (4)
+                                BroadcastExchange #4
+                                  WholeStageCodegen (3)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [ca_address_sk,ca_city]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
+                                        CometProject [hd_demo_sk]
+                                          CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                          InputAdapter
+                            BroadcastExchange #5
+                              WholeStageCodegen (4)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk,ca_city]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_city]
             InputAdapter
               BroadcastExchange #6
                 WholeStageCodegen (6)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt
index 6c289ac77b..9a32627233 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/explain.txt
@@ -1,48 +1,46 @@
 == Physical Plan ==
-* ColumnarToRow (44)
-+- CometTakeOrderedAndProject (43)
-   +- CometHashAggregate (42)
-      +- CometColumnarExchange (41)
-         +- RowToColumnar (40)
-            +- * HashAggregate (39)
-               +- * Project (38)
-                  +- * BroadcastHashJoin Inner BuildRight (37)
-                     :- * Project (32)
-                     :  +- * BroadcastHashJoin Inner BuildRight (31)
-                     :     :- * Project (25)
-                     :     :  +- * BroadcastHashJoin LeftAnti BuildRight (24)
-                     :     :     :- * BroadcastHashJoin LeftAnti BuildRight (17)
-                     :     :     :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-                     :     :     :  :  :- * ColumnarToRow (3)
-                     :     :     :  :  :  +- CometFilter (2)
-                     :     :     :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-                     :     :     :  :  +- BroadcastExchange (9)
-                     :     :     :  :     +- * Project (8)
-                     :     :     :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-                     :     :     :  :           :- * ColumnarToRow (5)
-                     :     :     :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-                     :     :     :  :           +- ReusedExchange (6)
-                     :     :     :  +- BroadcastExchange (16)
-                     :     :     :     +- * Project (15)
-                     :     :     :        +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :           :- * ColumnarToRow (12)
-                     :     :     :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-                     :     :     :           +- ReusedExchange (13)
-                     :     :     +- BroadcastExchange (23)
-                     :     :        +- * Project (22)
-                     :     :           +- * BroadcastHashJoin Inner BuildRight (21)
-                     :     :              :- * ColumnarToRow (19)
-                     :     :              :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-                     :     :              +- ReusedExchange (20)
-                     :     +- BroadcastExchange (30)
-                     :        +- * ColumnarToRow (29)
-                     :           +- CometProject (28)
-                     :              +- CometFilter (27)
-                     :                 +- CometScan parquet spark_catalog.default.customer_address (26)
-                     +- BroadcastExchange (36)
-                        +- * ColumnarToRow (35)
-                           +- CometFilter (34)
-                              +- CometScan parquet spark_catalog.default.customer_demographics (33)
+TakeOrderedAndProject (42)
++- * HashAggregate (41)
+   +- Exchange (40)
+      +- * HashAggregate (39)
+         +- * Project (38)
+            +- * BroadcastHashJoin Inner BuildRight (37)
+               :- * Project (32)
+               :  +- * BroadcastHashJoin Inner BuildRight (31)
+               :     :- * Project (25)
+               :     :  +- * BroadcastHashJoin LeftAnti BuildRight (24)
+               :     :     :- * BroadcastHashJoin LeftAnti BuildRight (17)
+               :     :     :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+               :     :     :  :  :- * ColumnarToRow (3)
+               :     :     :  :  :  +- CometFilter (2)
+               :     :     :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+               :     :     :  :  +- BroadcastExchange (9)
+               :     :     :  :     +- * Project (8)
+               :     :     :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :     :  :           :- * ColumnarToRow (5)
+               :     :     :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+               :     :     :  :           +- ReusedExchange (6)
+               :     :     :  +- BroadcastExchange (16)
+               :     :     :     +- * Project (15)
+               :     :     :        +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :           :- * ColumnarToRow (12)
+               :     :     :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+               :     :     :           +- ReusedExchange (13)
+               :     :     +- BroadcastExchange (23)
+               :     :        +- * Project (22)
+               :     :           +- * BroadcastHashJoin Inner BuildRight (21)
+               :     :              :- * ColumnarToRow (19)
+               :     :              :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+               :     :              +- ReusedExchange (20)
+               :     +- BroadcastExchange (30)
+               :        +- * ColumnarToRow (29)
+               :           +- CometProject (28)
+               :              +- CometFilter (27)
+               :                 +- CometScan parquet spark_catalog.default.customer_address (26)
+               +- BroadcastExchange (36)
+                  +- * ColumnarToRow (35)
+                     +- CometFilter (34)
+                        +- CometScan parquet spark_catalog.default.customer_demographics (33)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -69,7 +67,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#4, ss_sold_date_sk#5]
 
-(6) ReusedExchange [Reuses operator id: 49]
+(6) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#7]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -102,7 +100,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#8, ws_sold_date_sk#9]
 
-(13) ReusedExchange [Reuses operator id: 49]
+(13) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#11]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -135,7 +133,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#12, cs_sold_date_sk#13]
 
-(20) ReusedExchange [Reuses operator id: 49]
+(20) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#15]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -229,54 +227,50 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#24]
 Results [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
 
-(40) RowToColumnar
+(40) Exchange
 Input [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
+Arguments: hashpartitioning(cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) CometColumnarExchange
-Input [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
-Arguments: hashpartitioning(cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 10]
 Input [6]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23, count#25]
 Keys [5]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cd_purchase_estimate#22, cd_credit_rating#23]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#26]
+Results [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, count(1)#26 AS cnt1#27, cd_purchase_estimate#22, count(1)#26 AS cnt2#28, cd_credit_rating#23, count(1)#26 AS cnt3#29]
 
-(43) CometTakeOrderedAndProject
-Input [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#26, cd_purchase_estimate#22, cnt2#27, cd_credit_rating#23, cnt3#28]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[cd_gender#19 ASC NULLS FIRST,cd_marital_status#20 ASC NULLS FIRST,cd_education_status#21 ASC NULLS FIRST,cd_purchase_estimate#22 ASC NULLS FIRST,cd_credit_rating#23 ASC NULLS FIRST], output=[cd_gender#19,cd_marital_status#20,cd_education_status#21,cnt1#26,cd_purchase_estimate#22,cnt2#27,cd_credit_rating#23,cnt3#28]), 100, [cd_gender#19 ASC NULLS FIRST, cd_marital_status#20 ASC NULLS FIRST, cd_education_status#21 ASC NULLS FIRST, cd_purchase_estimate#22 ASC NULLS FIRST, cd_credit_rating#23 ASC NULLS FIRST], [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#26, cd_purchase_estimate#22, cnt2#27, cd_credit_rating#23, cnt3#28]
-
-(44) ColumnarToRow [codegen id : 10]
-Input [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#26, cd_purchase_estimate#22, cnt2#27, cd_credit_rating#23, cnt3#28]
+(42) TakeOrderedAndProject
+Input [8]: [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#27, cd_purchase_estimate#22, cnt2#28, cd_credit_rating#23, cnt3#29]
+Arguments: 100, [cd_gender#19 ASC NULLS FIRST, cd_marital_status#20 ASC NULLS FIRST, cd_education_status#21 ASC NULLS FIRST, cd_purchase_estimate#22 ASC NULLS FIRST, cd_credit_rating#23 ASC NULLS FIRST], [cd_gender#19, cd_marital_status#20, cd_education_status#21, cnt1#27, cd_purchase_estimate#22, cnt2#28, cd_credit_rating#23, cnt3#29]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#29, d_moy#30]
+Output [3]: [d_date_sk#7, d_year#30, d_moy#31]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,6), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(46) CometFilter
-Input [3]: [d_date_sk#7, d_year#29, d_moy#30]
-Condition : (((((isnotnull(d_year#29) AND isnotnull(d_moy#30)) AND (d_year#29 = 2001)) AND (d_moy#30 >= 4)) AND (d_moy#30 <= 6)) AND isnotnull(d_date_sk#7))
+(44) CometFilter
+Input [3]: [d_date_sk#7, d_year#30, d_moy#31]
+Condition : (((((isnotnull(d_year#30) AND isnotnull(d_moy#31)) AND (d_year#30 = 2001)) AND (d_moy#31 >= 4)) AND (d_moy#31 <= 6)) AND isnotnull(d_date_sk#7))
 
-(47) CometProject
-Input [3]: [d_date_sk#7, d_year#29, d_moy#30]
+(45) CometProject
+Input [3]: [d_date_sk#7, d_year#30, d_moy#31]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(48) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt
index 410950aeb0..f5b4eccfbe 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q69/simplified.txt
@@ -1,76 +1,74 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cnt1,cnt2,cnt3]
-        CometHashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,count]
-          CometColumnarExchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] #1
-            RowToColumnar
-              WholeStageCodegen (9)
-                HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] [count,count]
-                  Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
-                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                      Project [c_current_cdemo_sk]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [c_current_cdemo_sk,c_current_addr_sk]
-                            BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (2)
-                                        Project [ss_customer_sk]
-                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [d_date_sk]
-                                                              CometFilter [d_year,d_moy,d_date_sk]
-                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cnt1,cnt2,cnt3]
+  WholeStageCodegen (10)
+    HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,count] [count(1),cnt1,cnt2,cnt3,count]
+      InputAdapter
+        Exchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] #1
+          WholeStageCodegen (9)
+            HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating] [count,count]
+              Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
+                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                  Project [c_current_cdemo_sk]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [c_current_cdemo_sk,c_current_addr_sk]
+                        BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                          BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                            BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                              ColumnarToRow
                                 InputAdapter
-                                  BroadcastExchange #4
-                                    WholeStageCodegen (4)
-                                      Project [ws_bill_customer_sk]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                  CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
                               InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (6)
-                                    Project [cs_ship_customer_sk]
-                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                BroadcastExchange #2
+                                  WholeStageCodegen (2)
+                                    Project [ss_customer_sk]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                         ColumnarToRow
                                           InputAdapter
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #1
+                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_year,d_moy,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                         InputAdapter
                                           ReusedExchange [d_date_sk] #3
+                            InputAdapter
+                              BroadcastExchange #4
+                                WholeStageCodegen (4)
+                                  Project [ws_bill_customer_sk]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                           InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (7)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ca_address_sk]
-                                      CometFilter [ca_state,ca_address_sk]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                            BroadcastExchange #5
+                              WholeStageCodegen (6)
+                                Project [cs_ship_customer_sk]
+                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                          ReusedSubquery [d_date_sk] #1
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (8)
+                        BroadcastExchange #6
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cd_demo_sk]
-                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
+                                CometProject [ca_address_sk]
+                                  CometFilter [ca_state,ca_address_sk]
+                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                  InputAdapter
+                    BroadcastExchange #7
+                      WholeStageCodegen (8)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cd_demo_sk]
+                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt
index 31a4d6acdb..18ff7c4590 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/explain.txt
@@ -1,36 +1,34 @@
 == Physical Plan ==
-* ColumnarToRow (32)
-+- CometTakeOrderedAndProject (31)
-   +- CometHashAggregate (30)
-      +- CometColumnarExchange (29)
-         +- RowToColumnar (28)
-            +- * HashAggregate (27)
-               +- * Project (26)
-                  +- * BroadcastHashJoin Inner BuildRight (25)
-                     :- * Project (19)
-                     :  +- * BroadcastHashJoin Inner BuildRight (18)
-                     :     :- * Project (13)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-                     :     :     :- * Project (10)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :     :     +- BroadcastExchange (8)
-                     :     :     :        +- * ColumnarToRow (7)
-                     :     :     :           +- CometProject (6)
-                     :     :     :              +- CometFilter (5)
-                     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-                     :     :     +- ReusedExchange (11)
-                     :     +- BroadcastExchange (17)
-                     :        +- * ColumnarToRow (16)
-                     :           +- CometFilter (15)
-                     :              +- CometScan parquet spark_catalog.default.item (14)
-                     +- BroadcastExchange (24)
-                        +- * ColumnarToRow (23)
-                           +- CometProject (22)
-                              +- CometFilter (21)
-                                 +- CometScan parquet spark_catalog.default.promotion (20)
+TakeOrderedAndProject (30)
++- * HashAggregate (29)
+   +- Exchange (28)
+      +- * HashAggregate (27)
+         +- * Project (26)
+            +- * BroadcastHashJoin Inner BuildRight (25)
+               :- * Project (19)
+               :  +- * BroadcastHashJoin Inner BuildRight (18)
+               :     :- * Project (13)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+               :     :     :- * Project (10)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+               :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :  +- CometFilter (2)
+               :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :     :     +- BroadcastExchange (8)
+               :     :     :        +- * ColumnarToRow (7)
+               :     :     :           +- CometProject (6)
+               :     :     :              +- CometFilter (5)
+               :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+               :     :     +- ReusedExchange (11)
+               :     +- BroadcastExchange (17)
+               :        +- * ColumnarToRow (16)
+               :           +- CometFilter (15)
+               :              +- CometScan parquet spark_catalog.default.item (14)
+               +- BroadcastExchange (24)
+                  +- * ColumnarToRow (23)
+                     +- CometProject (22)
+                        +- CometFilter (21)
+                           +- CometScan parquet spark_catalog.default.promotion (20)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -80,7 +78,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_promo_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_promo_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 37]
+(11) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -160,54 +158,50 @@ Functions [4]: [partial_avg(ss_quantity#4), partial_avg(UnscaledValue(ss_list_pr
 Aggregate Attributes [8]: [sum#20, count#21, sum#22, count#23, sum#24, count#25, sum#26, count#27]
 Results [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 
-(28) RowToColumnar
+(28) Exchange
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
+Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometColumnarExchange
-Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
-Arguments: hashpartitioning(i_item_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 6]
 Input [9]: [i_item_id#16, sum#28, count#29, sum#30, count#31, sum#32, count#33, sum#34, count#35]
 Keys [1]: [i_item_id#16]
 Functions [4]: [avg(ss_quantity#4), avg(UnscaledValue(ss_list_price#5)), avg(UnscaledValue(ss_coupon_amt#7)), avg(UnscaledValue(ss_sales_price#6))]
+Aggregate Attributes [4]: [avg(ss_quantity#4)#36, avg(UnscaledValue(ss_list_price#5))#37, avg(UnscaledValue(ss_coupon_amt#7))#38, avg(UnscaledValue(ss_sales_price#6))#39]
+Results [5]: [i_item_id#16, avg(ss_quantity#4)#36 AS agg1#40, cast((avg(UnscaledValue(ss_list_price#5))#37 / 100.0) as decimal(11,6)) AS agg2#41, cast((avg(UnscaledValue(ss_coupon_amt#7))#38 / 100.0) as decimal(11,6)) AS agg3#42, cast((avg(UnscaledValue(ss_sales_price#6))#39 / 100.0) as decimal(11,6)) AS agg4#43]
 
-(31) CometTakeOrderedAndProject
-Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#16 ASC NULLS FIRST], output=[i_item_id#16,agg1#36,agg2#37,agg3#38,agg4#39]), 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
-
-(32) ColumnarToRow [codegen id : 6]
-Input [5]: [i_item_id#16, agg1#36, agg2#37, agg3#38, agg4#39]
+(30) TakeOrderedAndProject
+Input [5]: [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
+Arguments: 100, [i_item_id#16 ASC NULLS FIRST], [i_item_id#16, agg1#40, agg2#41, agg3#42, agg4#43]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#40]
+Output [2]: [d_date_sk#14, d_year#44]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(34) CometFilter
-Input [2]: [d_date_sk#14, d_year#40]
-Condition : ((isnotnull(d_year#40) AND (d_year#40 = 2000)) AND isnotnull(d_date_sk#14))
+(32) CometFilter
+Input [2]: [d_date_sk#14, d_year#44]
+Condition : ((isnotnull(d_year#44) AND (d_year#44 = 2000)) AND isnotnull(d_date_sk#14))
 
-(35) CometProject
-Input [2]: [d_date_sk#14, d_year#40]
+(33) CometProject
+Input [2]: [d_date_sk#14, d_year#44]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(36) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(37) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt
index 37d5a50ae0..2471de20a3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q7/simplified.txt
@@ -1,54 +1,52 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
-        CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count]
-          CometColumnarExchange [i_item_id] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                HashAggregate [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                  Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
-                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                      Project [ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
-                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                          Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ss_cdemo_sk,ss_item_sk,ss_promo_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_year,d_date_sk]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                  InputAdapter
-                                    BroadcastExchange #3
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [cd_demo_sk]
-                                              CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+TakeOrderedAndProject [i_item_id,agg1,agg2,agg3,agg4]
+  WholeStageCodegen (6)
+    HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count] [avg(ss_quantity),avg(UnscaledValue(ss_list_price)),avg(UnscaledValue(ss_coupon_amt)),avg(UnscaledValue(ss_sales_price)),agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
+      InputAdapter
+        Exchange [i_item_id] #1
+          WholeStageCodegen (5)
+            HashAggregate [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+              Project [ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
+                BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                  Project [ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,i_item_id]
+                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                      Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                          Project [ss_item_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [ss_cdemo_sk,ss_item_sk,ss_promo_sk]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_promo_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [d_date_sk]
+                                                  CometFilter [d_year,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                               InputAdapter
-                                ReusedExchange [d_date_sk] #2
+                                BroadcastExchange #3
+                                  WholeStageCodegen (1)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [cd_demo_sk]
+                                          CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (3)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [i_item_sk]
-                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                            ReusedExchange [d_date_sk] #2
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (4)
+                        BroadcastExchange #4
+                          WholeStageCodegen (3)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [p_promo_sk]
-                                  CometFilter [p_channel_email,p_channel_event,p_promo_sk]
-                                    CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
+                                CometFilter [i_item_sk]
+                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                  InputAdapter
+                    BroadcastExchange #5
+                      WholeStageCodegen (4)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [p_promo_sk]
+                              CometFilter [p_channel_email,p_channel_event,p_promo_sk]
+                                CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_email,p_channel_event]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt
index 8387487b4f..32499fad8a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/explain.txt
@@ -1,50 +1,46 @@
 == Physical Plan ==
-TakeOrderedAndProject (46)
-+- * Project (45)
-   +- Window (44)
-      +- * ColumnarToRow (43)
-         +- CometSort (42)
-            +- CometColumnarExchange (41)
-               +- CometHashAggregate (40)
-                  +- CometColumnarExchange (39)
-                     +- RowToColumnar (38)
-                        +- * HashAggregate (37)
-                           +- * Expand (36)
-                              +- * Project (35)
-                                 +- * BroadcastHashJoin Inner BuildRight (34)
-                                    :- * Project (6)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-                                    :     :- * ColumnarToRow (3)
-                                    :     :  +- CometFilter (2)
-                                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                                    :     +- ReusedExchange (4)
-                                    +- BroadcastExchange (33)
-                                       +- * BroadcastHashJoin LeftSemi BuildRight (32)
-                                          :- * ColumnarToRow (9)
-                                          :  +- CometFilter (8)
-                                          :     +- CometScan parquet spark_catalog.default.store (7)
-                                          +- BroadcastExchange (31)
-                                             +- * Project (30)
-                                                +- * Filter (29)
-                                                   +- Window (28)
-                                                      +- * ColumnarToRow (27)
-                                                         +- CometSort (26)
-                                                            +- CometHashAggregate (25)
-                                                               +- CometColumnarExchange (24)
-                                                                  +- RowToColumnar (23)
-                                                                     +- * HashAggregate (22)
-                                                                        +- * Project (21)
-                                                                           +- * BroadcastHashJoin Inner BuildRight (20)
-                                                                              :- * Project (18)
-                                                                              :  +- * BroadcastHashJoin Inner BuildRight (17)
-                                                                              :     :- * ColumnarToRow (12)
-                                                                              :     :  +- CometFilter (11)
-                                                                              :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
-                                                                              :     +- BroadcastExchange (16)
-                                                                              :        +- * ColumnarToRow (15)
-                                                                              :           +- CometFilter (14)
-                                                                              :              +- CometScan parquet spark_catalog.default.store (13)
-                                                                              +- ReusedExchange (19)
+TakeOrderedAndProject (42)
++- * Project (41)
+   +- Window (40)
+      +- * Sort (39)
+         +- Exchange (38)
+            +- * HashAggregate (37)
+               +- Exchange (36)
+                  +- * HashAggregate (35)
+                     +- * Expand (34)
+                        +- * Project (33)
+                           +- * BroadcastHashJoin Inner BuildRight (32)
+                              :- * Project (6)
+                              :  +- * BroadcastHashJoin Inner BuildRight (5)
+                              :     :- * ColumnarToRow (3)
+                              :     :  +- CometFilter (2)
+                              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     +- ReusedExchange (4)
+                              +- BroadcastExchange (31)
+                                 +- * BroadcastHashJoin LeftSemi BuildRight (30)
+                                    :- * ColumnarToRow (9)
+                                    :  +- CometFilter (8)
+                                    :     +- CometScan parquet spark_catalog.default.store (7)
+                                    +- BroadcastExchange (29)
+                                       +- * Project (28)
+                                          +- * Filter (27)
+                                             +- Window (26)
+                                                +- * Sort (25)
+                                                   +- * HashAggregate (24)
+                                                      +- Exchange (23)
+                                                         +- * HashAggregate (22)
+                                                            +- * Project (21)
+                                                               +- * BroadcastHashJoin Inner BuildRight (20)
+                                                                  :- * Project (18)
+                                                                  :  +- * BroadcastHashJoin Inner BuildRight (17)
+                                                                  :     :- * ColumnarToRow (12)
+                                                                  :     :  +- CometFilter (11)
+                                                                  :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
+                                                                  :     +- BroadcastExchange (16)
+                                                                  :        +- * ColumnarToRow (15)
+                                                                  :           +- CometFilter (14)
+                                                                  :              +- CometScan parquet spark_catalog.default.store (13)
+                                                                  +- ReusedExchange (19)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -62,7 +58,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 8]
 Input [3]: [ss_store_sk#1, ss_net_profit#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 51]
+(4) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 8]
@@ -132,7 +128,7 @@ Join condition: None
 Output [3]: [ss_net_profit#10, ss_sold_date_sk#11, s_state#14]
 Input [5]: [ss_store_sk#9, ss_net_profit#10, ss_sold_date_sk#11, s_store_sk#13, s_state#14]
 
-(19) ReusedExchange [Reuses operator id: 51]
+(19) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#15]
 
 (20) BroadcastHashJoin [codegen id : 4]
@@ -152,136 +148,128 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#10))]
 Aggregate Attributes [1]: [sum#16]
 Results [2]: [s_state#14, sum#17]
 
-(23) RowToColumnar
+(23) Exchange
 Input [2]: [s_state#14, sum#17]
+Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(24) CometColumnarExchange
-Input [2]: [s_state#14, sum#17]
-Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(25) CometHashAggregate
+(24) HashAggregate [codegen id : 5]
 Input [2]: [s_state#14, sum#17]
 Keys [1]: [s_state#14]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#10))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#10))#18]
+Results [3]: [s_state#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#10))#18,17,2) AS _w0#19, s_state#14]
 
-(26) CometSort
-Input [3]: [s_state#14, _w0#18, s_state#14]
-Arguments: [s_state#14, _w0#18, s_state#14], [s_state#14 ASC NULLS FIRST, _w0#18 DESC NULLS LAST]
+(25) Sort [codegen id : 5]
+Input [3]: [s_state#14, _w0#19, s_state#14]
+Arguments: [s_state#14 ASC NULLS FIRST, _w0#19 DESC NULLS LAST], false, 0
 
-(27) ColumnarToRow [codegen id : 5]
-Input [3]: [s_state#14, _w0#18, s_state#14]
+(26) Window
+Input [3]: [s_state#14, _w0#19, s_state#14]
+Arguments: [rank(_w0#19) windowspecdefinition(s_state#14, _w0#19 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#20], [s_state#14], [_w0#19 DESC NULLS LAST]
 
-(28) Window
-Input [3]: [s_state#14, _w0#18, s_state#14]
-Arguments: [rank(_w0#18) windowspecdefinition(s_state#14, _w0#18 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#19], [s_state#14], [_w0#18 DESC NULLS LAST]
+(27) Filter [codegen id : 6]
+Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
+Condition : (ranking#20 <= 5)
 
-(29) Filter [codegen id : 6]
-Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
-Condition : (ranking#19 <= 5)
-
-(30) Project [codegen id : 6]
+(28) Project [codegen id : 6]
 Output [1]: [s_state#14]
-Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
+Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
 
-(31) BroadcastExchange
+(29) BroadcastExchange
 Input [1]: [s_state#14]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=3]
 
-(32) BroadcastHashJoin [codegen id : 7]
+(30) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [s_state#8]
 Right keys [1]: [s_state#14]
 Join type: LeftSemi
 Join condition: None
 
-(33) BroadcastExchange
+(31) BroadcastExchange
 Input [3]: [s_store_sk#6, s_county#7, s_state#8]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(34) BroadcastHashJoin [codegen id : 8]
+(32) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_store_sk#1]
 Right keys [1]: [s_store_sk#6]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
+(33) Project [codegen id : 8]
 Output [3]: [ss_net_profit#2, s_state#8, s_county#7]
 Input [5]: [ss_store_sk#1, ss_net_profit#2, s_store_sk#6, s_county#7, s_state#8]
 
-(36) Expand [codegen id : 8]
+(34) Expand [codegen id : 8]
 Input [3]: [ss_net_profit#2, s_state#8, s_county#7]
-Arguments: [[ss_net_profit#2, s_state#8, s_county#7, 0], [ss_net_profit#2, s_state#8, null, 1], [ss_net_profit#2, null, null, 3]], [ss_net_profit#2, s_state#20, s_county#21, spark_grouping_id#22]
+Arguments: [[ss_net_profit#2, s_state#8, s_county#7, 0], [ss_net_profit#2, s_state#8, null, 1], [ss_net_profit#2, null, null, 3]], [ss_net_profit#2, s_state#21, s_county#22, spark_grouping_id#23]
 
-(37) HashAggregate [codegen id : 8]
-Input [4]: [ss_net_profit#2, s_state#20, s_county#21, spark_grouping_id#22]
-Keys [3]: [s_state#20, s_county#21, spark_grouping_id#22]
+(35) HashAggregate [codegen id : 8]
+Input [4]: [ss_net_profit#2, s_state#21, s_county#22, spark_grouping_id#23]
+Keys [3]: [s_state#21, s_county#22, spark_grouping_id#23]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum#23]
-Results [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
-
-(38) RowToColumnar
-Input [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
+Aggregate Attributes [1]: [sum#24]
+Results [4]: [s_state#21, s_county#22, spark_grouping_id#23, sum#25]
 
-(39) CometColumnarExchange
-Input [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
-Arguments: hashpartitioning(s_state#20, s_county#21, spark_grouping_id#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(36) Exchange
+Input [4]: [s_state#21, s_county#22, spark_grouping_id#23, sum#25]
+Arguments: hashpartitioning(s_state#21, s_county#22, spark_grouping_id#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(40) CometHashAggregate
-Input [4]: [s_state#20, s_county#21, spark_grouping_id#22, sum#24]
-Keys [3]: [s_state#20, s_county#21, spark_grouping_id#22]
+(37) HashAggregate [codegen id : 9]
+Input [4]: [s_state#21, s_county#22, spark_grouping_id#23, sum#25]
+Keys [3]: [s_state#21, s_county#22, spark_grouping_id#23]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#26]
+Results [7]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#26,17,2) AS total_sum#27, s_state#21, s_county#22, (cast((shiftright(spark_grouping_id#23, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#23, 0) & 1) as tinyint)) AS lochierarchy#28, MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#26,17,2) AS _w0#29, (cast((shiftright(spark_grouping_id#23, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#23, 0) & 1) as tinyint)) AS _w1#30, CASE WHEN (cast((shiftright(spark_grouping_id#23, 0) & 1) as tinyint) = 0) THEN s_state#21 END AS _w2#31]
 
-(41) CometColumnarExchange
-Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
-Arguments: hashpartitioning(_w1#28, _w2#29, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometSort
-Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
-Arguments: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29], [_w1#28 ASC NULLS FIRST, _w2#29 ASC NULLS FIRST, _w0#27 DESC NULLS LAST]
+(38) Exchange
+Input [7]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31]
+Arguments: hashpartitioning(_w1#30, _w2#31, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(43) ColumnarToRow [codegen id : 9]
-Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
+(39) Sort [codegen id : 10]
+Input [7]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31]
+Arguments: [_w1#30 ASC NULLS FIRST, _w2#31 ASC NULLS FIRST, _w0#29 DESC NULLS LAST], false, 0
 
-(44) Window
-Input [7]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29]
-Arguments: [rank(_w0#27) windowspecdefinition(_w1#28, _w2#29, _w0#27 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#30], [_w1#28, _w2#29], [_w0#27 DESC NULLS LAST]
+(40) Window
+Input [7]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31]
+Arguments: [rank(_w0#29) windowspecdefinition(_w1#30, _w2#31, _w0#29 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#32], [_w1#30, _w2#31], [_w0#29 DESC NULLS LAST]
 
-(45) Project [codegen id : 10]
-Output [5]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, rank_within_parent#30]
-Input [8]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, _w0#27, _w1#28, _w2#29, rank_within_parent#30]
+(41) Project [codegen id : 11]
+Output [5]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, rank_within_parent#32]
+Input [8]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, _w0#29, _w1#30, _w2#31, rank_within_parent#32]
 
-(46) TakeOrderedAndProject
-Input [5]: [total_sum#25, s_state#20, s_county#21, lochierarchy#26, rank_within_parent#30]
-Arguments: 100, [lochierarchy#26 DESC NULLS LAST, CASE WHEN (lochierarchy#26 = 0) THEN s_state#20 END ASC NULLS FIRST, rank_within_parent#30 ASC NULLS FIRST], [total_sum#25, s_state#20, s_county#21, lochierarchy#26, rank_within_parent#30]
+(42) TakeOrderedAndProject
+Input [5]: [total_sum#27, s_state#21, s_county#22, lochierarchy#28, rank_within_parent#32]
+Arguments: 100, [lochierarchy#28 DESC NULLS LAST, CASE WHEN (lochierarchy#28 = 0) THEN s_state#21 END ASC NULLS FIRST, rank_within_parent#32 ASC NULLS FIRST], [total_sum#27, s_state#21, s_county#22, lochierarchy#28, rank_within_parent#32]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (51)
-+- * ColumnarToRow (50)
-   +- CometProject (49)
-      +- CometFilter (48)
-         +- CometScan parquet spark_catalog.default.date_dim (47)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#31]
+Output [2]: [d_date_sk#5, d_month_seq#33]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(48) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#31]
-Condition : (((isnotnull(d_month_seq#31) AND (d_month_seq#31 >= 1200)) AND (d_month_seq#31 <= 1211)) AND isnotnull(d_date_sk#5))
+(44) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#33]
+Condition : (((isnotnull(d_month_seq#33) AND (d_month_seq#33 >= 1200)) AND (d_month_seq#33 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(49) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#31]
+(45) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#33]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(50) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(51) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt
index 53a93dc43f..0e01c5f710 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q70/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [lochierarchy,s_state,rank_within_parent,total_sum,s_county]
-  WholeStageCodegen (10)
+  WholeStageCodegen (11)
     Project [total_sum,s_state,s_county,lochierarchy,rank_within_parent]
       InputAdapter
         Window [_w0,_w1,_w2]
-          WholeStageCodegen (9)
-            ColumnarToRow
+          WholeStageCodegen (10)
+            Sort [_w1,_w2,_w0]
               InputAdapter
-                CometSort [_w1,_w2,_w0]
-                  CometColumnarExchange [_w1,_w2] #1
-                    CometHashAggregate [s_state,s_county,spark_grouping_id,sum]
-                      CometColumnarExchange [s_state,s_county,spark_grouping_id] #2
-                        RowToColumnar
+                Exchange [_w1,_w2] #1
+                  WholeStageCodegen (9)
+                    HashAggregate [s_state,s_county,spark_grouping_id,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,lochierarchy,_w0,_w1,_w2,sum]
+                      InputAdapter
+                        Exchange [s_state,s_county,spark_grouping_id] #2
                           WholeStageCodegen (8)
                             HashAggregate [s_state,s_county,spark_grouping_id,ss_net_profit] [sum,sum]
                               Expand [ss_net_profit,s_state,s_county]
@@ -48,29 +48,27 @@ TakeOrderedAndProject [lochierarchy,s_state,rank_within_parent,total_sum,s_count
                                                       InputAdapter
                                                         Window [_w0,s_state]
                                                           WholeStageCodegen (5)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometSort [s_state,_w0]
-                                                                  CometHashAggregate [s_state,sum]
-                                                                    CometColumnarExchange [s_state] #6
-                                                                      RowToColumnar
-                                                                        WholeStageCodegen (4)
-                                                                          HashAggregate [s_state,ss_net_profit] [sum,sum]
-                                                                            Project [ss_net_profit,s_state]
-                                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                Project [ss_net_profit,ss_sold_date_sk,s_state]
-                                                                                  BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                    ColumnarToRow
-                                                                                      InputAdapter
-                                                                                        CometFilter [ss_store_sk]
-                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                                                                            ReusedSubquery [d_date_sk] #1
-                                                                                    InputAdapter
-                                                                                      BroadcastExchange #7
-                                                                                        WholeStageCodegen (2)
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometFilter [s_store_sk]
-                                                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                                                            Sort [s_state,_w0]
+                                                              HashAggregate [sum] [sum(UnscaledValue(ss_net_profit)),_w0,s_state,sum]
+                                                                InputAdapter
+                                                                  Exchange [s_state] #6
+                                                                    WholeStageCodegen (4)
+                                                                      HashAggregate [s_state,ss_net_profit] [sum,sum]
+                                                                        Project [ss_net_profit,s_state]
+                                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                            Project [ss_net_profit,ss_sold_date_sk,s_state]
+                                                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometFilter [ss_store_sk]
+                                                                                      CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                                                                        ReusedSubquery [d_date_sk] #1
                                                                                 InputAdapter
-                                                                                  ReusedExchange [d_date_sk] #3
+                                                                                  BroadcastExchange #7
+                                                                                    WholeStageCodegen (2)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometFilter [s_store_sk]
+                                                                                            CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                                                                            InputAdapter
+                                                                              ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt
index 172f460c8a..39bedd1f2c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/explain.txt
@@ -1,44 +1,42 @@
 == Physical Plan ==
-* ColumnarToRow (40)
-+- CometSort (39)
-   +- CometColumnarExchange (38)
-      +- CometHashAggregate (37)
-         +- CometColumnarExchange (36)
-            +- RowToColumnar (35)
-               +- * HashAggregate (34)
-                  +- * Project (33)
-                     +- * BroadcastHashJoin Inner BuildRight (32)
-                        :- * Project (26)
-                        :  +- * BroadcastHashJoin Inner BuildLeft (25)
-                        :     :- BroadcastExchange (5)
-                        :     :  +- * ColumnarToRow (4)
-                        :     :     +- CometProject (3)
-                        :     :        +- CometFilter (2)
-                        :     :           +- CometScan parquet spark_catalog.default.item (1)
-                        :     +- Union (24)
-                        :        :- * Project (11)
-                        :        :  +- * BroadcastHashJoin Inner BuildRight (10)
-                        :        :     :- * ColumnarToRow (8)
-                        :        :     :  +- CometFilter (7)
-                        :        :     :     +- CometScan parquet spark_catalog.default.web_sales (6)
-                        :        :     +- ReusedExchange (9)
-                        :        :- * Project (17)
-                        :        :  +- * BroadcastHashJoin Inner BuildRight (16)
-                        :        :     :- * ColumnarToRow (14)
-                        :        :     :  +- CometFilter (13)
-                        :        :     :     +- CometScan parquet spark_catalog.default.catalog_sales (12)
-                        :        :     +- ReusedExchange (15)
-                        :        +- * Project (23)
-                        :           +- * BroadcastHashJoin Inner BuildRight (22)
-                        :              :- * ColumnarToRow (20)
-                        :              :  +- CometFilter (19)
-                        :              :     +- CometScan parquet spark_catalog.default.store_sales (18)
-                        :              +- ReusedExchange (21)
-                        +- BroadcastExchange (31)
-                           +- * ColumnarToRow (30)
-                              +- CometProject (29)
-                                 +- CometFilter (28)
-                                    +- CometScan parquet spark_catalog.default.time_dim (27)
+* Sort (38)
++- Exchange (37)
+   +- * HashAggregate (36)
+      +- Exchange (35)
+         +- * HashAggregate (34)
+            +- * Project (33)
+               +- * BroadcastHashJoin Inner BuildRight (32)
+                  :- * Project (26)
+                  :  +- * BroadcastHashJoin Inner BuildLeft (25)
+                  :     :- BroadcastExchange (5)
+                  :     :  +- * ColumnarToRow (4)
+                  :     :     +- CometProject (3)
+                  :     :        +- CometFilter (2)
+                  :     :           +- CometScan parquet spark_catalog.default.item (1)
+                  :     +- Union (24)
+                  :        :- * Project (11)
+                  :        :  +- * BroadcastHashJoin Inner BuildRight (10)
+                  :        :     :- * ColumnarToRow (8)
+                  :        :     :  +- CometFilter (7)
+                  :        :     :     +- CometScan parquet spark_catalog.default.web_sales (6)
+                  :        :     +- ReusedExchange (9)
+                  :        :- * Project (17)
+                  :        :  +- * BroadcastHashJoin Inner BuildRight (16)
+                  :        :     :- * ColumnarToRow (14)
+                  :        :     :  +- CometFilter (13)
+                  :        :     :     +- CometScan parquet spark_catalog.default.catalog_sales (12)
+                  :        :     +- ReusedExchange (15)
+                  :        +- * Project (23)
+                  :           +- * BroadcastHashJoin Inner BuildRight (22)
+                  :              :- * ColumnarToRow (20)
+                  :              :  +- CometFilter (19)
+                  :              :     +- CometScan parquet spark_catalog.default.store_sales (18)
+                  :              +- ReusedExchange (21)
+                  +- BroadcastExchange (31)
+                     +- * ColumnarToRow (30)
+                        +- CometProject (29)
+                           +- CometFilter (28)
+                              +- CometScan parquet spark_catalog.default.time_dim (27)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -78,7 +76,7 @@ Condition : (isnotnull(ws_item_sk#6) AND isnotnull(ws_sold_time_sk#5))
 (8) ColumnarToRow [codegen id : 3]
 Input [4]: [ws_sold_time_sk#5, ws_item_sk#6, ws_ext_sales_price#7, ws_sold_date_sk#8]
 
-(9) ReusedExchange [Reuses operator id: 45]
+(9) ReusedExchange [Reuses operator id: 43]
 Output [1]: [d_date_sk#10]
 
 (10) BroadcastHashJoin [codegen id : 3]
@@ -106,7 +104,7 @@ Condition : (isnotnull(cs_item_sk#15) AND isnotnull(cs_sold_time_sk#14))
 (14) ColumnarToRow [codegen id : 5]
 Input [4]: [cs_sold_time_sk#14, cs_item_sk#15, cs_ext_sales_price#16, cs_sold_date_sk#17]
 
-(15) ReusedExchange [Reuses operator id: 45]
+(15) ReusedExchange [Reuses operator id: 43]
 Output [1]: [d_date_sk#19]
 
 (16) BroadcastHashJoin [codegen id : 5]
@@ -134,7 +132,7 @@ Condition : (isnotnull(ss_item_sk#24) AND isnotnull(ss_sold_time_sk#23))
 (20) ColumnarToRow [codegen id : 7]
 Input [4]: [ss_sold_time_sk#23, ss_item_sk#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 
-(21) ReusedExchange [Reuses operator id: 45]
+(21) ReusedExchange [Reuses operator id: 43]
 Output [1]: [d_date_sk#28]
 
 (22) BroadcastHashJoin [codegen id : 7]
@@ -198,58 +196,54 @@ Functions [1]: [partial_sum(UnscaledValue(ext_price#11))]
 Aggregate Attributes [1]: [sum#36]
 Results [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
 
-(35) RowToColumnar
+(35) Exchange
 Input [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
+Arguments: hashpartitioning(i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(36) CometColumnarExchange
-Input [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
-Arguments: hashpartitioning(i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(37) CometHashAggregate
+(36) HashAggregate [codegen id : 10]
 Input [5]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34, sum#37]
 Keys [4]: [i_brand#3, i_brand_id#2, t_hour#33, t_minute#34]
 Functions [1]: [sum(UnscaledValue(ext_price#11))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ext_price#11))#38]
+Results [5]: [i_brand_id#2 AS brand_id#39, i_brand#3 AS brand#40, t_hour#33, t_minute#34, MakeDecimal(sum(UnscaledValue(ext_price#11))#38,17,2) AS ext_price#41]
 
-(38) CometColumnarExchange
-Input [5]: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40]
-Arguments: rangepartitioning(ext_price#40 DESC NULLS LAST, brand_id#38 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(39) CometSort
-Input [5]: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40]
-Arguments: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40], [ext_price#40 DESC NULLS LAST, brand_id#38 ASC NULLS FIRST]
+(37) Exchange
+Input [5]: [brand_id#39, brand#40, t_hour#33, t_minute#34, ext_price#41]
+Arguments: rangepartitioning(ext_price#41 DESC NULLS LAST, brand_id#39 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(40) ColumnarToRow [codegen id : 10]
-Input [5]: [brand_id#38, brand#39, t_hour#33, t_minute#34, ext_price#40]
+(38) Sort [codegen id : 11]
+Input [5]: [brand_id#39, brand#40, t_hour#33, t_minute#34, ext_price#41]
+Arguments: [ext_price#41 DESC NULLS LAST, brand_id#39 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 6 Hosting Expression = ws_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (45)
-+- * ColumnarToRow (44)
-   +- CometProject (43)
-      +- CometFilter (42)
-         +- CometScan parquet spark_catalog.default.date_dim (41)
+BroadcastExchange (43)
++- * ColumnarToRow (42)
+   +- CometProject (41)
+      +- CometFilter (40)
+         +- CometScan parquet spark_catalog.default.date_dim (39)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#41, d_moy#42]
+Output [3]: [d_date_sk#10, d_year#42, d_moy#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_moy), IsNotNull(d_year), EqualTo(d_moy,11), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(42) CometFilter
-Input [3]: [d_date_sk#10, d_year#41, d_moy#42]
-Condition : ((((isnotnull(d_moy#42) AND isnotnull(d_year#41)) AND (d_moy#42 = 11)) AND (d_year#41 = 1999)) AND isnotnull(d_date_sk#10))
+(40) CometFilter
+Input [3]: [d_date_sk#10, d_year#42, d_moy#43]
+Condition : ((((isnotnull(d_moy#43) AND isnotnull(d_year#42)) AND (d_moy#43 = 11)) AND (d_year#42 = 1999)) AND isnotnull(d_date_sk#10))
 
-(43) CometProject
-Input [3]: [d_date_sk#10, d_year#41, d_moy#42]
+(41) CometProject
+Input [3]: [d_date_sk#10, d_year#42, d_moy#43]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(44) ColumnarToRow [codegen id : 1]
+(42) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(45) BroadcastExchange
+(43) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt
index b5c6e96d6f..bea5376a00 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q71/simplified.txt
@@ -1,11 +1,11 @@
-WholeStageCodegen (10)
-  ColumnarToRow
+WholeStageCodegen (11)
+  Sort [ext_price,brand_id]
     InputAdapter
-      CometSort [ext_price,brand_id]
-        CometColumnarExchange [ext_price,brand_id] #1
-          CometHashAggregate [i_brand,i_brand_id,t_hour,t_minute,sum]
-            CometColumnarExchange [i_brand,i_brand_id,t_hour,t_minute] #2
-              RowToColumnar
+      Exchange [ext_price,brand_id] #1
+        WholeStageCodegen (10)
+          HashAggregate [i_brand,i_brand_id,t_hour,t_minute,sum] [sum(UnscaledValue(ext_price)),brand_id,brand,ext_price,sum]
+            InputAdapter
+              Exchange [i_brand,i_brand_id,t_hour,t_minute] #2
                 WholeStageCodegen (9)
                   HashAggregate [i_brand,i_brand_id,t_hour,t_minute,ext_price] [sum,sum]
                     Project [i_brand_id,i_brand,ext_price,t_hour,t_minute]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt
index dbc785238b..c0d1f949a8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/explain.txt
@@ -1,75 +1,74 @@
 == Physical Plan ==
-* ColumnarToRow (71)
-+- CometTakeOrderedAndProject (70)
-   +- CometHashAggregate (69)
-      +- CometColumnarExchange (68)
-         +- CometHashAggregate (67)
-            +- CometProject (66)
-               +- CometSortMergeJoin (65)
-                  :- CometSort (59)
-                  :  +- CometColumnarExchange (58)
-                  :     +- RowToColumnar (57)
-                  :        +- * Project (56)
-                  :           +- * BroadcastHashJoin LeftOuter BuildRight (55)
-                  :              :- * Project (50)
-                  :              :  +- * BroadcastHashJoin Inner BuildRight (49)
-                  :              :     :- * Project (44)
-                  :              :     :  +- * BroadcastHashJoin Inner BuildRight (43)
-                  :              :     :     :- * Project (38)
-                  :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-                  :              :     :     :     :- * Project (35)
-                  :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-                  :              :     :     :     :     :- * Project (28)
-                  :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
-                  :              :     :     :     :     :     :- * Project (21)
-                  :              :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                  :              :     :     :     :     :     :     :- * Project (15)
-                  :              :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :              :     :     :     :     :     :     :     :- * Project (9)
-                  :              :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :              :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
-                  :              :     :     :     :     :     :     :     :     :  +- CometFilter (2)
-                  :              :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                  :              :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
-                  :              :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
-                  :              :     :     :     :     :     :     :     :           +- CometFilter (5)
-                  :              :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
-                  :              :     :     :     :     :     :     :     +- BroadcastExchange (13)
-                  :              :     :     :     :     :     :     :        +- * ColumnarToRow (12)
-                  :              :     :     :     :     :     :     :           +- CometFilter (11)
-                  :              :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
-                  :              :     :     :     :     :     :     +- BroadcastExchange (19)
-                  :              :     :     :     :     :     :        +- * ColumnarToRow (18)
-                  :              :     :     :     :     :     :           +- CometFilter (17)
-                  :              :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
-                  :              :     :     :     :     :     +- BroadcastExchange (26)
-                  :              :     :     :     :     :        +- * ColumnarToRow (25)
-                  :              :     :     :     :     :           +- CometProject (24)
-                  :              :     :     :     :     :              +- CometFilter (23)
-                  :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
-                  :              :     :     :     :     +- BroadcastExchange (33)
-                  :              :     :     :     :        +- * ColumnarToRow (32)
-                  :              :     :     :     :           +- CometProject (31)
-                  :              :     :     :     :              +- CometFilter (30)
-                  :              :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
-                  :              :     :     :     +- ReusedExchange (36)
-                  :              :     :     +- BroadcastExchange (42)
-                  :              :     :        +- * ColumnarToRow (41)
-                  :              :     :           +- CometFilter (40)
-                  :              :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
-                  :              :     +- BroadcastExchange (48)
-                  :              :        +- * ColumnarToRow (47)
-                  :              :           +- CometFilter (46)
-                  :              :              +- CometScan parquet spark_catalog.default.date_dim (45)
-                  :              +- BroadcastExchange (54)
-                  :                 +- * ColumnarToRow (53)
-                  :                    +- CometFilter (52)
-                  :                       +- CometScan parquet spark_catalog.default.promotion (51)
-                  +- CometSort (64)
-                     +- CometColumnarExchange (63)
-                        +- CometProject (62)
-                           +- CometFilter (61)
-                              +- CometScan parquet spark_catalog.default.catalog_returns (60)
+TakeOrderedAndProject (70)
++- * HashAggregate (69)
+   +- Exchange (68)
+      +- * HashAggregate (67)
+         +- * Project (66)
+            +- * SortMergeJoin LeftOuter (65)
+               :- * Sort (58)
+               :  +- Exchange (57)
+               :     +- * Project (56)
+               :        +- * BroadcastHashJoin LeftOuter BuildRight (55)
+               :           :- * Project (50)
+               :           :  +- * BroadcastHashJoin Inner BuildRight (49)
+               :           :     :- * Project (44)
+               :           :     :  +- * BroadcastHashJoin Inner BuildRight (43)
+               :           :     :     :- * Project (38)
+               :           :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+               :           :     :     :     :- * Project (35)
+               :           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+               :           :     :     :     :     :- * Project (28)
+               :           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
+               :           :     :     :     :     :     :- * Project (21)
+               :           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :           :     :     :     :     :     :     :- * Project (15)
+               :           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :           :     :     :     :     :     :     :     :- * Project (9)
+               :           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :           :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
+               :           :     :     :     :     :     :     :     :     :  +- CometFilter (2)
+               :           :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :           :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
+               :           :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
+               :           :     :     :     :     :     :     :     :           +- CometFilter (5)
+               :           :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
+               :           :     :     :     :     :     :     :     +- BroadcastExchange (13)
+               :           :     :     :     :     :     :     :        +- * ColumnarToRow (12)
+               :           :     :     :     :     :     :     :           +- CometFilter (11)
+               :           :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
+               :           :     :     :     :     :     :     +- BroadcastExchange (19)
+               :           :     :     :     :     :     :        +- * ColumnarToRow (18)
+               :           :     :     :     :     :     :           +- CometFilter (17)
+               :           :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
+               :           :     :     :     :     :     +- BroadcastExchange (26)
+               :           :     :     :     :     :        +- * ColumnarToRow (25)
+               :           :     :     :     :     :           +- CometProject (24)
+               :           :     :     :     :     :              +- CometFilter (23)
+               :           :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
+               :           :     :     :     :     +- BroadcastExchange (33)
+               :           :     :     :     :        +- * ColumnarToRow (32)
+               :           :     :     :     :           +- CometProject (31)
+               :           :     :     :     :              +- CometFilter (30)
+               :           :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
+               :           :     :     :     +- ReusedExchange (36)
+               :           :     :     +- BroadcastExchange (42)
+               :           :     :        +- * ColumnarToRow (41)
+               :           :     :           +- CometFilter (40)
+               :           :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
+               :           :     +- BroadcastExchange (48)
+               :           :        +- * ColumnarToRow (47)
+               :           :           +- CometFilter (46)
+               :           :              +- CometScan parquet spark_catalog.default.date_dim (45)
+               :           +- BroadcastExchange (54)
+               :              +- * ColumnarToRow (53)
+               :                 +- CometFilter (52)
+               :                    +- CometScan parquet spark_catalog.default.promotion (51)
+               +- * ColumnarToRow (64)
+                  +- CometSort (63)
+                     +- CometExchange (62)
+                        +- CometProject (61)
+                           +- CometFilter (60)
+                              +- CometScan parquet spark_catalog.default.catalog_returns (59)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -236,7 +235,7 @@ Join condition: None
 Output [8]: [cs_ship_date_sk#1, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17]
 Input [10]: [cs_ship_date_sk#1, cs_bill_hdemo_sk#3, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17, hd_demo_sk#20]
 
-(36) ReusedExchange [Reuses operator id: 76]
+(36) ReusedExchange [Reuses operator id: 75]
 Output [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
 (37) BroadcastHashJoin [codegen id : 10]
@@ -333,16 +332,13 @@ Join condition: None
 Output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Input [7]: [cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, p_promo_sk#29]
 
-(57) RowToColumnar
+(57) Exchange
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(58) CometColumnarExchange
+(58) Sort [codegen id : 11]
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(59) CometSort
-Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST]
+Arguments: [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
@@ -351,81 +347,86 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(61) CometFilter
+(60) CometFilter
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Condition : (isnotnull(cr_item_sk#30) AND isnotnull(cr_order_number#31))
 
-(62) CometProject
+(61) CometProject
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30, cr_order_number#31]
 
-(63) CometColumnarExchange
+(62) CometExchange
 Input [2]: [cr_item_sk#30, cr_order_number#31]
-Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=10]
 
-(64) CometSort
+(63) CometSort
 Input [2]: [cr_item_sk#30, cr_order_number#31]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30 ASC NULLS FIRST, cr_order_number#31 ASC NULLS FIRST]
 
-(65) CometSortMergeJoin
-Left output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Right output [2]: [cr_item_sk#30, cr_order_number#31]
-Arguments: [cs_item_sk#4, cs_order_number#6], [cr_item_sk#30, cr_order_number#31], LeftOuter
+(64) ColumnarToRow [codegen id : 12]
+Input [2]: [cr_item_sk#30, cr_order_number#31]
 
-(66) CometProject
+(65) SortMergeJoin [codegen id : 13]
+Left keys [2]: [cs_item_sk#4, cs_order_number#6]
+Right keys [2]: [cr_item_sk#30, cr_order_number#31]
+Join type: LeftOuter
+Join condition: None
+
+(66) Project [codegen id : 13]
+Output [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Input [7]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, cr_item_sk#30, cr_order_number#31]
-Arguments: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 
-(67) CometHashAggregate
+(67) HashAggregate [codegen id : 13]
 Input [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [partial_count(1)]
+Aggregate Attributes [1]: [count#33]
+Results [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
 
-(68) CometColumnarExchange
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
-Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(68) Exchange
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
+Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(69) CometHashAggregate
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
+(69) HashAggregate [codegen id : 14]
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#35]
+Results [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count(1)#35 AS no_promo#36, count(1)#35 AS promo#37, count(1)#35 AS total_cnt#38]
 
-(70) CometTakeOrderedAndProject
-Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_cnt#36 DESC NULLS LAST,i_item_desc#17 ASC NULLS FIRST,w_warehouse_name#15 ASC NULLS FIRST,d_week_seq#24 ASC NULLS FIRST], output=[i_item_desc#17,w_warehouse_name#15,d_week_seq#24,no_promo#34,promo#35,total_cnt#36]), 100, [total_cnt#36 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
-
-(71) ColumnarToRow [codegen id : 11]
-Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
+(70) TakeOrderedAndProject
+Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
+Arguments: 100, [total_cnt#38 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (76)
-+- * ColumnarToRow (75)
-   +- CometProject (74)
-      +- CometFilter (73)
-         +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometProject (73)
+      +- CometFilter (72)
+         +- CometScan parquet spark_catalog.default.date_dim (71)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
+Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk), IsNotNull(d_week_seq), IsNotNull(d_date)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_week_seq:int,d_year:int>
 
-(73) CometFilter
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
-Condition : ((((isnotnull(d_year#37) AND (d_year#37 = 1999)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
+(72) CometFilter
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
+Condition : ((((isnotnull(d_year#39) AND (d_year#39 = 1999)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
 
-(74) CometProject
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
+(73) CometProject
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
 Arguments: [d_date_sk#22, d_date#23, d_week_seq#24], [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(75) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(76) BroadcastExchange
+(75) BroadcastExchange
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt
index 5bf7ab343a..5eb8ea5275 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q72/simplified.txt
@@ -1,108 +1,114 @@
-WholeStageCodegen (11)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
-        CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count]
-          CometColumnarExchange [i_item_desc,w_warehouse_name,d_week_seq] #1
-            CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq]
-              CometProject [w_warehouse_name,i_item_desc,d_week_seq]
-                CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                  CometSort [cs_item_sk,cs_order_number]
-                    CometColumnarExchange [cs_item_sk,cs_order_number] #2
-                      RowToColumnar
-                        WholeStageCodegen (10)
-                          Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                            BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                              Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                                BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
-                                  Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                    BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
-                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                            BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
-                                              Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                                  Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
-                                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
-                                                            BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
-                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
-                                                                      SubqueryBroadcast [d_date_sk] #1
-                                                                        BroadcastExchange #3
-                                                                          WholeStageCodegen (1)
-                                                                            ColumnarToRow
-                                                                              InputAdapter
-                                                                                CometProject [d_date_sk,d_date,d_week_seq]
-                                                                                  CometFilter [d_year,d_date_sk,d_week_seq,d_date]
-                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
+TakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
+  WholeStageCodegen (14)
+    HashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count] [count(1),no_promo,promo,total_cnt,count]
+      InputAdapter
+        Exchange [i_item_desc,w_warehouse_name,d_week_seq] #1
+          WholeStageCodegen (13)
+            HashAggregate [i_item_desc,w_warehouse_name,d_week_seq] [count,count]
+              Project [w_warehouse_name,i_item_desc,d_week_seq]
+                SortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                  InputAdapter
+                    WholeStageCodegen (11)
+                      Sort [cs_item_sk,cs_order_number]
+                        InputAdapter
+                          Exchange [cs_item_sk,cs_order_number] #2
+                            WholeStageCodegen (10)
+                              Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                                BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                                  Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                                    BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
+                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                        BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
+                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                              Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
+                                                  Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                    BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                        BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
+                                                            BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                                              Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
+                                                                BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
+                                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
+                                                                          SubqueryBroadcast [d_date_sk] #1
+                                                                            BroadcastExchange #3
+                                                                              WholeStageCodegen (1)
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometProject [d_date_sk,d_date,d_week_seq]
+                                                                                      CometFilter [d_year,d_date_sk,d_week_seq,d_date]
+                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
+                                                                  InputAdapter
+                                                                    BroadcastExchange #4
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
+                                                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
                                                               InputAdapter
-                                                                BroadcastExchange #4
-                                                                  WholeStageCodegen (1)
+                                                                BroadcastExchange #5
+                                                                  WholeStageCodegen (2)
                                                                     ColumnarToRow
                                                                       InputAdapter
-                                                                        CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
-                                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                                        CometFilter [w_warehouse_sk]
+                                                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                                                           InputAdapter
-                                                            BroadcastExchange #5
-                                                              WholeStageCodegen (2)
+                                                            BroadcastExchange #6
+                                                              WholeStageCodegen (3)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [w_warehouse_sk]
-                                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                                                    CometFilter [i_item_sk]
+                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
                                                       InputAdapter
-                                                        BroadcastExchange #6
-                                                          WholeStageCodegen (3)
+                                                        BroadcastExchange #7
+                                                          WholeStageCodegen (4)
                                                             ColumnarToRow
                                                               InputAdapter
-                                                                CometFilter [i_item_sk]
-                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                                                                CometProject [cd_demo_sk]
+                                                                  CometFilter [cd_marital_status,cd_demo_sk]
+                                                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                                   InputAdapter
-                                                    BroadcastExchange #7
-                                                      WholeStageCodegen (4)
+                                                    BroadcastExchange #8
+                                                      WholeStageCodegen (5)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometProject [cd_demo_sk]
-                                                              CometFilter [cd_marital_status,cd_demo_sk]
-                                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                            CometProject [hd_demo_sk]
+                                                              CometFilter [hd_buy_potential,hd_demo_sk]
+                                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
                                               InputAdapter
-                                                BroadcastExchange #8
-                                                  WholeStageCodegen (5)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [hd_demo_sk]
-                                                          CometFilter [hd_buy_potential,hd_demo_sk]
-                                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
+                                                ReusedExchange [d_date_sk,d_date,d_week_seq] #3
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_date,d_week_seq] #3
+                                            BroadcastExchange #9
+                                              WholeStageCodegen (7)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [d_week_seq,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
                                       InputAdapter
-                                        BroadcastExchange #9
-                                          WholeStageCodegen (7)
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (8)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometFilter [d_week_seq,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                                CometFilter [d_date,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                   InputAdapter
-                                    BroadcastExchange #10
-                                      WholeStageCodegen (8)
+                                    BroadcastExchange #11
+                                      WholeStageCodegen (9)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                              InputAdapter
-                                BroadcastExchange #11
-                                  WholeStageCodegen (9)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [p_promo_sk]
-                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
-                  CometSort [cr_item_sk,cr_order_number]
-                    CometColumnarExchange [cr_item_sk,cr_order_number] #12
-                      CometProject [cr_item_sk,cr_order_number]
-                        CometFilter [cr_item_sk,cr_order_number]
-                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
+                                            CometFilter [p_promo_sk]
+                                              CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                  InputAdapter
+                    WholeStageCodegen (12)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [cr_item_sk,cr_order_number]
+                            CometExchange [cr_item_sk,cr_order_number] #12
+                              CometProject [cr_item_sk,cr_order_number]
+                                CometFilter [cr_item_sk,cr_order_number]
+                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt
index 38bf356802..dc64c33861 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/explain.txt
@@ -1,40 +1,36 @@
 == Physical Plan ==
-* ColumnarToRow (36)
-+- CometSort (35)
-   +- CometColumnarExchange (34)
-      +- RowToColumnar (33)
-         +- * Project (32)
-            +- * BroadcastHashJoin Inner BuildRight (31)
-               :- * ColumnarToRow (26)
-               :  +- CometFilter (25)
-               :     +- CometHashAggregate (24)
-               :        +- CometColumnarExchange (23)
-               :           +- RowToColumnar (22)
-               :              +- * HashAggregate (21)
-               :                 +- * Project (20)
-               :                    +- * BroadcastHashJoin Inner BuildRight (19)
-               :                       :- * Project (13)
-               :                       :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :                       :     :- * Project (6)
-               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :                       :     :     :- * ColumnarToRow (3)
-               :                       :     :     :  +- CometFilter (2)
-               :                       :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                       :     :     +- ReusedExchange (4)
-               :                       :     +- BroadcastExchange (11)
-               :                       :        +- * ColumnarToRow (10)
-               :                       :           +- CometProject (9)
-               :                       :              +- CometFilter (8)
-               :                       :                 +- CometScan parquet spark_catalog.default.store (7)
-               :                       +- BroadcastExchange (18)
-               :                          +- * ColumnarToRow (17)
-               :                             +- CometProject (16)
-               :                                +- CometFilter (15)
-               :                                   +- CometScan parquet spark_catalog.default.household_demographics (14)
-               +- BroadcastExchange (30)
-                  +- * ColumnarToRow (29)
-                     +- CometFilter (28)
-                        +- CometScan parquet spark_catalog.default.customer (27)
+* Sort (32)
++- Exchange (31)
+   +- * Project (30)
+      +- * BroadcastHashJoin Inner BuildRight (29)
+         :- * Filter (24)
+         :  +- * HashAggregate (23)
+         :     +- Exchange (22)
+         :        +- * HashAggregate (21)
+         :           +- * Project (20)
+         :              +- * BroadcastHashJoin Inner BuildRight (19)
+         :                 :- * Project (13)
+         :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
+         :                 :     :- * Project (6)
+         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+         :                 :     :     :- * ColumnarToRow (3)
+         :                 :     :     :  +- CometFilter (2)
+         :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+         :                 :     :     +- ReusedExchange (4)
+         :                 :     +- BroadcastExchange (11)
+         :                 :        +- * ColumnarToRow (10)
+         :                 :           +- CometProject (9)
+         :                 :              +- CometFilter (8)
+         :                 :                 +- CometScan parquet spark_catalog.default.store (7)
+         :                 +- BroadcastExchange (18)
+         :                    +- * ColumnarToRow (17)
+         :                       +- CometProject (16)
+         :                          +- CometFilter (15)
+         :                             +- CometScan parquet spark_catalog.default.household_demographics (14)
+         +- BroadcastExchange (28)
+            +- * ColumnarToRow (27)
+               +- CometFilter (26)
+                  +- CometScan parquet spark_catalog.default.customer (25)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -52,7 +48,7 @@ Condition : ((isnotnull(ss_store_sk#3) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 41]
+(4) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -136,96 +132,86 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#14]
 Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 
-(22) RowToColumnar
+(22) Exchange
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) CometColumnarExchange
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(24) CometHashAggregate
+(23) HashAggregate [codegen id : 6]
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 Keys [2]: [ss_ticket_number#4, ss_customer_sk#1]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#16]
+Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count(1)#16 AS cnt#17]
 
-(25) CometFilter
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
-Condition : ((cnt#16 >= 1) AND (cnt#16 <= 5))
-
-(26) ColumnarToRow [codegen id : 6]
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
+(24) Filter [codegen id : 6]
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17]
+Condition : ((cnt#17 >= 1) AND (cnt#17 <= 5))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+Output [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string>
 
-(28) CometFilter
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
-Condition : isnotnull(c_customer_sk#17)
+(26) CometFilter
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+Condition : isnotnull(c_customer_sk#18)
 
-(29) ColumnarToRow [codegen id : 5]
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+(27) ColumnarToRow [codegen id : 5]
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 
-(30) BroadcastExchange
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+(28) BroadcastExchange
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(31) BroadcastHashJoin [codegen id : 6]
+(29) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#17]
+Right keys [1]: [c_customer_sk#18]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 6]
-Output [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16, c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
-
-(33) RowToColumnar
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-
-(34) CometColumnarExchange
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Arguments: rangepartitioning(cnt#16 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(30) Project [codegen id : 6]
+Output [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17, c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 
-(35) CometSort
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Arguments: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16], [cnt#16 DESC NULLS LAST]
+(31) Exchange
+Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Arguments: rangepartitioning(cnt#17 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(36) ColumnarToRow [codegen id : 7]
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+(32) Sort [codegen id : 7]
+Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Arguments: [cnt#17 DESC NULLS LAST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (41)
-+- * ColumnarToRow (40)
-   +- CometProject (39)
-      +- CometFilter (38)
-         +- CometScan parquet spark_catalog.default.date_dim (37)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#22, d_dom#23]
+Output [3]: [d_date_sk#7, d_year#23, d_dom#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_dom), GreaterThanOrEqual(d_dom,1), LessThanOrEqual(d_dom,2), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(38) CometFilter
-Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
-Condition : ((((isnotnull(d_dom#23) AND (d_dom#23 >= 1)) AND (d_dom#23 <= 2)) AND d_year#22 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
+(34) CometFilter
+Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
+Condition : ((((isnotnull(d_dom#24) AND (d_dom#24 >= 1)) AND (d_dom#24 <= 2)) AND d_year#23 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
 
-(39) CometProject
-Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
+(35) CometProject
+Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(40) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(41) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt
index 45a7796f70..7c5ee1ef5a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q73/simplified.txt
@@ -1,60 +1,56 @@
 WholeStageCodegen (7)
-  ColumnarToRow
+  Sort [cnt]
     InputAdapter
-      CometSort [cnt]
-        CometColumnarExchange [cnt] #1
-          RowToColumnar
-            WholeStageCodegen (6)
-              Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
-                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [cnt]
-                        CometHashAggregate [ss_ticket_number,ss_customer_sk,count]
-                          CometColumnarExchange [ss_ticket_number,ss_customer_sk] #2
-                            RowToColumnar
-                              WholeStageCodegen (4)
-                                HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
-                                  Project [ss_customer_sk,ss_ticket_number]
-                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                      Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
-                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                          Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_dom,d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
+      Exchange [cnt] #1
+        WholeStageCodegen (6)
+          Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
+            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+              Filter [cnt]
+                HashAggregate [ss_ticket_number,ss_customer_sk,count] [count(1),cnt,count]
+                  InputAdapter
+                    Exchange [ss_ticket_number,ss_customer_sk] #2
+                      WholeStageCodegen (4)
+                        HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
+                          Project [ss_customer_sk,ss_ticket_number]
+                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                              Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
+                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_dom,d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                  InputAdapter
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
                                           InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [s_store_sk]
-                                                      CometFilter [s_county,s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
+                                            CometProject [s_store_sk]
+                                              CometFilter [s_county,s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (3)
+                                    ColumnarToRow
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (3)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [hd_demo_sk]
-                                                  CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
-                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
-                  InputAdapter
-                    BroadcastExchange #6
-                      WholeStageCodegen (5)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [c_customer_sk]
-                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
+                                        CometProject [hd_demo_sk]
+                                          CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
+                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
+              InputAdapter
+                BroadcastExchange #6
+                  WholeStageCodegen (5)
+                    ColumnarToRow
+                      InputAdapter
+                        CometFilter [c_customer_sk]
+                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt
index 431ca36ddf..85413ac1ce 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/explain.txt
@@ -1,83 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (79)
-+- * Project (78)
-   +- * BroadcastHashJoin Inner BuildRight (77)
-      :- * Project (58)
-      :  +- * BroadcastHashJoin Inner BuildRight (57)
-      :     :- * BroadcastHashJoin Inner BuildRight (37)
-      :     :  :- * ColumnarToRow (18)
-      :     :  :  +- CometFilter (17)
-      :     :  :     +- CometHashAggregate (16)
-      :     :  :        +- CometColumnarExchange (15)
-      :     :  :           +- RowToColumnar (14)
-      :     :  :              +- * HashAggregate (13)
-      :     :  :                 +- * Project (12)
-      :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :  :                       :- * Project (9)
-      :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :  :                       :     :- * ColumnarToRow (3)
-      :     :  :                       :     :  +- CometFilter (2)
-      :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :  :                       :     +- BroadcastExchange (7)
-      :     :  :                       :        +- * ColumnarToRow (6)
-      :     :  :                       :           +- CometFilter (5)
-      :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :  :                       +- ReusedExchange (10)
-      :     :  +- BroadcastExchange (36)
-      :     :     +- * ColumnarToRow (35)
-      :     :        +- CometHashAggregate (34)
-      :     :           +- CometColumnarExchange (33)
-      :     :              +- RowToColumnar (32)
-      :     :                 +- * HashAggregate (31)
-      :     :                    +- * Project (30)
-      :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :                          :- * Project (27)
-      :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :                          :     :- * ColumnarToRow (21)
-      :     :                          :     :  +- CometFilter (20)
-      :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
-      :     :                          :     +- BroadcastExchange (25)
-      :     :                          :        +- * ColumnarToRow (24)
-      :     :                          :           +- CometFilter (23)
-      :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
-      :     :                          +- ReusedExchange (28)
-      :     +- BroadcastExchange (56)
-      :        +- * ColumnarToRow (55)
-      :           +- CometFilter (54)
-      :              +- CometHashAggregate (53)
-      :                 +- CometColumnarExchange (52)
-      :                    +- RowToColumnar (51)
-      :                       +- * HashAggregate (50)
-      :                          +- * Project (49)
-      :                             +- * BroadcastHashJoin Inner BuildRight (48)
-      :                                :- * Project (46)
-      :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
-      :                                :     :- * ColumnarToRow (40)
-      :                                :     :  +- CometFilter (39)
-      :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
-      :                                :     +- BroadcastExchange (44)
-      :                                :        +- * ColumnarToRow (43)
-      :                                :           +- CometFilter (42)
-      :                                :              +- CometScan parquet spark_catalog.default.web_sales (41)
-      :                                +- ReusedExchange (47)
-      +- BroadcastExchange (76)
-         +- * ColumnarToRow (75)
-            +- CometHashAggregate (74)
-               +- CometColumnarExchange (73)
-                  +- RowToColumnar (72)
-                     +- * HashAggregate (71)
-                        +- * Project (70)
-                           +- * BroadcastHashJoin Inner BuildRight (69)
-                              :- * Project (67)
-                              :  +- * BroadcastHashJoin Inner BuildRight (66)
-                              :     :- * ColumnarToRow (61)
-                              :     :  +- CometFilter (60)
-                              :     :     +- CometScan parquet spark_catalog.default.customer (59)
-                              :     +- BroadcastExchange (65)
-                              :        +- * ColumnarToRow (64)
-                              :           +- CometFilter (63)
-                              :              +- CometScan parquet spark_catalog.default.web_sales (62)
-                              +- ReusedExchange (68)
+TakeOrderedAndProject (71)
++- * Project (70)
+   +- * BroadcastHashJoin Inner BuildRight (69)
+      :- * Project (52)
+      :  +- * BroadcastHashJoin Inner BuildRight (51)
+      :     :- * BroadcastHashJoin Inner BuildRight (33)
+      :     :  :- * Filter (16)
+      :     :  :  +- * HashAggregate (15)
+      :     :  :     +- Exchange (14)
+      :     :  :        +- * HashAggregate (13)
+      :     :  :           +- * Project (12)
+      :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :  :                 :- * Project (9)
+      :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :  :                 :     :- * ColumnarToRow (3)
+      :     :  :                 :     :  +- CometFilter (2)
+      :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :  :                 :     +- BroadcastExchange (7)
+      :     :  :                 :        +- * ColumnarToRow (6)
+      :     :  :                 :           +- CometFilter (5)
+      :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :  :                 +- ReusedExchange (10)
+      :     :  +- BroadcastExchange (32)
+      :     :     +- * HashAggregate (31)
+      :     :        +- Exchange (30)
+      :     :           +- * HashAggregate (29)
+      :     :              +- * Project (28)
+      :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
+      :     :                    :- * Project (25)
+      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :                    :     :- * ColumnarToRow (19)
+      :     :                    :     :  +- CometFilter (18)
+      :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
+      :     :                    :     +- BroadcastExchange (23)
+      :     :                    :        +- * ColumnarToRow (22)
+      :     :                    :           +- CometFilter (21)
+      :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
+      :     :                    +- ReusedExchange (26)
+      :     +- BroadcastExchange (50)
+      :        +- * Filter (49)
+      :           +- * HashAggregate (48)
+      :              +- Exchange (47)
+      :                 +- * HashAggregate (46)
+      :                    +- * Project (45)
+      :                       +- * BroadcastHashJoin Inner BuildRight (44)
+      :                          :- * Project (42)
+      :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
+      :                          :     :- * ColumnarToRow (36)
+      :                          :     :  +- CometFilter (35)
+      :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
+      :                          :     +- BroadcastExchange (40)
+      :                          :        +- * ColumnarToRow (39)
+      :                          :           +- CometFilter (38)
+      :                          :              +- CometScan parquet spark_catalog.default.web_sales (37)
+      :                          +- ReusedExchange (43)
+      +- BroadcastExchange (68)
+         +- * HashAggregate (67)
+            +- Exchange (66)
+               +- * HashAggregate (65)
+                  +- * Project (64)
+                     +- * BroadcastHashJoin Inner BuildRight (63)
+                        :- * Project (61)
+                        :  +- * BroadcastHashJoin Inner BuildRight (60)
+                        :     :- * ColumnarToRow (55)
+                        :     :  +- CometFilter (54)
+                        :     :     +- CometScan parquet spark_catalog.default.customer (53)
+                        :     +- BroadcastExchange (59)
+                        :        +- * ColumnarToRow (58)
+                        :           +- CometFilter (57)
+                        :              +- CometScan parquet spark_catalog.default.web_sales (56)
+                        +- ReusedExchange (62)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -123,7 +115,7 @@ Join condition: None
 Output [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, ss_net_paid#6, ss_sold_date_sk#7]
 Input [7]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, ss_customer_sk#5, ss_net_paid#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 83]
+(10) ReusedExchange [Reuses operator id: 75]
 Output [2]: [d_date_sk#9, d_year#10]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -143,312 +135,296 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#6))]
 Aggregate Attributes [1]: [sum#11]
 Results [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 
-(14) RowToColumnar
+(14) Exchange
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 16]
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 Keys [4]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#6))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#6))#13]
+Results [2]: [c_customer_id#2 AS customer_id#14, MakeDecimal(sum(UnscaledValue(ss_net_paid#6))#13,17,2) AS year_total#15]
 
-(17) CometFilter
-Input [2]: [customer_id#13, year_total#14]
-Condition : (isnotnull(year_total#14) AND (year_total#14 > 0.00))
-
-(18) ColumnarToRow [codegen id : 16]
-Input [2]: [customer_id#13, year_total#14]
+(16) Filter [codegen id : 16]
+Input [2]: [customer_id#14, year_total#15]
+Condition : (isnotnull(year_total#15) AND (year_total#15 > 0.00))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
+Output [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(20) CometFilter
-Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
-Condition : (isnotnull(c_customer_sk#15) AND isnotnull(c_customer_id#16))
+(18) CometFilter
+Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
+Condition : (isnotnull(c_customer_sk#16) AND isnotnull(c_customer_id#17))
 
-(21) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
+(19) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+Output [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#21), dynamicpruningexpression(ss_sold_date_sk#21 IN dynamicpruning#22)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#22), dynamicpruningexpression(ss_sold_date_sk#22 IN dynamicpruning#23)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_net_paid:decimal(7,2)>
 
-(23) CometFilter
-Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
-Condition : isnotnull(ss_customer_sk#19)
+(21) CometFilter
+Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+Condition : isnotnull(ss_customer_sk#20)
 
-(24) ColumnarToRow [codegen id : 4]
-Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+(22) ColumnarToRow [codegen id : 4]
+Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 
-(25) BroadcastExchange
-Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+(23) BroadcastExchange
+Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(26) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#15]
-Right keys [1]: [ss_customer_sk#19]
+(24) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#16]
+Right keys [1]: [ss_customer_sk#20]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
-Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21]
-Input [7]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18, ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+(25) Project [codegen id : 6]
+Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22]
+Input [7]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19, ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 
-(28) ReusedExchange [Reuses operator id: 87]
-Output [2]: [d_date_sk#23, d_year#24]
+(26) ReusedExchange [Reuses operator id: 79]
+Output [2]: [d_date_sk#24, d_year#25]
 
-(29) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#21]
-Right keys [1]: [d_date_sk#23]
+(27) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#22]
+Right keys [1]: [d_date_sk#24]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
-Input [7]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21, d_date_sk#23, d_year#24]
-
-(31) HashAggregate [codegen id : 6]
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
-Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
-Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#20))]
-Aggregate Attributes [1]: [sum#25]
-Results [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-
-(32) RowToColumnar
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-
-(33) CometColumnarExchange
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-Arguments: hashpartitioning(c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
-Functions [1]: [sum(UnscaledValue(ss_net_paid#20))]
-
-(35) ColumnarToRow [codegen id : 7]
-Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
-
-(36) BroadcastExchange
-Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
+(28) Project [codegen id : 6]
+Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
+Input [7]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22, d_date_sk#24, d_year#25]
+
+(29) HashAggregate [codegen id : 6]
+Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
+Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
+Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#21))]
+Aggregate Attributes [1]: [sum#26]
+Results [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
+
+(30) Exchange
+Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
+Arguments: hashpartitioning(c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 7]
+Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
+Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
+Functions [1]: [sum(UnscaledValue(ss_net_paid#21))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#21))#13]
+Results [4]: [c_customer_id#17 AS customer_id#28, c_first_name#18 AS customer_first_name#29, c_last_name#19 AS customer_last_name#30, MakeDecimal(sum(UnscaledValue(ss_net_paid#21))#13,17,2) AS year_total#31]
+
+(32) BroadcastExchange
+Input [4]: [customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(37) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#13]
-Right keys [1]: [customer_id#27]
+(33) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#14]
+Right keys [1]: [customer_id#28]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
+Output [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(39) CometFilter
-Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
-Condition : (isnotnull(c_customer_sk#31) AND isnotnull(c_customer_id#32))
+(35) CometFilter
+Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
+Condition : (isnotnull(c_customer_sk#32) AND isnotnull(c_customer_id#33))
 
-(40) ColumnarToRow [codegen id : 10]
-Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
+(36) ColumnarToRow [codegen id : 10]
+Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+Output [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#37), dynamicpruningexpression(ws_sold_date_sk#37 IN dynamicpruning#38)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#38), dynamicpruningexpression(ws_sold_date_sk#38 IN dynamicpruning#39)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(42) CometFilter
-Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
-Condition : isnotnull(ws_bill_customer_sk#35)
+(38) CometFilter
+Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+Condition : isnotnull(ws_bill_customer_sk#36)
 
-(43) ColumnarToRow [codegen id : 8]
-Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+(39) ColumnarToRow [codegen id : 8]
+Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 
-(44) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+(40) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(45) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#31]
-Right keys [1]: [ws_bill_customer_sk#35]
+(41) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#32]
+Right keys [1]: [ws_bill_customer_sk#36]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 10]
-Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37]
-Input [7]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34, ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+(42) Project [codegen id : 10]
+Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38]
+Input [7]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35, ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 
-(47) ReusedExchange [Reuses operator id: 83]
-Output [2]: [d_date_sk#39, d_year#40]
+(43) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#40, d_year#41]
 
-(48) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#37]
-Right keys [1]: [d_date_sk#39]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#38]
+Right keys [1]: [d_date_sk#40]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 10]
-Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
-Input [7]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37, d_date_sk#39, d_year#40]
-
-(50) HashAggregate [codegen id : 10]
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
-Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#36))]
-Aggregate Attributes [1]: [sum#41]
-Results [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-
-(51) RowToColumnar
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-
-(52) CometColumnarExchange
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-Arguments: hashpartitioning(c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(53) CometHashAggregate
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#36))]
-
-(54) CometFilter
-Input [2]: [customer_id#43, year_total#44]
-Condition : (isnotnull(year_total#44) AND (year_total#44 > 0.00))
-
-(55) ColumnarToRow [codegen id : 11]
-Input [2]: [customer_id#43, year_total#44]
-
-(56) BroadcastExchange
-Input [2]: [customer_id#43, year_total#44]
+(45) Project [codegen id : 10]
+Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
+Input [7]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38, d_date_sk#40, d_year#41]
+
+(46) HashAggregate [codegen id : 10]
+Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
+Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#37))]
+Aggregate Attributes [1]: [sum#42]
+Results [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
+
+(47) Exchange
+Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
+Arguments: hashpartitioning(c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(48) HashAggregate [codegen id : 11]
+Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
+Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#37))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#37))#44]
+Results [2]: [c_customer_id#33 AS customer_id#45, MakeDecimal(sum(UnscaledValue(ws_net_paid#37))#44,17,2) AS year_total#46]
+
+(49) Filter [codegen id : 11]
+Input [2]: [customer_id#45, year_total#46]
+Condition : (isnotnull(year_total#46) AND (year_total#46 > 0.00))
+
+(50) BroadcastExchange
+Input [2]: [customer_id#45, year_total#46]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(57) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#13]
-Right keys [1]: [customer_id#43]
+(51) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#14]
+Right keys [1]: [customer_id#45]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 16]
-Output [7]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44]
-Input [8]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, customer_id#43, year_total#44]
+(52) Project [codegen id : 16]
+Output [7]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46]
+Input [8]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, customer_id#45, year_total#46]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
+Output [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(60) CometFilter
-Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
-Condition : (isnotnull(c_customer_sk#45) AND isnotnull(c_customer_id#46))
+(54) CometFilter
+Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
+Condition : (isnotnull(c_customer_sk#47) AND isnotnull(c_customer_id#48))
 
-(61) ColumnarToRow [codegen id : 14]
-Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
+(55) ColumnarToRow [codegen id : 14]
+Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+Output [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(63) CometFilter
-Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
-Condition : isnotnull(ws_bill_customer_sk#49)
+(57) CometFilter
+Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+Condition : isnotnull(ws_bill_customer_sk#51)
 
-(64) ColumnarToRow [codegen id : 12]
-Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+(58) ColumnarToRow [codegen id : 12]
+Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 
-(65) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+(59) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(66) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#45]
-Right keys [1]: [ws_bill_customer_sk#49]
+(60) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#47]
+Right keys [1]: [ws_bill_customer_sk#51]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 14]
-Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51]
-Input [7]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48, ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+(61) Project [codegen id : 14]
+Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53]
+Input [7]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50, ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 
-(68) ReusedExchange [Reuses operator id: 87]
-Output [2]: [d_date_sk#53, d_year#54]
+(62) ReusedExchange [Reuses operator id: 79]
+Output [2]: [d_date_sk#55, d_year#56]
 
-(69) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#51]
-Right keys [1]: [d_date_sk#53]
+(63) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#53]
+Right keys [1]: [d_date_sk#55]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 14]
-Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
-Input [7]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54]
-
-(71) HashAggregate [codegen id : 14]
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
-Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#50))]
-Aggregate Attributes [1]: [sum#55]
-Results [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-
-(72) RowToColumnar
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-
-(73) CometColumnarExchange
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-Arguments: hashpartitioning(c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(74) CometHashAggregate
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#50))]
-
-(75) ColumnarToRow [codegen id : 15]
-Input [2]: [customer_id#57, year_total#58]
-
-(76) BroadcastExchange
-Input [2]: [customer_id#57, year_total#58]
+(64) Project [codegen id : 14]
+Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
+Input [7]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56]
+
+(65) HashAggregate [codegen id : 14]
+Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
+Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#52))]
+Aggregate Attributes [1]: [sum#57]
+Results [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
+
+(66) Exchange
+Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
+Arguments: hashpartitioning(c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(67) HashAggregate [codegen id : 15]
+Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
+Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#52))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#52))#44]
+Results [2]: [c_customer_id#48 AS customer_id#59, MakeDecimal(sum(UnscaledValue(ws_net_paid#52))#44,17,2) AS year_total#60]
+
+(68) BroadcastExchange
+Input [2]: [customer_id#59, year_total#60]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(77) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#13]
-Right keys [1]: [customer_id#57]
+(69) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#14]
+Right keys [1]: [customer_id#59]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#44 > 0.00) THEN (year_total#58 / year_total#44) END > CASE WHEN (year_total#14 > 0.00) THEN (year_total#30 / year_total#14) END)
+Join condition: (CASE WHEN (year_total#46 > 0.00) THEN (year_total#60 / year_total#46) END > CASE WHEN (year_total#15 > 0.00) THEN (year_total#31 / year_total#15) END)
 
-(78) Project [codegen id : 16]
-Output [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
-Input [9]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44, customer_id#57, year_total#58]
+(70) Project [codegen id : 16]
+Output [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
+Input [9]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46, customer_id#59, year_total#60]
 
-(79) TakeOrderedAndProject
-Input [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
-Arguments: 100, [customer_id#27 ASC NULLS FIRST, customer_id#27 ASC NULLS FIRST, customer_id#27 ASC NULLS FIRST], [customer_id#27, customer_first_name#28, customer_last_name#29]
+(71) TakeOrderedAndProject
+Input [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
+Arguments: 100, [customer_id#28 ASC NULLS FIRST, customer_id#28 ASC NULLS FIRST, customer_id#28 ASC NULLS FIRST], [customer_id#28, customer_first_name#29, customer_last_name#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (83)
-+- * ColumnarToRow (82)
-   +- CometFilter (81)
-      +- CometScan parquet spark_catalog.default.date_dim (80)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometFilter (73)
+      +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -458,44 +434,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(81) CometFilter
+(73) CometFilter
 Input [2]: [d_date_sk#9, d_year#10]
 Condition : (((isnotnull(d_year#10) AND (d_year#10 = 2001)) AND d_year#10 IN (2001,2002)) AND isnotnull(d_date_sk#9))
 
-(82) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_year#10]
 
-(83) BroadcastExchange
+(75) BroadcastExchange
 Input [2]: [d_date_sk#9, d_year#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#21 IN dynamicpruning#22
-BroadcastExchange (87)
-+- * ColumnarToRow (86)
-   +- CometFilter (85)
-      +- CometScan parquet spark_catalog.default.date_dim (84)
+Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
+BroadcastExchange (79)
++- * ColumnarToRow (78)
+   +- CometFilter (77)
+      +- CometScan parquet spark_catalog.default.date_dim (76)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#23, d_year#24]
+Output [2]: [d_date_sk#24, d_year#25]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(85) CometFilter
-Input [2]: [d_date_sk#23, d_year#24]
-Condition : (((isnotnull(d_year#24) AND (d_year#24 = 2002)) AND d_year#24 IN (2001,2002)) AND isnotnull(d_date_sk#23))
+(77) CometFilter
+Input [2]: [d_date_sk#24, d_year#25]
+Condition : (((isnotnull(d_year#25) AND (d_year#25 = 2002)) AND d_year#25 IN (2001,2002)) AND isnotnull(d_date_sk#24))
 
-(86) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#23, d_year#24]
+(78) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#24, d_year#25]
 
-(87) BroadcastExchange
-Input [2]: [d_date_sk#23, d_year#24]
+(79) BroadcastExchange
+Input [2]: [d_date_sk#24, d_year#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#37 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#38 IN dynamicpruning#8
 
-Subquery:4 Hosting operator id = 62 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#22
+Subquery:4 Hosting operator id = 56 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#23
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt
index 6136429173..9d3ae8fbee 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q74/simplified.txt
@@ -5,13 +5,43 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name]
         Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,year_total,year_total]
           BroadcastHashJoin [customer_id,customer_id]
             BroadcastHashJoin [customer_id,customer_id]
-              ColumnarToRow
-                InputAdapter
-                  CometFilter [year_total]
-                    CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                      CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #1
-                        RowToColumnar
-                          WholeStageCodegen (3)
+              Filter [year_total]
+                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,year_total,sum]
+                  InputAdapter
+                    Exchange [c_customer_id,c_first_name,c_last_name,d_year] #1
+                      WholeStageCodegen (3)
+                        HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
+                          Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
+                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [c_customer_sk,c_customer_id]
+                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ss_customer_sk]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                              InputAdapter
+                                ReusedExchange [d_date_sk,d_year] #3
+              InputAdapter
+                BroadcastExchange #4
+                  WholeStageCodegen (7)
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,customer_first_name,customer_last_name,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #5
+                          WholeStageCodegen (6)
                             HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
                               Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
                                 BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -22,109 +52,71 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name]
                                           CometFilter [c_customer_sk,c_customer_id]
                                             CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                       InputAdapter
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
+                                        BroadcastExchange #6
+                                          WholeStageCodegen (4)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometFilter [ss_customer_sk]
                                                   CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
+                                                    SubqueryBroadcast [d_date_sk] #2
+                                                      BroadcastExchange #7
                                                         WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
                                                               CometFilter [d_year,d_date_sk]
                                                                 CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
-              InputAdapter
-                BroadcastExchange #4
-                  WholeStageCodegen (7)
-                    ColumnarToRow
-                      InputAdapter
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #5
-                            RowToColumnar
-                              WholeStageCodegen (6)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (4)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ss_customer_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #2
-                                                          BroadcastExchange #7
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #7
+                                    ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [year_total]
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #9
-                            RowToColumnar
-                              WholeStageCodegen (10)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                          InputAdapter
-                                            BroadcastExchange #10
-                                              WholeStageCodegen (8)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
+                  Filter [year_total]
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #9
+                          WholeStageCodegen (10)
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                              Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk,c_customer_id]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (8)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              ColumnarToRow
+              HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
                 InputAdapter
-                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #12
-                      RowToColumnar
-                        WholeStageCodegen (14)
-                          HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_customer_id]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                    InputAdapter
-                                      BroadcastExchange #13
-                                        WholeStageCodegen (12)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #2
+                  Exchange [c_customer_id,c_first_name,c_last_name,d_year] #12
+                    WholeStageCodegen (14)
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                        Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_customer_sk,c_customer_id]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #7
+                                  BroadcastExchange #13
+                                    WholeStageCodegen (12)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_customer_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #2
+                            InputAdapter
+                              ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt
index 8b2d451b09..3a29db88ef 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/explain.txt
@@ -1,138 +1,136 @@
 == Physical Plan ==
-TakeOrderedAndProject (134)
-+- * Project (133)
-   +- * SortMergeJoin Inner (132)
-      :- * ColumnarToRow (72)
-      :  +- CometSort (71)
-      :     +- CometColumnarExchange (70)
-      :        +- CometFilter (69)
-      :           +- CometHashAggregate (68)
-      :              +- CometColumnarExchange (67)
-      :                 +- CometHashAggregate (66)
-      :                    +- CometHashAggregate (65)
-      :                       +- CometColumnarExchange (64)
-      :                          +- CometHashAggregate (63)
-      :                             +- CometUnion (62)
-      :                                :- CometProject (23)
-      :                                :  +- CometSortMergeJoin (22)
-      :                                :     :- CometSort (16)
-      :                                :     :  +- CometColumnarExchange (15)
-      :                                :     :     +- RowToColumnar (14)
-      :                                :     :        +- * Project (13)
-      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (12)
-      :                                :     :              :- * Project (10)
-      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (9)
-      :                                :     :              :     :- * ColumnarToRow (3)
-      :                                :     :              :     :  +- CometFilter (2)
-      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-      :                                :     :              :     +- BroadcastExchange (8)
-      :                                :     :              :        +- * ColumnarToRow (7)
-      :                                :     :              :           +- CometProject (6)
-      :                                :     :              :              +- CometFilter (5)
-      :                                :     :              :                 +- CometScan parquet spark_catalog.default.item (4)
-      :                                :     :              +- ReusedExchange (11)
-      :                                :     +- CometSort (21)
-      :                                :        +- CometColumnarExchange (20)
-      :                                :           +- CometProject (19)
-      :                                :              +- CometFilter (18)
-      :                                :                 +- CometScan parquet spark_catalog.default.catalog_returns (17)
-      :                                :- CometProject (42)
-      :                                :  +- CometSortMergeJoin (41)
-      :                                :     :- CometSort (35)
-      :                                :     :  +- CometColumnarExchange (34)
-      :                                :     :     +- RowToColumnar (33)
-      :                                :     :        +- * Project (32)
-      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (31)
-      :                                :     :              :- * Project (29)
-      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (28)
-      :                                :     :              :     :- * ColumnarToRow (26)
-      :                                :     :              :     :  +- CometFilter (25)
-      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
-      :                                :     :              :     +- ReusedExchange (27)
-      :                                :     :              +- ReusedExchange (30)
-      :                                :     +- CometSort (40)
-      :                                :        +- CometColumnarExchange (39)
-      :                                :           +- CometProject (38)
-      :                                :              +- CometFilter (37)
-      :                                :                 +- CometScan parquet spark_catalog.default.store_returns (36)
-      :                                +- CometProject (61)
-      :                                   +- CometSortMergeJoin (60)
-      :                                      :- CometSort (54)
-      :                                      :  +- CometColumnarExchange (53)
-      :                                      :     +- RowToColumnar (52)
-      :                                      :        +- * Project (51)
-      :                                      :           +- * BroadcastHashJoin Inner BuildRight (50)
-      :                                      :              :- * Project (48)
-      :                                      :              :  +- * BroadcastHashJoin Inner BuildRight (47)
-      :                                      :              :     :- * ColumnarToRow (45)
-      :                                      :              :     :  +- CometFilter (44)
-      :                                      :              :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
-      :                                      :              :     +- ReusedExchange (46)
-      :                                      :              +- ReusedExchange (49)
-      :                                      +- CometSort (59)
-      :                                         +- CometColumnarExchange (58)
-      :                                            +- CometProject (57)
-      :                                               +- CometFilter (56)
-      :                                                  +- CometScan parquet spark_catalog.default.web_returns (55)
-      +- * ColumnarToRow (131)
-         +- CometSort (130)
-            +- CometColumnarExchange (129)
-               +- CometFilter (128)
-                  +- CometHashAggregate (127)
-                     +- CometColumnarExchange (126)
-                        +- CometHashAggregate (125)
-                           +- CometHashAggregate (124)
-                              +- CometColumnarExchange (123)
-                                 +- CometHashAggregate (122)
-                                    +- CometUnion (121)
-                                       :- CometProject (88)
-                                       :  +- CometSortMergeJoin (87)
-                                       :     :- CometSort (84)
-                                       :     :  +- CometColumnarExchange (83)
-                                       :     :     +- RowToColumnar (82)
-                                       :     :        +- * Project (81)
-                                       :     :           +- * BroadcastHashJoin Inner BuildRight (80)
-                                       :     :              :- * Project (78)
-                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (77)
-                                       :     :              :     :- * ColumnarToRow (75)
-                                       :     :              :     :  +- CometFilter (74)
-                                       :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (73)
-                                       :     :              :     +- ReusedExchange (76)
-                                       :     :              +- ReusedExchange (79)
-                                       :     +- CometSort (86)
-                                       :        +- ReusedExchange (85)
-                                       :- CometProject (104)
-                                       :  +- CometSortMergeJoin (103)
-                                       :     :- CometSort (100)
-                                       :     :  +- CometColumnarExchange (99)
-                                       :     :     +- RowToColumnar (98)
-                                       :     :        +- * Project (97)
-                                       :     :           +- * BroadcastHashJoin Inner BuildRight (96)
-                                       :     :              :- * Project (94)
-                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (93)
-                                       :     :              :     :- * ColumnarToRow (91)
-                                       :     :              :     :  +- CometFilter (90)
-                                       :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (89)
-                                       :     :              :     +- ReusedExchange (92)
-                                       :     :              +- ReusedExchange (95)
-                                       :     +- CometSort (102)
-                                       :        +- ReusedExchange (101)
-                                       +- CometProject (120)
-                                          +- CometSortMergeJoin (119)
-                                             :- CometSort (116)
-                                             :  +- CometColumnarExchange (115)
-                                             :     +- RowToColumnar (114)
-                                             :        +- * Project (113)
-                                             :           +- * BroadcastHashJoin Inner BuildRight (112)
-                                             :              :- * Project (110)
-                                             :              :  +- * BroadcastHashJoin Inner BuildRight (109)
-                                             :              :     :- * ColumnarToRow (107)
-                                             :              :     :  +- CometFilter (106)
-                                             :              :     :     +- CometScan parquet spark_catalog.default.web_sales (105)
-                                             :              :     +- ReusedExchange (108)
-                                             :              +- ReusedExchange (111)
-                                             +- CometSort (118)
-                                                +- ReusedExchange (117)
+TakeOrderedAndProject (132)
++- * Project (131)
+   +- * SortMergeJoin Inner (130)
+      :- * Sort (71)
+      :  +- Exchange (70)
+      :     +- * Filter (69)
+      :        +- * HashAggregate (68)
+      :           +- Exchange (67)
+      :              +- * HashAggregate (66)
+      :                 +- * HashAggregate (65)
+      :                    +- Exchange (64)
+      :                       +- * HashAggregate (63)
+      :                          +- Union (62)
+      :                             :- * Project (23)
+      :                             :  +- * SortMergeJoin LeftOuter (22)
+      :                             :     :- * Sort (15)
+      :                             :     :  +- Exchange (14)
+      :                             :     :     +- * Project (13)
+      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (12)
+      :                             :     :           :- * Project (10)
+      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (9)
+      :                             :     :           :     :- * ColumnarToRow (3)
+      :                             :     :           :     :  +- CometFilter (2)
+      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+      :                             :     :           :     +- BroadcastExchange (8)
+      :                             :     :           :        +- * ColumnarToRow (7)
+      :                             :     :           :           +- CometProject (6)
+      :                             :     :           :              +- CometFilter (5)
+      :                             :     :           :                 +- CometScan parquet spark_catalog.default.item (4)
+      :                             :     :           +- ReusedExchange (11)
+      :                             :     +- * ColumnarToRow (21)
+      :                             :        +- CometSort (20)
+      :                             :           +- CometExchange (19)
+      :                             :              +- CometProject (18)
+      :                             :                 +- CometFilter (17)
+      :                             :                    +- CometScan parquet spark_catalog.default.catalog_returns (16)
+      :                             :- * Project (42)
+      :                             :  +- * SortMergeJoin LeftOuter (41)
+      :                             :     :- * Sort (34)
+      :                             :     :  +- Exchange (33)
+      :                             :     :     +- * Project (32)
+      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (31)
+      :                             :     :           :- * Project (29)
+      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (28)
+      :                             :     :           :     :- * ColumnarToRow (26)
+      :                             :     :           :     :  +- CometFilter (25)
+      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
+      :                             :     :           :     +- ReusedExchange (27)
+      :                             :     :           +- ReusedExchange (30)
+      :                             :     +- * ColumnarToRow (40)
+      :                             :        +- CometSort (39)
+      :                             :           +- CometExchange (38)
+      :                             :              +- CometProject (37)
+      :                             :                 +- CometFilter (36)
+      :                             :                    +- CometScan parquet spark_catalog.default.store_returns (35)
+      :                             +- * Project (61)
+      :                                +- * SortMergeJoin LeftOuter (60)
+      :                                   :- * Sort (53)
+      :                                   :  +- Exchange (52)
+      :                                   :     +- * Project (51)
+      :                                   :        +- * BroadcastHashJoin Inner BuildRight (50)
+      :                                   :           :- * Project (48)
+      :                                   :           :  +- * BroadcastHashJoin Inner BuildRight (47)
+      :                                   :           :     :- * ColumnarToRow (45)
+      :                                   :           :     :  +- CometFilter (44)
+      :                                   :           :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
+      :                                   :           :     +- ReusedExchange (46)
+      :                                   :           +- ReusedExchange (49)
+      :                                   +- * ColumnarToRow (59)
+      :                                      +- CometSort (58)
+      :                                         +- CometExchange (57)
+      :                                            +- CometProject (56)
+      :                                               +- CometFilter (55)
+      :                                                  +- CometScan parquet spark_catalog.default.web_returns (54)
+      +- * Sort (129)
+         +- Exchange (128)
+            +- * Filter (127)
+               +- * HashAggregate (126)
+                  +- Exchange (125)
+                     +- * HashAggregate (124)
+                        +- * HashAggregate (123)
+                           +- Exchange (122)
+                              +- * HashAggregate (121)
+                                 +- Union (120)
+                                    :- * Project (87)
+                                    :  +- * SortMergeJoin LeftOuter (86)
+                                    :     :- * Sort (82)
+                                    :     :  +- Exchange (81)
+                                    :     :     +- * Project (80)
+                                    :     :        +- * BroadcastHashJoin Inner BuildRight (79)
+                                    :     :           :- * Project (77)
+                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (76)
+                                    :     :           :     :- * ColumnarToRow (74)
+                                    :     :           :     :  +- CometFilter (73)
+                                    :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (72)
+                                    :     :           :     +- ReusedExchange (75)
+                                    :     :           +- ReusedExchange (78)
+                                    :     +- * ColumnarToRow (85)
+                                    :        +- CometSort (84)
+                                    :           +- ReusedExchange (83)
+                                    :- * Project (103)
+                                    :  +- * SortMergeJoin LeftOuter (102)
+                                    :     :- * Sort (98)
+                                    :     :  +- Exchange (97)
+                                    :     :     +- * Project (96)
+                                    :     :        +- * BroadcastHashJoin Inner BuildRight (95)
+                                    :     :           :- * Project (93)
+                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (92)
+                                    :     :           :     :- * ColumnarToRow (90)
+                                    :     :           :     :  +- CometFilter (89)
+                                    :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (88)
+                                    :     :           :     +- ReusedExchange (91)
+                                    :     :           +- ReusedExchange (94)
+                                    :     +- * ColumnarToRow (101)
+                                    :        +- CometSort (100)
+                                    :           +- ReusedExchange (99)
+                                    +- * Project (119)
+                                       +- * SortMergeJoin LeftOuter (118)
+                                          :- * Sort (114)
+                                          :  +- Exchange (113)
+                                          :     +- * Project (112)
+                                          :        +- * BroadcastHashJoin Inner BuildRight (111)
+                                          :           :- * Project (109)
+                                          :           :  +- * BroadcastHashJoin Inner BuildRight (108)
+                                          :           :     :- * ColumnarToRow (106)
+                                          :           :     :  +- CometFilter (105)
+                                          :           :     :     +- CometScan parquet spark_catalog.default.web_sales (104)
+                                          :           :     +- ReusedExchange (107)
+                                          :           +- ReusedExchange (110)
+                                          +- * ColumnarToRow (117)
+                                             +- CometSort (116)
+                                                +- ReusedExchange (115)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -182,7 +180,7 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Input [10]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_item_sk#7, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 
-(11) ReusedExchange [Reuses operator id: 138]
+(11) ReusedExchange [Reuses operator id: 136]
 Output [2]: [d_date_sk#13, d_year#14]
 
 (12) BroadcastHashJoin [codegen id : 3]
@@ -195,16 +193,13 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
 Input [11]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_date_sk#13, d_year#14]
 
-(14) RowToColumnar
+(14) Exchange
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
+Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
+(15) Sort [codegen id : 4]
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometSort
-Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14], [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST]
+Arguments: [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
@@ -213,30 +208,34 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(18) CometFilter
+(17) CometFilter
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Condition : (isnotnull(cr_order_number#16) AND isnotnull(cr_item_sk#15))
 
-(19) CometProject
+(18) CometProject
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 
-(20) CometColumnarExchange
+(19) CometExchange
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
-(21) CometSort
+(20) CometSort
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_order_number#16 ASC NULLS FIRST, cr_item_sk#15 ASC NULLS FIRST]
 
-(22) CometSortMergeJoin
-Left output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Right output [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: [cs_order_number#2, cs_item_sk#1], [cr_order_number#16, cr_item_sk#15], LeftOuter
+(21) ColumnarToRow [codegen id : 5]
+Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 
-(23) CometProject
+(22) SortMergeJoin [codegen id : 6]
+Left keys [2]: [cs_order_number#2, cs_item_sk#1]
+Right keys [2]: [cr_order_number#16, cr_item_sk#15]
+Join type: LeftOuter
+Join condition: None
+
+(23) Project [codegen id : 6]
+Output [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
 Input [13]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14, cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21], [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
@@ -250,45 +249,42 @@ ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sa
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 Condition : isnotnull(ss_item_sk#22)
 
-(26) ColumnarToRow [codegen id : 6]
+(26) ColumnarToRow [codegen id : 9]
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 
 (27) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(28) BroadcastHashJoin [codegen id : 6]
+(28) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_item_sk#22]
 Right keys [1]: [i_item_sk#28]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 6]
+(29) Project [codegen id : 9]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 Input [10]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(30) ReusedExchange [Reuses operator id: 138]
+(30) ReusedExchange [Reuses operator id: 136]
 Output [2]: [d_date_sk#33, d_year#34]
 
-(31) BroadcastHashJoin [codegen id : 6]
+(31) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_sold_date_sk#26]
 Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 6]
+(32) Project [codegen id : 9]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
 Input [11]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_date_sk#33, d_year#34]
 
-(33) RowToColumnar
-Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-
-(34) CometColumnarExchange
+(33) Exchange
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) CometSort
+(34) Sort [codegen id : 10]
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34], [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST]
+Arguments: [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_returns
 Output [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
@@ -297,30 +293,34 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(37) CometFilter
+(36) CometFilter
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Condition : (isnotnull(sr_ticket_number#36) AND isnotnull(sr_item_sk#35))
 
-(38) CometProject
+(37) CometProject
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 
-(39) CometColumnarExchange
+(38) CometExchange
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
-(40) CometSort
+(39) CometSort
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_ticket_number#36 ASC NULLS FIRST, sr_item_sk#35 ASC NULLS FIRST]
 
-(41) CometSortMergeJoin
-Left output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Right output [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: [ss_ticket_number#23, ss_item_sk#22], [sr_ticket_number#36, sr_item_sk#35], LeftOuter
+(40) ColumnarToRow [codegen id : 11]
+Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
+
+(41) SortMergeJoin [codegen id : 12]
+Left keys [2]: [ss_ticket_number#23, ss_item_sk#22]
+Right keys [2]: [sr_ticket_number#36, sr_item_sk#35]
+Join type: LeftOuter
+Join condition: None
 
-(42) CometProject
+(42) Project [codegen id : 12]
+Output [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
 Input [13]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34, sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41], [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
@@ -334,45 +334,42 @@ ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sal
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 Condition : isnotnull(ws_item_sk#42)
 
-(45) ColumnarToRow [codegen id : 9]
+(45) ColumnarToRow [codegen id : 15]
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 
 (46) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(47) BroadcastHashJoin [codegen id : 9]
+(47) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ws_item_sk#42]
 Right keys [1]: [i_item_sk#48]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 9]
+(48) Project [codegen id : 15]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 Input [10]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(49) ReusedExchange [Reuses operator id: 138]
+(49) ReusedExchange [Reuses operator id: 136]
 Output [2]: [d_date_sk#53, d_year#54]
 
-(50) BroadcastHashJoin [codegen id : 9]
+(50) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ws_sold_date_sk#46]
 Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 9]
+(51) Project [codegen id : 15]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
 Input [11]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_date_sk#53, d_year#54]
 
-(52) RowToColumnar
+(52) Exchange
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
+Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(53) CometColumnarExchange
+(53) Sort [codegen id : 16]
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(54) CometSort
-Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54], [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST]
+Arguments: [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.web_returns
 Output [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
@@ -381,352 +378,363 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_quantity:int,wr_return_amt:decimal(7,2)>
 
-(56) CometFilter
+(55) CometFilter
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Condition : (isnotnull(wr_order_number#56) AND isnotnull(wr_item_sk#55))
 
-(57) CometProject
+(56) CometProject
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 
-(58) CometColumnarExchange
+(57) CometExchange
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(59) CometSort
+(58) CometSort
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_order_number#56 ASC NULLS FIRST, wr_item_sk#55 ASC NULLS FIRST]
 
-(60) CometSortMergeJoin
-Left output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Right output [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: [ws_order_number#43, ws_item_sk#42], [wr_order_number#56, wr_item_sk#55], LeftOuter
+(59) ColumnarToRow [codegen id : 17]
+Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
+
+(60) SortMergeJoin [codegen id : 18]
+Left keys [2]: [ws_order_number#43, ws_item_sk#42]
+Right keys [2]: [wr_order_number#56, wr_item_sk#55]
+Join type: LeftOuter
+Join condition: None
 
-(61) CometProject
+(61) Project [codegen id : 18]
+Output [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
 Input [13]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54, wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61], [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
 
-(62) CometUnion
-Child 0 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
-Child 1 Input [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41]
-Child 2 Input [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61]
+(62) Union
 
-(63) CometHashAggregate
+(63) HashAggregate [codegen id : 19]
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(64) CometColumnarExchange
+(64) Exchange
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(65) CometHashAggregate
+(65) HashAggregate [codegen id : 20]
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(66) CometHashAggregate
+(66) HashAggregate [codegen id : 20]
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum#62, sum#63]
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
 
-(67) CometColumnarExchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(67) Exchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(68) CometHashAggregate
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
+(68) HashAggregate [codegen id : 21]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum(sales_cnt#20)#66 AS sales_cnt#68, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#69]
 
-(69) CometFilter
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
-Condition : isnotnull(sales_cnt#64)
+(69) Filter [codegen id : 21]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
+Condition : isnotnull(sales_cnt#68)
 
-(70) CometColumnarExchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
-Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(70) Exchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
+Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(71) CometSort
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
-Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65], [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST]
-
-(72) ColumnarToRow [codegen id : 10]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+(71) Sort [codegen id : 22]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
+Arguments: [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
+Output [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#70), dynamicpruningexpression(cs_sold_date_sk#70 IN dynamicpruning#71)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#74), dynamicpruningexpression(cs_sold_date_sk#74 IN dynamicpruning#75)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_ext_sales_price:decimal(7,2)>
 
-(74) CometFilter
-Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
-Condition : isnotnull(cs_item_sk#66)
+(73) CometFilter
+Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
+Condition : isnotnull(cs_item_sk#70)
 
-(75) ColumnarToRow [codegen id : 13]
-Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
+(74) ColumnarToRow [codegen id : 25]
+Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
 
-(76) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(75) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 
-(77) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cs_item_sk#66]
-Right keys [1]: [i_item_sk#72]
+(76) BroadcastHashJoin [codegen id : 25]
+Left keys [1]: [cs_item_sk#70]
+Right keys [1]: [i_item_sk#76]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 13]
-Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
-Input [10]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(77) Project [codegen id : 25]
+Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+Input [10]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 
-(79) ReusedExchange [Reuses operator id: 142]
-Output [2]: [d_date_sk#77, d_year#78]
+(78) ReusedExchange [Reuses operator id: 140]
+Output [2]: [d_date_sk#81, d_year#82]
 
-(80) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cs_sold_date_sk#70]
-Right keys [1]: [d_date_sk#77]
+(79) BroadcastHashJoin [codegen id : 25]
+Left keys [1]: [cs_sold_date_sk#74]
+Right keys [1]: [d_date_sk#81]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 13]
-Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Input [11]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_date_sk#77, d_year#78]
+(80) Project [codegen id : 25]
+Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
+Input [11]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_date_sk#81, d_year#82]
 
-(82) RowToColumnar
-Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+(81) Exchange
+Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
+Arguments: hashpartitioning(cs_order_number#71, cs_item_sk#70, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(83) CometColumnarExchange
-Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Arguments: hashpartitioning(cs_order_number#67, cs_item_sk#66, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(82) Sort [codegen id : 26]
+Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
+Arguments: [cs_order_number#71 ASC NULLS FIRST, cs_item_sk#70 ASC NULLS FIRST], false, 0
 
-(84) CometSort
-Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Arguments: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78], [cs_order_number#67 ASC NULLS FIRST, cs_item_sk#66 ASC NULLS FIRST]
+(83) ReusedExchange [Reuses operator id: 19]
+Output [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
 
-(85) ReusedExchange [Reuses operator id: 20]
-Output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+(84) CometSort
+Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+Arguments: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86], [cr_order_number#84 ASC NULLS FIRST, cr_item_sk#83 ASC NULLS FIRST]
 
-(86) CometSort
-Input [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
-Arguments: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82], [cr_order_number#80 ASC NULLS FIRST, cr_item_sk#79 ASC NULLS FIRST]
+(85) ColumnarToRow [codegen id : 27]
+Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
 
-(87) CometSortMergeJoin
-Left output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Right output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
-Arguments: [cs_order_number#67, cs_item_sk#66], [cr_order_number#80, cr_item_sk#79], LeftOuter
+(86) SortMergeJoin [codegen id : 28]
+Left keys [2]: [cs_order_number#71, cs_item_sk#70]
+Right keys [2]: [cr_order_number#84, cr_item_sk#83]
+Join type: LeftOuter
+Join condition: None
 
-(88) CometProject
-Input [13]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78, cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
-Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21], [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, (cs_quantity#68 - coalesce(cr_return_quantity#81, 0)) AS sales_cnt#20, (cs_ext_sales_price#69 - coalesce(cr_return_amount#82, 0.00)) AS sales_amt#21]
+(87) Project [codegen id : 28]
+Output [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, (cs_quantity#72 - coalesce(cr_return_quantity#85, 0)) AS sales_cnt#20, (cs_ext_sales_price#73 - coalesce(cr_return_amount#86, 0.00)) AS sales_amt#21]
+Input [13]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82, cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
+Output [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#87), dynamicpruningexpression(ss_sold_date_sk#87 IN dynamicpruning#88)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#91), dynamicpruningexpression(ss_sold_date_sk#91 IN dynamicpruning#92)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sales_price:decimal(7,2)>
 
-(90) CometFilter
-Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
-Condition : isnotnull(ss_item_sk#83)
+(89) CometFilter
+Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
+Condition : isnotnull(ss_item_sk#87)
 
-(91) ColumnarToRow [codegen id : 16]
-Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
+(90) ColumnarToRow [codegen id : 31]
+Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
 
-(92) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
+(91) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
 
-(93) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [ss_item_sk#83]
-Right keys [1]: [i_item_sk#89]
+(92) BroadcastHashJoin [codegen id : 31]
+Left keys [1]: [ss_item_sk#87]
+Right keys [1]: [i_item_sk#93]
 Join type: Inner
 Join condition: None
 
-(94) Project [codegen id : 16]
-Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
-Input [10]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
+(93) Project [codegen id : 31]
+Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
+Input [10]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
 
-(95) ReusedExchange [Reuses operator id: 142]
-Output [2]: [d_date_sk#94, d_year#95]
+(94) ReusedExchange [Reuses operator id: 140]
+Output [2]: [d_date_sk#98, d_year#99]
 
-(96) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [ss_sold_date_sk#87]
-Right keys [1]: [d_date_sk#94]
+(95) BroadcastHashJoin [codegen id : 31]
+Left keys [1]: [ss_sold_date_sk#91]
+Right keys [1]: [d_date_sk#98]
 Join type: Inner
 Join condition: None
 
-(97) Project [codegen id : 16]
-Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Input [11]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_date_sk#94, d_year#95]
+(96) Project [codegen id : 31]
+Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
+Input [11]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_date_sk#98, d_year#99]
 
-(98) RowToColumnar
-Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+(97) Exchange
+Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
+Arguments: hashpartitioning(ss_ticket_number#88, ss_item_sk#87, 5), ENSURE_REQUIREMENTS, [plan_id=12]
 
-(99) CometColumnarExchange
-Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Arguments: hashpartitioning(ss_ticket_number#84, ss_item_sk#83, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(98) Sort [codegen id : 32]
+Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
+Arguments: [ss_ticket_number#88 ASC NULLS FIRST, ss_item_sk#87 ASC NULLS FIRST], false, 0
 
-(100) CometSort
-Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Arguments: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95], [ss_ticket_number#84 ASC NULLS FIRST, ss_item_sk#83 ASC NULLS FIRST]
+(99) ReusedExchange [Reuses operator id: 38]
+Output [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
 
-(101) ReusedExchange [Reuses operator id: 39]
-Output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+(100) CometSort
+Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+Arguments: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103], [sr_ticket_number#101 ASC NULLS FIRST, sr_item_sk#100 ASC NULLS FIRST]
 
-(102) CometSort
-Input [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
-Arguments: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99], [sr_ticket_number#97 ASC NULLS FIRST, sr_item_sk#96 ASC NULLS FIRST]
+(101) ColumnarToRow [codegen id : 33]
+Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
 
-(103) CometSortMergeJoin
-Left output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Right output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
-Arguments: [ss_ticket_number#84, ss_item_sk#83], [sr_ticket_number#97, sr_item_sk#96], LeftOuter
+(102) SortMergeJoin [codegen id : 34]
+Left keys [2]: [ss_ticket_number#88, ss_item_sk#87]
+Right keys [2]: [sr_ticket_number#101, sr_item_sk#100]
+Join type: LeftOuter
+Join condition: None
 
-(104) CometProject
-Input [13]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95, sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
-Arguments: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41], [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, (ss_quantity#85 - coalesce(sr_return_quantity#98, 0)) AS sales_cnt#40, (ss_ext_sales_price#86 - coalesce(sr_return_amt#99, 0.00)) AS sales_amt#41]
+(103) Project [codegen id : 34]
+Output [7]: [d_year#99, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, (ss_quantity#89 - coalesce(sr_return_quantity#102, 0)) AS sales_cnt#40, (ss_ext_sales_price#90 - coalesce(sr_return_amt#103, 0.00)) AS sales_amt#41]
+Input [13]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99, sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
+Output [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#104), dynamicpruningexpression(ws_sold_date_sk#104 IN dynamicpruning#105)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#108), dynamicpruningexpression(ws_sold_date_sk#108 IN dynamicpruning#109)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sales_price:decimal(7,2)>
 
-(106) CometFilter
-Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
-Condition : isnotnull(ws_item_sk#100)
+(105) CometFilter
+Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
+Condition : isnotnull(ws_item_sk#104)
 
-(107) ColumnarToRow [codegen id : 19]
-Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
+(106) ColumnarToRow [codegen id : 37]
+Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
 
-(108) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
+(107) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
 
-(109) BroadcastHashJoin [codegen id : 19]
-Left keys [1]: [ws_item_sk#100]
-Right keys [1]: [i_item_sk#106]
+(108) BroadcastHashJoin [codegen id : 37]
+Left keys [1]: [ws_item_sk#104]
+Right keys [1]: [i_item_sk#110]
 Join type: Inner
 Join condition: None
 
-(110) Project [codegen id : 19]
-Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
-Input [10]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
+(109) Project [codegen id : 37]
+Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
+Input [10]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
 
-(111) ReusedExchange [Reuses operator id: 142]
-Output [2]: [d_date_sk#111, d_year#112]
+(110) ReusedExchange [Reuses operator id: 140]
+Output [2]: [d_date_sk#115, d_year#116]
 
-(112) BroadcastHashJoin [codegen id : 19]
-Left keys [1]: [ws_sold_date_sk#104]
-Right keys [1]: [d_date_sk#111]
+(111) BroadcastHashJoin [codegen id : 37]
+Left keys [1]: [ws_sold_date_sk#108]
+Right keys [1]: [d_date_sk#115]
 Join type: Inner
 Join condition: None
 
-(113) Project [codegen id : 19]
-Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Input [11]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_date_sk#111, d_year#112]
+(112) Project [codegen id : 37]
+Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
+Input [11]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_date_sk#115, d_year#116]
 
-(114) RowToColumnar
-Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+(113) Exchange
+Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
+Arguments: hashpartitioning(ws_order_number#105, ws_item_sk#104, 5), ENSURE_REQUIREMENTS, [plan_id=13]
 
-(115) CometColumnarExchange
-Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Arguments: hashpartitioning(ws_order_number#101, ws_item_sk#100, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+(114) Sort [codegen id : 38]
+Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
+Arguments: [ws_order_number#105 ASC NULLS FIRST, ws_item_sk#104 ASC NULLS FIRST], false, 0
 
-(116) CometSort
-Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Arguments: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112], [ws_order_number#101 ASC NULLS FIRST, ws_item_sk#100 ASC NULLS FIRST]
+(115) ReusedExchange [Reuses operator id: 57]
+Output [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
 
-(117) ReusedExchange [Reuses operator id: 58]
-Output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+(116) CometSort
+Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+Arguments: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120], [wr_order_number#118 ASC NULLS FIRST, wr_item_sk#117 ASC NULLS FIRST]
 
-(118) CometSort
-Input [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
-Arguments: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116], [wr_order_number#114 ASC NULLS FIRST, wr_item_sk#113 ASC NULLS FIRST]
+(117) ColumnarToRow [codegen id : 39]
+Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
 
-(119) CometSortMergeJoin
-Left output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Right output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
-Arguments: [ws_order_number#101, ws_item_sk#100], [wr_order_number#114, wr_item_sk#113], LeftOuter
+(118) SortMergeJoin [codegen id : 40]
+Left keys [2]: [ws_order_number#105, ws_item_sk#104]
+Right keys [2]: [wr_order_number#118, wr_item_sk#117]
+Join type: LeftOuter
+Join condition: None
 
-(120) CometProject
-Input [13]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112, wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
-Arguments: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61], [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, (ws_quantity#102 - coalesce(wr_return_quantity#115, 0)) AS sales_cnt#60, (ws_ext_sales_price#103 - coalesce(wr_return_amt#116, 0.00)) AS sales_amt#61]
+(119) Project [codegen id : 40]
+Output [7]: [d_year#116, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, (ws_quantity#106 - coalesce(wr_return_quantity#119, 0)) AS sales_cnt#60, (ws_ext_sales_price#107 - coalesce(wr_return_amt#120, 0.00)) AS sales_amt#61]
+Input [13]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116, wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
 
-(121) CometUnion
-Child 0 Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Child 1 Input [7]: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41]
-Child 2 Input [7]: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61]
+(120) Union
 
-(122) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+(121) HashAggregate [codegen id : 41]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(123) CometColumnarExchange
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+(122) Exchange
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=14]
 
-(124) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+(123) HashAggregate [codegen id : 42]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(125) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(124) HashAggregate [codegen id : 42]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum#62, sum#121]
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
 
-(126) CometColumnarExchange
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
-Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+(125) Exchange
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
+Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(127) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
-Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(126) HashAggregate [codegen id : 43]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
+Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum(sales_cnt#20)#66 AS sales_cnt#123, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#124]
 
-(128) CometFilter
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
-Condition : isnotnull(sales_cnt#118)
-
-(129) CometColumnarExchange
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
-Arguments: hashpartitioning(i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
+(127) Filter [codegen id : 43]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+Condition : isnotnull(sales_cnt#123)
 
-(130) CometSort
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
-Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119], [i_brand_id#73 ASC NULLS FIRST, i_class_id#74 ASC NULLS FIRST, i_category_id#75 ASC NULLS FIRST, i_manufact_id#76 ASC NULLS FIRST]
+(128) Exchange
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+Arguments: hashpartitioning(i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=16]
 
-(131) ColumnarToRow [codegen id : 20]
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+(129) Sort [codegen id : 44]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+Arguments: [i_brand_id#77 ASC NULLS FIRST, i_class_id#78 ASC NULLS FIRST, i_category_id#79 ASC NULLS FIRST, i_manufact_id#80 ASC NULLS FIRST], false, 0
 
-(132) SortMergeJoin [codegen id : 21]
+(130) SortMergeJoin [codegen id : 45]
 Left keys [4]: [i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
-Right keys [4]: [i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+Right keys [4]: [i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 Join type: Inner
-Join condition: ((cast(sales_cnt#64 as decimal(17,2)) / cast(sales_cnt#118 as decimal(17,2))) < 0.90000000000000000000)
+Join condition: ((cast(sales_cnt#68 as decimal(17,2)) / cast(sales_cnt#123 as decimal(17,2))) < 0.90000000000000000000)
 
-(133) Project [codegen id : 21]
-Output [10]: [d_year#78 AS prev_year#120, d_year#14 AS year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#118 AS prev_yr_cnt#122, sales_cnt#64 AS curr_yr_cnt#123, (sales_cnt#64 - sales_cnt#118) AS sales_cnt_diff#124, (sales_amt#65 - sales_amt#119) AS sales_amt_diff#125]
-Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65, d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+(131) Project [codegen id : 45]
+Output [10]: [d_year#82 AS prev_year#125, d_year#14 AS year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#123 AS prev_yr_cnt#127, sales_cnt#68 AS curr_yr_cnt#128, (sales_cnt#68 - sales_cnt#123) AS sales_cnt_diff#129, (sales_amt#69 - sales_amt#124) AS sales_amt_diff#130]
+Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69, d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
 
-(134) TakeOrderedAndProject
-Input [10]: [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
-Arguments: 100, [sales_cnt_diff#124 ASC NULLS FIRST], [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
+(132) TakeOrderedAndProject
+Input [10]: [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
+Arguments: 100, [sales_cnt_diff#129 ASC NULLS FIRST], [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (138)
-+- * ColumnarToRow (137)
-   +- CometFilter (136)
-      +- CometScan parquet spark_catalog.default.date_dim (135)
+BroadcastExchange (136)
++- * ColumnarToRow (135)
+   +- CometFilter (134)
+      +- CometScan parquet spark_catalog.default.date_dim (133)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -736,14 +744,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(136) CometFilter
+(134) CometFilter
 Input [2]: [d_date_sk#13, d_year#14]
 Condition : ((isnotnull(d_year#14) AND (d_year#14 = 2002)) AND isnotnull(d_date_sk#13))
 
-(137) ColumnarToRow [codegen id : 1]
+(135) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#13, d_year#14]
 
-(138) BroadcastExchange
+(136) BroadcastExchange
 Input [2]: [d_date_sk#13, d_year#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=17]
 
@@ -751,33 +759,33 @@ Subquery:2 Hosting operator id = 24 Hosting Expression = ss_sold_date_sk#26 IN d
 
 Subquery:3 Hosting operator id = 43 Hosting Expression = ws_sold_date_sk#46 IN dynamicpruning#6
 
-Subquery:4 Hosting operator id = 73 Hosting Expression = cs_sold_date_sk#70 IN dynamicpruning#71
-BroadcastExchange (142)
-+- * ColumnarToRow (141)
-   +- CometFilter (140)
-      +- CometScan parquet spark_catalog.default.date_dim (139)
+Subquery:4 Hosting operator id = 72 Hosting Expression = cs_sold_date_sk#74 IN dynamicpruning#75
+BroadcastExchange (140)
++- * ColumnarToRow (139)
+   +- CometFilter (138)
+      +- CometScan parquet spark_catalog.default.date_dim (137)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#77, d_year#78]
+Output [2]: [d_date_sk#81, d_year#82]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(140) CometFilter
-Input [2]: [d_date_sk#77, d_year#78]
-Condition : ((isnotnull(d_year#78) AND (d_year#78 = 2001)) AND isnotnull(d_date_sk#77))
+(138) CometFilter
+Input [2]: [d_date_sk#81, d_year#82]
+Condition : ((isnotnull(d_year#82) AND (d_year#82 = 2001)) AND isnotnull(d_date_sk#81))
 
-(141) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#77, d_year#78]
+(139) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#81, d_year#82]
 
-(142) BroadcastExchange
-Input [2]: [d_date_sk#77, d_year#78]
+(140) BroadcastExchange
+Input [2]: [d_date_sk#81, d_year#82]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=18]
 
-Subquery:5 Hosting operator id = 89 Hosting Expression = ss_sold_date_sk#87 IN dynamicpruning#71
+Subquery:5 Hosting operator id = 88 Hosting Expression = ss_sold_date_sk#91 IN dynamicpruning#75
 
-Subquery:6 Hosting operator id = 105 Hosting Expression = ws_sold_date_sk#104 IN dynamicpruning#71
+Subquery:6 Hosting operator id = 104 Hosting Expression = ws_sold_date_sk#108 IN dynamicpruning#75
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt
index 153383e5d0..837398c8f1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q75/simplified.txt
@@ -1,185 +1,237 @@
 TakeOrderedAndProject [sales_cnt_diff,prev_year,year,i_brand_id,i_class_id,i_category_id,i_manufact_id,prev_yr_cnt,curr_yr_cnt,sales_amt_diff]
-  WholeStageCodegen (21)
+  WholeStageCodegen (45)
     Project [d_year,d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt,sales_amt,sales_amt]
       SortMergeJoin [i_brand_id,i_class_id,i_category_id,i_manufact_id,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt]
         InputAdapter
-          WholeStageCodegen (10)
-            ColumnarToRow
+          WholeStageCodegen (22)
+            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
               InputAdapter
-                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
-                    CometFilter [sales_cnt]
-                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
-                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
-                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
-                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  CometUnion
-                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                        CometSort [cs_order_number,cs_item_sk]
-                                          CometColumnarExchange [cs_order_number,cs_item_sk] #4
-                                            RowToColumnar
-                                              WholeStageCodegen (3)
-                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                        ColumnarToRow
+                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
+                  WholeStageCodegen (21)
+                    Filter [sales_cnt]
+                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
+                        InputAdapter
+                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
+                            WholeStageCodegen (20)
+                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
+                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  InputAdapter
+                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
+                                      WholeStageCodegen (19)
+                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                          InputAdapter
+                                            Union
+                                              WholeStageCodegen (6)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
+                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                    InputAdapter
+                                                      WholeStageCodegen (4)
+                                                        Sort [cs_order_number,cs_item_sk]
                                                           InputAdapter
-                                                            CometFilter [cs_item_sk]
-                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                  BroadcastExchange #5
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
+                                                            Exchange [cs_order_number,cs_item_sk] #4
+                                                              WholeStageCodegen (3)
+                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [cs_item_sk]
+                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                                  BroadcastExchange #5
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                         InputAdapter
-                                                                          CometFilter [d_year,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                        InputAdapter
-                                                          BroadcastExchange #6
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
+                                                                          BroadcastExchange #6
+                                                                            WholeStageCodegen (1)
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #5
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #5
-                                        CometSort [cr_order_number,cr_item_sk]
-                                          CometColumnarExchange [cr_order_number,cr_item_sk] #7
-                                            CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                              CometFilter [cr_order_number,cr_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
-                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                        CometSort [ss_ticket_number,ss_item_sk]
-                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #8
-                                            RowToColumnar
-                                              WholeStageCodegen (6)
-                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                      WholeStageCodegen (5)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ss_item_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [cr_order_number,cr_item_sk]
+                                                              CometExchange [cr_order_number,cr_item_sk] #7
+                                                                CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                                                  CometFilter [cr_order_number,cr_item_sk]
+                                                                    CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                              WholeStageCodegen (12)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
+                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #5
-                                        CometSort [sr_ticket_number,sr_item_sk]
-                                          CometColumnarExchange [sr_ticket_number,sr_item_sk] #9
-                                            CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                              CometFilter [sr_ticket_number,sr_item_sk]
-                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
-                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                        CometSort [ws_order_number,ws_item_sk]
-                                          CometColumnarExchange [ws_order_number,ws_item_sk] #10
-                                            RowToColumnar
-                                              WholeStageCodegen (9)
-                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                      WholeStageCodegen (10)
+                                                        Sort [ss_ticket_number,ss_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ss_ticket_number,ss_item_sk] #8
+                                                              WholeStageCodegen (9)
+                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                    InputAdapter
+                                                      WholeStageCodegen (11)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ws_item_sk]
-                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [sr_ticket_number,sr_item_sk]
+                                                              CometExchange [sr_ticket_number,sr_item_sk] #9
+                                                                CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                                                  CometFilter [sr_ticket_number,sr_item_sk]
+                                                                    CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                              WholeStageCodegen (18)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
+                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #5
-                                        CometSort [wr_order_number,wr_item_sk]
-                                          CometColumnarExchange [wr_order_number,wr_item_sk] #11
-                                            CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                              CometFilter [wr_order_number,wr_item_sk]
-                                                CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+                                                      WholeStageCodegen (16)
+                                                        Sort [ws_order_number,ws_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ws_order_number,ws_item_sk] #10
+                                                              WholeStageCodegen (15)
+                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ws_item_sk]
+                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                    InputAdapter
+                                                      WholeStageCodegen (17)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometSort [wr_order_number,wr_item_sk]
+                                                              CometExchange [wr_order_number,wr_item_sk] #11
+                                                                CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                                                  CometFilter [wr_order_number,wr_item_sk]
+                                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
         InputAdapter
-          WholeStageCodegen (20)
-            ColumnarToRow
+          WholeStageCodegen (44)
+            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
               InputAdapter
-                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
-                    CometFilter [sales_cnt]
-                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
-                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
-                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
-                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  CometUnion
-                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                        CometSort [cs_order_number,cs_item_sk]
-                                          CometColumnarExchange [cs_order_number,cs_item_sk] #15
-                                            RowToColumnar
-                                              WholeStageCodegen (13)
-                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                        ColumnarToRow
+                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
+                  WholeStageCodegen (43)
+                    Filter [sales_cnt]
+                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
+                        InputAdapter
+                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
+                            WholeStageCodegen (42)
+                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
+                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  InputAdapter
+                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
+                                      WholeStageCodegen (41)
+                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                          InputAdapter
+                                            Union
+                                              WholeStageCodegen (28)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
+                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                    InputAdapter
+                                                      WholeStageCodegen (26)
+                                                        Sort [cs_order_number,cs_item_sk]
                                                           InputAdapter
-                                                            CometFilter [cs_item_sk]
-                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #2
-                                                                  BroadcastExchange #16
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
+                                                            Exchange [cs_order_number,cs_item_sk] #15
+                                                              WholeStageCodegen (25)
+                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [cs_item_sk]
+                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #2
+                                                                                  BroadcastExchange #16
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                         InputAdapter
-                                                                          CometFilter [d_year,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #16
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #16
-                                        CometSort [cr_order_number,cr_item_sk]
-                                          ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
-                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                        CometSort [ss_ticket_number,ss_item_sk]
-                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #17
-                                            RowToColumnar
-                                              WholeStageCodegen (16)
-                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                      WholeStageCodegen (27)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ss_item_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #2
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [cr_order_number,cr_item_sk]
+                                                              ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
+                                              WholeStageCodegen (34)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
+                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                    InputAdapter
+                                                      WholeStageCodegen (32)
+                                                        Sort [ss_ticket_number,ss_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ss_ticket_number,ss_item_sk] #17
+                                                              WholeStageCodegen (31)
+                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #2
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #16
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #16
-                                        CometSort [sr_ticket_number,sr_item_sk]
-                                          ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
-                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                        CometSort [ws_order_number,ws_item_sk]
-                                          CometColumnarExchange [ws_order_number,ws_item_sk] #18
-                                            RowToColumnar
-                                              WholeStageCodegen (19)
-                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                      WholeStageCodegen (33)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ws_item_sk]
-                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #2
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [sr_ticket_number,sr_item_sk]
+                                                              ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
+                                              WholeStageCodegen (40)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
+                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #16
-                                        CometSort [wr_order_number,wr_item_sk]
-                                          ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
+                                                      WholeStageCodegen (38)
+                                                        Sort [ws_order_number,ws_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ws_order_number,ws_item_sk] #18
+                                                              WholeStageCodegen (37)
+                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ws_item_sk]
+                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #2
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #16
+                                                    InputAdapter
+                                                      WholeStageCodegen (39)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometSort [wr_order_number,wr_item_sk]
+                                                              ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt
index 3286597a34..459bc5c019 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/explain.txt
@@ -1,44 +1,42 @@
 == Physical Plan ==
-* ColumnarToRow (40)
-+- CometTakeOrderedAndProject (39)
-   +- CometHashAggregate (38)
-      +- CometColumnarExchange (37)
-         +- RowToColumnar (36)
-            +- * HashAggregate (35)
-               +- Union (34)
-                  :- * Project (15)
-                  :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :     :- * Project (9)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :     :     :- * ColumnarToRow (3)
-                  :     :     :  +- CometFilter (2)
-                  :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :     :     +- BroadcastExchange (7)
-                  :     :        +- * ColumnarToRow (6)
-                  :     :           +- CometFilter (5)
-                  :     :              +- CometScan parquet spark_catalog.default.item (4)
-                  :     +- BroadcastExchange (13)
-                  :        +- * ColumnarToRow (12)
-                  :           +- CometFilter (11)
-                  :              +- CometScan parquet spark_catalog.default.date_dim (10)
-                  :- * Project (24)
-                  :  +- * BroadcastHashJoin Inner BuildRight (23)
-                  :     :- * Project (21)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                  :     :     :- * ColumnarToRow (18)
-                  :     :     :  +- CometFilter (17)
-                  :     :     :     +- CometScan parquet spark_catalog.default.web_sales (16)
-                  :     :     +- ReusedExchange (19)
-                  :     +- ReusedExchange (22)
-                  +- * Project (33)
-                     +- * BroadcastHashJoin Inner BuildRight (32)
-                        :- * Project (30)
-                        :  +- * BroadcastHashJoin Inner BuildRight (29)
-                        :     :- * ColumnarToRow (27)
-                        :     :  +- CometFilter (26)
-                        :     :     +- CometScan parquet spark_catalog.default.catalog_sales (25)
-                        :     +- ReusedExchange (28)
-                        +- ReusedExchange (31)
+TakeOrderedAndProject (38)
++- * HashAggregate (37)
+   +- Exchange (36)
+      +- * HashAggregate (35)
+         +- Union (34)
+            :- * Project (15)
+            :  +- * BroadcastHashJoin Inner BuildRight (14)
+            :     :- * Project (9)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+            :     :     :- * ColumnarToRow (3)
+            :     :     :  +- CometFilter (2)
+            :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :     :     +- BroadcastExchange (7)
+            :     :        +- * ColumnarToRow (6)
+            :     :           +- CometFilter (5)
+            :     :              +- CometScan parquet spark_catalog.default.item (4)
+            :     +- BroadcastExchange (13)
+            :        +- * ColumnarToRow (12)
+            :           +- CometFilter (11)
+            :              +- CometScan parquet spark_catalog.default.date_dim (10)
+            :- * Project (24)
+            :  +- * BroadcastHashJoin Inner BuildRight (23)
+            :     :- * Project (21)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+            :     :     :- * ColumnarToRow (18)
+            :     :     :  +- CometFilter (17)
+            :     :     :     +- CometScan parquet spark_catalog.default.web_sales (16)
+            :     :     +- ReusedExchange (19)
+            :     +- ReusedExchange (22)
+            +- * Project (33)
+               +- * BroadcastHashJoin Inner BuildRight (32)
+                  :- * Project (30)
+                  :  +- * BroadcastHashJoin Inner BuildRight (29)
+                  :     :- * ColumnarToRow (27)
+                  :     :  +- CometFilter (26)
+                  :     :     +- CometScan parquet spark_catalog.default.catalog_sales (25)
+                  :     +- ReusedExchange (28)
+                  +- ReusedExchange (31)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -203,22 +201,18 @@ Functions [2]: [partial_count(1), partial_sum(UnscaledValue(ext_sales_price#12))
 Aggregate Attributes [2]: [count#37, sum#38]
 Results [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
 
-(36) RowToColumnar
+(36) Exchange
 Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
+Arguments: hashpartitioning(channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(37) CometColumnarExchange
-Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
-Arguments: hashpartitioning(channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(38) CometHashAggregate
+(37) HashAggregate [codegen id : 11]
 Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count#39, sum#40]
 Keys [5]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6]
 Functions [2]: [count(1), sum(UnscaledValue(ext_sales_price#12))]
+Aggregate Attributes [2]: [count(1)#41, sum(UnscaledValue(ext_sales_price#12))#42]
+Results [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, count(1)#41 AS sales_cnt#43, MakeDecimal(sum(UnscaledValue(ext_sales_price#12))#42,17,2) AS sales_amt#44]
 
-(39) CometTakeOrderedAndProject
-Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#41, sales_amt#42]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#10 ASC NULLS FIRST,col_name#11 ASC NULLS FIRST,d_year#8 ASC NULLS FIRST,d_qoy#9 ASC NULLS FIRST,i_category#6 ASC NULLS FIRST], output=[channel#10,col_name#11,d_year#8,d_qoy#9,i_category#6,sales_cnt#41,sales_amt#42]), 100, [channel#10 ASC NULLS FIRST, col_name#11 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#9 ASC NULLS FIRST, i_category#6 ASC NULLS FIRST], [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#41, sales_amt#42]
-
-(40) ColumnarToRow [codegen id : 11]
-Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#41, sales_amt#42]
+(38) TakeOrderedAndProject
+Input [7]: [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#43, sales_amt#44]
+Arguments: 100, [channel#10 ASC NULLS FIRST, col_name#11 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#9 ASC NULLS FIRST, i_category#6 ASC NULLS FIRST], [channel#10, col_name#11, d_year#8, d_qoy#9, i_category#6, sales_cnt#43, sales_amt#44]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt
index 8cd2591c7b..73e6b09afe 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q76/simplified.txt
@@ -1,60 +1,58 @@
-WholeStageCodegen (11)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,col_name,d_year,d_qoy,i_category,sales_cnt,sales_amt]
-        CometHashAggregate [channel,col_name,d_year,d_qoy,i_category,count,sum]
-          CometColumnarExchange [channel,col_name,d_year,d_qoy,i_category] #1
-            RowToColumnar
-              WholeStageCodegen (10)
-                HashAggregate [channel,col_name,d_year,d_qoy,i_category,ext_sales_price] [count,sum,count,sum]
-                  InputAdapter
-                    Union
-                      WholeStageCodegen (3)
-                        Project [ss_store_sk,d_year,d_qoy,i_category,ss_ext_sales_price]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ss_store_sk,ss_ext_sales_price,ss_sold_date_sk,i_category]
-                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ss_store_sk,ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
+TakeOrderedAndProject [channel,col_name,d_year,d_qoy,i_category,sales_cnt,sales_amt]
+  WholeStageCodegen (11)
+    HashAggregate [channel,col_name,d_year,d_qoy,i_category,count,sum] [count(1),sum(UnscaledValue(ext_sales_price)),sales_cnt,sales_amt,count,sum]
+      InputAdapter
+        Exchange [channel,col_name,d_year,d_qoy,i_category] #1
+          WholeStageCodegen (10)
+            HashAggregate [channel,col_name,d_year,d_qoy,i_category,ext_sales_price] [count,sum,count,sum]
+              InputAdapter
+                Union
+                  WholeStageCodegen (3)
+                    Project [ss_store_sk,d_year,d_qoy,i_category,ss_ext_sales_price]
+                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                        Project [ss_store_sk,ss_ext_sales_price,ss_sold_date_sk,i_category]
+                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ss_store_sk,ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_sold_date_sk]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
+                              BroadcastExchange #2
+                                WholeStageCodegen (1)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [d_date_sk]
-                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                      WholeStageCodegen (6)
-                        Project [ws_ship_customer_sk,d_year,d_qoy,i_category,ws_ext_sales_price]
-                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                            Project [ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk,i_category]
-                              BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ws_ship_customer_sk,ws_item_sk]
-                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk]
+                                      CometFilter [i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_category]
+                        InputAdapter
+                          BroadcastExchange #3
+                            WholeStageCodegen (2)
+                              ColumnarToRow
                                 InputAdapter
-                                  ReusedExchange [i_item_sk,i_category] #2
+                                  CometFilter [d_date_sk]
+                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                  WholeStageCodegen (6)
+                    Project [ws_ship_customer_sk,d_year,d_qoy,i_category,ws_ext_sales_price]
+                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                        Project [ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk,i_category]
+                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ws_ship_customer_sk,ws_item_sk]
+                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ship_customer_sk,ws_ext_sales_price,ws_sold_date_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
-                      WholeStageCodegen (9)
-                        Project [cs_ship_addr_sk,d_year,d_qoy,i_category,cs_ext_sales_price]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_ship_addr_sk,cs_ext_sales_price,cs_sold_date_sk,i_category]
-                              BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [cs_ship_addr_sk,cs_item_sk]
-                                      CometScan parquet spark_catalog.default.catalog_sales [cs_ship_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
-                                InputAdapter
-                                  ReusedExchange [i_item_sk,i_category] #2
+                              ReusedExchange [i_item_sk,i_category] #2
+                        InputAdapter
+                          ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                  WholeStageCodegen (9)
+                    Project [cs_ship_addr_sk,d_year,d_qoy,i_category,cs_ext_sales_price]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_ship_addr_sk,cs_ext_sales_price,cs_sold_date_sk,i_category]
+                          BroadcastHashJoin [cs_item_sk,i_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [cs_ship_addr_sk,cs_item_sk]
+                                  CometScan parquet spark_catalog.default.catalog_sales [cs_ship_addr_sk,cs_item_sk,cs_ext_sales_price,cs_sold_date_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk,d_year,d_qoy] #3
+                              ReusedExchange [i_item_sk,i_category] #2
+                        InputAdapter
+                          ReusedExchange [d_date_sk,d_year,d_qoy] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt
index 2b95b83f04..692db69b81 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/explain.txt
@@ -1,103 +1,89 @@
 == Physical Plan ==
-* ColumnarToRow (99)
-+- CometTakeOrderedAndProject (98)
-   +- CometHashAggregate (97)
-      +- CometColumnarExchange (96)
-         +- RowToColumnar (95)
-            +- * HashAggregate (94)
-               +- * Expand (93)
-                  +- Union (92)
-                     :- * Project (34)
-                     :  +- * BroadcastHashJoin LeftOuter BuildRight (33)
-                     :     :- * ColumnarToRow (17)
-                     :     :  +- CometHashAggregate (16)
-                     :     :     +- CometColumnarExchange (15)
-                     :     :        +- RowToColumnar (14)
-                     :     :           +- * HashAggregate (13)
-                     :     :              +- * Project (12)
-                     :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
-                     :     :                    :- * Project (6)
-                     :     :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-                     :     :                    :     :- * ColumnarToRow (3)
-                     :     :                    :     :  +- CometFilter (2)
-                     :     :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :                    :     +- ReusedExchange (4)
-                     :     :                    +- BroadcastExchange (10)
-                     :     :                       +- * ColumnarToRow (9)
-                     :     :                          +- CometFilter (8)
-                     :     :                             +- CometScan parquet spark_catalog.default.store (7)
-                     :     +- BroadcastExchange (32)
-                     :        +- * ColumnarToRow (31)
-                     :           +- CometHashAggregate (30)
-                     :              +- CometColumnarExchange (29)
-                     :                 +- RowToColumnar (28)
-                     :                    +- * HashAggregate (27)
-                     :                       +- * Project (26)
-                     :                          +- * BroadcastHashJoin Inner BuildRight (25)
-                     :                             :- * Project (23)
-                     :                             :  +- * BroadcastHashJoin Inner BuildRight (22)
-                     :                             :     :- * ColumnarToRow (20)
-                     :                             :     :  +- CometFilter (19)
-                     :                             :     :     +- CometScan parquet spark_catalog.default.store_returns (18)
-                     :                             :     +- ReusedExchange (21)
-                     :                             +- ReusedExchange (24)
-                     :- * Project (57)
-                     :  +- * BroadcastNestedLoopJoin Inner BuildLeft (56)
-                     :     :- BroadcastExchange (45)
-                     :     :  +- * ColumnarToRow (44)
-                     :     :     +- CometHashAggregate (43)
-                     :     :        +- CometColumnarExchange (42)
-                     :     :           +- RowToColumnar (41)
-                     :     :              +- * HashAggregate (40)
-                     :     :                 +- * Project (39)
-                     :     :                    +- * BroadcastHashJoin Inner BuildRight (38)
-                     :     :                       :- * ColumnarToRow (36)
-                     :     :                       :  +- CometScan parquet spark_catalog.default.catalog_sales (35)
-                     :     :                       +- ReusedExchange (37)
-                     :     +- * ColumnarToRow (55)
-                     :        +- CometHashAggregate (54)
-                     :           +- CometColumnarExchange (53)
-                     :              +- RowToColumnar (52)
-                     :                 +- * HashAggregate (51)
-                     :                    +- * Project (50)
-                     :                       +- * BroadcastHashJoin Inner BuildRight (49)
-                     :                          :- * ColumnarToRow (47)
-                     :                          :  +- CometScan parquet spark_catalog.default.catalog_returns (46)
-                     :                          +- ReusedExchange (48)
-                     +- * Project (91)
-                        +- * BroadcastHashJoin LeftOuter BuildRight (90)
-                           :- * ColumnarToRow (74)
-                           :  +- CometHashAggregate (73)
-                           :     +- CometColumnarExchange (72)
-                           :        +- RowToColumnar (71)
-                           :           +- * HashAggregate (70)
-                           :              +- * Project (69)
-                           :                 +- * BroadcastHashJoin Inner BuildRight (68)
-                           :                    :- * Project (63)
-                           :                    :  +- * BroadcastHashJoin Inner BuildRight (62)
-                           :                    :     :- * ColumnarToRow (60)
-                           :                    :     :  +- CometFilter (59)
-                           :                    :     :     +- CometScan parquet spark_catalog.default.web_sales (58)
-                           :                    :     +- ReusedExchange (61)
-                           :                    +- BroadcastExchange (67)
-                           :                       +- * ColumnarToRow (66)
-                           :                          +- CometFilter (65)
-                           :                             +- CometScan parquet spark_catalog.default.web_page (64)
-                           +- BroadcastExchange (89)
-                              +- * ColumnarToRow (88)
-                                 +- CometHashAggregate (87)
-                                    +- CometColumnarExchange (86)
-                                       +- RowToColumnar (85)
-                                          +- * HashAggregate (84)
-                                             +- * Project (83)
-                                                +- * BroadcastHashJoin Inner BuildRight (82)
-                                                   :- * Project (80)
-                                                   :  +- * BroadcastHashJoin Inner BuildRight (79)
-                                                   :     :- * ColumnarToRow (77)
-                                                   :     :  +- CometFilter (76)
-                                                   :     :     +- CometScan parquet spark_catalog.default.web_returns (75)
-                                                   :     +- ReusedExchange (78)
-                                                   +- ReusedExchange (81)
+TakeOrderedAndProject (85)
++- * HashAggregate (84)
+   +- Exchange (83)
+      +- * HashAggregate (82)
+         +- * Expand (81)
+            +- Union (80)
+               :- * Project (30)
+               :  +- * BroadcastHashJoin LeftOuter BuildRight (29)
+               :     :- * HashAggregate (15)
+               :     :  +- Exchange (14)
+               :     :     +- * HashAggregate (13)
+               :     :        +- * Project (12)
+               :     :           +- * BroadcastHashJoin Inner BuildRight (11)
+               :     :              :- * Project (6)
+               :     :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :     :              :     :- * ColumnarToRow (3)
+               :     :              :     :  +- CometFilter (2)
+               :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :              :     +- ReusedExchange (4)
+               :     :              +- BroadcastExchange (10)
+               :     :                 +- * ColumnarToRow (9)
+               :     :                    +- CometFilter (8)
+               :     :                       +- CometScan parquet spark_catalog.default.store (7)
+               :     +- BroadcastExchange (28)
+               :        +- * HashAggregate (27)
+               :           +- Exchange (26)
+               :              +- * HashAggregate (25)
+               :                 +- * Project (24)
+               :                    +- * BroadcastHashJoin Inner BuildRight (23)
+               :                       :- * Project (21)
+               :                       :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :                       :     :- * ColumnarToRow (18)
+               :                       :     :  +- CometFilter (17)
+               :                       :     :     +- CometScan parquet spark_catalog.default.store_returns (16)
+               :                       :     +- ReusedExchange (19)
+               :                       +- ReusedExchange (22)
+               :- * Project (49)
+               :  +- * BroadcastNestedLoopJoin Inner BuildLeft (48)
+               :     :- BroadcastExchange (39)
+               :     :  +- * HashAggregate (38)
+               :     :     +- Exchange (37)
+               :     :        +- * HashAggregate (36)
+               :     :           +- * Project (35)
+               :     :              +- * BroadcastHashJoin Inner BuildRight (34)
+               :     :                 :- * ColumnarToRow (32)
+               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (31)
+               :     :                 +- ReusedExchange (33)
+               :     +- * HashAggregate (47)
+               :        +- Exchange (46)
+               :           +- * HashAggregate (45)
+               :              +- * Project (44)
+               :                 +- * BroadcastHashJoin Inner BuildRight (43)
+               :                    :- * ColumnarToRow (41)
+               :                    :  +- CometScan parquet spark_catalog.default.catalog_returns (40)
+               :                    +- ReusedExchange (42)
+               +- * Project (79)
+                  +- * BroadcastHashJoin LeftOuter BuildRight (78)
+                     :- * HashAggregate (64)
+                     :  +- Exchange (63)
+                     :     +- * HashAggregate (62)
+                     :        +- * Project (61)
+                     :           +- * BroadcastHashJoin Inner BuildRight (60)
+                     :              :- * Project (55)
+                     :              :  +- * BroadcastHashJoin Inner BuildRight (54)
+                     :              :     :- * ColumnarToRow (52)
+                     :              :     :  +- CometFilter (51)
+                     :              :     :     +- CometScan parquet spark_catalog.default.web_sales (50)
+                     :              :     +- ReusedExchange (53)
+                     :              +- BroadcastExchange (59)
+                     :                 +- * ColumnarToRow (58)
+                     :                    +- CometFilter (57)
+                     :                       +- CometScan parquet spark_catalog.default.web_page (56)
+                     +- BroadcastExchange (77)
+                        +- * HashAggregate (76)
+                           +- Exchange (75)
+                              +- * HashAggregate (74)
+                                 +- * Project (73)
+                                    +- * BroadcastHashJoin Inner BuildRight (72)
+                                       :- * Project (70)
+                                       :  +- * BroadcastHashJoin Inner BuildRight (69)
+                                       :     :- * ColumnarToRow (67)
+                                       :     :  +- CometFilter (66)
+                                       :     :     +- CometScan parquet spark_catalog.default.web_returns (65)
+                                       :     +- ReusedExchange (68)
+                                       +- ReusedExchange (71)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -115,7 +101,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [ss_store_sk#1, ss_ext_sales_price#2, ss_net_profit#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 104]
+(4) ReusedExchange [Reuses operator id: 90]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -163,427 +149,399 @@ Functions [2]: [partial_sum(UnscaledValue(ss_ext_sales_price#2)), partial_sum(Un
 Aggregate Attributes [2]: [sum#8, sum#9]
 Results [3]: [s_store_sk#7, sum#10, sum#11]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [s_store_sk#7, sum#10, sum#11]
+Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [s_store_sk#7, sum#10, sum#11]
-Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 8]
 Input [3]: [s_store_sk#7, sum#10, sum#11]
 Keys [1]: [s_store_sk#7]
 Functions [2]: [sum(UnscaledValue(ss_ext_sales_price#2)), sum(UnscaledValue(ss_net_profit#3))]
-
-(17) ColumnarToRow [codegen id : 8]
-Input [3]: [s_store_sk#7, sales#12, profit#13]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_ext_sales_price#2))#12, sum(UnscaledValue(ss_net_profit#3))#13]
+Results [3]: [s_store_sk#7, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#12,17,2) AS sales#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#3))#13,17,2) AS profit#15]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
+Output [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(sr_returned_date_sk#17), dynamicpruningexpression(sr_returned_date_sk#17 IN dynamicpruning#18)]
+PartitionFilters: [isnotnull(sr_returned_date_sk#19), dynamicpruningexpression(sr_returned_date_sk#19 IN dynamicpruning#20)]
 PushedFilters: [IsNotNull(sr_store_sk)]
 ReadSchema: struct<sr_store_sk:int,sr_return_amt:decimal(7,2),sr_net_loss:decimal(7,2)>
 
-(19) CometFilter
-Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
-Condition : isnotnull(sr_store_sk#14)
+(17) CometFilter
+Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
+Condition : isnotnull(sr_store_sk#16)
 
-(20) ColumnarToRow [codegen id : 6]
-Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
+(18) ColumnarToRow [codegen id : 6]
+Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
 
-(21) ReusedExchange [Reuses operator id: 104]
-Output [1]: [d_date_sk#19]
+(19) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#21]
 
-(22) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_returned_date_sk#17]
-Right keys [1]: [d_date_sk#19]
+(20) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_returned_date_sk#19]
+Right keys [1]: [d_date_sk#21]
 Join type: Inner
 Join condition: None
 
-(23) Project [codegen id : 6]
-Output [3]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16]
-Input [5]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17, d_date_sk#19]
+(21) Project [codegen id : 6]
+Output [3]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18]
+Input [5]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19, d_date_sk#21]
 
-(24) ReusedExchange [Reuses operator id: 10]
-Output [1]: [s_store_sk#20]
+(22) ReusedExchange [Reuses operator id: 10]
+Output [1]: [s_store_sk#22]
 
-(25) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_store_sk#14]
-Right keys [1]: [s_store_sk#20]
+(23) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_store_sk#16]
+Right keys [1]: [s_store_sk#22]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
-Output [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
-Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
-
-(27) HashAggregate [codegen id : 6]
-Input [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
-Keys [1]: [s_store_sk#20]
-Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#15)), partial_sum(UnscaledValue(sr_net_loss#16))]
-Aggregate Attributes [2]: [sum#21, sum#22]
-Results [3]: [s_store_sk#20, sum#23, sum#24]
-
-(28) RowToColumnar
-Input [3]: [s_store_sk#20, sum#23, sum#24]
-
-(29) CometColumnarExchange
-Input [3]: [s_store_sk#20, sum#23, sum#24]
-Arguments: hashpartitioning(s_store_sk#20, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
-Input [3]: [s_store_sk#20, sum#23, sum#24]
-Keys [1]: [s_store_sk#20]
-Functions [2]: [sum(UnscaledValue(sr_return_amt#15)), sum(UnscaledValue(sr_net_loss#16))]
-
-(31) ColumnarToRow [codegen id : 7]
-Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
-
-(32) BroadcastExchange
-Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
+(24) Project [codegen id : 6]
+Output [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
+Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
+
+(25) HashAggregate [codegen id : 6]
+Input [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
+Keys [1]: [s_store_sk#22]
+Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#17)), partial_sum(UnscaledValue(sr_net_loss#18))]
+Aggregate Attributes [2]: [sum#23, sum#24]
+Results [3]: [s_store_sk#22, sum#25, sum#26]
+
+(26) Exchange
+Input [3]: [s_store_sk#22, sum#25, sum#26]
+Arguments: hashpartitioning(s_store_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+
+(27) HashAggregate [codegen id : 7]
+Input [3]: [s_store_sk#22, sum#25, sum#26]
+Keys [1]: [s_store_sk#22]
+Functions [2]: [sum(UnscaledValue(sr_return_amt#17)), sum(UnscaledValue(sr_net_loss#18))]
+Aggregate Attributes [2]: [sum(UnscaledValue(sr_return_amt#17))#27, sum(UnscaledValue(sr_net_loss#18))#28]
+Results [3]: [s_store_sk#22, MakeDecimal(sum(UnscaledValue(sr_return_amt#17))#27,17,2) AS returns#29, MakeDecimal(sum(UnscaledValue(sr_net_loss#18))#28,17,2) AS profit_loss#30]
+
+(28) BroadcastExchange
+Input [3]: [s_store_sk#22, returns#29, profit_loss#30]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 8]
+(29) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [s_store_sk#7]
-Right keys [1]: [s_store_sk#20]
+Right keys [1]: [s_store_sk#22]
 Join type: LeftOuter
 Join condition: None
 
-(34) Project [codegen id : 8]
-Output [5]: [sales#12, coalesce(returns#25, 0.00) AS returns#27, (profit#13 - coalesce(profit_loss#26, 0.00)) AS profit#28, store channel AS channel#29, s_store_sk#7 AS id#30]
-Input [6]: [s_store_sk#7, sales#12, profit#13, s_store_sk#20, returns#25, profit_loss#26]
+(30) Project [codegen id : 8]
+Output [5]: [sales#14, coalesce(returns#29, 0.00) AS returns#31, (profit#15 - coalesce(profit_loss#30, 0.00)) AS profit#32, store channel AS channel#33, s_store_sk#7 AS id#34]
+Input [6]: [s_store_sk#7, sales#14, profit#15, s_store_sk#22, returns#29, profit_loss#30]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
+Output [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#34), dynamicpruningexpression(cs_sold_date_sk#34 IN dynamicpruning#35)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#38), dynamicpruningexpression(cs_sold_date_sk#38 IN dynamicpruning#39)]
 ReadSchema: struct<cs_call_center_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(36) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
+(32) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
 
-(37) ReusedExchange [Reuses operator id: 104]
-Output [1]: [d_date_sk#36]
+(33) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#40]
 
-(38) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#34]
-Right keys [1]: [d_date_sk#36]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#38]
+Right keys [1]: [d_date_sk#40]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 10]
-Output [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
-Input [5]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34, d_date_sk#36]
-
-(40) HashAggregate [codegen id : 10]
-Input [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
-Keys [1]: [cs_call_center_sk#31]
-Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#32)), partial_sum(UnscaledValue(cs_net_profit#33))]
-Aggregate Attributes [2]: [sum#37, sum#38]
-Results [3]: [cs_call_center_sk#31, sum#39, sum#40]
-
-(41) RowToColumnar
-Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
-
-(42) CometColumnarExchange
-Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
-Arguments: hashpartitioning(cs_call_center_sk#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(43) CometHashAggregate
-Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
-Keys [1]: [cs_call_center_sk#31]
-Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#32)), sum(UnscaledValue(cs_net_profit#33))]
-
-(44) ColumnarToRow [codegen id : 11]
-Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
-
-(45) BroadcastExchange
-Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
+(35) Project [codegen id : 10]
+Output [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
+Input [5]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38, d_date_sk#40]
+
+(36) HashAggregate [codegen id : 10]
+Input [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
+Keys [1]: [cs_call_center_sk#35]
+Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#36)), partial_sum(UnscaledValue(cs_net_profit#37))]
+Aggregate Attributes [2]: [sum#41, sum#42]
+Results [3]: [cs_call_center_sk#35, sum#43, sum#44]
+
+(37) Exchange
+Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
+Arguments: hashpartitioning(cs_call_center_sk#35, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(38) HashAggregate [codegen id : 11]
+Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
+Keys [1]: [cs_call_center_sk#35]
+Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#36)), sum(UnscaledValue(cs_net_profit#37))]
+Aggregate Attributes [2]: [sum(UnscaledValue(cs_ext_sales_price#36))#45, sum(UnscaledValue(cs_net_profit#37))#46]
+Results [3]: [cs_call_center_sk#35, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#36))#45,17,2) AS sales#47, MakeDecimal(sum(UnscaledValue(cs_net_profit#37))#46,17,2) AS profit#48]
+
+(39) BroadcastExchange
+Input [3]: [cs_call_center_sk#35, sales#47, profit#48]
 Arguments: IdentityBroadcastMode, [plan_id=6]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
+Output [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#45), dynamicpruningexpression(cr_returned_date_sk#45 IN dynamicpruning#46)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#51), dynamicpruningexpression(cr_returned_date_sk#51 IN dynamicpruning#52)]
 ReadSchema: struct<cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(47) ColumnarToRow [codegen id : 13]
-Input [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
+(41) ColumnarToRow [codegen id : 13]
+Input [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 
-(48) ReusedExchange [Reuses operator id: 104]
-Output [1]: [d_date_sk#47]
+(42) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#53]
 
-(49) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cr_returned_date_sk#45]
-Right keys [1]: [d_date_sk#47]
+(43) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cr_returned_date_sk#51]
+Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 13]
-Output [2]: [cr_return_amount#43, cr_net_loss#44]
-Input [4]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45, d_date_sk#47]
+(44) Project [codegen id : 13]
+Output [2]: [cr_return_amount#49, cr_net_loss#50]
+Input [4]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51, d_date_sk#53]
 
-(51) HashAggregate [codegen id : 13]
-Input [2]: [cr_return_amount#43, cr_net_loss#44]
+(45) HashAggregate [codegen id : 13]
+Input [2]: [cr_return_amount#49, cr_net_loss#50]
 Keys: []
-Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#43)), partial_sum(UnscaledValue(cr_net_loss#44))]
-Aggregate Attributes [2]: [sum#48, sum#49]
-Results [2]: [sum#50, sum#51]
-
-(52) RowToColumnar
-Input [2]: [sum#50, sum#51]
+Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#49)), partial_sum(UnscaledValue(cr_net_loss#50))]
+Aggregate Attributes [2]: [sum#54, sum#55]
+Results [2]: [sum#56, sum#57]
 
-(53) CometColumnarExchange
-Input [2]: [sum#50, sum#51]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(46) Exchange
+Input [2]: [sum#56, sum#57]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(54) CometHashAggregate
-Input [2]: [sum#50, sum#51]
+(47) HashAggregate
+Input [2]: [sum#56, sum#57]
 Keys: []
-Functions [2]: [sum(UnscaledValue(cr_return_amount#43)), sum(UnscaledValue(cr_net_loss#44))]
+Functions [2]: [sum(UnscaledValue(cr_return_amount#49)), sum(UnscaledValue(cr_net_loss#50))]
+Aggregate Attributes [2]: [sum(UnscaledValue(cr_return_amount#49))#58, sum(UnscaledValue(cr_net_loss#50))#59]
+Results [2]: [MakeDecimal(sum(UnscaledValue(cr_return_amount#49))#58,17,2) AS returns#60, MakeDecimal(sum(UnscaledValue(cr_net_loss#50))#59,17,2) AS profit_loss#61]
 
-(55) ColumnarToRow
-Input [2]: [returns#52, profit_loss#53]
-
-(56) BroadcastNestedLoopJoin [codegen id : 14]
+(48) BroadcastNestedLoopJoin [codegen id : 14]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 14]
-Output [5]: [sales#41, returns#52, (profit#42 - profit_loss#53) AS profit#54, catalog channel AS channel#55, cs_call_center_sk#31 AS id#56]
-Input [5]: [cs_call_center_sk#31, sales#41, profit#42, returns#52, profit_loss#53]
+(49) Project [codegen id : 14]
+Output [5]: [sales#47, returns#60, (profit#48 - profit_loss#61) AS profit#62, catalog channel AS channel#63, cs_call_center_sk#35 AS id#64]
+Input [5]: [cs_call_center_sk#35, sales#47, profit#48, returns#60, profit_loss#61]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
+Output [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#60), dynamicpruningexpression(ws_sold_date_sk#60 IN dynamicpruning#61)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#68), dynamicpruningexpression(ws_sold_date_sk#68 IN dynamicpruning#69)]
 PushedFilters: [IsNotNull(ws_web_page_sk)]
 ReadSchema: struct<ws_web_page_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(59) CometFilter
-Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
-Condition : isnotnull(ws_web_page_sk#57)
+(51) CometFilter
+Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
+Condition : isnotnull(ws_web_page_sk#65)
 
-(60) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
+(52) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
 
-(61) ReusedExchange [Reuses operator id: 104]
-Output [1]: [d_date_sk#62]
+(53) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#70]
 
-(62) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#60]
-Right keys [1]: [d_date_sk#62]
+(54) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#68]
+Right keys [1]: [d_date_sk#70]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 17]
-Output [3]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59]
-Input [5]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60, d_date_sk#62]
+(55) Project [codegen id : 17]
+Output [3]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67]
+Input [5]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68, d_date_sk#70]
 
 (unknown) Scan parquet spark_catalog.default.web_page
-Output [1]: [wp_web_page_sk#63]
+Output [1]: [wp_web_page_sk#71]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_page]
 PushedFilters: [IsNotNull(wp_web_page_sk)]
 ReadSchema: struct<wp_web_page_sk:int>
 
-(65) CometFilter
-Input [1]: [wp_web_page_sk#63]
-Condition : isnotnull(wp_web_page_sk#63)
+(57) CometFilter
+Input [1]: [wp_web_page_sk#71]
+Condition : isnotnull(wp_web_page_sk#71)
 
-(66) ColumnarToRow [codegen id : 16]
-Input [1]: [wp_web_page_sk#63]
+(58) ColumnarToRow [codegen id : 16]
+Input [1]: [wp_web_page_sk#71]
 
-(67) BroadcastExchange
-Input [1]: [wp_web_page_sk#63]
+(59) BroadcastExchange
+Input [1]: [wp_web_page_sk#71]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(68) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_web_page_sk#57]
-Right keys [1]: [wp_web_page_sk#63]
+(60) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_web_page_sk#65]
+Right keys [1]: [wp_web_page_sk#71]
 Join type: Inner
 Join condition: None
 
-(69) Project [codegen id : 17]
-Output [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
-Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
-
-(70) HashAggregate [codegen id : 17]
-Input [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
-Keys [1]: [wp_web_page_sk#63]
-Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#58)), partial_sum(UnscaledValue(ws_net_profit#59))]
-Aggregate Attributes [2]: [sum#64, sum#65]
-Results [3]: [wp_web_page_sk#63, sum#66, sum#67]
+(61) Project [codegen id : 17]
+Output [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
+Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
 
-(71) RowToColumnar
-Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
+(62) HashAggregate [codegen id : 17]
+Input [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
+Keys [1]: [wp_web_page_sk#71]
+Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#66)), partial_sum(UnscaledValue(ws_net_profit#67))]
+Aggregate Attributes [2]: [sum#72, sum#73]
+Results [3]: [wp_web_page_sk#71, sum#74, sum#75]
 
-(72) CometColumnarExchange
-Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
-Arguments: hashpartitioning(wp_web_page_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(63) Exchange
+Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
+Arguments: hashpartitioning(wp_web_page_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(73) CometHashAggregate
-Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
-Keys [1]: [wp_web_page_sk#63]
-Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#58)), sum(UnscaledValue(ws_net_profit#59))]
-
-(74) ColumnarToRow [codegen id : 22]
-Input [3]: [wp_web_page_sk#63, sales#68, profit#69]
+(64) HashAggregate [codegen id : 22]
+Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
+Keys [1]: [wp_web_page_sk#71]
+Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#66)), sum(UnscaledValue(ws_net_profit#67))]
+Aggregate Attributes [2]: [sum(UnscaledValue(ws_ext_sales_price#66))#76, sum(UnscaledValue(ws_net_profit#67))#77]
+Results [3]: [wp_web_page_sk#71, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#66))#76,17,2) AS sales#78, MakeDecimal(sum(UnscaledValue(ws_net_profit#67))#77,17,2) AS profit#79]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
+Output [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#73), dynamicpruningexpression(wr_returned_date_sk#73 IN dynamicpruning#74)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#83), dynamicpruningexpression(wr_returned_date_sk#83 IN dynamicpruning#84)]
 PushedFilters: [IsNotNull(wr_web_page_sk)]
 ReadSchema: struct<wr_web_page_sk:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(76) CometFilter
-Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
-Condition : isnotnull(wr_web_page_sk#70)
+(66) CometFilter
+Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
+Condition : isnotnull(wr_web_page_sk#80)
 
-(77) ColumnarToRow [codegen id : 20]
-Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
+(67) ColumnarToRow [codegen id : 20]
+Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
 
-(78) ReusedExchange [Reuses operator id: 104]
-Output [1]: [d_date_sk#75]
+(68) ReusedExchange [Reuses operator id: 90]
+Output [1]: [d_date_sk#85]
 
-(79) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_returned_date_sk#73]
-Right keys [1]: [d_date_sk#75]
+(69) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_returned_date_sk#83]
+Right keys [1]: [d_date_sk#85]
 Join type: Inner
 Join condition: None
 
-(80) Project [codegen id : 20]
-Output [3]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72]
-Input [5]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73, d_date_sk#75]
+(70) Project [codegen id : 20]
+Output [3]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82]
+Input [5]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83, d_date_sk#85]
 
-(81) ReusedExchange [Reuses operator id: 67]
-Output [1]: [wp_web_page_sk#76]
+(71) ReusedExchange [Reuses operator id: 59]
+Output [1]: [wp_web_page_sk#86]
 
-(82) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_web_page_sk#70]
-Right keys [1]: [wp_web_page_sk#76]
+(72) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_web_page_sk#80]
+Right keys [1]: [wp_web_page_sk#86]
 Join type: Inner
 Join condition: None
 
-(83) Project [codegen id : 20]
-Output [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
-Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
-
-(84) HashAggregate [codegen id : 20]
-Input [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
-Keys [1]: [wp_web_page_sk#76]
-Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#71)), partial_sum(UnscaledValue(wr_net_loss#72))]
-Aggregate Attributes [2]: [sum#77, sum#78]
-Results [3]: [wp_web_page_sk#76, sum#79, sum#80]
-
-(85) RowToColumnar
-Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
-
-(86) CometColumnarExchange
-Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
-Arguments: hashpartitioning(wp_web_page_sk#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(87) CometHashAggregate
-Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
-Keys [1]: [wp_web_page_sk#76]
-Functions [2]: [sum(UnscaledValue(wr_return_amt#71)), sum(UnscaledValue(wr_net_loss#72))]
-
-(88) ColumnarToRow [codegen id : 21]
-Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
-
-(89) BroadcastExchange
-Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
+(73) Project [codegen id : 20]
+Output [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
+Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
+
+(74) HashAggregate [codegen id : 20]
+Input [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
+Keys [1]: [wp_web_page_sk#86]
+Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#81)), partial_sum(UnscaledValue(wr_net_loss#82))]
+Aggregate Attributes [2]: [sum#87, sum#88]
+Results [3]: [wp_web_page_sk#86, sum#89, sum#90]
+
+(75) Exchange
+Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
+Arguments: hashpartitioning(wp_web_page_sk#86, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(76) HashAggregate [codegen id : 21]
+Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
+Keys [1]: [wp_web_page_sk#86]
+Functions [2]: [sum(UnscaledValue(wr_return_amt#81)), sum(UnscaledValue(wr_net_loss#82))]
+Aggregate Attributes [2]: [sum(UnscaledValue(wr_return_amt#81))#91, sum(UnscaledValue(wr_net_loss#82))#92]
+Results [3]: [wp_web_page_sk#86, MakeDecimal(sum(UnscaledValue(wr_return_amt#81))#91,17,2) AS returns#93, MakeDecimal(sum(UnscaledValue(wr_net_loss#82))#92,17,2) AS profit_loss#94]
+
+(77) BroadcastExchange
+Input [3]: [wp_web_page_sk#86, returns#93, profit_loss#94]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(90) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [wp_web_page_sk#63]
-Right keys [1]: [wp_web_page_sk#76]
+(78) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [wp_web_page_sk#71]
+Right keys [1]: [wp_web_page_sk#86]
 Join type: LeftOuter
 Join condition: None
 
-(91) Project [codegen id : 22]
-Output [5]: [sales#68, coalesce(returns#81, 0.00) AS returns#83, (profit#69 - coalesce(profit_loss#82, 0.00)) AS profit#84, web channel AS channel#85, wp_web_page_sk#63 AS id#86]
-Input [6]: [wp_web_page_sk#63, sales#68, profit#69, wp_web_page_sk#76, returns#81, profit_loss#82]
-
-(92) Union
-
-(93) Expand [codegen id : 23]
-Input [5]: [sales#12, returns#27, profit#28, channel#29, id#30]
-Arguments: [[sales#12, returns#27, profit#28, channel#29, id#30, 0], [sales#12, returns#27, profit#28, channel#29, null, 1], [sales#12, returns#27, profit#28, null, null, 3]], [sales#12, returns#27, profit#28, channel#87, id#88, spark_grouping_id#89]
+(79) Project [codegen id : 22]
+Output [5]: [sales#78, coalesce(returns#93, 0.00) AS returns#95, (profit#79 - coalesce(profit_loss#94, 0.00)) AS profit#96, web channel AS channel#97, wp_web_page_sk#71 AS id#98]
+Input [6]: [wp_web_page_sk#71, sales#78, profit#79, wp_web_page_sk#86, returns#93, profit_loss#94]
 
-(94) HashAggregate [codegen id : 23]
-Input [6]: [sales#12, returns#27, profit#28, channel#87, id#88, spark_grouping_id#89]
-Keys [3]: [channel#87, id#88, spark_grouping_id#89]
-Functions [3]: [partial_sum(sales#12), partial_sum(returns#27), partial_sum(profit#28)]
-Aggregate Attributes [6]: [sum#90, isEmpty#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
-Results [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
+(80) Union
 
-(95) RowToColumnar
-Input [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
+(81) Expand [codegen id : 23]
+Input [5]: [sales#14, returns#31, profit#32, channel#33, id#34]
+Arguments: [[sales#14, returns#31, profit#32, channel#33, id#34, 0], [sales#14, returns#31, profit#32, channel#33, null, 1], [sales#14, returns#31, profit#32, null, null, 3]], [sales#14, returns#31, profit#32, channel#99, id#100, spark_grouping_id#101]
 
-(96) CometColumnarExchange
-Input [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
-Arguments: hashpartitioning(channel#87, id#88, spark_grouping_id#89, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(82) HashAggregate [codegen id : 23]
+Input [6]: [sales#14, returns#31, profit#32, channel#99, id#100, spark_grouping_id#101]
+Keys [3]: [channel#99, id#100, spark_grouping_id#101]
+Functions [3]: [partial_sum(sales#14), partial_sum(returns#31), partial_sum(profit#32)]
+Aggregate Attributes [6]: [sum#102, isEmpty#103, sum#104, isEmpty#105, sum#106, isEmpty#107]
+Results [9]: [channel#99, id#100, spark_grouping_id#101, sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
 
-(97) CometHashAggregate
-Input [9]: [channel#87, id#88, spark_grouping_id#89, sum#96, isEmpty#97, sum#98, isEmpty#99, sum#100, isEmpty#101]
-Keys [3]: [channel#87, id#88, spark_grouping_id#89]
-Functions [3]: [sum(sales#12), sum(returns#27), sum(profit#28)]
+(83) Exchange
+Input [9]: [channel#99, id#100, spark_grouping_id#101, sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
+Arguments: hashpartitioning(channel#99, id#100, spark_grouping_id#101, 5), ENSURE_REQUIREMENTS, [plan_id=12]
 
-(98) CometTakeOrderedAndProject
-Input [5]: [channel#87, id#88, sales#102, returns#103, profit#104]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#87 ASC NULLS FIRST,id#88 ASC NULLS FIRST], output=[channel#87,id#88,sales#102,returns#103,profit#104]), 100, [channel#87 ASC NULLS FIRST, id#88 ASC NULLS FIRST], [channel#87, id#88, sales#102, returns#103, profit#104]
+(84) HashAggregate [codegen id : 24]
+Input [9]: [channel#99, id#100, spark_grouping_id#101, sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
+Keys [3]: [channel#99, id#100, spark_grouping_id#101]
+Functions [3]: [sum(sales#14), sum(returns#31), sum(profit#32)]
+Aggregate Attributes [3]: [sum(sales#14)#114, sum(returns#31)#115, sum(profit#32)#116]
+Results [5]: [channel#99, id#100, sum(sales#14)#114 AS sales#117, sum(returns#31)#115 AS returns#118, sum(profit#32)#116 AS profit#119]
 
-(99) ColumnarToRow [codegen id : 24]
-Input [5]: [channel#87, id#88, sales#102, returns#103, profit#104]
+(85) TakeOrderedAndProject
+Input [5]: [channel#99, id#100, sales#117, returns#118, profit#119]
+Arguments: 100, [channel#99 ASC NULLS FIRST, id#100 ASC NULLS FIRST], [channel#99, id#100, sales#117, returns#118, profit#119]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (104)
-+- * ColumnarToRow (103)
-   +- CometProject (102)
-      +- CometFilter (101)
-         +- CometScan parquet spark_catalog.default.date_dim (100)
+BroadcastExchange (90)
++- * ColumnarToRow (89)
+   +- CometProject (88)
+      +- CometFilter (87)
+         +- CometScan parquet spark_catalog.default.date_dim (86)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_date#105]
+Output [2]: [d_date_sk#6, d_date#120]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-03), LessThanOrEqual(d_date,2000-09-02), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(101) CometFilter
-Input [2]: [d_date_sk#6, d_date#105]
-Condition : (((isnotnull(d_date#105) AND (d_date#105 >= 2000-08-03)) AND (d_date#105 <= 2000-09-02)) AND isnotnull(d_date_sk#6))
+(87) CometFilter
+Input [2]: [d_date_sk#6, d_date#120]
+Condition : (((isnotnull(d_date#120) AND (d_date#120 >= 2000-08-03)) AND (d_date#120 <= 2000-09-02)) AND isnotnull(d_date_sk#6))
 
-(102) CometProject
-Input [2]: [d_date_sk#6, d_date#105]
+(88) CometProject
+Input [2]: [d_date_sk#6, d_date#120]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(103) ColumnarToRow [codegen id : 1]
+(89) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(104) BroadcastExchange
+(90) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:2 Hosting operator id = 18 Hosting Expression = sr_returned_date_sk#17 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 16 Hosting Expression = sr_returned_date_sk#19 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 35 Hosting Expression = cs_sold_date_sk#34 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 31 Hosting Expression = cs_sold_date_sk#38 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 46 Hosting Expression = cr_returned_date_sk#45 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 40 Hosting Expression = cr_returned_date_sk#51 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 58 Hosting Expression = ws_sold_date_sk#60 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 50 Hosting Expression = ws_sold_date_sk#68 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 75 Hosting Expression = wr_returned_date_sk#73 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 65 Hosting Expression = wr_returned_date_sk#83 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt
index d8ada5be65..d6693067f0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q77/simplified.txt
@@ -1,157 +1,143 @@
-WholeStageCodegen (24)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
-        CometHashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-          CometColumnarExchange [channel,id,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (23)
-                HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  Expand [sales,returns,profit,channel,id]
-                    InputAdapter
-                      Union
-                        WholeStageCodegen (8)
-                          Project [sales,returns,profit,profit_loss,s_store_sk]
-                            BroadcastHashJoin [s_store_sk,s_store_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometHashAggregate [s_store_sk,sum,sum]
-                                    CometColumnarExchange [s_store_sk] #2
-                                      RowToColumnar
-                                        WholeStageCodegen (3)
-                                          HashAggregate [s_store_sk,ss_ext_sales_price,ss_net_profit] [sum,sum,sum,sum]
-                                            Project [ss_ext_sales_price,ss_net_profit,s_store_sk]
-                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                Project [ss_store_sk,ss_ext_sales_price,ss_net_profit]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [ss_store_sk]
-                                                          CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #1
-                                                              BroadcastExchange #3
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_date,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                    InputAdapter
-                                                      ReusedExchange [d_date_sk] #3
-                                                InputAdapter
-                                                  BroadcastExchange #4
-                                                    WholeStageCodegen (2)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [s_store_sk]
-                                                            CometScan parquet spark_catalog.default.store [s_store_sk]
-                              InputAdapter
-                                BroadcastExchange #5
-                                  WholeStageCodegen (7)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [s_store_sk,sum,sum]
-                                          CometColumnarExchange [s_store_sk] #6
-                                            RowToColumnar
-                                              WholeStageCodegen (6)
-                                                HashAggregate [s_store_sk,sr_return_amt,sr_net_loss] [sum,sum,sum,sum]
-                                                  Project [sr_return_amt,sr_net_loss,s_store_sk]
-                                                    BroadcastHashJoin [sr_store_sk,s_store_sk]
-                                                      Project [sr_store_sk,sr_return_amt,sr_net_loss]
-                                                        BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+TakeOrderedAndProject [channel,id,sales,returns,profit]
+  WholeStageCodegen (24)
+    HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+      InputAdapter
+        Exchange [channel,id,spark_grouping_id] #1
+          WholeStageCodegen (23)
+            HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+              Expand [sales,returns,profit,channel,id]
+                InputAdapter
+                  Union
+                    WholeStageCodegen (8)
+                      Project [sales,returns,profit,profit_loss,s_store_sk]
+                        BroadcastHashJoin [s_store_sk,s_store_sk]
+                          HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(UnscaledValue(ss_net_profit)),sales,profit,sum,sum]
+                            InputAdapter
+                              Exchange [s_store_sk] #2
+                                WholeStageCodegen (3)
+                                  HashAggregate [s_store_sk,ss_ext_sales_price,ss_net_profit] [sum,sum,sum,sum]
+                                    Project [ss_ext_sales_price,ss_net_profit,s_store_sk]
+                                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                        Project [ss_store_sk,ss_ext_sales_price,ss_net_profit]
+                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_store_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #3
+                                                        WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
-                                                              CometFilter [sr_store_sk]
-                                                                CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
-                                                                  ReusedSubquery [d_date_sk] #1
-                                                          InputAdapter
-                                                            ReusedExchange [d_date_sk] #3
-                                                      InputAdapter
-                                                        ReusedExchange [s_store_sk] #4
-                        WholeStageCodegen (14)
-                          Project [sales,returns,profit,profit_loss,cs_call_center_sk]
-                            BroadcastNestedLoopJoin
-                              InputAdapter
-                                BroadcastExchange #7
-                                  WholeStageCodegen (11)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [cs_call_center_sk,sum,sum]
-                                          CometColumnarExchange [cs_call_center_sk] #8
-                                            RowToColumnar
-                                              WholeStageCodegen (10)
-                                                HashAggregate [cs_call_center_sk,cs_ext_sales_price,cs_net_profit] [sum,sum,sum,sum]
-                                                  Project [cs_call_center_sk,cs_ext_sales_price,cs_net_profit]
-                                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_call_center_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
-                                                      InputAdapter
-                                                        ReusedExchange [d_date_sk] #3
-                              ColumnarToRow
-                                InputAdapter
-                                  CometHashAggregate [sum,sum]
-                                    CometColumnarExchange #9
-                                      RowToColumnar
-                                        WholeStageCodegen (13)
-                                          HashAggregate [cr_return_amount,cr_net_loss] [sum,sum,sum,sum]
-                                            Project [cr_return_amount,cr_net_loss]
-                                              BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometScan parquet spark_catalog.default.catalog_returns [cr_return_amount,cr_net_loss,cr_returned_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_date,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk] #3
+                                        InputAdapter
+                                          BroadcastExchange #4
+                                            WholeStageCodegen (2)
+                                              ColumnarToRow
                                                 InputAdapter
-                                                  ReusedExchange [d_date_sk] #3
-                        WholeStageCodegen (22)
-                          Project [sales,returns,profit,profit_loss,wp_web_page_sk]
-                            BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometHashAggregate [wp_web_page_sk,sum,sum]
-                                    CometColumnarExchange [wp_web_page_sk] #10
-                                      RowToColumnar
-                                        WholeStageCodegen (17)
-                                          HashAggregate [wp_web_page_sk,ws_ext_sales_price,ws_net_profit] [sum,sum,sum,sum]
-                                            Project [ws_ext_sales_price,ws_net_profit,wp_web_page_sk]
-                                              BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                                                Project [ws_web_page_sk,ws_ext_sales_price,ws_net_profit]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [ws_web_page_sk]
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_web_page_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #1
+                                                  CometFilter [s_store_sk]
+                                                    CometScan parquet spark_catalog.default.store [s_store_sk]
+                          InputAdapter
+                            BroadcastExchange #5
+                              WholeStageCodegen (7)
+                                HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(sr_return_amt)),sum(UnscaledValue(sr_net_loss)),returns,profit_loss,sum,sum]
+                                  InputAdapter
+                                    Exchange [s_store_sk] #6
+                                      WholeStageCodegen (6)
+                                        HashAggregate [s_store_sk,sr_return_amt,sr_net_loss] [sum,sum,sum,sum]
+                                          Project [sr_return_amt,sr_net_loss,s_store_sk]
+                                            BroadcastHashJoin [sr_store_sk,s_store_sk]
+                                              Project [sr_store_sk,sr_return_amt,sr_net_loss]
+                                                BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                                                  ColumnarToRow
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk] #3
+                                                      CometFilter [sr_store_sk]
+                                                        CometScan parquet spark_catalog.default.store_returns [sr_store_sk,sr_return_amt,sr_net_loss,sr_returned_date_sk]
+                                                          ReusedSubquery [d_date_sk] #1
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk] #3
+                                              InputAdapter
+                                                ReusedExchange [s_store_sk] #4
+                    WholeStageCodegen (14)
+                      Project [sales,returns,profit,profit_loss,cs_call_center_sk]
+                        BroadcastNestedLoopJoin
+                          InputAdapter
+                            BroadcastExchange #7
+                              WholeStageCodegen (11)
+                                HashAggregate [cs_call_center_sk,sum,sum] [sum(UnscaledValue(cs_ext_sales_price)),sum(UnscaledValue(cs_net_profit)),sales,profit,sum,sum]
+                                  InputAdapter
+                                    Exchange [cs_call_center_sk] #8
+                                      WholeStageCodegen (10)
+                                        HashAggregate [cs_call_center_sk,cs_ext_sales_price,cs_net_profit] [sum,sum,sum,sum]
+                                          Project [cs_call_center_sk,cs_ext_sales_price,cs_net_profit]
+                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                              ColumnarToRow
                                                 InputAdapter
-                                                  BroadcastExchange #11
-                                                    WholeStageCodegen (16)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [wp_web_page_sk]
-                                                            CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
-                              InputAdapter
-                                BroadcastExchange #12
-                                  WholeStageCodegen (21)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [wp_web_page_sk,sum,sum]
-                                          CometColumnarExchange [wp_web_page_sk] #13
-                                            RowToColumnar
-                                              WholeStageCodegen (20)
-                                                HashAggregate [wp_web_page_sk,wr_return_amt,wr_net_loss] [sum,sum,sum,sum]
-                                                  Project [wr_return_amt,wr_net_loss,wp_web_page_sk]
-                                                    BroadcastHashJoin [wr_web_page_sk,wp_web_page_sk]
-                                                      Project [wr_web_page_sk,wr_return_amt,wr_net_loss]
-                                                        BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [wr_web_page_sk]
-                                                                CometScan parquet spark_catalog.default.web_returns [wr_web_page_sk,wr_return_amt,wr_net_loss,wr_returned_date_sk]
-                                                                  ReusedSubquery [d_date_sk] #1
-                                                          InputAdapter
-                                                            ReusedExchange [d_date_sk] #3
-                                                      InputAdapter
-                                                        ReusedExchange [wp_web_page_sk] #11
+                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_call_center_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                              InputAdapter
+                                                ReusedExchange [d_date_sk] #3
+                          HashAggregate [sum,sum] [sum(UnscaledValue(cr_return_amount)),sum(UnscaledValue(cr_net_loss)),returns,profit_loss,sum,sum]
+                            InputAdapter
+                              Exchange #9
+                                WholeStageCodegen (13)
+                                  HashAggregate [cr_return_amount,cr_net_loss] [sum,sum,sum,sum]
+                                    Project [cr_return_amount,cr_net_loss]
+                                      BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.catalog_returns [cr_return_amount,cr_net_loss,cr_returned_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                    WholeStageCodegen (22)
+                      Project [sales,returns,profit,profit_loss,wp_web_page_sk]
+                        BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
+                          HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(ws_ext_sales_price)),sum(UnscaledValue(ws_net_profit)),sales,profit,sum,sum]
+                            InputAdapter
+                              Exchange [wp_web_page_sk] #10
+                                WholeStageCodegen (17)
+                                  HashAggregate [wp_web_page_sk,ws_ext_sales_price,ws_net_profit] [sum,sum,sum,sum]
+                                    Project [ws_ext_sales_price,ws_net_profit,wp_web_page_sk]
+                                      BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                                        Project [ws_web_page_sk,ws_ext_sales_price,ws_net_profit]
+                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ws_web_page_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_web_page_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                            InputAdapter
+                                              ReusedExchange [d_date_sk] #3
+                                        InputAdapter
+                                          BroadcastExchange #11
+                                            WholeStageCodegen (16)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [wp_web_page_sk]
+                                                    CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
+                          InputAdapter
+                            BroadcastExchange #12
+                              WholeStageCodegen (21)
+                                HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(wr_return_amt)),sum(UnscaledValue(wr_net_loss)),returns,profit_loss,sum,sum]
+                                  InputAdapter
+                                    Exchange [wp_web_page_sk] #13
+                                      WholeStageCodegen (20)
+                                        HashAggregate [wp_web_page_sk,wr_return_amt,wr_net_loss] [sum,sum,sum,sum]
+                                          Project [wr_return_amt,wr_net_loss,wp_web_page_sk]
+                                            BroadcastHashJoin [wr_web_page_sk,wp_web_page_sk]
+                                              Project [wr_web_page_sk,wr_return_amt,wr_net_loss]
+                                                BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [wr_web_page_sk]
+                                                        CometScan parquet spark_catalog.default.web_returns [wr_web_page_sk,wr_return_amt,wr_net_loss,wr_returned_date_sk]
+                                                          ReusedSubquery [d_date_sk] #1
+                                                  InputAdapter
+                                                    ReusedExchange [d_date_sk] #3
+                                              InputAdapter
+                                                ReusedExchange [wp_web_page_sk] #11
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt
index 79c2b2a5bd..caab92168f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/explain.txt
@@ -1,75 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (71)
-+- * Project (70)
-   +- * ColumnarToRow (69)
-      +- CometSortMergeJoin (68)
-         :- CometProject (45)
-         :  +- CometSortMergeJoin (44)
-         :     :- CometSort (21)
-         :     :  +- CometHashAggregate (20)
-         :     :     +- CometColumnarExchange (19)
-         :     :        +- RowToColumnar (18)
-         :     :           +- * HashAggregate (17)
-         :     :              +- * Project (16)
-         :     :                 +- * BroadcastHashJoin Inner BuildRight (15)
-         :     :                    :- * ColumnarToRow (13)
-         :     :                    :  +- CometProject (12)
-         :     :                    :     +- CometFilter (11)
-         :     :                    :        +- CometSortMergeJoin (10)
-         :     :                    :           :- CometSort (4)
-         :     :                    :           :  +- CometColumnarExchange (3)
-         :     :                    :           :     +- CometFilter (2)
-         :     :                    :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
-         :     :                    :           +- CometSort (9)
-         :     :                    :              +- CometColumnarExchange (8)
-         :     :                    :                 +- CometProject (7)
-         :     :                    :                    +- CometFilter (6)
-         :     :                    :                       +- CometScan parquet spark_catalog.default.store_returns (5)
-         :     :                    +- ReusedExchange (14)
-         :     +- CometSort (43)
-         :        +- CometFilter (42)
-         :           +- CometHashAggregate (41)
-         :              +- CometColumnarExchange (40)
-         :                 +- RowToColumnar (39)
-         :                    +- * HashAggregate (38)
-         :                       +- * Project (37)
-         :                          +- * BroadcastHashJoin Inner BuildRight (36)
-         :                             :- * ColumnarToRow (34)
-         :                             :  +- CometProject (33)
-         :                             :     +- CometFilter (32)
-         :                             :        +- CometSortMergeJoin (31)
-         :                             :           :- CometSort (25)
-         :                             :           :  +- CometColumnarExchange (24)
-         :                             :           :     +- CometFilter (23)
-         :                             :           :        +- CometScan parquet spark_catalog.default.web_sales (22)
-         :                             :           +- CometSort (30)
-         :                             :              +- CometColumnarExchange (29)
-         :                             :                 +- CometProject (28)
-         :                             :                    +- CometFilter (27)
-         :                             :                       +- CometScan parquet spark_catalog.default.web_returns (26)
-         :                             +- ReusedExchange (35)
-         +- CometSort (67)
-            +- CometFilter (66)
-               +- CometHashAggregate (65)
-                  +- CometColumnarExchange (64)
-                     +- RowToColumnar (63)
-                        +- * HashAggregate (62)
-                           +- * Project (61)
-                              +- * BroadcastHashJoin Inner BuildRight (60)
-                                 :- * ColumnarToRow (58)
-                                 :  +- CometProject (57)
-                                 :     +- CometFilter (56)
-                                 :        +- CometSortMergeJoin (55)
-                                 :           :- CometSort (49)
-                                 :           :  +- CometColumnarExchange (48)
-                                 :           :     +- CometFilter (47)
-                                 :           :        +- CometScan parquet spark_catalog.default.catalog_sales (46)
-                                 :           +- CometSort (54)
-                                 :              +- CometColumnarExchange (53)
-                                 :                 +- CometProject (52)
-                                 :                    +- CometFilter (51)
-                                 :                       +- CometScan parquet spark_catalog.default.catalog_returns (50)
-                                 +- ReusedExchange (59)
+TakeOrderedAndProject (67)
++- * Project (66)
+   +- * SortMergeJoin Inner (65)
+      :- * Project (43)
+      :  +- * SortMergeJoin Inner (42)
+      :     :- * Sort (20)
+      :     :  +- * HashAggregate (19)
+      :     :     +- Exchange (18)
+      :     :        +- * HashAggregate (17)
+      :     :           +- * Project (16)
+      :     :              +- * BroadcastHashJoin Inner BuildRight (15)
+      :     :                 :- * ColumnarToRow (13)
+      :     :                 :  +- CometProject (12)
+      :     :                 :     +- CometFilter (11)
+      :     :                 :        +- CometSortMergeJoin (10)
+      :     :                 :           :- CometSort (4)
+      :     :                 :           :  +- CometExchange (3)
+      :     :                 :           :     +- CometFilter (2)
+      :     :                 :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :                 :           +- CometSort (9)
+      :     :                 :              +- CometExchange (8)
+      :     :                 :                 +- CometProject (7)
+      :     :                 :                    +- CometFilter (6)
+      :     :                 :                       +- CometScan parquet spark_catalog.default.store_returns (5)
+      :     :                 +- ReusedExchange (14)
+      :     +- * Sort (41)
+      :        +- * Filter (40)
+      :           +- * HashAggregate (39)
+      :              +- Exchange (38)
+      :                 +- * HashAggregate (37)
+      :                    +- * Project (36)
+      :                       +- * BroadcastHashJoin Inner BuildRight (35)
+      :                          :- * ColumnarToRow (33)
+      :                          :  +- CometProject (32)
+      :                          :     +- CometFilter (31)
+      :                          :        +- CometSortMergeJoin (30)
+      :                          :           :- CometSort (24)
+      :                          :           :  +- CometExchange (23)
+      :                          :           :     +- CometFilter (22)
+      :                          :           :        +- CometScan parquet spark_catalog.default.web_sales (21)
+      :                          :           +- CometSort (29)
+      :                          :              +- CometExchange (28)
+      :                          :                 +- CometProject (27)
+      :                          :                    +- CometFilter (26)
+      :                          :                       +- CometScan parquet spark_catalog.default.web_returns (25)
+      :                          +- ReusedExchange (34)
+      +- * Sort (64)
+         +- * Filter (63)
+            +- * HashAggregate (62)
+               +- Exchange (61)
+                  +- * HashAggregate (60)
+                     +- * Project (59)
+                        +- * BroadcastHashJoin Inner BuildRight (58)
+                           :- * ColumnarToRow (56)
+                           :  +- CometProject (55)
+                           :     +- CometFilter (54)
+                           :        +- CometSortMergeJoin (53)
+                           :           :- CometSort (47)
+                           :           :  +- CometExchange (46)
+                           :           :     +- CometFilter (45)
+                           :           :        +- CometScan parquet spark_catalog.default.catalog_sales (44)
+                           :           +- CometSort (52)
+                           :              +- CometExchange (51)
+                           :                 +- CometProject (50)
+                           :                    +- CometFilter (49)
+                           :                       +- CometScan parquet spark_catalog.default.catalog_returns (48)
+                           +- ReusedExchange (57)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -84,9 +80,9 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_ticket_number:int,ss_qua
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_customer_sk#2))
 
-(3) CometColumnarExchange
+(3) CometExchange
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
@@ -107,9 +103,9 @@ Condition : (isnotnull(sr_ticket_number#10) AND isnotnull(sr_item_sk#9))
 Input [3]: [sr_item_sk#9, sr_ticket_number#10, sr_returned_date_sk#11]
 Arguments: [sr_item_sk#9, sr_ticket_number#10], [sr_item_sk#9, sr_ticket_number#10]
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
-Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
@@ -131,7 +127,7 @@ Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5,
 (13) ColumnarToRow [codegen id : 2]
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(14) ReusedExchange [Reuses operator id: 75]
+(14) ReusedExchange [Reuses operator id: 71]
 Output [2]: [d_date_sk#12, d_year#13]
 
 (15) BroadcastHashJoin [codegen id : 2]
@@ -151,252 +147,248 @@ Functions [3]: [partial_sum(ss_quantity#4), partial_sum(UnscaledValue(ss_wholesa
 Aggregate Attributes [3]: [sum#14, sum#15, sum#16]
 Results [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 
-(18) RowToColumnar
+(18) Exchange
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
+Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) CometColumnarExchange
-Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
-Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(20) CometHashAggregate
+(19) HashAggregate [codegen id : 3]
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 Keys [3]: [d_year#13, ss_item_sk#1, ss_customer_sk#2]
 Functions [3]: [sum(ss_quantity#4), sum(UnscaledValue(ss_wholesale_cost#5)), sum(UnscaledValue(ss_sales_price#6))]
+Aggregate Attributes [3]: [sum(ss_quantity#4)#20, sum(UnscaledValue(ss_wholesale_cost#5))#21, sum(UnscaledValue(ss_sales_price#6))#22]
+Results [6]: [d_year#13 AS ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, sum(ss_quantity#4)#20 AS ss_qty#24, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#5))#21,17,2) AS ss_wc#25, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#22,17,2) AS ss_sp#26]
 
-(21) CometSort
-Input [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23], [ss_sold_year#20 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST]
+(20) Sort [codegen id : 3]
+Input [6]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
+Arguments: [ss_sold_year#23 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_sold_date_sk#30 IN dynamicpruning#31)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_order_number:int,ws_quantity:int,ws_wholesale_cost:decimal(7,2),ws_sales_price:decimal(7,2)>
 
-(23) CometFilter
-Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Condition : (isnotnull(ws_item_sk#24) AND isnotnull(ws_bill_customer_sk#25))
+(22) CometFilter
+Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Condition : (isnotnull(ws_item_sk#27) AND isnotnull(ws_bill_customer_sk#28))
 
-(24) CometColumnarExchange
-Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Arguments: hashpartitioning(ws_order_number#26, ws_item_sk#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(23) CometExchange
+Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Arguments: hashpartitioning(ws_order_number#29, ws_item_sk#27, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
 
-(25) CometSort
-Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_order_number#26 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST]
+(24) CometSort
+Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_order_number#29 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
+Output [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int>
 
-(27) CometFilter
-Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
-Condition : (isnotnull(wr_order_number#33) AND isnotnull(wr_item_sk#32))
+(26) CometFilter
+Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
+Condition : (isnotnull(wr_order_number#36) AND isnotnull(wr_item_sk#35))
 
-(28) CometProject
-Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
-Arguments: [wr_item_sk#32, wr_order_number#33], [wr_item_sk#32, wr_order_number#33]
+(27) CometProject
+Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
+Arguments: [wr_item_sk#35, wr_order_number#36], [wr_item_sk#35, wr_order_number#36]
 
-(29) CometColumnarExchange
-Input [2]: [wr_item_sk#32, wr_order_number#33]
-Arguments: hashpartitioning(wr_order_number#33, wr_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(28) CometExchange
+Input [2]: [wr_item_sk#35, wr_order_number#36]
+Arguments: hashpartitioning(wr_order_number#36, wr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
-(30) CometSort
-Input [2]: [wr_item_sk#32, wr_order_number#33]
-Arguments: [wr_item_sk#32, wr_order_number#33], [wr_order_number#33 ASC NULLS FIRST, wr_item_sk#32 ASC NULLS FIRST]
+(29) CometSort
+Input [2]: [wr_item_sk#35, wr_order_number#36]
+Arguments: [wr_item_sk#35, wr_order_number#36], [wr_order_number#36 ASC NULLS FIRST, wr_item_sk#35 ASC NULLS FIRST]
 
-(31) CometSortMergeJoin
-Left output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Right output [2]: [wr_item_sk#32, wr_order_number#33]
-Arguments: [ws_order_number#26, ws_item_sk#24], [wr_order_number#33, wr_item_sk#32], LeftOuter
+(30) CometSortMergeJoin
+Left output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Right output [2]: [wr_item_sk#35, wr_order_number#36]
+Arguments: [ws_order_number#29, ws_item_sk#27], [wr_order_number#36, wr_item_sk#35], LeftOuter
 
-(32) CometFilter
-Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
-Condition : isnull(wr_order_number#33)
+(31) CometFilter
+Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
+Condition : isnull(wr_order_number#36)
 
-(33) CometProject
-Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
-Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+(32) CometProject
+Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
+Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
 
-(34) ColumnarToRow [codegen id : 4]
-Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+(33) ColumnarToRow [codegen id : 5]
+Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
 
-(35) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#35, d_year#36]
+(34) ReusedExchange [Reuses operator id: 71]
+Output [2]: [d_date_sk#38, d_year#39]
 
-(36) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [ws_sold_date_sk#30]
-Right keys [1]: [d_date_sk#35]
+(35) BroadcastHashJoin [codegen id : 5]
+Left keys [1]: [ws_sold_date_sk#33]
+Right keys [1]: [d_date_sk#38]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 4]
-Output [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
-Input [8]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, d_date_sk#35, d_year#36]
-
-(38) HashAggregate [codegen id : 4]
-Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
-Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
-Functions [3]: [partial_sum(ws_quantity#27), partial_sum(UnscaledValue(ws_wholesale_cost#28)), partial_sum(UnscaledValue(ws_sales_price#29))]
-Aggregate Attributes [3]: [sum#37, sum#38, sum#39]
-Results [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-
-(39) RowToColumnar
-Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-
-(40) CometColumnarExchange
-Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-Arguments: hashpartitioning(d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(41) CometHashAggregate
-Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
-Functions [3]: [sum(ws_quantity#27), sum(UnscaledValue(ws_wholesale_cost#28)), sum(UnscaledValue(ws_sales_price#29))]
-
-(42) CometFilter
-Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Condition : (coalesce(ws_qty#45, 0) > 0)
-
-(43) CometSort
-Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Arguments: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47], [ws_sold_year#43 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST, ws_customer_sk#44 ASC NULLS FIRST]
-
-(44) CometSortMergeJoin
-Left output [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
-Right output [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44], Inner
+(36) Project [codegen id : 5]
+Output [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
+Input [8]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, d_date_sk#38, d_year#39]
+
+(37) HashAggregate [codegen id : 5]
+Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
+Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
+Functions [3]: [partial_sum(ws_quantity#30), partial_sum(UnscaledValue(ws_wholesale_cost#31)), partial_sum(UnscaledValue(ws_sales_price#32))]
+Aggregate Attributes [3]: [sum#40, sum#41, sum#42]
+Results [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
+
+(38) Exchange
+Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
+Arguments: hashpartitioning(d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(39) HashAggregate [codegen id : 6]
+Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
+Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
+Functions [3]: [sum(ws_quantity#30), sum(UnscaledValue(ws_wholesale_cost#31)), sum(UnscaledValue(ws_sales_price#32))]
+Aggregate Attributes [3]: [sum(ws_quantity#30)#46, sum(UnscaledValue(ws_wholesale_cost#31))#47, sum(UnscaledValue(ws_sales_price#32))#48]
+Results [6]: [d_year#39 AS ws_sold_year#49, ws_item_sk#27, ws_bill_customer_sk#28 AS ws_customer_sk#50, sum(ws_quantity#30)#46 AS ws_qty#51, MakeDecimal(sum(UnscaledValue(ws_wholesale_cost#31))#47,17,2) AS ws_wc#52, MakeDecimal(sum(UnscaledValue(ws_sales_price#32))#48,17,2) AS ws_sp#53]
+
+(40) Filter [codegen id : 6]
+Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
+Condition : (coalesce(ws_qty#51, 0) > 0)
+
+(41) Sort [codegen id : 6]
+Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
+Arguments: [ws_sold_year#49 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST, ws_customer_sk#50 ASC NULLS FIRST], false, 0
+
+(42) SortMergeJoin [codegen id : 7]
+Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
+Right keys [3]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50]
+Join type: Inner
+Join condition: None
 
-(45) CometProject
-Input [12]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47], [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
+(43) Project [codegen id : 7]
+Output [9]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53]
+Input [12]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#54), dynamicpruningexpression(cs_sold_date_sk#54 IN dynamicpruning#55)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#60), dynamicpruningexpression(cs_sold_date_sk#60 IN dynamicpruning#61)]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_wholesale_cost:decimal(7,2),cs_sales_price:decimal(7,2)>
 
-(47) CometFilter
-Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Condition : (isnotnull(cs_item_sk#49) AND isnotnull(cs_bill_customer_sk#48))
+(45) CometFilter
+Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Condition : (isnotnull(cs_item_sk#55) AND isnotnull(cs_bill_customer_sk#54))
 
-(48) CometColumnarExchange
-Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Arguments: hashpartitioning(cs_order_number#50, cs_item_sk#49, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(46) CometExchange
+Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Arguments: hashpartitioning(cs_order_number#56, cs_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(49) CometSort
-Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_order_number#50 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST]
+(47) CometSort
+Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_order_number#56 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
+Output [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(51) CometFilter
-Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
-Condition : (isnotnull(cr_order_number#57) AND isnotnull(cr_item_sk#56))
+(49) CometFilter
+Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
+Condition : (isnotnull(cr_order_number#63) AND isnotnull(cr_item_sk#62))
 
-(52) CometProject
-Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
-Arguments: [cr_item_sk#56, cr_order_number#57], [cr_item_sk#56, cr_order_number#57]
+(50) CometProject
+Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
+Arguments: [cr_item_sk#62, cr_order_number#63], [cr_item_sk#62, cr_order_number#63]
 
-(53) CometColumnarExchange
-Input [2]: [cr_item_sk#56, cr_order_number#57]
-Arguments: hashpartitioning(cr_order_number#57, cr_item_sk#56, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(51) CometExchange
+Input [2]: [cr_item_sk#62, cr_order_number#63]
+Arguments: hashpartitioning(cr_order_number#63, cr_item_sk#62, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
 
-(54) CometSort
-Input [2]: [cr_item_sk#56, cr_order_number#57]
-Arguments: [cr_item_sk#56, cr_order_number#57], [cr_order_number#57 ASC NULLS FIRST, cr_item_sk#56 ASC NULLS FIRST]
+(52) CometSort
+Input [2]: [cr_item_sk#62, cr_order_number#63]
+Arguments: [cr_item_sk#62, cr_order_number#63], [cr_order_number#63 ASC NULLS FIRST, cr_item_sk#62 ASC NULLS FIRST]
 
-(55) CometSortMergeJoin
-Left output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Right output [2]: [cr_item_sk#56, cr_order_number#57]
-Arguments: [cs_order_number#50, cs_item_sk#49], [cr_order_number#57, cr_item_sk#56], LeftOuter
+(53) CometSortMergeJoin
+Left output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Right output [2]: [cr_item_sk#62, cr_order_number#63]
+Arguments: [cs_order_number#56, cs_item_sk#55], [cr_order_number#63, cr_item_sk#62], LeftOuter
 
-(56) CometFilter
-Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
-Condition : isnull(cr_order_number#57)
+(54) CometFilter
+Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
+Condition : isnull(cr_order_number#63)
 
-(57) CometProject
-Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
-Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+(55) CometProject
+Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
+Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
 
-(58) ColumnarToRow [codegen id : 6]
-Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+(56) ColumnarToRow [codegen id : 9]
+Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
 
-(59) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#59, d_year#60]
+(57) ReusedExchange [Reuses operator id: 71]
+Output [2]: [d_date_sk#65, d_year#66]
 
-(60) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [cs_sold_date_sk#54]
-Right keys [1]: [d_date_sk#59]
+(58) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [cs_sold_date_sk#60]
+Right keys [1]: [d_date_sk#65]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 6]
-Output [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
-Input [8]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, d_date_sk#59, d_year#60]
-
-(62) HashAggregate [codegen id : 6]
-Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
-Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
-Functions [3]: [partial_sum(cs_quantity#51), partial_sum(UnscaledValue(cs_wholesale_cost#52)), partial_sum(UnscaledValue(cs_sales_price#53))]
-Aggregate Attributes [3]: [sum#61, sum#62, sum#63]
-Results [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-
-(63) RowToColumnar
-Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-
-(64) CometColumnarExchange
-Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-Arguments: hashpartitioning(d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(65) CometHashAggregate
-Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
-Functions [3]: [sum(cs_quantity#51), sum(UnscaledValue(cs_wholesale_cost#52)), sum(UnscaledValue(cs_sales_price#53))]
-
-(66) CometFilter
-Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
-Condition : (coalesce(cs_qty#69, 0) > 0)
-
-(67) CometSort
-Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
-Arguments: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71], [cs_sold_year#67 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST, cs_customer_sk#68 ASC NULLS FIRST]
-
-(68) CometSortMergeJoin
-Left output [9]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
-Right output [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68], Inner
-
-(69) ColumnarToRow [codegen id : 7]
-Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+(59) Project [codegen id : 9]
+Output [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
+Input [8]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, d_date_sk#65, d_year#66]
+
+(60) HashAggregate [codegen id : 9]
+Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
+Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
+Functions [3]: [partial_sum(cs_quantity#57), partial_sum(UnscaledValue(cs_wholesale_cost#58)), partial_sum(UnscaledValue(cs_sales_price#59))]
+Aggregate Attributes [3]: [sum#67, sum#68, sum#69]
+Results [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
+
+(61) Exchange
+Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
+Arguments: hashpartitioning(d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+
+(62) HashAggregate [codegen id : 10]
+Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
+Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
+Functions [3]: [sum(cs_quantity#57), sum(UnscaledValue(cs_wholesale_cost#58)), sum(UnscaledValue(cs_sales_price#59))]
+Aggregate Attributes [3]: [sum(cs_quantity#57)#73, sum(UnscaledValue(cs_wholesale_cost#58))#74, sum(UnscaledValue(cs_sales_price#59))#75]
+Results [6]: [d_year#66 AS cs_sold_year#76, cs_item_sk#55, cs_bill_customer_sk#54 AS cs_customer_sk#77, sum(cs_quantity#57)#73 AS cs_qty#78, MakeDecimal(sum(UnscaledValue(cs_wholesale_cost#58))#74,17,2) AS cs_wc#79, MakeDecimal(sum(UnscaledValue(cs_sales_price#59))#75,17,2) AS cs_sp#80]
+
+(63) Filter [codegen id : 10]
+Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
+Condition : (coalesce(cs_qty#78, 0) > 0)
+
+(64) Sort [codegen id : 10]
+Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
+Arguments: [cs_sold_year#76 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST, cs_customer_sk#77 ASC NULLS FIRST], false, 0
+
+(65) SortMergeJoin [codegen id : 11]
+Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
+Right keys [3]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77]
+Join type: Inner
+Join condition: None
 
-(70) Project [codegen id : 7]
-Output [12]: [round((cast(ss_qty#21 as double) / cast(coalesce((ws_qty#45 + cs_qty#69), 1) as double)), 2) AS ratio#72, ss_qty#21 AS store_qty#73, ss_wc#22 AS store_wholesale_cost#74, ss_sp#23 AS store_sales_price#75, (coalesce(ws_qty#45, 0) + coalesce(cs_qty#69, 0)) AS other_chan_qty#76, (coalesce(ws_wc#46, 0.00) + coalesce(cs_wc#70, 0.00)) AS other_chan_wholesale_cost#77, (coalesce(ws_sp#47, 0.00) + coalesce(cs_sp#71, 0.00)) AS other_chan_sales_price#78, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, cs_qty#69]
-Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+(66) Project [codegen id : 11]
+Output [12]: [round((cast(ss_qty#24 as double) / cast(coalesce((ws_qty#51 + cs_qty#78), 1) as double)), 2) AS ratio#81, ss_qty#24 AS store_qty#82, ss_wc#25 AS store_wholesale_cost#83, ss_sp#26 AS store_sales_price#84, (coalesce(ws_qty#51, 0) + coalesce(cs_qty#78, 0)) AS other_chan_qty#85, (coalesce(ws_wc#52, 0.00) + coalesce(cs_wc#79, 0.00)) AS other_chan_wholesale_cost#86, (coalesce(ws_sp#53, 0.00) + coalesce(cs_sp#80, 0.00)) AS other_chan_sales_price#87, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, cs_qty#78]
+Input [15]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53, cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
 
-(71) TakeOrderedAndProject
-Input [12]: [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, cs_qty#69]
-Arguments: 100, [ratio#72 ASC NULLS FIRST, ss_qty#21 DESC NULLS LAST, ss_wc#22 DESC NULLS LAST, ss_sp#23 DESC NULLS LAST, other_chan_qty#76 ASC NULLS FIRST, other_chan_wholesale_cost#77 ASC NULLS FIRST, other_chan_sales_price#78 ASC NULLS FIRST, round((cast(ss_qty#21 as double) / cast(coalesce((ws_qty#45 + cs_qty#69), 1) as double)), 2) ASC NULLS FIRST], [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78]
+(67) TakeOrderedAndProject
+Input [12]: [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, cs_qty#78]
+Arguments: 100, [ratio#81 ASC NULLS FIRST, ss_qty#24 DESC NULLS LAST, ss_wc#25 DESC NULLS LAST, ss_sp#26 DESC NULLS LAST, other_chan_qty#85 ASC NULLS FIRST, other_chan_wholesale_cost#86 ASC NULLS FIRST, other_chan_sales_price#87 ASC NULLS FIRST, round((cast(ss_qty#24 as double) / cast(coalesce((ws_qty#51 + cs_qty#78), 1) as double)), 2) ASC NULLS FIRST], [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometFilter (73)
-      +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (71)
++- * ColumnarToRow (70)
+   +- CometFilter (69)
+      +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -406,19 +398,19 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(73) CometFilter
+(69) CometFilter
 Input [2]: [d_date_sk#12, d_year#13]
 Condition : ((isnotnull(d_year#13) AND (d_year#13 = 2000)) AND isnotnull(d_date_sk#12))
 
-(74) ColumnarToRow [codegen id : 1]
+(70) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#12, d_year#13]
 
-(75) BroadcastExchange
+(71) BroadcastExchange
 Input [2]: [d_date_sk#12, d_year#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 21 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 46 Hosting Expression = cs_sold_date_sk#54 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 44 Hosting Expression = cs_sold_date_sk#60 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt
index 002e6d86d8..7b351afcd3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q78/simplified.txt
@@ -1,74 +1,80 @@
 TakeOrderedAndProject [ratio,ss_qty,ss_wc,ss_sp,other_chan_qty,other_chan_wholesale_cost,other_chan_sales_price,ws_qty,cs_qty,store_qty,store_wholesale_cost,store_sales_price]
-  WholeStageCodegen (7)
+  WholeStageCodegen (11)
     Project [ss_qty,ws_qty,cs_qty,ss_wc,ss_sp,ws_wc,cs_wc,ws_sp,cs_sp]
-      ColumnarToRow
+      SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
         InputAdapter
-          CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
-            CometProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
-              CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
-                CometSort [ss_sold_year,ss_item_sk,ss_customer_sk]
-                  CometHashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum]
-                    CometColumnarExchange [d_year,ss_item_sk,ss_customer_sk] #1
-                      RowToColumnar
-                        WholeStageCodegen (2)
-                          HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
-                            Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                      CometFilter [sr_ticket_number]
-                                        CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                          CometSort [ss_ticket_number,ss_item_sk]
-                                            CometColumnarExchange [ss_ticket_number,ss_item_sk] #2
-                                              CometFilter [ss_item_sk,ss_customer_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                          CometSort [sr_ticket_number,sr_item_sk]
-                                            CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
-                                              CometProject [sr_item_sk,sr_ticket_number]
-                                                CometFilter [sr_ticket_number,sr_item_sk]
-                                                  CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #3
-                CometSort [ws_sold_year,ws_item_sk,ws_customer_sk]
-                  CometFilter [ws_qty]
-                    CometHashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum]
-                      CometColumnarExchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
-                        RowToColumnar
-                          WholeStageCodegen (4)
-                            HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
-                              Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  ColumnarToRow
+          WholeStageCodegen (7)
+            Project [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
+              SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
+                InputAdapter
+                  WholeStageCodegen (3)
+                    Sort [ss_sold_year,ss_item_sk,ss_customer_sk]
+                      HashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum] [sum(ss_quantity),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_sales_price)),ss_sold_year,ss_qty,ss_wc,ss_sp,sum,sum,sum]
+                        InputAdapter
+                          Exchange [d_year,ss_item_sk,ss_customer_sk] #1
+                            WholeStageCodegen (2)
+                              HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
+                                Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                          CometFilter [sr_ticket_number]
+                                            CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                              CometSort [ss_ticket_number,ss_item_sk]
+                                                CometExchange [ss_ticket_number,ss_item_sk] #2
+                                                  CometFilter [ss_item_sk,ss_customer_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [d_year,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                              CometSort [sr_ticket_number,sr_item_sk]
+                                                CometExchange [sr_ticket_number,sr_item_sk] #4
+                                                  CometProject [sr_item_sk,sr_ticket_number]
+                                                    CometFilter [sr_ticket_number,sr_item_sk]
+                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                     InputAdapter
-                                      CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                        CometFilter [wr_order_number]
-                                          CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                            CometSort [ws_order_number,ws_item_sk]
-                                              CometColumnarExchange [ws_order_number,ws_item_sk] #6
-                                                CometFilter [ws_item_sk,ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            CometSort [wr_order_number,wr_item_sk]
-                                              CometColumnarExchange [wr_order_number,wr_item_sk] #7
-                                                CometProject [wr_item_sk,wr_order_number]
-                                                  CometFilter [wr_order_number,wr_item_sk]
-                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
-            CometSort [cs_sold_year,cs_item_sk,cs_customer_sk]
-              CometFilter [cs_qty]
-                CometHashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum]
-                  CometColumnarExchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
-                    RowToColumnar
-                      WholeStageCodegen (6)
+                                      ReusedExchange [d_date_sk,d_year] #3
+                InputAdapter
+                  WholeStageCodegen (6)
+                    Sort [ws_sold_year,ws_item_sk,ws_customer_sk]
+                      Filter [ws_qty]
+                        HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum] [sum(ws_quantity),sum(UnscaledValue(ws_wholesale_cost)),sum(UnscaledValue(ws_sales_price)),ws_sold_year,ws_customer_sk,ws_qty,ws_wc,ws_sp,sum,sum,sum]
+                          InputAdapter
+                            Exchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
+                              WholeStageCodegen (5)
+                                HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
+                                  Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                            CometFilter [wr_order_number]
+                                              CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                                CometSort [ws_order_number,ws_item_sk]
+                                                  CometExchange [ws_order_number,ws_item_sk] #6
+                                                    CometFilter [ws_item_sk,ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
+                                                CometSort [wr_order_number,wr_item_sk]
+                                                  CometExchange [wr_order_number,wr_item_sk] #7
+                                                    CometProject [wr_item_sk,wr_order_number]
+                                                      CometFilter [wr_order_number,wr_item_sk]
+                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year] #3
+        InputAdapter
+          WholeStageCodegen (10)
+            Sort [cs_sold_year,cs_item_sk,cs_customer_sk]
+              Filter [cs_qty]
+                HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum] [sum(cs_quantity),sum(UnscaledValue(cs_wholesale_cost)),sum(UnscaledValue(cs_sales_price)),cs_sold_year,cs_customer_sk,cs_qty,cs_wc,cs_sp,sum,sum,sum]
+                  InputAdapter
+                    Exchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
+                      WholeStageCodegen (9)
                         HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,cs_quantity,cs_wholesale_cost,cs_sales_price] [sum,sum,sum,sum,sum,sum]
                           Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_wholesale_cost,cs_sales_price,d_year]
                             BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
@@ -78,12 +84,12 @@ TakeOrderedAndProject [ratio,ss_qty,ss_wc,ss_sp,other_chan_qty,other_chan_wholes
                                     CometFilter [cr_order_number]
                                       CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
                                         CometSort [cs_order_number,cs_item_sk]
-                                          CometColumnarExchange [cs_order_number,cs_item_sk] #9
+                                          CometExchange [cs_order_number,cs_item_sk] #9
                                             CometFilter [cs_item_sk,cs_bill_customer_sk]
                                               CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_order_number,cs_quantity,cs_wholesale_cost,cs_sales_price,cs_sold_date_sk]
                                                 ReusedSubquery [d_date_sk] #1
                                         CometSort [cr_order_number,cr_item_sk]
-                                          CometColumnarExchange [cr_order_number,cr_item_sk] #10
+                                          CometExchange [cr_order_number,cr_item_sk] #10
                                             CometProject [cr_item_sk,cr_order_number]
                                               CometFilter [cr_order_number,cr_item_sk]
                                                 CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt
index 344150578b..667c05e1c6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/explain.txt
@@ -1,36 +1,34 @@
 == Physical Plan ==
-TakeOrderedAndProject (32)
-+- * Project (31)
-   +- * BroadcastHashJoin Inner BuildRight (30)
-      :- * ColumnarToRow (25)
-      :  +- CometHashAggregate (24)
-      :     +- CometColumnarExchange (23)
-      :        +- RowToColumnar (22)
-      :           +- * HashAggregate (21)
-      :              +- * Project (20)
-      :                 +- * BroadcastHashJoin Inner BuildRight (19)
-      :                    :- * Project (13)
-      :                    :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :                    :     :- * Project (6)
-      :                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :                    :     :     :- * ColumnarToRow (3)
-      :                    :     :     :  +- CometFilter (2)
-      :                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :                    :     :     +- ReusedExchange (4)
-      :                    :     +- BroadcastExchange (11)
-      :                    :        +- * ColumnarToRow (10)
-      :                    :           +- CometProject (9)
-      :                    :              +- CometFilter (8)
-      :                    :                 +- CometScan parquet spark_catalog.default.store (7)
-      :                    +- BroadcastExchange (18)
-      :                       +- * ColumnarToRow (17)
-      :                          +- CometProject (16)
-      :                             +- CometFilter (15)
-      :                                +- CometScan parquet spark_catalog.default.household_demographics (14)
-      +- BroadcastExchange (29)
-         +- * ColumnarToRow (28)
-            +- CometFilter (27)
-               +- CometScan parquet spark_catalog.default.customer (26)
+TakeOrderedAndProject (30)
++- * Project (29)
+   +- * BroadcastHashJoin Inner BuildRight (28)
+      :- * HashAggregate (23)
+      :  +- Exchange (22)
+      :     +- * HashAggregate (21)
+      :        +- * Project (20)
+      :           +- * BroadcastHashJoin Inner BuildRight (19)
+      :              :- * Project (13)
+      :              :  +- * BroadcastHashJoin Inner BuildRight (12)
+      :              :     :- * Project (6)
+      :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :              :     :     :- * ColumnarToRow (3)
+      :              :     :     :  +- CometFilter (2)
+      :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+      :              :     :     +- ReusedExchange (4)
+      :              :     +- BroadcastExchange (11)
+      :              :        +- * ColumnarToRow (10)
+      :              :           +- CometProject (9)
+      :              :              +- CometFilter (8)
+      :              :                 +- CometScan parquet spark_catalog.default.store (7)
+      :              +- BroadcastExchange (18)
+      :                 +- * ColumnarToRow (17)
+      :                    +- CometProject (16)
+      :                       +- CometFilter (15)
+      :                          +- CometScan parquet spark_catalog.default.household_demographics (14)
+      +- BroadcastExchange (27)
+         +- * ColumnarToRow (26)
+            +- CometFilter (25)
+               +- CometScan parquet spark_catalog.default.customer (24)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -48,7 +46,7 @@ Condition : ((isnotnull(ss_store_sk#4) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [8]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_addr_sk#3, ss_store_sk#4, ss_ticket_number#5, ss_coupon_amt#6, ss_net_profit#7, ss_sold_date_sk#8]
 
-(4) ReusedExchange [Reuses operator id: 37]
+(4) ReusedExchange [Reuses operator id: 35]
 Output [1]: [d_date_sk#10]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -132,82 +130,78 @@ Functions [2]: [partial_sum(UnscaledValue(ss_coupon_amt#6)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#17, sum#18]
 Results [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
 
-(22) RowToColumnar
+(22) Exchange
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
+Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) CometColumnarExchange
-Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
-Arguments: hashpartitioning(ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(24) CometHashAggregate
+(23) HashAggregate [codegen id : 6]
 Input [6]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13, sum#19, sum#20]
 Keys [4]: [ss_ticket_number#5, ss_customer_sk#1, ss_addr_sk#3, s_city#13]
 Functions [2]: [sum(UnscaledValue(ss_coupon_amt#6)), sum(UnscaledValue(ss_net_profit#7))]
-
-(25) ColumnarToRow [codegen id : 6]
-Input [5]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, amt#21, profit#22]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_coupon_amt#6))#21, sum(UnscaledValue(ss_net_profit#7))#22]
+Results [5]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#6))#21,17,2) AS amt#23, MakeDecimal(sum(UnscaledValue(ss_net_profit#7))#22,17,2) AS profit#24]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
+Output [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_first_name:string,c_last_name:string>
 
-(27) CometFilter
-Input [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
-Condition : isnotnull(c_customer_sk#23)
+(25) CometFilter
+Input [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
+Condition : isnotnull(c_customer_sk#25)
 
-(28) ColumnarToRow [codegen id : 5]
-Input [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
+(26) ColumnarToRow [codegen id : 5]
+Input [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
 
-(29) BroadcastExchange
-Input [3]: [c_customer_sk#23, c_first_name#24, c_last_name#25]
+(27) BroadcastExchange
+Input [3]: [c_customer_sk#25, c_first_name#26, c_last_name#27]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(30) BroadcastHashJoin [codegen id : 6]
+(28) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#23]
+Right keys [1]: [c_customer_sk#25]
 Join type: Inner
 Join condition: None
 
-(31) Project [codegen id : 6]
-Output [7]: [c_last_name#25, c_first_name#24, substr(s_city#13, 1, 30) AS substr(s_city, 1, 30)#26, ss_ticket_number#5, amt#21, profit#22, s_city#13]
-Input [8]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, amt#21, profit#22, c_customer_sk#23, c_first_name#24, c_last_name#25]
+(29) Project [codegen id : 6]
+Output [7]: [c_last_name#27, c_first_name#26, substr(s_city#13, 1, 30) AS substr(s_city, 1, 30)#28, ss_ticket_number#5, amt#23, profit#24, s_city#13]
+Input [8]: [ss_ticket_number#5, ss_customer_sk#1, s_city#13, amt#23, profit#24, c_customer_sk#25, c_first_name#26, c_last_name#27]
 
-(32) TakeOrderedAndProject
-Input [7]: [c_last_name#25, c_first_name#24, substr(s_city, 1, 30)#26, ss_ticket_number#5, amt#21, profit#22, s_city#13]
-Arguments: 100, [c_last_name#25 ASC NULLS FIRST, c_first_name#24 ASC NULLS FIRST, substr(s_city#13, 1, 30) ASC NULLS FIRST, profit#22 ASC NULLS FIRST], [c_last_name#25, c_first_name#24, substr(s_city, 1, 30)#26, ss_ticket_number#5, amt#21, profit#22]
+(30) TakeOrderedAndProject
+Input [7]: [c_last_name#27, c_first_name#26, substr(s_city, 1, 30)#28, ss_ticket_number#5, amt#23, profit#24, s_city#13]
+Arguments: 100, [c_last_name#27 ASC NULLS FIRST, c_first_name#26 ASC NULLS FIRST, substr(s_city#13, 1, 30) ASC NULLS FIRST, profit#24 ASC NULLS FIRST], [c_last_name#27, c_first_name#26, substr(s_city, 1, 30)#28, ss_ticket_number#5, amt#23, profit#24]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (37)
-+- * ColumnarToRow (36)
-   +- CometProject (35)
-      +- CometFilter (34)
-         +- CometScan parquet spark_catalog.default.date_dim (33)
+BroadcastExchange (35)
++- * ColumnarToRow (34)
+   +- CometProject (33)
+      +- CometFilter (32)
+         +- CometScan parquet spark_catalog.default.date_dim (31)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#27, d_dow#28]
+Output [3]: [d_date_sk#10, d_year#29, d_dow#30]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_dow), EqualTo(d_dow,1), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dow:int>
 
-(34) CometFilter
-Input [3]: [d_date_sk#10, d_year#27, d_dow#28]
-Condition : (((isnotnull(d_dow#28) AND (d_dow#28 = 1)) AND d_year#27 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
+(32) CometFilter
+Input [3]: [d_date_sk#10, d_year#29, d_dow#30]
+Condition : (((isnotnull(d_dow#30) AND (d_dow#30 = 1)) AND d_year#29 IN (1999,2000,2001)) AND isnotnull(d_date_sk#10))
 
-(35) CometProject
-Input [3]: [d_date_sk#10, d_year#27, d_dow#28]
+(33) CometProject
+Input [3]: [d_date_sk#10, d_year#29, d_dow#30]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(36) ColumnarToRow [codegen id : 1]
+(34) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(37) BroadcastExchange
+(35) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt
index b86117fc50..4c05c449c5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q79/simplified.txt
@@ -2,49 +2,47 @@ TakeOrderedAndProject [c_last_name,c_first_name,s_city,profit,substr(s_city, 1,
   WholeStageCodegen (6)
     Project [c_last_name,c_first_name,s_city,ss_ticket_number,amt,profit]
       BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-        ColumnarToRow
+        HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,sum,sum] [sum(UnscaledValue(ss_coupon_amt)),sum(UnscaledValue(ss_net_profit)),amt,profit,sum,sum]
           InputAdapter
-            CometHashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,sum,sum]
-              CometColumnarExchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city] #1
-                RowToColumnar
-                  WholeStageCodegen (4)
-                    HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
-                      Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
-                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                          Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
-                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                              Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
-                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                        CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [d_date_sk]
-                                                      CometFilter [d_dow,d_year,d_date_sk]
-                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk] #2
+            Exchange [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city] #1
+              WholeStageCodegen (4)
+                HashAggregate [ss_ticket_number,ss_customer_sk,ss_addr_sk,s_city,ss_coupon_amt,ss_net_profit] [sum,sum,sum,sum]
+                  Project [ss_customer_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
+                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                      Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,s_city]
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_ticket_number,ss_coupon_amt,ss_net_profit,ss_sold_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometProject [d_date_sk]
+                                                  CometFilter [d_dow,d_year,d_date_sk]
+                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dow]
                               InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (2)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [s_store_sk,s_city]
-                                          CometFilter [s_number_employees,s_store_sk]
-                                            CometScan parquet spark_catalog.default.store [s_store_sk,s_number_employees,s_city]
+                                ReusedExchange [d_date_sk] #2
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (3)
+                            BroadcastExchange #3
+                              WholeStageCodegen (2)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometProject [hd_demo_sk]
-                                      CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                        CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                                    CometProject [s_store_sk,s_city]
+                                      CometFilter [s_number_employees,s_store_sk]
+                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_number_employees,s_city]
+                      InputAdapter
+                        BroadcastExchange #4
+                          WholeStageCodegen (3)
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [hd_demo_sk]
+                                  CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
         InputAdapter
           BroadcastExchange #5
             WholeStageCodegen (5)
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt
index 67656a9098..f54999ff58 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/explain.txt
@@ -1,53 +1,47 @@
 == Physical Plan ==
-* ColumnarToRow (49)
-+- CometTakeOrderedAndProject (48)
-   +- CometHashAggregate (47)
-      +- CometColumnarExchange (46)
-         +- RowToColumnar (45)
-            +- * HashAggregate (44)
-               +- * Project (43)
-                  +- * BroadcastHashJoin Inner BuildRight (42)
-                     :- * Project (12)
-                     :  +- * BroadcastHashJoin Inner BuildRight (11)
-                     :     :- * Project (6)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                     :     :     :- * ColumnarToRow (3)
-                     :     :     :  +- CometFilter (2)
-                     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :     :     +- ReusedExchange (4)
-                     :     +- BroadcastExchange (10)
-                     :        +- * ColumnarToRow (9)
-                     :           +- CometFilter (8)
-                     :              +- CometScan parquet spark_catalog.default.store (7)
-                     +- BroadcastExchange (41)
-                        +- * ColumnarToRow (40)
-                           +- CometHashAggregate (39)
-                              +- CometColumnarExchange (38)
-                                 +- RowToColumnar (37)
-                                    +- * HashAggregate (36)
-                                       +- * BroadcastHashJoin LeftSemi BuildRight (35)
-                                          :- * ColumnarToRow (16)
-                                          :  +- CometProject (15)
-                                          :     +- CometFilter (14)
-                                          :        +- CometScan parquet spark_catalog.default.customer_address (13)
-                                          +- BroadcastExchange (34)
-                                             +- * ColumnarToRow (33)
-                                                +- CometProject (32)
-                                                   +- CometFilter (31)
-                                                      +- CometHashAggregate (30)
-                                                         +- CometColumnarExchange (29)
-                                                            +- RowToColumnar (28)
-                                                               +- * HashAggregate (27)
-                                                                  +- * Project (26)
-                                                                     +- * BroadcastHashJoin Inner BuildRight (25)
-                                                                        :- * ColumnarToRow (19)
-                                                                        :  +- CometFilter (18)
-                                                                        :     +- CometScan parquet spark_catalog.default.customer_address (17)
-                                                                        +- BroadcastExchange (24)
-                                                                           +- * ColumnarToRow (23)
-                                                                              +- CometProject (22)
-                                                                                 +- CometFilter (21)
-                                                                                    +- CometScan parquet spark_catalog.default.customer (20)
+TakeOrderedAndProject (43)
++- * HashAggregate (42)
+   +- Exchange (41)
+      +- * HashAggregate (40)
+         +- * Project (39)
+            +- * BroadcastHashJoin Inner BuildRight (38)
+               :- * Project (12)
+               :  +- * BroadcastHashJoin Inner BuildRight (11)
+               :     :- * Project (6)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :     :     :- * ColumnarToRow (3)
+               :     :     :  +- CometFilter (2)
+               :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :     :     +- ReusedExchange (4)
+               :     +- BroadcastExchange (10)
+               :        +- * ColumnarToRow (9)
+               :           +- CometFilter (8)
+               :              +- CometScan parquet spark_catalog.default.store (7)
+               +- BroadcastExchange (37)
+                  +- * HashAggregate (36)
+                     +- Exchange (35)
+                        +- * HashAggregate (34)
+                           +- * BroadcastHashJoin LeftSemi BuildRight (33)
+                              :- * ColumnarToRow (16)
+                              :  +- CometProject (15)
+                              :     +- CometFilter (14)
+                              :        +- CometScan parquet spark_catalog.default.customer_address (13)
+                              +- BroadcastExchange (32)
+                                 +- * Project (31)
+                                    +- * Filter (30)
+                                       +- * HashAggregate (29)
+                                          +- Exchange (28)
+                                             +- * HashAggregate (27)
+                                                +- * Project (26)
+                                                   +- * BroadcastHashJoin Inner BuildRight (25)
+                                                      :- * ColumnarToRow (19)
+                                                      :  +- CometFilter (18)
+                                                      :     +- CometScan parquet spark_catalog.default.customer_address (17)
+                                                      +- BroadcastExchange (24)
+                                                         +- * ColumnarToRow (23)
+                                                            +- CometProject (22)
+                                                               +- CometFilter (21)
+                                                                  +- CometScan parquet spark_catalog.default.customer (20)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -65,7 +59,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 8]
 Input [3]: [ss_store_sk#1, ss_net_profit#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 54]
+(4) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 8]
@@ -176,130 +170,118 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#15]
 Results [2]: [ca_zip#12, count#16]
 
-(28) RowToColumnar
+(28) Exchange
 Input [2]: [ca_zip#12, count#16]
+Arguments: hashpartitioning(ca_zip#12, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(29) CometColumnarExchange
-Input [2]: [ca_zip#12, count#16]
-Arguments: hashpartitioning(ca_zip#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
+(29) HashAggregate [codegen id : 5]
 Input [2]: [ca_zip#12, count#16]
 Keys [1]: [ca_zip#12]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#17]
+Results [2]: [substr(ca_zip#12, 1, 5) AS ca_zip#18, count(1)#17 AS cnt#19]
 
-(31) CometFilter
-Input [2]: [ca_zip#17, cnt#18]
-Condition : (cnt#18 > 10)
-
-(32) CometProject
-Input [2]: [ca_zip#17, cnt#18]
-Arguments: [ca_zip#17], [ca_zip#17]
+(30) Filter [codegen id : 5]
+Input [2]: [ca_zip#18, cnt#19]
+Condition : (cnt#19 > 10)
 
-(33) ColumnarToRow [codegen id : 5]
-Input [1]: [ca_zip#17]
+(31) Project [codegen id : 5]
+Output [1]: [ca_zip#18]
+Input [2]: [ca_zip#18, cnt#19]
 
-(34) BroadcastExchange
-Input [1]: [ca_zip#17]
+(32) BroadcastExchange
+Input [1]: [ca_zip#18]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true])),false), [plan_id=4]
 
-(35) BroadcastHashJoin [codegen id : 6]
+(33) BroadcastHashJoin [codegen id : 6]
 Left keys [2]: [coalesce(ca_zip#10, ), isnull(ca_zip#10)]
-Right keys [2]: [coalesce(ca_zip#17, ), isnull(ca_zip#17)]
+Right keys [2]: [coalesce(ca_zip#18, ), isnull(ca_zip#18)]
 Join type: LeftSemi
 Join condition: None
 
-(36) HashAggregate [codegen id : 6]
+(34) HashAggregate [codegen id : 6]
 Input [1]: [ca_zip#10]
 Keys [1]: [ca_zip#10]
 Functions: []
 Aggregate Attributes: []
 Results [1]: [ca_zip#10]
 
-(37) RowToColumnar
+(35) Exchange
 Input [1]: [ca_zip#10]
+Arguments: hashpartitioning(ca_zip#10, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(38) CometColumnarExchange
-Input [1]: [ca_zip#10]
-Arguments: hashpartitioning(ca_zip#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(39) CometHashAggregate
+(36) HashAggregate [codegen id : 7]
 Input [1]: [ca_zip#10]
 Keys [1]: [ca_zip#10]
 Functions: []
+Aggregate Attributes: []
+Results [1]: [ca_zip#10]
 
-(40) ColumnarToRow [codegen id : 7]
-Input [1]: [ca_zip#10]
-
-(41) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [ca_zip#10]
 Arguments: HashedRelationBroadcastMode(List(substr(input[0, string, true], 1, 2)),false), [plan_id=6]
 
-(42) BroadcastHashJoin [codegen id : 8]
+(38) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [substr(s_zip#8, 1, 2)]
 Right keys [1]: [substr(ca_zip#10, 1, 2)]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 8]
+(39) Project [codegen id : 8]
 Output [2]: [ss_net_profit#2, s_store_name#7]
 Input [4]: [ss_net_profit#2, s_store_name#7, s_zip#8, ca_zip#10]
 
-(44) HashAggregate [codegen id : 8]
+(40) HashAggregate [codegen id : 8]
 Input [2]: [ss_net_profit#2, s_store_name#7]
 Keys [1]: [s_store_name#7]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum#19]
-Results [2]: [s_store_name#7, sum#20]
+Aggregate Attributes [1]: [sum#20]
+Results [2]: [s_store_name#7, sum#21]
 
-(45) RowToColumnar
-Input [2]: [s_store_name#7, sum#20]
+(41) Exchange
+Input [2]: [s_store_name#7, sum#21]
+Arguments: hashpartitioning(s_store_name#7, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(46) CometColumnarExchange
-Input [2]: [s_store_name#7, sum#20]
-Arguments: hashpartitioning(s_store_name#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(47) CometHashAggregate
-Input [2]: [s_store_name#7, sum#20]
+(42) HashAggregate [codegen id : 9]
+Input [2]: [s_store_name#7, sum#21]
 Keys [1]: [s_store_name#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#22]
+Results [2]: [s_store_name#7, MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#22,17,2) AS sum(ss_net_profit)#23]
 
-(48) CometTakeOrderedAndProject
-Input [2]: [s_store_name#7, sum(ss_net_profit)#21]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[s_store_name#7 ASC NULLS FIRST], output=[s_store_name#7,sum(ss_net_profit)#21]), 100, [s_store_name#7 ASC NULLS FIRST], [s_store_name#7, sum(ss_net_profit)#21]
-
-(49) ColumnarToRow [codegen id : 9]
-Input [2]: [s_store_name#7, sum(ss_net_profit)#21]
+(43) TakeOrderedAndProject
+Input [2]: [s_store_name#7, sum(ss_net_profit)#23]
+Arguments: 100, [s_store_name#7 ASC NULLS FIRST], [s_store_name#7, sum(ss_net_profit)#23]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (54)
-+- * ColumnarToRow (53)
-   +- CometProject (52)
-      +- CometFilter (51)
-         +- CometScan parquet spark_catalog.default.date_dim (50)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#5, d_year#22, d_qoy#23]
+Output [3]: [d_date_sk#5, d_year#24, d_qoy#25]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_qoy), IsNotNull(d_year), EqualTo(d_qoy,2), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(51) CometFilter
-Input [3]: [d_date_sk#5, d_year#22, d_qoy#23]
-Condition : ((((isnotnull(d_qoy#23) AND isnotnull(d_year#22)) AND (d_qoy#23 = 2)) AND (d_year#22 = 1998)) AND isnotnull(d_date_sk#5))
+(45) CometFilter
+Input [3]: [d_date_sk#5, d_year#24, d_qoy#25]
+Condition : ((((isnotnull(d_qoy#25) AND isnotnull(d_year#24)) AND (d_qoy#25 = 2)) AND (d_year#24 = 1998)) AND isnotnull(d_date_sk#5))
 
-(52) CometProject
-Input [3]: [d_date_sk#5, d_year#22, d_qoy#23]
+(46) CometProject
+Input [3]: [d_date_sk#5, d_year#24, d_qoy#25]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(53) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(54) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt
index f4b5da283b..76fa276931 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q8/simplified.txt
@@ -1,78 +1,72 @@
-WholeStageCodegen (9)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [s_store_name,sum(ss_net_profit)]
-        CometHashAggregate [s_store_name,sum]
-          CometColumnarExchange [s_store_name] #1
-            RowToColumnar
-              WholeStageCodegen (8)
-                HashAggregate [s_store_name,ss_net_profit] [sum,sum]
-                  Project [ss_net_profit,s_store_name]
-                    BroadcastHashJoin [s_zip,ca_zip]
-                      Project [ss_net_profit,s_store_name,s_zip]
-                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                          Project [ss_store_sk,ss_net_profit]
-                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [ss_store_sk]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [d_date_sk]
-                                                  CometFilter [d_qoy,d_year,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                              InputAdapter
-                                ReusedExchange [d_date_sk] #2
+TakeOrderedAndProject [s_store_name,sum(ss_net_profit)]
+  WholeStageCodegen (9)
+    HashAggregate [s_store_name,sum] [sum(UnscaledValue(ss_net_profit)),sum(ss_net_profit),sum]
+      InputAdapter
+        Exchange [s_store_name] #1
+          WholeStageCodegen (8)
+            HashAggregate [s_store_name,ss_net_profit] [sum,sum]
+              Project [ss_net_profit,s_store_name]
+                BroadcastHashJoin [s_zip,ca_zip]
+                  Project [ss_net_profit,s_store_name,s_zip]
+                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                      Project [ss_store_sk,ss_net_profit]
+                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [ss_store_sk]
+                                CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                  SubqueryBroadcast [d_date_sk] #1
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [d_date_sk]
+                                              CometFilter [d_qoy,d_year,d_date_sk]
+                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                           InputAdapter
-                            BroadcastExchange #3
-                              WholeStageCodegen (2)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [s_store_sk,s_zip]
-                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
+                            ReusedExchange [d_date_sk] #2
                       InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (7)
+                        BroadcastExchange #3
+                          WholeStageCodegen (2)
                             ColumnarToRow
                               InputAdapter
-                                CometHashAggregate [ca_zip]
-                                  CometColumnarExchange [ca_zip] #5
-                                    RowToColumnar
-                                      WholeStageCodegen (6)
-                                        HashAggregate [ca_zip]
-                                          BroadcastHashJoin [ca_zip,ca_zip]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [ca_zip] [ca_zip]
-                                                  CometFilter [ca_zip]
-                                                    CometScan parquet spark_catalog.default.customer_address [ca_zip]
-                                            InputAdapter
-                                              BroadcastExchange #6
-                                                WholeStageCodegen (5)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [ca_zip]
-                                                        CometFilter [cnt]
-                                                          CometHashAggregate [ca_zip,count]
-                                                            CometColumnarExchange [ca_zip] #7
-                                                              RowToColumnar
-                                                                WholeStageCodegen (4)
-                                                                  HashAggregate [ca_zip] [count,count]
-                                                                    Project [ca_zip]
-                                                                      BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [ca_address_sk]
-                                                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #8
-                                                                            WholeStageCodegen (3)
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometProject [c_current_addr_sk]
-                                                                                    CometFilter [c_preferred_cust_flag,c_current_addr_sk]
-                                                                                      CometScan parquet spark_catalog.default.customer [c_current_addr_sk,c_preferred_cust_flag]
+                                CometFilter [s_store_sk,s_zip]
+                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
+                  InputAdapter
+                    BroadcastExchange #4
+                      WholeStageCodegen (7)
+                        HashAggregate [ca_zip]
+                          InputAdapter
+                            Exchange [ca_zip] #5
+                              WholeStageCodegen (6)
+                                HashAggregate [ca_zip]
+                                  BroadcastHashJoin [ca_zip,ca_zip]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [ca_zip] [ca_zip]
+                                          CometFilter [ca_zip]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_zip]
+                                    InputAdapter
+                                      BroadcastExchange #6
+                                        WholeStageCodegen (5)
+                                          Project [ca_zip]
+                                            Filter [cnt]
+                                              HashAggregate [ca_zip,count] [count(1),ca_zip,cnt,count]
+                                                InputAdapter
+                                                  Exchange [ca_zip] #7
+                                                    WholeStageCodegen (4)
+                                                      HashAggregate [ca_zip] [count,count]
+                                                        Project [ca_zip]
+                                                          BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [ca_address_sk]
+                                                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_zip]
+                                                            InputAdapter
+                                                              BroadcastExchange #8
+                                                                WholeStageCodegen (3)
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometProject [c_current_addr_sk]
+                                                                        CometFilter [c_preferred_cust_flag,c_current_addr_sk]
+                                                                          CometScan parquet spark_catalog.default.customer [c_current_addr_sk,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt
index e08d527aa0..dfd123a1d9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/explain.txt
@@ -1,116 +1,108 @@
 == Physical Plan ==
-* ColumnarToRow (112)
-+- CometTakeOrderedAndProject (111)
-   +- CometHashAggregate (110)
-      +- CometColumnarExchange (109)
-         +- RowToColumnar (108)
-            +- * HashAggregate (107)
-               +- * Expand (106)
-                  +- Union (105)
-                     :- * HashAggregate (40)
-                     :  +- * ColumnarToRow (39)
-                     :     +- CometColumnarExchange (38)
-                     :        +- RowToColumnar (37)
-                     :           +- * HashAggregate (36)
-                     :              +- * Project (35)
-                     :                 +- * BroadcastHashJoin Inner BuildRight (34)
-                     :                    :- * Project (28)
-                     :                    :  +- * BroadcastHashJoin Inner BuildRight (27)
-                     :                    :     :- * Project (21)
-                     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :                    :     :     :- * Project (15)
-                     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :                    :     :     :     :- * ColumnarToRow (12)
-                     :                    :     :     :     :  +- CometProject (11)
-                     :                    :     :     :     :     +- CometSortMergeJoin (10)
-                     :                    :     :     :     :        :- CometSort (4)
-                     :                    :     :     :     :        :  +- CometColumnarExchange (3)
-                     :                    :     :     :     :        :     +- CometFilter (2)
-                     :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :                    :     :     :     :        +- CometSort (9)
-                     :                    :     :     :     :           +- CometColumnarExchange (8)
-                     :                    :     :     :     :              +- CometProject (7)
-                     :                    :     :     :     :                 +- CometFilter (6)
-                     :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-                     :                    :     :     :     +- ReusedExchange (13)
-                     :                    :     :     +- BroadcastExchange (19)
-                     :                    :     :        +- * ColumnarToRow (18)
-                     :                    :     :           +- CometFilter (17)
-                     :                    :     :              +- CometScan parquet spark_catalog.default.store (16)
-                     :                    :     +- BroadcastExchange (26)
-                     :                    :        +- * ColumnarToRow (25)
-                     :                    :           +- CometProject (24)
-                     :                    :              +- CometFilter (23)
-                     :                    :                 +- CometScan parquet spark_catalog.default.item (22)
-                     :                    +- BroadcastExchange (33)
-                     :                       +- * ColumnarToRow (32)
-                     :                          +- CometProject (31)
-                     :                             +- CometFilter (30)
-                     :                                +- CometScan parquet spark_catalog.default.promotion (29)
-                     :- * HashAggregate (72)
-                     :  +- * ColumnarToRow (71)
-                     :     +- CometColumnarExchange (70)
-                     :        +- RowToColumnar (69)
-                     :           +- * HashAggregate (68)
-                     :              +- * Project (67)
-                     :                 +- * BroadcastHashJoin Inner BuildRight (66)
-                     :                    :- * Project (64)
-                     :                    :  +- * BroadcastHashJoin Inner BuildRight (63)
-                     :                    :     :- * Project (61)
-                     :                    :     :  +- * BroadcastHashJoin Inner BuildRight (60)
-                     :                    :     :     :- * Project (55)
-                     :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-                     :                    :     :     :     :- * ColumnarToRow (52)
-                     :                    :     :     :     :  +- CometProject (51)
-                     :                    :     :     :     :     +- CometSortMergeJoin (50)
-                     :                    :     :     :     :        :- CometSort (44)
-                     :                    :     :     :     :        :  +- CometColumnarExchange (43)
-                     :                    :     :     :     :        :     +- CometFilter (42)
-                     :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (41)
-                     :                    :     :     :     :        +- CometSort (49)
-                     :                    :     :     :     :           +- CometColumnarExchange (48)
-                     :                    :     :     :     :              +- CometProject (47)
-                     :                    :     :     :     :                 +- CometFilter (46)
-                     :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (45)
-                     :                    :     :     :     +- ReusedExchange (53)
-                     :                    :     :     +- BroadcastExchange (59)
-                     :                    :     :        +- * ColumnarToRow (58)
-                     :                    :     :           +- CometFilter (57)
-                     :                    :     :              +- CometScan parquet spark_catalog.default.catalog_page (56)
-                     :                    :     +- ReusedExchange (62)
-                     :                    +- ReusedExchange (65)
-                     +- * HashAggregate (104)
-                        +- * ColumnarToRow (103)
-                           +- CometColumnarExchange (102)
-                              +- RowToColumnar (101)
-                                 +- * HashAggregate (100)
-                                    +- * Project (99)
-                                       +- * BroadcastHashJoin Inner BuildRight (98)
-                                          :- * Project (96)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (95)
-                                          :     :- * Project (93)
-                                          :     :  +- * BroadcastHashJoin Inner BuildRight (92)
-                                          :     :     :- * Project (87)
-                                          :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
-                                          :     :     :     :- * ColumnarToRow (84)
-                                          :     :     :     :  +- CometProject (83)
-                                          :     :     :     :     +- CometSortMergeJoin (82)
-                                          :     :     :     :        :- CometSort (76)
-                                          :     :     :     :        :  +- CometColumnarExchange (75)
-                                          :     :     :     :        :     +- CometFilter (74)
-                                          :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (73)
-                                          :     :     :     :        +- CometSort (81)
-                                          :     :     :     :           +- CometColumnarExchange (80)
-                                          :     :     :     :              +- CometProject (79)
-                                          :     :     :     :                 +- CometFilter (78)
-                                          :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (77)
-                                          :     :     :     +- ReusedExchange (85)
-                                          :     :     +- BroadcastExchange (91)
-                                          :     :        +- * ColumnarToRow (90)
-                                          :     :           +- CometFilter (89)
-                                          :     :              +- CometScan parquet spark_catalog.default.web_site (88)
-                                          :     +- ReusedExchange (94)
-                                          +- ReusedExchange (97)
+TakeOrderedAndProject (104)
++- * HashAggregate (103)
+   +- Exchange (102)
+      +- * HashAggregate (101)
+         +- * Expand (100)
+            +- Union (99)
+               :- * HashAggregate (38)
+               :  +- Exchange (37)
+               :     +- * HashAggregate (36)
+               :        +- * Project (35)
+               :           +- * BroadcastHashJoin Inner BuildRight (34)
+               :              :- * Project (28)
+               :              :  +- * BroadcastHashJoin Inner BuildRight (27)
+               :              :     :- * Project (21)
+               :              :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :              :     :     :- * Project (15)
+               :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :              :     :     :     :- * ColumnarToRow (12)
+               :              :     :     :     :  +- CometProject (11)
+               :              :     :     :     :     +- CometSortMergeJoin (10)
+               :              :     :     :     :        :- CometSort (4)
+               :              :     :     :     :        :  +- CometExchange (3)
+               :              :     :     :     :        :     +- CometFilter (2)
+               :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
+               :              :     :     :     :        +- CometSort (9)
+               :              :     :     :     :           +- CometExchange (8)
+               :              :     :     :     :              +- CometProject (7)
+               :              :     :     :     :                 +- CometFilter (6)
+               :              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+               :              :     :     :     +- ReusedExchange (13)
+               :              :     :     +- BroadcastExchange (19)
+               :              :     :        +- * ColumnarToRow (18)
+               :              :     :           +- CometFilter (17)
+               :              :     :              +- CometScan parquet spark_catalog.default.store (16)
+               :              :     +- BroadcastExchange (26)
+               :              :        +- * ColumnarToRow (25)
+               :              :           +- CometProject (24)
+               :              :              +- CometFilter (23)
+               :              :                 +- CometScan parquet spark_catalog.default.item (22)
+               :              +- BroadcastExchange (33)
+               :                 +- * ColumnarToRow (32)
+               :                    +- CometProject (31)
+               :                       +- CometFilter (30)
+               :                          +- CometScan parquet spark_catalog.default.promotion (29)
+               :- * HashAggregate (68)
+               :  +- Exchange (67)
+               :     +- * HashAggregate (66)
+               :        +- * Project (65)
+               :           +- * BroadcastHashJoin Inner BuildRight (64)
+               :              :- * Project (62)
+               :              :  +- * BroadcastHashJoin Inner BuildRight (61)
+               :              :     :- * Project (59)
+               :              :     :  +- * BroadcastHashJoin Inner BuildRight (58)
+               :              :     :     :- * Project (53)
+               :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (52)
+               :              :     :     :     :- * ColumnarToRow (50)
+               :              :     :     :     :  +- CometProject (49)
+               :              :     :     :     :     +- CometSortMergeJoin (48)
+               :              :     :     :     :        :- CometSort (42)
+               :              :     :     :     :        :  +- CometExchange (41)
+               :              :     :     :     :        :     +- CometFilter (40)
+               :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (39)
+               :              :     :     :     :        +- CometSort (47)
+               :              :     :     :     :           +- CometExchange (46)
+               :              :     :     :     :              +- CometProject (45)
+               :              :     :     :     :                 +- CometFilter (44)
+               :              :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (43)
+               :              :     :     :     +- ReusedExchange (51)
+               :              :     :     +- BroadcastExchange (57)
+               :              :     :        +- * ColumnarToRow (56)
+               :              :     :           +- CometFilter (55)
+               :              :     :              +- CometScan parquet spark_catalog.default.catalog_page (54)
+               :              :     +- ReusedExchange (60)
+               :              +- ReusedExchange (63)
+               +- * HashAggregate (98)
+                  +- Exchange (97)
+                     +- * HashAggregate (96)
+                        +- * Project (95)
+                           +- * BroadcastHashJoin Inner BuildRight (94)
+                              :- * Project (92)
+                              :  +- * BroadcastHashJoin Inner BuildRight (91)
+                              :     :- * Project (89)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (88)
+                              :     :     :- * Project (83)
+                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (82)
+                              :     :     :     :- * ColumnarToRow (80)
+                              :     :     :     :  +- CometProject (79)
+                              :     :     :     :     +- CometSortMergeJoin (78)
+                              :     :     :     :        :- CometSort (72)
+                              :     :     :     :        :  +- CometExchange (71)
+                              :     :     :     :        :     +- CometFilter (70)
+                              :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (69)
+                              :     :     :     :        +- CometSort (77)
+                              :     :     :     :           +- CometExchange (76)
+                              :     :     :     :              +- CometProject (75)
+                              :     :     :     :                 +- CometFilter (74)
+                              :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (73)
+                              :     :     :     +- ReusedExchange (81)
+                              :     :     +- BroadcastExchange (87)
+                              :     :        +- * ColumnarToRow (86)
+                              :     :           +- CometFilter (85)
+                              :     :              +- CometScan parquet spark_catalog.default.web_site (84)
+                              :     +- ReusedExchange (90)
+                              +- ReusedExchange (93)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -125,9 +117,9 @@ ReadSchema: struct<ss_item_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_numb
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
 Condition : ((isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1)) AND isnotnull(ss_promo_sk#3))
 
-(3) CometColumnarExchange
+(3) CometExchange
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
@@ -148,9 +140,9 @@ Condition : (isnotnull(sr_item_sk#9) AND isnotnull(sr_ticket_number#10))
 Input [5]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12, sr_returned_date_sk#13]
 Arguments: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12], [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
-Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
@@ -168,7 +160,7 @@ Arguments: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss
 (12) ColumnarToRow [codegen id : 5]
 Input [8]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7, sr_return_amt#11, sr_net_loss#12]
 
-(13) ReusedExchange [Reuses operator id: 117]
+(13) ReusedExchange [Reuses operator id: 109]
 Output [1]: [d_date_sk#14]
 
 (14) BroadcastHashJoin [codegen id : 5]
@@ -280,17 +272,11 @@ Functions [3]: [partial_sum(UnscaledValue(ss_ext_sales_price#5)), partial_sum(co
 Aggregate Attributes [5]: [sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Results [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 
-(37) RowToColumnar
+(37) Exchange
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
+Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(38) CometColumnarExchange
-Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
-Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(39) ColumnarToRow [codegen id : 6]
-Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
-
-(40) HashAggregate [codegen id : 6]
+(38) HashAggregate [codegen id : 6]
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 Keys [1]: [s_store_id#16]
 Functions [3]: [sum(UnscaledValue(ss_ext_sales_price#5)), sum(coalesce(cast(sr_return_amt#11 as decimal(12,2)), 0.00)), sum((ss_net_profit#6 - coalesce(cast(sr_net_loss#12 as decimal(12,2)), 0.00)))]
@@ -305,15 +291,15 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk), IsNotNull(cs_item_sk), IsNotNull(cs_promo_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_item_sk:int,cs_promo_sk:int,cs_order_number:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(42) CometFilter
+(40) CometFilter
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : ((isnotnull(cs_catalog_page_sk#39) AND isnotnull(cs_item_sk#40)) AND isnotnull(cs_promo_sk#41))
 
-(43) CometColumnarExchange
+(41) CometExchange
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
-Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(44) CometSort
+(42) CometSort
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45], [cs_item_sk#40 ASC NULLS FIRST, cs_order_number#42 ASC NULLS FIRST]
 
@@ -324,44 +310,44 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(46) CometFilter
+(44) CometFilter
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Condition : (isnotnull(cr_item_sk#47) AND isnotnull(cr_order_number#48))
 
-(47) CometProject
+(45) CometProject
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 
-(48) CometColumnarExchange
+(46) CometExchange
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
-Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
 
-(49) CometSort
+(47) CometSort
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47 ASC NULLS FIRST, cr_order_number#48 ASC NULLS FIRST]
 
-(50) CometSortMergeJoin
+(48) CometSortMergeJoin
 Left output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Right output [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_item_sk#40, cs_order_number#42], [cr_item_sk#47, cr_order_number#48], LeftOuter
 
-(51) CometProject
+(49) CometProject
 Input [11]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50], [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(52) ColumnarToRow [codegen id : 11]
+(50) ColumnarToRow [codegen id : 11]
 Input [8]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(53) ReusedExchange [Reuses operator id: 117]
+(51) ReusedExchange [Reuses operator id: 109]
 Output [1]: [d_date_sk#52]
 
-(54) BroadcastHashJoin [codegen id : 11]
+(52) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_sold_date_sk#45]
 Right keys [1]: [d_date_sk#52]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 11]
+(53) Project [codegen id : 11]
 Output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50, d_date_sk#52]
 
@@ -372,71 +358,65 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(57) CometFilter
+(55) CometFilter
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Condition : isnotnull(cp_catalog_page_sk#53)
 
-(58) ColumnarToRow [codegen id : 8]
+(56) ColumnarToRow [codegen id : 8]
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(59) BroadcastExchange
+(57) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 11]
+(58) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_catalog_page_sk#39]
 Right keys [1]: [cp_catalog_page_sk#53]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 11]
+(59) Project [codegen id : 11]
 Output [7]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(62) ReusedExchange [Reuses operator id: 26]
+(60) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#55]
 
-(63) BroadcastHashJoin [codegen id : 11]
+(61) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_item_sk#40]
 Right keys [1]: [i_item_sk#55]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 11]
+(62) Project [codegen id : 11]
 Output [6]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [8]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, i_item_sk#55]
 
-(65) ReusedExchange [Reuses operator id: 33]
+(63) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#56]
 
-(66) BroadcastHashJoin [codegen id : 11]
+(64) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_promo_sk#41]
 Right keys [1]: [p_promo_sk#56]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 11]
+(65) Project [codegen id : 11]
 Output [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [7]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, p_promo_sk#56]
 
-(68) HashAggregate [codegen id : 11]
+(66) HashAggregate [codegen id : 11]
 Input [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [partial_sum(UnscaledValue(cs_ext_sales_price#43)), partial_sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), partial_sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#57, sum#58, isEmpty#59, sum#60, isEmpty#61]
 Results [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 
-(69) RowToColumnar
-Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
-
-(70) CometColumnarExchange
-Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
-Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(71) ColumnarToRow [codegen id : 12]
+(67) Exchange
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
+Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(72) HashAggregate [codegen id : 12]
+(68) HashAggregate [codegen id : 12]
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [sum(UnscaledValue(cs_ext_sales_price#43)), sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
@@ -451,15 +431,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#81), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk), IsNotNull(ws_item_sk), IsNotNull(ws_promo_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_promo_sk:int,ws_order_number:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(74) CometFilter
+(70) CometFilter
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Condition : ((isnotnull(ws_web_site_sk#76) AND isnotnull(ws_item_sk#75)) AND isnotnull(ws_promo_sk#77))
 
-(75) CometColumnarExchange
+(71) CometExchange
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
-Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=11]
 
-(76) CometSort
+(72) CometSort
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81], [ws_item_sk#75 ASC NULLS FIRST, ws_order_number#78 ASC NULLS FIRST]
 
@@ -470,44 +450,44 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_item_sk), IsNotNull(wr_order_number)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(78) CometFilter
+(74) CometFilter
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Condition : (isnotnull(wr_item_sk#83) AND isnotnull(wr_order_number#84))
 
-(79) CometProject
+(75) CometProject
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 
-(80) CometColumnarExchange
+(76) CometExchange
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
-Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
 
-(81) CometSort
+(77) CometSort
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83 ASC NULLS FIRST, wr_order_number#84 ASC NULLS FIRST]
 
-(82) CometSortMergeJoin
+(78) CometSortMergeJoin
 Left output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Right output [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_order_number#78], [wr_item_sk#83, wr_order_number#84], LeftOuter
 
-(83) CometProject
+(79) CometProject
 Input [11]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86], [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(84) ColumnarToRow [codegen id : 17]
+(80) ColumnarToRow [codegen id : 17]
 Input [8]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(85) ReusedExchange [Reuses operator id: 117]
+(81) ReusedExchange [Reuses operator id: 109]
 Output [1]: [d_date_sk#88]
 
-(86) BroadcastHashJoin [codegen id : 17]
+(82) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_sold_date_sk#81]
 Right keys [1]: [d_date_sk#88]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 17]
+(83) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86, d_date_sk#88]
 
@@ -518,143 +498,133 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(89) CometFilter
+(85) CometFilter
 Input [2]: [web_site_sk#89, web_site_id#90]
 Condition : isnotnull(web_site_sk#89)
 
-(90) ColumnarToRow [codegen id : 14]
+(86) ColumnarToRow [codegen id : 14]
 Input [2]: [web_site_sk#89, web_site_id#90]
 
-(91) BroadcastExchange
+(87) BroadcastExchange
 Input [2]: [web_site_sk#89, web_site_id#90]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(92) BroadcastHashJoin [codegen id : 17]
+(88) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_web_site_sk#76]
 Right keys [1]: [web_site_sk#89]
 Join type: Inner
 Join condition: None
 
-(93) Project [codegen id : 17]
+(89) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_sk#89, web_site_id#90]
 
-(94) ReusedExchange [Reuses operator id: 26]
+(90) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#91]
 
-(95) BroadcastHashJoin [codegen id : 17]
+(91) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_item_sk#75]
 Right keys [1]: [i_item_sk#91]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 17]
+(92) Project [codegen id : 17]
 Output [6]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [8]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, i_item_sk#91]
 
-(97) ReusedExchange [Reuses operator id: 33]
+(93) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#92]
 
-(98) BroadcastHashJoin [codegen id : 17]
+(94) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_promo_sk#77]
 Right keys [1]: [p_promo_sk#92]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 17]
+(95) Project [codegen id : 17]
 Output [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [7]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, p_promo_sk#92]
 
-(100) HashAggregate [codegen id : 17]
+(96) HashAggregate [codegen id : 17]
 Input [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Keys [1]: [web_site_id#90]
 Functions [3]: [partial_sum(UnscaledValue(ws_ext_sales_price#79)), partial_sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), partial_sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#93, sum#94, isEmpty#95, sum#96, isEmpty#97]
 Results [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 
-(101) RowToColumnar
+(97) Exchange
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
+Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, [plan_id=14]
 
-(102) CometColumnarExchange
-Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
-Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
-
-(103) ColumnarToRow [codegen id : 18]
-Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
-
-(104) HashAggregate [codegen id : 18]
+(98) HashAggregate [codegen id : 18]
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 Keys [1]: [web_site_id#90]
 Functions [3]: [sum(UnscaledValue(ws_ext_sales_price#79)), sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_sales_price#79))#103, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105]
 Results [5]: [MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#79))#103,17,2) AS sales#106, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104 AS returns#107, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105 AS profit#108, web channel AS channel#109, concat(web_site, web_site_id#90) AS id#110]
 
-(105) Union
+(99) Union
 
-(106) Expand [codegen id : 19]
+(100) Expand [codegen id : 19]
 Input [5]: [sales#34, returns#35, profit#36, channel#37, id#38]
 Arguments: [[sales#34, returns#35, profit#36, channel#37, id#38, 0], [sales#34, returns#35, profit#36, channel#37, null, 1], [sales#34, returns#35, profit#36, null, null, 3]], [sales#34, returns#35, profit#36, channel#111, id#112, spark_grouping_id#113]
 
-(107) HashAggregate [codegen id : 19]
+(101) HashAggregate [codegen id : 19]
 Input [6]: [sales#34, returns#35, profit#36, channel#111, id#112, spark_grouping_id#113]
 Keys [3]: [channel#111, id#112, spark_grouping_id#113]
 Functions [3]: [partial_sum(sales#34), partial_sum(returns#35), partial_sum(profit#36)]
 Aggregate Attributes [6]: [sum#114, isEmpty#115, sum#116, isEmpty#117, sum#118, isEmpty#119]
 Results [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
 
-(108) RowToColumnar
-Input [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
-
-(109) CometColumnarExchange
+(102) Exchange
 Input [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
-Arguments: hashpartitioning(channel#111, id#112, spark_grouping_id#113, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+Arguments: hashpartitioning(channel#111, id#112, spark_grouping_id#113, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(110) CometHashAggregate
+(103) HashAggregate [codegen id : 20]
 Input [9]: [channel#111, id#112, spark_grouping_id#113, sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
 Keys [3]: [channel#111, id#112, spark_grouping_id#113]
 Functions [3]: [sum(sales#34), sum(returns#35), sum(profit#36)]
+Aggregate Attributes [3]: [sum(sales#34)#126, sum(returns#35)#127, sum(profit#36)#128]
+Results [5]: [channel#111, id#112, sum(sales#34)#126 AS sales#129, sum(returns#35)#127 AS returns#130, sum(profit#36)#128 AS profit#131]
 
-(111) CometTakeOrderedAndProject
-Input [5]: [channel#111, id#112, sales#126, returns#127, profit#128]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#111 ASC NULLS FIRST,id#112 ASC NULLS FIRST], output=[channel#111,id#112,sales#126,returns#127,profit#128]), 100, [channel#111 ASC NULLS FIRST, id#112 ASC NULLS FIRST], [channel#111, id#112, sales#126, returns#127, profit#128]
-
-(112) ColumnarToRow [codegen id : 20]
-Input [5]: [channel#111, id#112, sales#126, returns#127, profit#128]
+(104) TakeOrderedAndProject
+Input [5]: [channel#111, id#112, sales#129, returns#130, profit#131]
+Arguments: 100, [channel#111 ASC NULLS FIRST, id#112 ASC NULLS FIRST], [channel#111, id#112, sales#129, returns#130, profit#131]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (117)
-+- * ColumnarToRow (116)
-   +- CometProject (115)
-      +- CometFilter (114)
-         +- CometScan parquet spark_catalog.default.date_dim (113)
+BroadcastExchange (109)
++- * ColumnarToRow (108)
+   +- CometProject (107)
+      +- CometFilter (106)
+         +- CometScan parquet spark_catalog.default.date_dim (105)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_date#129]
+Output [2]: [d_date_sk#14, d_date#132]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-08-23), LessThanOrEqual(d_date,2000-09-22), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(114) CometFilter
-Input [2]: [d_date_sk#14, d_date#129]
-Condition : (((isnotnull(d_date#129) AND (d_date#129 >= 2000-08-23)) AND (d_date#129 <= 2000-09-22)) AND isnotnull(d_date_sk#14))
+(106) CometFilter
+Input [2]: [d_date_sk#14, d_date#132]
+Condition : (((isnotnull(d_date#132) AND (d_date#132 >= 2000-08-23)) AND (d_date#132 <= 2000-09-22)) AND isnotnull(d_date_sk#14))
 
-(115) CometProject
-Input [2]: [d_date_sk#14, d_date#129]
+(107) CometProject
+Input [2]: [d_date_sk#14, d_date#132]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(116) ColumnarToRow [codegen id : 1]
+(108) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(117) BroadcastExchange
+(109) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=16]
 
-Subquery:2 Hosting operator id = 41 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 39 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 73 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 69 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt
index f28c862efd..8fc66cbe4d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q80/simplified.txt
@@ -1,160 +1,152 @@
-WholeStageCodegen (20)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
-        CometHashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-          CometColumnarExchange [channel,id,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (19)
-                HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  Expand [sales,returns,profit,channel,id]
-                    InputAdapter
-                      Union
-                        WholeStageCodegen (6)
-                          HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [s_store_id] #2
-                                  RowToColumnar
-                                    WholeStageCodegen (5)
-                                      HashAggregate [s_store_id,ss_ext_sales_price,sr_return_amt,ss_net_profit,sr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
-                                        Project [ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
-                                          BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                            Project [ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
-                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                Project [ss_item_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
-                                                  BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                    Project [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss]
-                                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk,sr_return_amt,sr_net_loss]
-                                                              CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                                                                CometSort [ss_item_sk,ss_ticket_number]
-                                                                  CometColumnarExchange [ss_item_sk,ss_ticket_number] #3
-                                                                    CometFilter [ss_store_sk,ss_item_sk,ss_promo_sk]
-                                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                                        SubqueryBroadcast [d_date_sk] #1
-                                                                          BroadcastExchange #4
-                                                                            WholeStageCodegen (1)
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometProject [d_date_sk]
-                                                                                    CometFilter [d_date,d_date_sk]
-                                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                                CometSort [sr_item_sk,sr_ticket_number]
-                                                                  CometColumnarExchange [sr_item_sk,sr_ticket_number] #5
-                                                                    CometProject [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss]
-                                                                      CometFilter [sr_item_sk,sr_ticket_number]
-                                                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss,sr_returned_date_sk]
-                                                        InputAdapter
-                                                          ReusedExchange [d_date_sk] #4
-                                                    InputAdapter
-                                                      BroadcastExchange #6
-                                                        WholeStageCodegen (2)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [s_store_sk]
-                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
+TakeOrderedAndProject [channel,id,sales,returns,profit]
+  WholeStageCodegen (20)
+    HashAggregate [channel,id,spark_grouping_id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+      InputAdapter
+        Exchange [channel,id,spark_grouping_id] #1
+          WholeStageCodegen (19)
+            HashAggregate [channel,id,spark_grouping_id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+              Expand [sales,returns,profit,channel,id]
+                InputAdapter
+                  Union
+                    WholeStageCodegen (6)
+                      HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
+                        InputAdapter
+                          Exchange [s_store_id] #2
+                            WholeStageCodegen (5)
+                              HashAggregate [s_store_id,ss_ext_sales_price,sr_return_amt,ss_net_profit,sr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
+                                Project [ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
+                                  BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                    Project [ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
+                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                        Project [ss_item_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
+                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                            Project [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss]
+                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk,sr_return_amt,sr_net_loss]
+                                                      CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                        CometSort [ss_item_sk,ss_ticket_number]
+                                                          CometExchange [ss_item_sk,ss_ticket_number] #3
+                                                            CometFilter [ss_store_sk,ss_item_sk,ss_promo_sk]
+                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                  BroadcastExchange #4
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [d_date_sk]
+                                                                            CometFilter [d_date,d_date_sk]
+                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                        CometSort [sr_item_sk,sr_ticket_number]
+                                                          CometExchange [sr_item_sk,sr_ticket_number] #5
+                                                            CometProject [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss]
+                                                              CometFilter [sr_item_sk,sr_ticket_number]
+                                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss,sr_returned_date_sk]
                                                 InputAdapter
-                                                  BroadcastExchange #7
-                                                    WholeStageCodegen (3)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [i_item_sk]
-                                                            CometFilter [i_current_price,i_item_sk]
-                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price]
+                                                  ReusedExchange [d_date_sk] #4
                                             InputAdapter
-                                              BroadcastExchange #8
-                                                WholeStageCodegen (4)
+                                              BroadcastExchange #6
+                                                WholeStageCodegen (2)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometProject [p_promo_sk]
-                                                        CometFilter [p_channel_tv,p_promo_sk]
-                                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_tv]
-                        WholeStageCodegen (12)
-                          HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [cp_catalog_page_id] #9
-                                  RowToColumnar
-                                    WholeStageCodegen (11)
-                                      HashAggregate [cp_catalog_page_id,cs_ext_sales_price,cr_return_amount,cs_net_profit,cr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
-                                        Project [cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
-                                          BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                                            Project [cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
-                                              BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                Project [cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
-                                                  BroadcastHashJoin [cs_catalog_page_sk,cp_catalog_page_sk]
-                                                    Project [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss]
-                                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk,cr_return_amount,cr_net_loss]
-                                                              CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                                                                CometSort [cs_item_sk,cs_order_number]
-                                                                  CometColumnarExchange [cs_item_sk,cs_order_number] #10
-                                                                    CometFilter [cs_catalog_page_sk,cs_item_sk,cs_promo_sk]
-                                                                      CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
-                                                                        ReusedSubquery [d_date_sk] #1
-                                                                CometSort [cr_item_sk,cr_order_number]
-                                                                  CometColumnarExchange [cr_item_sk,cr_order_number] #11
-                                                                    CometProject [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss]
-                                                                      CometFilter [cr_item_sk,cr_order_number]
-                                                                        CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss,cr_returned_date_sk]
-                                                        InputAdapter
-                                                          ReusedExchange [d_date_sk] #4
-                                                    InputAdapter
-                                                      BroadcastExchange #12
-                                                        WholeStageCodegen (8)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [cp_catalog_page_sk]
-                                                                CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
+                                                      CometFilter [s_store_sk]
+                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
+                                        InputAdapter
+                                          BroadcastExchange #7
+                                            WholeStageCodegen (3)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [i_item_sk]
+                                                    CometFilter [i_current_price,i_item_sk]
+                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price]
+                                    InputAdapter
+                                      BroadcastExchange #8
+                                        WholeStageCodegen (4)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [p_promo_sk]
+                                                CometFilter [p_channel_tv,p_promo_sk]
+                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_tv]
+                    WholeStageCodegen (12)
+                      HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
+                        InputAdapter
+                          Exchange [cp_catalog_page_id] #9
+                            WholeStageCodegen (11)
+                              HashAggregate [cp_catalog_page_id,cs_ext_sales_price,cr_return_amount,cs_net_profit,cr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
+                                Project [cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
+                                  BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                                    Project [cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
+                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                        Project [cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
+                                          BroadcastHashJoin [cs_catalog_page_sk,cp_catalog_page_sk]
+                                            Project [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss]
+                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk,cr_return_amount,cr_net_loss]
+                                                      CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                                                        CometSort [cs_item_sk,cs_order_number]
+                                                          CometExchange [cs_item_sk,cs_order_number] #10
+                                                            CometFilter [cs_catalog_page_sk,cs_item_sk,cs_promo_sk]
+                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                        CometSort [cr_item_sk,cr_order_number]
+                                                          CometExchange [cr_item_sk,cr_order_number] #11
+                                                            CometProject [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss]
+                                                              CometFilter [cr_item_sk,cr_order_number]
+                                                                CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss,cr_returned_date_sk]
                                                 InputAdapter
-                                                  ReusedExchange [i_item_sk] #7
+                                                  ReusedExchange [d_date_sk] #4
                                             InputAdapter
-                                              ReusedExchange [p_promo_sk] #8
-                        WholeStageCodegen (18)
-                          HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
-                            ColumnarToRow
-                              InputAdapter
-                                CometColumnarExchange [web_site_id] #13
-                                  RowToColumnar
-                                    WholeStageCodegen (17)
-                                      HashAggregate [web_site_id,ws_ext_sales_price,wr_return_amt,ws_net_profit,wr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
-                                        Project [ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
-                                          BroadcastHashJoin [ws_promo_sk,p_promo_sk]
-                                            Project [ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
-                                              BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                Project [ws_item_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
-                                                  BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                                                    Project [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss]
-                                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometProject [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk,wr_return_amt,wr_net_loss]
-                                                              CometSortMergeJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
-                                                                CometSort [ws_item_sk,ws_order_number]
-                                                                  CometColumnarExchange [ws_item_sk,ws_order_number] #14
-                                                                    CometFilter [ws_web_site_sk,ws_item_sk,ws_promo_sk]
-                                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_order_number,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                                        ReusedSubquery [d_date_sk] #1
-                                                                CometSort [wr_item_sk,wr_order_number]
-                                                                  CometColumnarExchange [wr_item_sk,wr_order_number] #15
-                                                                    CometProject [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss]
-                                                                      CometFilter [wr_item_sk,wr_order_number]
-                                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
-                                                        InputAdapter
-                                                          ReusedExchange [d_date_sk] #4
+                                              BroadcastExchange #12
+                                                WholeStageCodegen (8)
+                                                  ColumnarToRow
                                                     InputAdapter
-                                                      BroadcastExchange #16
-                                                        WholeStageCodegen (14)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometFilter [web_site_sk]
-                                                                CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
+                                                      CometFilter [cp_catalog_page_sk]
+                                                        CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
+                                        InputAdapter
+                                          ReusedExchange [i_item_sk] #7
+                                    InputAdapter
+                                      ReusedExchange [p_promo_sk] #8
+                    WholeStageCodegen (18)
+                      HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),sales,returns,profit,channel,id,sum,sum,isEmpty,sum,isEmpty]
+                        InputAdapter
+                          Exchange [web_site_id] #13
+                            WholeStageCodegen (17)
+                              HashAggregate [web_site_id,ws_ext_sales_price,wr_return_amt,ws_net_profit,wr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
+                                Project [ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
+                                  BroadcastHashJoin [ws_promo_sk,p_promo_sk]
+                                    Project [ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
+                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                        Project [ws_item_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
+                                          BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                                            Project [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss]
+                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk,wr_return_amt,wr_net_loss]
+                                                      CometSortMergeJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
+                                                        CometSort [ws_item_sk,ws_order_number]
+                                                          CometExchange [ws_item_sk,ws_order_number] #14
+                                                            CometFilter [ws_web_site_sk,ws_item_sk,ws_promo_sk]
+                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_order_number,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                                ReusedSubquery [d_date_sk] #1
+                                                        CometSort [wr_item_sk,wr_order_number]
+                                                          CometExchange [wr_item_sk,wr_order_number] #15
+                                                            CometProject [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss]
+                                                              CometFilter [wr_item_sk,wr_order_number]
+                                                                CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
                                                 InputAdapter
-                                                  ReusedExchange [i_item_sk] #7
+                                                  ReusedExchange [d_date_sk] #4
                                             InputAdapter
-                                              ReusedExchange [p_promo_sk] #8
+                                              BroadcastExchange #16
+                                                WholeStageCodegen (14)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [web_site_sk]
+                                                        CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
+                                        InputAdapter
+                                          ReusedExchange [i_item_sk] #7
+                                    InputAdapter
+                                      ReusedExchange [p_promo_sk] #8
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt
index c31369315e..d8dc396dd7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/explain.txt
@@ -1,56 +1,52 @@
 == Physical Plan ==
-TakeOrderedAndProject (52)
-+- * Project (51)
-   +- * BroadcastHashJoin Inner BuildRight (50)
-      :- * Project (45)
-      :  +- * BroadcastHashJoin Inner BuildRight (44)
-      :     :- * Project (39)
-      :     :  +- * BroadcastHashJoin Inner BuildRight (38)
-      :     :     :- * ColumnarToRow (18)
-      :     :     :  +- CometFilter (17)
-      :     :     :     +- CometHashAggregate (16)
-      :     :     :        +- CometColumnarExchange (15)
-      :     :     :           +- RowToColumnar (14)
-      :     :     :              +- * HashAggregate (13)
-      :     :     :                 +- * Project (12)
-      :     :     :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :     :                       :- * Project (6)
-      :     :     :                       :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :     :     :                       :     :- * ColumnarToRow (3)
-      :     :     :                       :     :  +- CometFilter (2)
-      :     :     :                       :     :     +- CometScan parquet spark_catalog.default.catalog_returns (1)
-      :     :     :                       :     +- ReusedExchange (4)
-      :     :     :                       +- BroadcastExchange (10)
-      :     :     :                          +- * ColumnarToRow (9)
-      :     :     :                             +- CometFilter (8)
-      :     :     :                                +- CometScan parquet spark_catalog.default.customer_address (7)
-      :     :     +- BroadcastExchange (37)
-      :     :        +- * ColumnarToRow (36)
-      :     :           +- CometFilter (35)
-      :     :              +- CometHashAggregate (34)
-      :     :                 +- CometColumnarExchange (33)
-      :     :                    +- CometHashAggregate (32)
-      :     :                       +- CometHashAggregate (31)
-      :     :                          +- CometColumnarExchange (30)
-      :     :                             +- RowToColumnar (29)
-      :     :                                +- * HashAggregate (28)
-      :     :                                   +- * Project (27)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :                                         :- * Project (24)
-      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (23)
-      :     :                                         :     :- * ColumnarToRow (21)
-      :     :                                         :     :  +- CometFilter (20)
-      :     :                                         :     :     +- CometScan parquet spark_catalog.default.catalog_returns (19)
-      :     :                                         :     +- ReusedExchange (22)
-      :     :                                         +- ReusedExchange (25)
-      :     +- BroadcastExchange (43)
-      :        +- * ColumnarToRow (42)
-      :           +- CometFilter (41)
-      :              +- CometScan parquet spark_catalog.default.customer (40)
-      +- BroadcastExchange (49)
-         +- * ColumnarToRow (48)
-            +- CometFilter (47)
-               +- CometScan parquet spark_catalog.default.customer_address (46)
+TakeOrderedAndProject (48)
++- * Project (47)
+   +- * BroadcastHashJoin Inner BuildRight (46)
+      :- * Project (41)
+      :  +- * BroadcastHashJoin Inner BuildRight (40)
+      :     :- * Project (35)
+      :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+      :     :     :- * Filter (16)
+      :     :     :  +- * HashAggregate (15)
+      :     :     :     +- Exchange (14)
+      :     :     :        +- * HashAggregate (13)
+      :     :     :           +- * Project (12)
+      :     :     :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :     :                 :- * Project (6)
+      :     :     :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
+      :     :     :                 :     :- * ColumnarToRow (3)
+      :     :     :                 :     :  +- CometFilter (2)
+      :     :     :                 :     :     +- CometScan parquet spark_catalog.default.catalog_returns (1)
+      :     :     :                 :     +- ReusedExchange (4)
+      :     :     :                 +- BroadcastExchange (10)
+      :     :     :                    +- * ColumnarToRow (9)
+      :     :     :                       +- CometFilter (8)
+      :     :     :                          +- CometScan parquet spark_catalog.default.customer_address (7)
+      :     :     +- BroadcastExchange (33)
+      :     :        +- * Filter (32)
+      :     :           +- * HashAggregate (31)
+      :     :              +- Exchange (30)
+      :     :                 +- * HashAggregate (29)
+      :     :                    +- * HashAggregate (28)
+      :     :                       +- Exchange (27)
+      :     :                          +- * HashAggregate (26)
+      :     :                             +- * Project (25)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :                                   :- * Project (22)
+      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (21)
+      :     :                                   :     :- * ColumnarToRow (19)
+      :     :                                   :     :  +- CometFilter (18)
+      :     :                                   :     :     +- CometScan parquet spark_catalog.default.catalog_returns (17)
+      :     :                                   :     +- ReusedExchange (20)
+      :     :                                   +- ReusedExchange (23)
+      :     +- BroadcastExchange (39)
+      :        +- * ColumnarToRow (38)
+      :           +- CometFilter (37)
+      :              +- CometScan parquet spark_catalog.default.customer (36)
+      +- BroadcastExchange (45)
+         +- * ColumnarToRow (44)
+            +- CometFilter (43)
+               +- CometScan parquet spark_catalog.default.customer_address (42)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
@@ -68,7 +64,7 @@ Condition : (isnotnull(cr_returning_addr_sk#2) AND isnotnull(cr_returning_custom
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 57]
+(4) ReusedExchange [Reuses operator id: 53]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -116,212 +112,208 @@ Functions [1]: [partial_sum(UnscaledValue(cr_return_amt_inc_tax#3))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
+Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
-Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 11]
 Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#10]
 Keys [2]: [cr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))#11]
+Results [3]: [cr_returning_customer_sk#1 AS ctr_customer_sk#12, ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(cr_return_amt_inc_tax#3))#11,17,2) AS ctr_total_return#14]
 
-(17) CometFilter
-Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
-Condition : isnotnull(ctr_total_return#13)
-
-(18) ColumnarToRow [codegen id : 10]
-Input [3]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13]
+(16) Filter [codegen id : 11]
+Input [3]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14]
+Condition : isnotnull(ctr_total_return#14)
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#4), dynamicpruningexpression(cr_returned_date_sk#4 IN dynamicpruning#14)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#4), dynamicpruningexpression(cr_returned_date_sk#4 IN dynamicpruning#15)]
 PushedFilters: [IsNotNull(cr_returning_addr_sk)]
 ReadSchema: struct<cr_returning_customer_sk:int,cr_returning_addr_sk:int,cr_return_amt_inc_tax:decimal(7,2)>
 
-(20) CometFilter
+(18) CometFilter
 Input [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 Condition : isnotnull(cr_returning_addr_sk#2)
 
-(21) ColumnarToRow [codegen id : 6]
+(19) ColumnarToRow [codegen id : 6]
 Input [4]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4]
 
-(22) ReusedExchange [Reuses operator id: 57]
+(20) ReusedExchange [Reuses operator id: 53]
 Output [1]: [d_date_sk#6]
 
-(23) BroadcastHashJoin [codegen id : 6]
+(21) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cr_returned_date_sk#4]
 Right keys [1]: [d_date_sk#6]
 Join type: Inner
 Join condition: None
 
-(24) Project [codegen id : 6]
+(22) Project [codegen id : 6]
 Output [3]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3]
 Input [5]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, cr_returned_date_sk#4, d_date_sk#6]
 
-(25) ReusedExchange [Reuses operator id: 10]
+(23) ReusedExchange [Reuses operator id: 10]
 Output [2]: [ca_address_sk#7, ca_state#8]
 
-(26) BroadcastHashJoin [codegen id : 6]
+(24) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cr_returning_addr_sk#2]
 Right keys [1]: [ca_address_sk#7]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
+(25) Project [codegen id : 6]
 Output [3]: [cr_returning_customer_sk#1, cr_return_amt_inc_tax#3, ca_state#8]
 Input [5]: [cr_returning_customer_sk#1, cr_returning_addr_sk#2, cr_return_amt_inc_tax#3, ca_address_sk#7, ca_state#8]
 
-(28) HashAggregate [codegen id : 6]
+(26) HashAggregate [codegen id : 6]
 Input [3]: [cr_returning_customer_sk#1, cr_return_amt_inc_tax#3, ca_state#8]
 Keys [2]: [cr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [partial_sum(UnscaledValue(cr_return_amt_inc_tax#3))]
-Aggregate Attributes [1]: [sum#15]
-Results [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
+Aggregate Attributes [1]: [sum#16]
+Results [3]: [cr_returning_customer_sk#1, ca_state#8, sum#17]
 
-(29) RowToColumnar
-Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
+(27) Exchange
+Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#17]
+Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(30) CometColumnarExchange
-Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
-Arguments: hashpartitioning(cr_returning_customer_sk#1, ca_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(31) CometHashAggregate
-Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#16]
+(28) HashAggregate [codegen id : 7]
+Input [3]: [cr_returning_customer_sk#1, ca_state#8, sum#17]
 Keys [2]: [cr_returning_customer_sk#1, ca_state#8]
 Functions [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))]
-
-(32) CometHashAggregate
-Input [2]: [ctr_state#12, ctr_total_return#13]
-Keys [1]: [ctr_state#12]
-Functions [1]: [partial_avg(ctr_total_return#13)]
-
-(33) CometColumnarExchange
-Input [3]: [ctr_state#12, sum#17, count#18]
-Arguments: hashpartitioning(ctr_state#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [3]: [ctr_state#12, sum#17, count#18]
-Keys [1]: [ctr_state#12]
-Functions [1]: [avg(ctr_total_return#13)]
-
-(35) CometFilter
-Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
-Condition : isnotnull((avg(ctr_total_return) * 1.2)#19)
-
-(36) ColumnarToRow [codegen id : 7]
-Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
-
-(37) BroadcastExchange
-Input [2]: [(avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+Aggregate Attributes [1]: [sum(UnscaledValue(cr_return_amt_inc_tax#3))#11]
+Results [2]: [ca_state#8 AS ctr_state#13, MakeDecimal(sum(UnscaledValue(cr_return_amt_inc_tax#3))#11,17,2) AS ctr_total_return#14]
+
+(29) HashAggregate [codegen id : 7]
+Input [2]: [ctr_state#13, ctr_total_return#14]
+Keys [1]: [ctr_state#13]
+Functions [1]: [partial_avg(ctr_total_return#14)]
+Aggregate Attributes [2]: [sum#18, count#19]
+Results [3]: [ctr_state#13, sum#20, count#21]
+
+(30) Exchange
+Input [3]: [ctr_state#13, sum#20, count#21]
+Arguments: hashpartitioning(ctr_state#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 8]
+Input [3]: [ctr_state#13, sum#20, count#21]
+Keys [1]: [ctr_state#13]
+Functions [1]: [avg(ctr_total_return#14)]
+Aggregate Attributes [1]: [avg(ctr_total_return#14)#22]
+Results [2]: [(avg(ctr_total_return#14)#22 * 1.2) AS (avg(ctr_total_return) * 1.2)#23, ctr_state#13 AS ctr_state#13#24]
+
+(32) Filter [codegen id : 8]
+Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
+Condition : isnotnull((avg(ctr_total_return) * 1.2)#23)
+
+(33) BroadcastExchange
+Input [2]: [(avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
 Arguments: HashedRelationBroadcastMode(List(input[1, string, true]),false), [plan_id=5]
 
-(38) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ctr_state#12]
-Right keys [1]: [ctr_state#12#20]
+(34) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [ctr_state#13]
+Right keys [1]: [ctr_state#13#24]
 Join type: Inner
-Join condition: (cast(ctr_total_return#13 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#19)
+Join condition: (cast(ctr_total_return#14 as decimal(24,7)) > (avg(ctr_total_return) * 1.2)#23)
 
-(39) Project [codegen id : 10]
-Output [2]: [ctr_customer_sk#11, ctr_total_return#13]
-Input [5]: [ctr_customer_sk#11, ctr_state#12, ctr_total_return#13, (avg(ctr_total_return) * 1.2)#19, ctr_state#12#20]
+(35) Project [codegen id : 11]
+Output [2]: [ctr_customer_sk#12, ctr_total_return#14]
+Input [5]: [ctr_customer_sk#12, ctr_state#13, ctr_total_return#14, (avg(ctr_total_return) * 1.2)#23, ctr_state#13#24]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
+Output [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_current_addr_sk:int,c_salutation:string,c_first_name:string,c_last_name:string>
 
-(41) CometFilter
-Input [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
-Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_current_addr_sk#23))
+(37) CometFilter
+Input [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
+Condition : (isnotnull(c_customer_sk#25) AND isnotnull(c_current_addr_sk#27))
 
-(42) ColumnarToRow [codegen id : 8]
-Input [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
+(38) ColumnarToRow [codegen id : 9]
+Input [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
 
-(43) BroadcastExchange
-Input [6]: [c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
+(39) BroadcastExchange
+Input [6]: [c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(44) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ctr_customer_sk#11]
-Right keys [1]: [c_customer_sk#21]
+(40) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [ctr_customer_sk#12]
+Right keys [1]: [c_customer_sk#25]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
-Output [6]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
-Input [8]: [ctr_customer_sk#11, ctr_total_return#13, c_customer_sk#21, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26]
+(41) Project [codegen id : 11]
+Output [6]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
+Input [8]: [ctr_customer_sk#12, ctr_total_return#14, c_customer_sk#25, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30]
 
 (unknown) Scan parquet spark_catalog.default.customer_address
-Output [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
+Output [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_state), EqualTo(ca_state,GA), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_street_number:string,ca_street_name:string,ca_street_type:string,ca_suite_number:string,ca_city:string,ca_county:string,ca_state:string,ca_zip:string,ca_country:string,ca_gmt_offset:decimal(5,2),ca_location_type:string>
 
-(47) CometFilter
-Input [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
-Condition : ((isnotnull(ca_state#34) AND (ca_state#34 = GA)) AND isnotnull(ca_address_sk#27))
+(43) CometFilter
+Input [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
+Condition : ((isnotnull(ca_state#38) AND (ca_state#38 = GA)) AND isnotnull(ca_address_sk#31))
 
-(48) ColumnarToRow [codegen id : 9]
-Input [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
+(44) ColumnarToRow [codegen id : 10]
+Input [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
 
-(49) BroadcastExchange
-Input [12]: [ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
+(45) BroadcastExchange
+Input [12]: [ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(50) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_current_addr_sk#23]
-Right keys [1]: [ca_address_sk#27]
+(46) BroadcastHashJoin [codegen id : 11]
+Left keys [1]: [c_current_addr_sk#27]
+Right keys [1]: [ca_address_sk#31]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 10]
-Output [16]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38, ctr_total_return#13]
-Input [18]: [ctr_total_return#13, c_customer_id#22, c_current_addr_sk#23, c_salutation#24, c_first_name#25, c_last_name#26, ca_address_sk#27, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38]
+(47) Project [codegen id : 11]
+Output [16]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42, ctr_total_return#14]
+Input [18]: [ctr_total_return#14, c_customer_id#26, c_current_addr_sk#27, c_salutation#28, c_first_name#29, c_last_name#30, ca_address_sk#31, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42]
 
-(52) TakeOrderedAndProject
-Input [16]: [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38, ctr_total_return#13]
-Arguments: 100, [c_customer_id#22 ASC NULLS FIRST, c_salutation#24 ASC NULLS FIRST, c_first_name#25 ASC NULLS FIRST, c_last_name#26 ASC NULLS FIRST, ca_street_number#28 ASC NULLS FIRST, ca_street_name#29 ASC NULLS FIRST, ca_street_type#30 ASC NULLS FIRST, ca_suite_number#31 ASC NULLS FIRST, ca_city#32 ASC NULLS FIRST, ca_county#33 ASC NULLS FIRST, ca_state#34 ASC NULLS FIRST, ca_zip#35 ASC NULLS FIRST, ca_country#36 ASC NULLS FIRST, ca_gmt_offset#37 ASC NULLS FIRST, ca_location_type#38 ASC NULLS FIRST, ctr_total_return#13 ASC NULLS FIRST], [c_customer_id#22, c_salutation#24, c_first_name#25, c_last_name#26, ca_street_number#28, ca_street_name#29, ca_street_type#30, ca_suite_number#31, ca_city#32, ca_county#33, ca_state#34, ca_zip#35, ca_country#36, ca_gmt_offset#37, ca_location_type#38, ctr_total_return#13]
+(48) TakeOrderedAndProject
+Input [16]: [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42, ctr_total_return#14]
+Arguments: 100, [c_customer_id#26 ASC NULLS FIRST, c_salutation#28 ASC NULLS FIRST, c_first_name#29 ASC NULLS FIRST, c_last_name#30 ASC NULLS FIRST, ca_street_number#32 ASC NULLS FIRST, ca_street_name#33 ASC NULLS FIRST, ca_street_type#34 ASC NULLS FIRST, ca_suite_number#35 ASC NULLS FIRST, ca_city#36 ASC NULLS FIRST, ca_county#37 ASC NULLS FIRST, ca_state#38 ASC NULLS FIRST, ca_zip#39 ASC NULLS FIRST, ca_country#40 ASC NULLS FIRST, ca_gmt_offset#41 ASC NULLS FIRST, ca_location_type#42 ASC NULLS FIRST, ctr_total_return#14 ASC NULLS FIRST], [c_customer_id#26, c_salutation#28, c_first_name#29, c_last_name#30, ca_street_number#32, ca_street_name#33, ca_street_type#34, ca_suite_number#35, ca_city#36, ca_county#37, ca_state#38, ca_zip#39, ca_country#40, ca_gmt_offset#41, ca_location_type#42, ctr_total_return#14]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cr_returned_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (57)
-+- * ColumnarToRow (56)
-   +- CometProject (55)
-      +- CometFilter (54)
-         +- CometScan parquet spark_catalog.default.date_dim (53)
+BroadcastExchange (53)
++- * ColumnarToRow (52)
+   +- CometProject (51)
+      +- CometFilter (50)
+         +- CometScan parquet spark_catalog.default.date_dim (49)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_year#39]
+Output [2]: [d_date_sk#6, d_year#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(54) CometFilter
-Input [2]: [d_date_sk#6, d_year#39]
-Condition : ((isnotnull(d_year#39) AND (d_year#39 = 2000)) AND isnotnull(d_date_sk#6))
+(50) CometFilter
+Input [2]: [d_date_sk#6, d_year#43]
+Condition : ((isnotnull(d_year#43) AND (d_year#43 = 2000)) AND isnotnull(d_date_sk#6))
 
-(55) CometProject
-Input [2]: [d_date_sk#6, d_year#39]
+(51) CometProject
+Input [2]: [d_date_sk#6, d_year#43]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(56) ColumnarToRow [codegen id : 1]
+(52) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(57) BroadcastExchange
+(53) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 19 Hosting Expression = cr_returned_date_sk#4 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 17 Hosting Expression = cr_returned_date_sk#4 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt
index 8e5f0eb89b..da163f0233 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q81/simplified.txt
@@ -1,56 +1,54 @@
 TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,ca_street_number,ca_street_name,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset,ca_location_type,ctr_total_return]
-  WholeStageCodegen (10)
+  WholeStageCodegen (11)
     Project [c_customer_id,c_salutation,c_first_name,c_last_name,ca_street_number,ca_street_name,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset,ca_location_type,ctr_total_return]
       BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
         Project [ctr_total_return,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name]
           BroadcastHashJoin [ctr_customer_sk,c_customer_sk]
             Project [ctr_customer_sk,ctr_total_return]
               BroadcastHashJoin [ctr_state,ctr_state,ctr_total_return,(avg(ctr_total_return) * 1.2)]
-                ColumnarToRow
-                  InputAdapter
-                    CometFilter [ctr_total_return]
-                      CometHashAggregate [cr_returning_customer_sk,ca_state,sum]
-                        CometColumnarExchange [cr_returning_customer_sk,ca_state] #1
-                          RowToColumnar
-                            WholeStageCodegen (3)
-                              HashAggregate [cr_returning_customer_sk,ca_state,cr_return_amt_inc_tax] [sum,sum]
-                                Project [cr_returning_customer_sk,cr_return_amt_inc_tax,ca_state]
-                                  BroadcastHashJoin [cr_returning_addr_sk,ca_address_sk]
-                                    Project [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax]
-                                      BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cr_returning_addr_sk,cr_returning_customer_sk]
-                                              CometScan parquet spark_catalog.default.catalog_returns [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax,cr_returned_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #2
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #2
+                Filter [ctr_total_return]
+                  HashAggregate [cr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(cr_return_amt_inc_tax)),ctr_customer_sk,ctr_state,ctr_total_return,sum]
+                    InputAdapter
+                      Exchange [cr_returning_customer_sk,ca_state] #1
+                        WholeStageCodegen (3)
+                          HashAggregate [cr_returning_customer_sk,ca_state,cr_return_amt_inc_tax] [sum,sum]
+                            Project [cr_returning_customer_sk,cr_return_amt_inc_tax,ca_state]
+                              BroadcastHashJoin [cr_returning_addr_sk,ca_address_sk]
+                                Project [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax]
+                                  BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [cr_returning_addr_sk,cr_returning_customer_sk]
+                                          CometScan parquet spark_catalog.default.catalog_returns [cr_returning_customer_sk,cr_returning_addr_sk,cr_return_amt_inc_tax,cr_returned_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #2
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                     InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (2)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ca_address_sk,ca_state]
-                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                      ReusedExchange [d_date_sk] #2
+                                InputAdapter
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (2)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ca_address_sk,ca_state]
+                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                 InputAdapter
                   BroadcastExchange #4
-                    WholeStageCodegen (7)
-                      ColumnarToRow
-                        InputAdapter
-                          CometFilter [(avg(ctr_total_return) * 1.2)]
-                            CometHashAggregate [ctr_state,sum,count]
-                              CometColumnarExchange [ctr_state] #5
-                                CometHashAggregate [ctr_state,ctr_total_return]
-                                  CometHashAggregate [cr_returning_customer_sk,ca_state,sum]
-                                    CometColumnarExchange [cr_returning_customer_sk,ca_state] #6
-                                      RowToColumnar
+                    WholeStageCodegen (8)
+                      Filter [(avg(ctr_total_return) * 1.2)]
+                        HashAggregate [ctr_state,sum,count] [avg(ctr_total_return),(avg(ctr_total_return) * 1.2),ctr_state,sum,count]
+                          InputAdapter
+                            Exchange [ctr_state] #5
+                              WholeStageCodegen (7)
+                                HashAggregate [ctr_state,ctr_total_return] [sum,count,sum,count]
+                                  HashAggregate [cr_returning_customer_sk,ca_state,sum] [sum(UnscaledValue(cr_return_amt_inc_tax)),ctr_state,ctr_total_return,sum]
+                                    InputAdapter
+                                      Exchange [cr_returning_customer_sk,ca_state] #6
                                         WholeStageCodegen (6)
                                           HashAggregate [cr_returning_customer_sk,ca_state,cr_return_amt_inc_tax] [sum,sum]
                                             Project [cr_returning_customer_sk,cr_return_amt_inc_tax,ca_state]
@@ -68,14 +66,14 @@ TakeOrderedAndProject [c_customer_id,c_salutation,c_first_name,c_last_name,ca_st
                                                   ReusedExchange [ca_address_sk,ca_state] #3
             InputAdapter
               BroadcastExchange #7
-                WholeStageCodegen (8)
+                WholeStageCodegen (9)
                   ColumnarToRow
                     InputAdapter
                       CometFilter [c_customer_sk,c_current_addr_sk]
                         CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_current_addr_sk,c_salutation,c_first_name,c_last_name]
         InputAdapter
           BroadcastExchange #8
-            WholeStageCodegen (9)
+            WholeStageCodegen (10)
               ColumnarToRow
                 InputAdapter
                   CometFilter [ca_state,ca_address_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt
index 694fc26e95..683f7bd940 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/explain.txt
@@ -1,31 +1,29 @@
 == Physical Plan ==
-* ColumnarToRow (27)
-+- CometTakeOrderedAndProject (26)
-   +- CometHashAggregate (25)
-      +- CometColumnarExchange (24)
-         +- RowToColumnar (23)
-            +- * HashAggregate (22)
-               +- * Project (21)
-                  +- * BroadcastHashJoin Inner BuildLeft (20)
-                     :- BroadcastExchange (15)
-                     :  +- * Project (14)
-                     :     +- * BroadcastHashJoin Inner BuildRight (13)
-                     :        :- * Project (11)
-                     :        :  +- * BroadcastHashJoin Inner BuildRight (10)
-                     :        :     :- * ColumnarToRow (4)
-                     :        :     :  +- CometProject (3)
-                     :        :     :     +- CometFilter (2)
-                     :        :     :        +- CometScan parquet spark_catalog.default.item (1)
-                     :        :     +- BroadcastExchange (9)
-                     :        :        +- * ColumnarToRow (8)
-                     :        :           +- CometProject (7)
-                     :        :              +- CometFilter (6)
-                     :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
-                     :        +- ReusedExchange (12)
-                     +- * ColumnarToRow (19)
-                        +- CometProject (18)
-                           +- CometFilter (17)
-                              +- CometScan parquet spark_catalog.default.store_sales (16)
+TakeOrderedAndProject (25)
++- * HashAggregate (24)
+   +- Exchange (23)
+      +- * HashAggregate (22)
+         +- * Project (21)
+            +- * BroadcastHashJoin Inner BuildLeft (20)
+               :- BroadcastExchange (15)
+               :  +- * Project (14)
+               :     +- * BroadcastHashJoin Inner BuildRight (13)
+               :        :- * Project (11)
+               :        :  +- * BroadcastHashJoin Inner BuildRight (10)
+               :        :     :- * ColumnarToRow (4)
+               :        :     :  +- CometProject (3)
+               :        :     :     +- CometFilter (2)
+               :        :     :        +- CometScan parquet spark_catalog.default.item (1)
+               :        :     +- BroadcastExchange (9)
+               :        :        +- * ColumnarToRow (8)
+               :        :           +- CometProject (7)
+               :        :              +- CometFilter (6)
+               :        :                 +- CometScan parquet spark_catalog.default.inventory (5)
+               :        +- ReusedExchange (12)
+               +- * ColumnarToRow (19)
+                  +- CometProject (18)
+                     +- CometFilter (17)
+                        +- CometScan parquet spark_catalog.default.store_sales (16)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -79,7 +77,7 @@ Join condition: None
 Output [5]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_date_sk#8]
 Input [6]: [i_item_sk#1, i_item_id#2, i_item_desc#3, i_current_price#4, inv_item_sk#6, inv_date_sk#8]
 
-(12) ReusedExchange [Reuses operator id: 32]
+(12) ReusedExchange [Reuses operator id: 30]
 Output [1]: [d_date_sk#10]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -131,33 +129,29 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(23) RowToColumnar
+(23) Exchange
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(24) CometColumnarExchange
-Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: hashpartitioning(i_item_id#2, i_item_desc#3, i_current_price#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(25) CometHashAggregate
+(24) HashAggregate [codegen id : 5]
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Keys [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 Functions: []
+Aggregate Attributes: []
+Results [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
 
-(26) CometTakeOrderedAndProject
-Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#2 ASC NULLS FIRST], output=[i_item_id#2,i_item_desc#3,i_current_price#4]), 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
-
-(27) ColumnarToRow [codegen id : 5]
+(25) TakeOrderedAndProject
 Input [3]: [i_item_id#2, i_item_desc#3, i_current_price#4]
+Arguments: 100, [i_item_id#2 ASC NULLS FIRST], [i_item_id#2, i_item_desc#3, i_current_price#4]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 5 Hosting Expression = inv_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (32)
-+- * ColumnarToRow (31)
-   +- CometProject (30)
-      +- CometFilter (29)
-         +- CometScan parquet spark_catalog.default.date_dim (28)
+BroadcastExchange (30)
++- * ColumnarToRow (29)
+   +- CometProject (28)
+      +- CometFilter (27)
+         +- CometScan parquet spark_catalog.default.date_dim (26)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -167,18 +161,18 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-05-25), LessThanOrEqual(d_date,2000-07-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(29) CometFilter
+(27) CometFilter
 Input [2]: [d_date_sk#10, d_date#13]
 Condition : (((isnotnull(d_date#13) AND (d_date#13 >= 2000-05-25)) AND (d_date#13 <= 2000-07-24)) AND isnotnull(d_date_sk#10))
 
-(30) CometProject
+(28) CometProject
 Input [2]: [d_date_sk#10, d_date#13]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(31) ColumnarToRow [codegen id : 1]
+(29) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(32) BroadcastExchange
+(30) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt
index 2c652d64fd..0252eb575f 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q82/simplified.txt
@@ -1,46 +1,44 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
-        CometHashAggregate [i_item_id,i_item_desc,i_current_price]
-          CometColumnarExchange [i_item_id,i_item_desc,i_current_price] #1
-            RowToColumnar
-              WholeStageCodegen (4)
-                HashAggregate [i_item_id,i_item_desc,i_current_price]
-                  Project [i_item_id,i_item_desc,i_current_price]
-                    BroadcastHashJoin [i_item_sk,ss_item_sk]
-                      InputAdapter
-                        BroadcastExchange #2
-                          WholeStageCodegen (3)
-                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                              BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
-                                  BroadcastHashJoin [i_item_sk,inv_item_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
-                                          CometFilter [i_current_price,i_manufact_id,i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
-                                    InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [inv_item_sk,inv_date_sk]
-                                                CometFilter [inv_quantity_on_hand,inv_item_sk]
-                                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #4
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_date,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+TakeOrderedAndProject [i_item_id,i_item_desc,i_current_price]
+  WholeStageCodegen (5)
+    HashAggregate [i_item_id,i_item_desc,i_current_price]
+      InputAdapter
+        Exchange [i_item_id,i_item_desc,i_current_price] #1
+          WholeStageCodegen (4)
+            HashAggregate [i_item_id,i_item_desc,i_current_price]
+              Project [i_item_id,i_item_desc,i_current_price]
+                BroadcastHashJoin [i_item_sk,ss_item_sk]
+                  InputAdapter
+                    BroadcastExchange #2
+                      WholeStageCodegen (3)
+                        Project [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                          BroadcastHashJoin [inv_date_sk,d_date_sk]
+                            Project [i_item_sk,i_item_id,i_item_desc,i_current_price,inv_date_sk]
+                              BroadcastHashJoin [i_item_sk,inv_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [i_item_sk,i_item_id,i_item_desc,i_current_price]
+                                      CometFilter [i_current_price,i_manufact_id,i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_manufact_id]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #4
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [ss_item_sk]
-                            CometFilter [ss_item_sk]
-                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [inv_item_sk,inv_date_sk]
+                                            CometFilter [inv_quantity_on_hand,inv_item_sk]
+                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #4
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_date,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #4
+                  ColumnarToRow
+                    InputAdapter
+                      CometProject [ss_item_sk]
+                        CometFilter [ss_item_sk]
+                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt
index 63c12d9f08..164ecf8af8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/explain.txt
@@ -1,56 +1,50 @@
 == Physical Plan ==
-TakeOrderedAndProject (52)
-+- * Project (51)
-   +- * BroadcastHashJoin Inner BuildRight (50)
-      :- * Project (34)
-      :  +- * BroadcastHashJoin Inner BuildRight (33)
-      :     :- * ColumnarToRow (17)
-      :     :  +- CometHashAggregate (16)
-      :     :     +- CometColumnarExchange (15)
-      :     :        +- RowToColumnar (14)
-      :     :           +- * HashAggregate (13)
-      :     :              +- * Project (12)
-      :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                    :- * Project (9)
-      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                    :     :- * ColumnarToRow (3)
-      :     :                    :     :  +- CometFilter (2)
-      :     :                    :     :     +- CometScan parquet spark_catalog.default.store_returns (1)
-      :     :                    :     +- BroadcastExchange (7)
-      :     :                    :        +- * ColumnarToRow (6)
-      :     :                    :           +- CometFilter (5)
-      :     :                    :              +- CometScan parquet spark_catalog.default.item (4)
-      :     :                    +- ReusedExchange (10)
-      :     +- BroadcastExchange (32)
-      :        +- * ColumnarToRow (31)
-      :           +- CometHashAggregate (30)
-      :              +- CometColumnarExchange (29)
-      :                 +- RowToColumnar (28)
-      :                    +- * HashAggregate (27)
-      :                       +- * Project (26)
-      :                          +- * BroadcastHashJoin Inner BuildRight (25)
-      :                             :- * Project (23)
-      :                             :  +- * BroadcastHashJoin Inner BuildRight (22)
-      :                             :     :- * ColumnarToRow (20)
-      :                             :     :  +- CometFilter (19)
-      :                             :     :     +- CometScan parquet spark_catalog.default.catalog_returns (18)
-      :                             :     +- ReusedExchange (21)
-      :                             +- ReusedExchange (24)
-      +- BroadcastExchange (49)
-         +- * ColumnarToRow (48)
-            +- CometHashAggregate (47)
-               +- CometColumnarExchange (46)
-                  +- RowToColumnar (45)
-                     +- * HashAggregate (44)
-                        +- * Project (43)
-                           +- * BroadcastHashJoin Inner BuildRight (42)
-                              :- * Project (40)
-                              :  +- * BroadcastHashJoin Inner BuildRight (39)
-                              :     :- * ColumnarToRow (37)
-                              :     :  +- CometFilter (36)
-                              :     :     +- CometScan parquet spark_catalog.default.web_returns (35)
-                              :     +- ReusedExchange (38)
-                              +- ReusedExchange (41)
+TakeOrderedAndProject (46)
++- * Project (45)
+   +- * BroadcastHashJoin Inner BuildRight (44)
+      :- * Project (30)
+      :  +- * BroadcastHashJoin Inner BuildRight (29)
+      :     :- * HashAggregate (15)
+      :     :  +- Exchange (14)
+      :     :     +- * HashAggregate (13)
+      :     :        +- * Project (12)
+      :     :           +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :              :- * Project (9)
+      :     :              :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :              :     :- * ColumnarToRow (3)
+      :     :              :     :  +- CometFilter (2)
+      :     :              :     :     +- CometScan parquet spark_catalog.default.store_returns (1)
+      :     :              :     +- BroadcastExchange (7)
+      :     :              :        +- * ColumnarToRow (6)
+      :     :              :           +- CometFilter (5)
+      :     :              :              +- CometScan parquet spark_catalog.default.item (4)
+      :     :              +- ReusedExchange (10)
+      :     +- BroadcastExchange (28)
+      :        +- * HashAggregate (27)
+      :           +- Exchange (26)
+      :              +- * HashAggregate (25)
+      :                 +- * Project (24)
+      :                    +- * BroadcastHashJoin Inner BuildRight (23)
+      :                       :- * Project (21)
+      :                       :  +- * BroadcastHashJoin Inner BuildRight (20)
+      :                       :     :- * ColumnarToRow (18)
+      :                       :     :  +- CometFilter (17)
+      :                       :     :     +- CometScan parquet spark_catalog.default.catalog_returns (16)
+      :                       :     +- ReusedExchange (19)
+      :                       +- ReusedExchange (22)
+      +- BroadcastExchange (43)
+         +- * HashAggregate (42)
+            +- Exchange (41)
+               +- * HashAggregate (40)
+                  +- * Project (39)
+                     +- * BroadcastHashJoin Inner BuildRight (38)
+                        :- * Project (36)
+                        :  +- * BroadcastHashJoin Inner BuildRight (35)
+                        :     :- * ColumnarToRow (33)
+                        :     :  +- CometFilter (32)
+                        :     :     +- CometScan parquet spark_catalog.default.web_returns (31)
+                        :     +- ReusedExchange (34)
+                        +- ReusedExchange (37)
 
 
 (unknown) Scan parquet spark_catalog.default.store_returns
@@ -96,7 +90,7 @@ Join condition: None
 Output [3]: [sr_return_quantity#2, sr_returned_date_sk#3, i_item_id#6]
 Input [5]: [sr_item_sk#1, sr_return_quantity#2, sr_returned_date_sk#3, i_item_sk#5, i_item_id#6]
 
-(10) ReusedExchange [Reuses operator id: 68]
+(10) ReusedExchange [Reuses operator id: 62]
 Output [1]: [d_date_sk#7]
 
 (11) BroadcastHashJoin [codegen id : 5]
@@ -116,274 +110,262 @@ Functions [1]: [partial_sum(sr_return_quantity#2)]
 Aggregate Attributes [1]: [sum#8]
 Results [2]: [i_item_id#6, sum#9]
 
-(14) RowToColumnar
+(14) Exchange
 Input [2]: [i_item_id#6, sum#9]
+Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [2]: [i_item_id#6, sum#9]
-Arguments: hashpartitioning(i_item_id#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 18]
 Input [2]: [i_item_id#6, sum#9]
 Keys [1]: [i_item_id#6]
 Functions [1]: [sum(sr_return_quantity#2)]
-
-(17) ColumnarToRow [codegen id : 18]
-Input [2]: [item_id#10, sr_item_qty#11]
+Aggregate Attributes [1]: [sum(sr_return_quantity#2)#10]
+Results [2]: [i_item_id#6 AS item_id#11, sum(sr_return_quantity#2)#10 AS sr_item_qty#12]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14]
+Output [3]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#14), dynamicpruningexpression(cr_returned_date_sk#14 IN dynamicpruning#15)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#15), dynamicpruningexpression(cr_returned_date_sk#15 IN dynamicpruning#16)]
 PushedFilters: [IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_return_quantity:int>
 
-(19) CometFilter
-Input [3]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14]
-Condition : isnotnull(cr_item_sk#12)
+(17) CometFilter
+Input [3]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15]
+Condition : isnotnull(cr_item_sk#13)
 
-(20) ColumnarToRow [codegen id : 10]
-Input [3]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14]
+(18) ColumnarToRow [codegen id : 10]
+Input [3]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15]
 
-(21) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#16, i_item_id#17]
+(19) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#17, i_item_id#18]
 
-(22) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cr_item_sk#12]
-Right keys [1]: [i_item_sk#16]
+(20) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cr_item_sk#13]
+Right keys [1]: [i_item_sk#17]
 Join type: Inner
 Join condition: None
 
-(23) Project [codegen id : 10]
-Output [3]: [cr_return_quantity#13, cr_returned_date_sk#14, i_item_id#17]
-Input [5]: [cr_item_sk#12, cr_return_quantity#13, cr_returned_date_sk#14, i_item_sk#16, i_item_id#17]
+(21) Project [codegen id : 10]
+Output [3]: [cr_return_quantity#14, cr_returned_date_sk#15, i_item_id#18]
+Input [5]: [cr_item_sk#13, cr_return_quantity#14, cr_returned_date_sk#15, i_item_sk#17, i_item_id#18]
 
-(24) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#18]
+(22) ReusedExchange [Reuses operator id: 62]
+Output [1]: [d_date_sk#19]
 
-(25) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cr_returned_date_sk#14]
-Right keys [1]: [d_date_sk#18]
+(23) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cr_returned_date_sk#15]
+Right keys [1]: [d_date_sk#19]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 10]
-Output [2]: [cr_return_quantity#13, i_item_id#17]
-Input [4]: [cr_return_quantity#13, cr_returned_date_sk#14, i_item_id#17, d_date_sk#18]
-
-(27) HashAggregate [codegen id : 10]
-Input [2]: [cr_return_quantity#13, i_item_id#17]
-Keys [1]: [i_item_id#17]
-Functions [1]: [partial_sum(cr_return_quantity#13)]
-Aggregate Attributes [1]: [sum#19]
-Results [2]: [i_item_id#17, sum#20]
-
-(28) RowToColumnar
-Input [2]: [i_item_id#17, sum#20]
-
-(29) CometColumnarExchange
-Input [2]: [i_item_id#17, sum#20]
-Arguments: hashpartitioning(i_item_id#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
-Input [2]: [i_item_id#17, sum#20]
-Keys [1]: [i_item_id#17]
-Functions [1]: [sum(cr_return_quantity#13)]
-
-(31) ColumnarToRow [codegen id : 11]
-Input [2]: [item_id#21, cr_item_qty#22]
-
-(32) BroadcastExchange
-Input [2]: [item_id#21, cr_item_qty#22]
+(24) Project [codegen id : 10]
+Output [2]: [cr_return_quantity#14, i_item_id#18]
+Input [4]: [cr_return_quantity#14, cr_returned_date_sk#15, i_item_id#18, d_date_sk#19]
+
+(25) HashAggregate [codegen id : 10]
+Input [2]: [cr_return_quantity#14, i_item_id#18]
+Keys [1]: [i_item_id#18]
+Functions [1]: [partial_sum(cr_return_quantity#14)]
+Aggregate Attributes [1]: [sum#20]
+Results [2]: [i_item_id#18, sum#21]
+
+(26) Exchange
+Input [2]: [i_item_id#18, sum#21]
+Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+
+(27) HashAggregate [codegen id : 11]
+Input [2]: [i_item_id#18, sum#21]
+Keys [1]: [i_item_id#18]
+Functions [1]: [sum(cr_return_quantity#14)]
+Aggregate Attributes [1]: [sum(cr_return_quantity#14)#22]
+Results [2]: [i_item_id#18 AS item_id#23, sum(cr_return_quantity#14)#22 AS cr_item_qty#24]
+
+(28) BroadcastExchange
+Input [2]: [item_id#23, cr_item_qty#24]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [item_id#10]
-Right keys [1]: [item_id#21]
+(29) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [item_id#11]
+Right keys [1]: [item_id#23]
 Join type: Inner
 Join condition: None
 
-(34) Project [codegen id : 18]
-Output [3]: [item_id#10, sr_item_qty#11, cr_item_qty#22]
-Input [4]: [item_id#10, sr_item_qty#11, item_id#21, cr_item_qty#22]
+(30) Project [codegen id : 18]
+Output [3]: [item_id#11, sr_item_qty#12, cr_item_qty#24]
+Input [4]: [item_id#11, sr_item_qty#12, item_id#23, cr_item_qty#24]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [3]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25]
+Output [3]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#25), dynamicpruningexpression(wr_returned_date_sk#25 IN dynamicpruning#26)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#27), dynamicpruningexpression(wr_returned_date_sk#27 IN dynamicpruning#28)]
 PushedFilters: [IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_return_quantity:int>
 
-(36) CometFilter
-Input [3]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25]
-Condition : isnotnull(wr_item_sk#23)
+(32) CometFilter
+Input [3]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27]
+Condition : isnotnull(wr_item_sk#25)
 
-(37) ColumnarToRow [codegen id : 16]
-Input [3]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25]
+(33) ColumnarToRow [codegen id : 16]
+Input [3]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27]
 
-(38) ReusedExchange [Reuses operator id: 7]
-Output [2]: [i_item_sk#27, i_item_id#28]
+(34) ReusedExchange [Reuses operator id: 7]
+Output [2]: [i_item_sk#29, i_item_id#30]
 
-(39) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [wr_item_sk#23]
-Right keys [1]: [i_item_sk#27]
+(35) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [wr_item_sk#25]
+Right keys [1]: [i_item_sk#29]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 16]
-Output [3]: [wr_return_quantity#24, wr_returned_date_sk#25, i_item_id#28]
-Input [5]: [wr_item_sk#23, wr_return_quantity#24, wr_returned_date_sk#25, i_item_sk#27, i_item_id#28]
+(36) Project [codegen id : 16]
+Output [3]: [wr_return_quantity#26, wr_returned_date_sk#27, i_item_id#30]
+Input [5]: [wr_item_sk#25, wr_return_quantity#26, wr_returned_date_sk#27, i_item_sk#29, i_item_id#30]
 
-(41) ReusedExchange [Reuses operator id: 68]
-Output [1]: [d_date_sk#29]
+(37) ReusedExchange [Reuses operator id: 62]
+Output [1]: [d_date_sk#31]
 
-(42) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [wr_returned_date_sk#25]
-Right keys [1]: [d_date_sk#29]
+(38) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [wr_returned_date_sk#27]
+Right keys [1]: [d_date_sk#31]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 16]
-Output [2]: [wr_return_quantity#24, i_item_id#28]
-Input [4]: [wr_return_quantity#24, wr_returned_date_sk#25, i_item_id#28, d_date_sk#29]
-
-(44) HashAggregate [codegen id : 16]
-Input [2]: [wr_return_quantity#24, i_item_id#28]
-Keys [1]: [i_item_id#28]
-Functions [1]: [partial_sum(wr_return_quantity#24)]
-Aggregate Attributes [1]: [sum#30]
-Results [2]: [i_item_id#28, sum#31]
-
-(45) RowToColumnar
-Input [2]: [i_item_id#28, sum#31]
-
-(46) CometColumnarExchange
-Input [2]: [i_item_id#28, sum#31]
-Arguments: hashpartitioning(i_item_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(47) CometHashAggregate
-Input [2]: [i_item_id#28, sum#31]
-Keys [1]: [i_item_id#28]
-Functions [1]: [sum(wr_return_quantity#24)]
-
-(48) ColumnarToRow [codegen id : 17]
-Input [2]: [item_id#32, wr_item_qty#33]
-
-(49) BroadcastExchange
-Input [2]: [item_id#32, wr_item_qty#33]
+(39) Project [codegen id : 16]
+Output [2]: [wr_return_quantity#26, i_item_id#30]
+Input [4]: [wr_return_quantity#26, wr_returned_date_sk#27, i_item_id#30, d_date_sk#31]
+
+(40) HashAggregate [codegen id : 16]
+Input [2]: [wr_return_quantity#26, i_item_id#30]
+Keys [1]: [i_item_id#30]
+Functions [1]: [partial_sum(wr_return_quantity#26)]
+Aggregate Attributes [1]: [sum#32]
+Results [2]: [i_item_id#30, sum#33]
+
+(41) Exchange
+Input [2]: [i_item_id#30, sum#33]
+Arguments: hashpartitioning(i_item_id#30, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(42) HashAggregate [codegen id : 17]
+Input [2]: [i_item_id#30, sum#33]
+Keys [1]: [i_item_id#30]
+Functions [1]: [sum(wr_return_quantity#26)]
+Aggregate Attributes [1]: [sum(wr_return_quantity#26)#34]
+Results [2]: [i_item_id#30 AS item_id#35, sum(wr_return_quantity#26)#34 AS wr_item_qty#36]
+
+(43) BroadcastExchange
+Input [2]: [item_id#35, wr_item_qty#36]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=6]
 
-(50) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [item_id#10]
-Right keys [1]: [item_id#32]
+(44) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [item_id#11]
+Right keys [1]: [item_id#35]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 18]
-Output [8]: [item_id#10, sr_item_qty#11, (((cast(sr_item_qty#11 as double) / cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as double)) / 3.0) * 100.0) AS sr_dev#34, cr_item_qty#22, (((cast(cr_item_qty#22 as double) / cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as double)) / 3.0) * 100.0) AS cr_dev#35, wr_item_qty#33, (((cast(wr_item_qty#33 as double) / cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as double)) / 3.0) * 100.0) AS wr_dev#36, (cast(((sr_item_qty#11 + cr_item_qty#22) + wr_item_qty#33) as decimal(20,0)) / 3.0) AS average#37]
-Input [5]: [item_id#10, sr_item_qty#11, cr_item_qty#22, item_id#32, wr_item_qty#33]
+(45) Project [codegen id : 18]
+Output [8]: [item_id#11, sr_item_qty#12, (((cast(sr_item_qty#12 as double) / cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as double)) / 3.0) * 100.0) AS sr_dev#37, cr_item_qty#24, (((cast(cr_item_qty#24 as double) / cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as double)) / 3.0) * 100.0) AS cr_dev#38, wr_item_qty#36, (((cast(wr_item_qty#36 as double) / cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as double)) / 3.0) * 100.0) AS wr_dev#39, (cast(((sr_item_qty#12 + cr_item_qty#24) + wr_item_qty#36) as decimal(20,0)) / 3.0) AS average#40]
+Input [5]: [item_id#11, sr_item_qty#12, cr_item_qty#24, item_id#35, wr_item_qty#36]
 
-(52) TakeOrderedAndProject
-Input [8]: [item_id#10, sr_item_qty#11, sr_dev#34, cr_item_qty#22, cr_dev#35, wr_item_qty#33, wr_dev#36, average#37]
-Arguments: 100, [item_id#10 ASC NULLS FIRST, sr_item_qty#11 ASC NULLS FIRST], [item_id#10, sr_item_qty#11, sr_dev#34, cr_item_qty#22, cr_dev#35, wr_item_qty#33, wr_dev#36, average#37]
+(46) TakeOrderedAndProject
+Input [8]: [item_id#11, sr_item_qty#12, sr_dev#37, cr_item_qty#24, cr_dev#38, wr_item_qty#36, wr_dev#39, average#40]
+Arguments: 100, [item_id#11 ASC NULLS FIRST, sr_item_qty#12 ASC NULLS FIRST], [item_id#11, sr_item_qty#12, sr_dev#37, cr_item_qty#24, cr_dev#38, wr_item_qty#36, wr_dev#39, average#40]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = sr_returned_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (68)
-+- * Project (67)
-   +- * BroadcastHashJoin LeftSemi BuildRight (66)
-      :- * ColumnarToRow (55)
-      :  +- CometFilter (54)
-      :     +- CometScan parquet spark_catalog.default.date_dim (53)
-      +- BroadcastExchange (65)
-         +- * Project (64)
-            +- * BroadcastHashJoin LeftSemi BuildRight (63)
-               :- * ColumnarToRow (57)
-               :  +- CometScan parquet spark_catalog.default.date_dim (56)
-               +- BroadcastExchange (62)
-                  +- * ColumnarToRow (61)
-                     +- CometProject (60)
-                        +- CometFilter (59)
-                           +- CometScan parquet spark_catalog.default.date_dim (58)
+BroadcastExchange (62)
++- * Project (61)
+   +- * BroadcastHashJoin LeftSemi BuildRight (60)
+      :- * ColumnarToRow (49)
+      :  +- CometFilter (48)
+      :     +- CometScan parquet spark_catalog.default.date_dim (47)
+      +- BroadcastExchange (59)
+         +- * Project (58)
+            +- * BroadcastHashJoin LeftSemi BuildRight (57)
+               :- * ColumnarToRow (51)
+               :  +- CometScan parquet spark_catalog.default.date_dim (50)
+               +- BroadcastExchange (56)
+                  +- * ColumnarToRow (55)
+                     +- CometProject (54)
+                        +- CometFilter (53)
+                           +- CometScan parquet spark_catalog.default.date_dim (52)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_date#38]
+Output [2]: [d_date_sk#7, d_date#41]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(54) CometFilter
-Input [2]: [d_date_sk#7, d_date#38]
+(48) CometFilter
+Input [2]: [d_date_sk#7, d_date#41]
 Condition : isnotnull(d_date_sk#7)
 
-(55) ColumnarToRow [codegen id : 3]
-Input [2]: [d_date_sk#7, d_date#38]
+(49) ColumnarToRow [codegen id : 3]
+Input [2]: [d_date_sk#7, d_date#41]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#39, d_week_seq#40]
+Output [2]: [d_date#42, d_week_seq#43]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(57) ColumnarToRow [codegen id : 2]
-Input [2]: [d_date#39, d_week_seq#40]
+(51) ColumnarToRow [codegen id : 2]
+Input [2]: [d_date#42, d_week_seq#43]
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date#41, d_week_seq#42]
+Output [2]: [d_date#44, d_week_seq#45]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 ReadSchema: struct<d_date:date,d_week_seq:int>
 
-(59) CometFilter
-Input [2]: [d_date#41, d_week_seq#42]
-Condition : cast(d_date#41 as string) IN (2000-06-30,2000-09-27,2000-11-17)
+(53) CometFilter
+Input [2]: [d_date#44, d_week_seq#45]
+Condition : cast(d_date#44 as string) IN (2000-06-30,2000-09-27,2000-11-17)
 
-(60) CometProject
-Input [2]: [d_date#41, d_week_seq#42]
-Arguments: [d_week_seq#42], [d_week_seq#42]
+(54) CometProject
+Input [2]: [d_date#44, d_week_seq#45]
+Arguments: [d_week_seq#45], [d_week_seq#45]
 
-(61) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#42]
+(55) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#45]
 
-(62) BroadcastExchange
-Input [1]: [d_week_seq#42]
+(56) BroadcastExchange
+Input [1]: [d_week_seq#45]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(63) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [d_week_seq#40]
-Right keys [1]: [d_week_seq#42]
+(57) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [d_week_seq#43]
+Right keys [1]: [d_week_seq#45]
 Join type: LeftSemi
 Join condition: None
 
-(64) Project [codegen id : 2]
-Output [1]: [d_date#39]
-Input [2]: [d_date#39, d_week_seq#40]
+(58) Project [codegen id : 2]
+Output [1]: [d_date#42]
+Input [2]: [d_date#42, d_week_seq#43]
 
-(65) BroadcastExchange
-Input [1]: [d_date#39]
+(59) BroadcastExchange
+Input [1]: [d_date#42]
 Arguments: HashedRelationBroadcastMode(List(input[0, date, true]),false), [plan_id=8]
 
-(66) BroadcastHashJoin [codegen id : 3]
-Left keys [1]: [d_date#38]
-Right keys [1]: [d_date#39]
+(60) BroadcastHashJoin [codegen id : 3]
+Left keys [1]: [d_date#41]
+Right keys [1]: [d_date#42]
 Join type: LeftSemi
 Join condition: None
 
-(67) Project [codegen id : 3]
+(61) Project [codegen id : 3]
 Output [1]: [d_date_sk#7]
-Input [2]: [d_date_sk#7, d_date#38]
+Input [2]: [d_date_sk#7, d_date#41]
 
-(68) BroadcastExchange
+(62) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-Subquery:2 Hosting operator id = 18 Hosting Expression = cr_returned_date_sk#14 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 16 Hosting Expression = cr_returned_date_sk#15 IN dynamicpruning#4
 
-Subquery:3 Hosting operator id = 35 Hosting Expression = wr_returned_date_sk#25 IN dynamicpruning#4
+Subquery:3 Hosting operator id = 31 Hosting Expression = wr_returned_date_sk#27 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt
index bc1df2c571..a8f1ba3f10 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q83/simplified.txt
@@ -4,98 +4,92 @@ TakeOrderedAndProject [item_id,sr_item_qty,sr_dev,cr_item_qty,cr_dev,wr_item_qty
       BroadcastHashJoin [item_id,item_id]
         Project [item_id,sr_item_qty,cr_item_qty]
           BroadcastHashJoin [item_id,item_id]
-            ColumnarToRow
+            HashAggregate [i_item_id,sum] [sum(sr_return_quantity),item_id,sr_item_qty,sum]
               InputAdapter
-                CometHashAggregate [i_item_id,sum]
-                  CometColumnarExchange [i_item_id] #1
-                    RowToColumnar
-                      WholeStageCodegen (5)
-                        HashAggregate [i_item_id,sr_return_quantity] [sum,sum]
-                          Project [sr_return_quantity,i_item_id]
-                            BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
-                              Project [sr_return_quantity,sr_returned_date_sk,i_item_id]
-                                BroadcastHashJoin [sr_item_sk,i_item_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [sr_item_sk]
-                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_return_quantity,sr_returned_date_sk]
-                                          SubqueryBroadcast [d_date_sk] #1
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (3)
-                                                Project [d_date_sk]
-                                                  BroadcastHashJoin [d_date,d_date]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                    InputAdapter
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (2)
-                                                          Project [d_date]
-                                                            BroadcastHashJoin [d_week_seq,d_week_seq]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
-                                                              InputAdapter
-                                                                BroadcastExchange #4
-                                                                  WholeStageCodegen (1)
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [d_week_seq]
-                                                                          CometFilter [d_date]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
-                                  InputAdapter
-                                    BroadcastExchange #5
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [i_item_sk,i_item_id]
-                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                Exchange [i_item_id] #1
+                  WholeStageCodegen (5)
+                    HashAggregate [i_item_id,sr_return_quantity] [sum,sum]
+                      Project [sr_return_quantity,i_item_id]
+                        BroadcastHashJoin [sr_returned_date_sk,d_date_sk]
+                          Project [sr_return_quantity,sr_returned_date_sk,i_item_id]
+                            BroadcastHashJoin [sr_item_sk,i_item_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [sr_item_sk]
+                                    CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_return_quantity,sr_returned_date_sk]
+                                      SubqueryBroadcast [d_date_sk] #1
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (3)
+                                            Project [d_date_sk]
+                                              BroadcastHashJoin [d_date,d_date]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                InputAdapter
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (2)
+                                                      Project [d_date]
+                                                        BroadcastHashJoin [d_week_seq,d_week_seq]
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
+                                                          InputAdapter
+                                                            BroadcastExchange #4
+                                                              WholeStageCodegen (1)
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [d_week_seq]
+                                                                      CometFilter [d_date]
+                                                                        CometScan parquet spark_catalog.default.date_dim [d_date,d_week_seq]
                               InputAdapter
-                                ReusedExchange [d_date_sk] #2
+                                BroadcastExchange #5
+                                  WholeStageCodegen (1)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [i_item_sk,i_item_id]
+                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+                          InputAdapter
+                            ReusedExchange [d_date_sk] #2
             InputAdapter
               BroadcastExchange #6
                 WholeStageCodegen (11)
-                  ColumnarToRow
+                  HashAggregate [i_item_id,sum] [sum(cr_return_quantity),item_id,cr_item_qty,sum]
                     InputAdapter
-                      CometHashAggregate [i_item_id,sum]
-                        CometColumnarExchange [i_item_id] #7
-                          RowToColumnar
-                            WholeStageCodegen (10)
-                              HashAggregate [i_item_id,cr_return_quantity] [sum,sum]
-                                Project [cr_return_quantity,i_item_id]
-                                  BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
-                                    Project [cr_return_quantity,cr_returned_date_sk,i_item_id]
-                                      BroadcastHashJoin [cr_item_sk,i_item_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [cr_item_sk]
-                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_return_quantity,cr_returned_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                        InputAdapter
-                                          ReusedExchange [i_item_sk,i_item_id] #5
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #2
-        InputAdapter
-          BroadcastExchange #8
-            WholeStageCodegen (17)
-              ColumnarToRow
-                InputAdapter
-                  CometHashAggregate [i_item_id,sum]
-                    CometColumnarExchange [i_item_id] #9
-                      RowToColumnar
-                        WholeStageCodegen (16)
-                          HashAggregate [i_item_id,wr_return_quantity] [sum,sum]
-                            Project [wr_return_quantity,i_item_id]
-                              BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
-                                Project [wr_return_quantity,wr_returned_date_sk,i_item_id]
-                                  BroadcastHashJoin [wr_item_sk,i_item_sk]
+                      Exchange [i_item_id] #7
+                        WholeStageCodegen (10)
+                          HashAggregate [i_item_id,cr_return_quantity] [sum,sum]
+                            Project [cr_return_quantity,i_item_id]
+                              BroadcastHashJoin [cr_returned_date_sk,d_date_sk]
+                                Project [cr_return_quantity,cr_returned_date_sk,i_item_id]
+                                  BroadcastHashJoin [cr_item_sk,i_item_sk]
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [wr_item_sk]
-                                          CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_return_quantity,wr_returned_date_sk]
+                                        CometFilter [cr_item_sk]
+                                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_return_quantity,cr_returned_date_sk]
                                             ReusedSubquery [d_date_sk] #1
                                     InputAdapter
                                       ReusedExchange [i_item_sk,i_item_id] #5
                                 InputAdapter
                                   ReusedExchange [d_date_sk] #2
+        InputAdapter
+          BroadcastExchange #8
+            WholeStageCodegen (17)
+              HashAggregate [i_item_id,sum] [sum(wr_return_quantity),item_id,wr_item_qty,sum]
+                InputAdapter
+                  Exchange [i_item_id] #9
+                    WholeStageCodegen (16)
+                      HashAggregate [i_item_id,wr_return_quantity] [sum,sum]
+                        Project [wr_return_quantity,i_item_id]
+                          BroadcastHashJoin [wr_returned_date_sk,d_date_sk]
+                            Project [wr_return_quantity,wr_returned_date_sk,i_item_id]
+                              BroadcastHashJoin [wr_item_sk,i_item_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [wr_item_sk]
+                                      CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_return_quantity,wr_returned_date_sk]
+                                        ReusedSubquery [d_date_sk] #1
+                                InputAdapter
+                                  ReusedExchange [i_item_sk,i_item_id] #5
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt
index fad4c0cd4e..4de54cadc1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/explain.txt
@@ -1,54 +1,52 @@
 == Physical Plan ==
-* ColumnarToRow (50)
-+- CometTakeOrderedAndProject (49)
-   +- CometHashAggregate (48)
-      +- CometColumnarExchange (47)
-         +- RowToColumnar (46)
-            +- * HashAggregate (45)
-               +- * Project (44)
-                  +- * BroadcastHashJoin Inner BuildRight (43)
-                     :- * Project (38)
-                     :  +- * BroadcastHashJoin Inner BuildRight (37)
-                     :     :- * Project (35)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-                     :     :     :- * Project (28)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
-                     :     :     :     :- * Project (22)
-                     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (21)
-                     :     :     :     :     :- * Project (16)
-                     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
-                     :     :     :     :     :     :- * Project (10)
-                     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildLeft (9)
-                     :     :     :     :     :     :     :- BroadcastExchange (4)
-                     :     :     :     :     :     :     :  +- * ColumnarToRow (3)
-                     :     :     :     :     :     :     :     +- CometFilter (2)
-                     :     :     :     :     :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
-                     :     :     :     :     :     :     +- * ColumnarToRow (8)
-                     :     :     :     :     :     :        +- CometProject (7)
-                     :     :     :     :     :     :           +- CometFilter (6)
-                     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_returns (5)
-                     :     :     :     :     :     +- BroadcastExchange (14)
-                     :     :     :     :     :        +- * ColumnarToRow (13)
-                     :     :     :     :     :           +- CometFilter (12)
-                     :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_page (11)
-                     :     :     :     :     +- BroadcastExchange (20)
-                     :     :     :     :        +- * ColumnarToRow (19)
-                     :     :     :     :           +- CometFilter (18)
-                     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (17)
-                     :     :     :     +- BroadcastExchange (26)
-                     :     :     :        +- * ColumnarToRow (25)
-                     :     :     :           +- CometFilter (24)
-                     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (23)
-                     :     :     +- BroadcastExchange (33)
-                     :     :        +- * ColumnarToRow (32)
-                     :     :           +- CometProject (31)
-                     :     :              +- CometFilter (30)
-                     :     :                 +- CometScan parquet spark_catalog.default.customer_address (29)
-                     :     +- ReusedExchange (36)
-                     +- BroadcastExchange (42)
-                        +- * ColumnarToRow (41)
-                           +- CometFilter (40)
-                              +- CometScan parquet spark_catalog.default.reason (39)
+TakeOrderedAndProject (48)
++- * HashAggregate (47)
+   +- Exchange (46)
+      +- * HashAggregate (45)
+         +- * Project (44)
+            +- * BroadcastHashJoin Inner BuildRight (43)
+               :- * Project (38)
+               :  +- * BroadcastHashJoin Inner BuildRight (37)
+               :     :- * Project (35)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+               :     :     :- * Project (28)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
+               :     :     :     :- * Project (22)
+               :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (21)
+               :     :     :     :     :- * Project (16)
+               :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (15)
+               :     :     :     :     :     :- * Project (10)
+               :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildLeft (9)
+               :     :     :     :     :     :     :- BroadcastExchange (4)
+               :     :     :     :     :     :     :  +- * ColumnarToRow (3)
+               :     :     :     :     :     :     :     +- CometFilter (2)
+               :     :     :     :     :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
+               :     :     :     :     :     :     +- * ColumnarToRow (8)
+               :     :     :     :     :     :        +- CometProject (7)
+               :     :     :     :     :     :           +- CometFilter (6)
+               :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_returns (5)
+               :     :     :     :     :     +- BroadcastExchange (14)
+               :     :     :     :     :        +- * ColumnarToRow (13)
+               :     :     :     :     :           +- CometFilter (12)
+               :     :     :     :     :              +- CometScan parquet spark_catalog.default.web_page (11)
+               :     :     :     :     +- BroadcastExchange (20)
+               :     :     :     :        +- * ColumnarToRow (19)
+               :     :     :     :           +- CometFilter (18)
+               :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (17)
+               :     :     :     +- BroadcastExchange (26)
+               :     :     :        +- * ColumnarToRow (25)
+               :     :     :           +- CometFilter (24)
+               :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (23)
+               :     :     +- BroadcastExchange (33)
+               :     :        +- * ColumnarToRow (32)
+               :     :           +- CometProject (31)
+               :     :              +- CometFilter (30)
+               :     :                 +- CometScan parquet spark_catalog.default.customer_address (29)
+               :     +- ReusedExchange (36)
+               +- BroadcastExchange (42)
+                  +- * ColumnarToRow (41)
+                     +- CometFilter (40)
+                        +- CometScan parquet spark_catalog.default.reason (39)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -214,7 +212,7 @@ Join condition: ((((ca_state#26 IN (IN,OH,NJ) AND (ws_net_profit#6 >= 100.00)) A
 Output [5]: [ws_quantity#4, ws_sold_date_sk#7, wr_reason_sk#13, wr_fee#15, wr_refunded_cash#16]
 Input [9]: [ws_quantity#4, ws_net_profit#6, ws_sold_date_sk#7, wr_refunded_addr_sk#11, wr_reason_sk#13, wr_fee#15, wr_refunded_cash#16, ca_address_sk#25, ca_state#26]
 
-(36) ReusedExchange [Reuses operator id: 55]
+(36) ReusedExchange [Reuses operator id: 53]
 Output [1]: [d_date_sk#28]
 
 (37) BroadcastHashJoin [codegen id : 8]
@@ -262,54 +260,50 @@ Functions [3]: [partial_avg(ws_quantity#4), partial_avg(UnscaledValue(wr_refunde
 Aggregate Attributes [6]: [sum#31, count#32, sum#33, count#34, sum#35, count#36]
 Results [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
 
-(46) RowToColumnar
+(46) Exchange
 Input [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
+Arguments: hashpartitioning(r_reason_desc#30, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(47) CometColumnarExchange
-Input [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
-Arguments: hashpartitioning(r_reason_desc#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(48) CometHashAggregate
+(47) HashAggregate [codegen id : 9]
 Input [7]: [r_reason_desc#30, sum#37, count#38, sum#39, count#40, sum#41, count#42]
 Keys [1]: [r_reason_desc#30]
 Functions [3]: [avg(ws_quantity#4), avg(UnscaledValue(wr_refunded_cash#16)), avg(UnscaledValue(wr_fee#15))]
+Aggregate Attributes [3]: [avg(ws_quantity#4)#43, avg(UnscaledValue(wr_refunded_cash#16))#44, avg(UnscaledValue(wr_fee#15))#45]
+Results [4]: [substr(r_reason_desc#30, 1, 20) AS substr(r_reason_desc, 1, 20)#46, avg(ws_quantity#4)#43 AS avg(ws_quantity)#47, cast((avg(UnscaledValue(wr_refunded_cash#16))#44 / 100.0) as decimal(11,6)) AS avg(wr_refunded_cash)#48, cast((avg(UnscaledValue(wr_fee#15))#45 / 100.0) as decimal(11,6)) AS avg(wr_fee)#49]
 
-(49) CometTakeOrderedAndProject
-Input [4]: [substr(r_reason_desc, 1, 20)#43, avg(ws_quantity)#44, avg(wr_refunded_cash)#45, avg(wr_fee)#46]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[substr(r_reason_desc, 1, 20)#43 ASC NULLS FIRST,avg(ws_quantity)#44 ASC NULLS FIRST,avg(wr_refunded_cash)#45 ASC NULLS FIRST,avg(wr_fee)#46 ASC NULLS FIRST], output=[substr(r_reason_desc, 1, 20)#43,avg(ws_quantity)#44,avg(wr_refunded_cash)#45,avg(wr_fee)#46]), 100, [substr(r_reason_desc, 1, 20)#43 ASC NULLS FIRST, avg(ws_quantity)#44 ASC NULLS FIRST, avg(wr_refunded_cash)#45 ASC NULLS FIRST, avg(wr_fee)#46 ASC NULLS FIRST], [substr(r_reason_desc, 1, 20)#43, avg(ws_quantity)#44, avg(wr_refunded_cash)#45, avg(wr_fee)#46]
-
-(50) ColumnarToRow [codegen id : 9]
-Input [4]: [substr(r_reason_desc, 1, 20)#43, avg(ws_quantity)#44, avg(wr_refunded_cash)#45, avg(wr_fee)#46]
+(48) TakeOrderedAndProject
+Input [4]: [substr(r_reason_desc, 1, 20)#46, avg(ws_quantity)#47, avg(wr_refunded_cash)#48, avg(wr_fee)#49]
+Arguments: 100, [substr(r_reason_desc, 1, 20)#46 ASC NULLS FIRST, avg(ws_quantity)#47 ASC NULLS FIRST, avg(wr_refunded_cash)#48 ASC NULLS FIRST, avg(wr_fee)#49 ASC NULLS FIRST], [substr(r_reason_desc, 1, 20)#46, avg(ws_quantity)#47, avg(wr_refunded_cash)#48, avg(wr_fee)#49]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (55)
-+- * ColumnarToRow (54)
-   +- CometProject (53)
-      +- CometFilter (52)
-         +- CometScan parquet spark_catalog.default.date_dim (51)
+BroadcastExchange (53)
++- * ColumnarToRow (52)
+   +- CometProject (51)
+      +- CometFilter (50)
+         +- CometScan parquet spark_catalog.default.date_dim (49)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#28, d_year#47]
+Output [2]: [d_date_sk#28, d_year#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(52) CometFilter
-Input [2]: [d_date_sk#28, d_year#47]
-Condition : ((isnotnull(d_year#47) AND (d_year#47 = 2000)) AND isnotnull(d_date_sk#28))
+(50) CometFilter
+Input [2]: [d_date_sk#28, d_year#50]
+Condition : ((isnotnull(d_year#50) AND (d_year#50 = 2000)) AND isnotnull(d_date_sk#28))
 
-(53) CometProject
-Input [2]: [d_date_sk#28, d_year#47]
+(51) CometProject
+Input [2]: [d_date_sk#28, d_year#50]
 Arguments: [d_date_sk#28], [d_date_sk#28]
 
-(54) ColumnarToRow [codegen id : 1]
+(52) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#28]
 
-(55) BroadcastExchange
+(53) BroadcastExchange
 Input [1]: [d_date_sk#28]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt
index 10f51b2972..e21f8091c0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q85/simplified.txt
@@ -1,81 +1,79 @@
-WholeStageCodegen (9)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [substr(r_reason_desc, 1, 20),avg(ws_quantity),avg(wr_refunded_cash),avg(wr_fee)]
-        CometHashAggregate [r_reason_desc,sum,count,sum,count,sum,count]
-          CometColumnarExchange [r_reason_desc] #1
-            RowToColumnar
-              WholeStageCodegen (8)
-                HashAggregate [r_reason_desc,ws_quantity,wr_refunded_cash,wr_fee] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                  Project [ws_quantity,wr_fee,wr_refunded_cash,r_reason_desc]
-                    BroadcastHashJoin [wr_reason_sk,r_reason_sk]
-                      Project [ws_quantity,wr_reason_sk,wr_fee,wr_refunded_cash]
-                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                          Project [ws_quantity,ws_sold_date_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                            BroadcastHashJoin [wr_refunded_addr_sk,ca_address_sk,ca_state,ws_net_profit]
-                              Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                                BroadcastHashJoin [wr_returning_cdemo_sk,cd_marital_status,cd_education_status,cd_demo_sk,cd_marital_status,cd_education_status]
-                                  Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash,cd_marital_status,cd_education_status]
-                                    BroadcastHashJoin [wr_refunded_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ws_sales_price]
-                                      Project [ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                                        BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                                          Project [ws_web_page_sk,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
-                                            BroadcastHashJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
-                                              InputAdapter
-                                                BroadcastExchange #2
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [ws_item_sk,ws_order_number,ws_web_page_sk,ws_sales_price,ws_net_profit]
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_page_sk,ws_order_number,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #1
-                                                              BroadcastExchange #3
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_year,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash]
-                                                    CometFilter [wr_item_sk,wr_order_number,wr_refunded_cdemo_sk,wr_returning_cdemo_sk,wr_refunded_addr_sk,wr_reason_sk]
-                                                      CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash,wr_returned_date_sk]
+TakeOrderedAndProject [substr(r_reason_desc, 1, 20),avg(ws_quantity),avg(wr_refunded_cash),avg(wr_fee)]
+  WholeStageCodegen (9)
+    HashAggregate [r_reason_desc,sum,count,sum,count,sum,count] [avg(ws_quantity),avg(UnscaledValue(wr_refunded_cash)),avg(UnscaledValue(wr_fee)),substr(r_reason_desc, 1, 20),avg(ws_quantity),avg(wr_refunded_cash),avg(wr_fee),sum,count,sum,count,sum,count]
+      InputAdapter
+        Exchange [r_reason_desc] #1
+          WholeStageCodegen (8)
+            HashAggregate [r_reason_desc,ws_quantity,wr_refunded_cash,wr_fee] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+              Project [ws_quantity,wr_fee,wr_refunded_cash,r_reason_desc]
+                BroadcastHashJoin [wr_reason_sk,r_reason_sk]
+                  Project [ws_quantity,wr_reason_sk,wr_fee,wr_refunded_cash]
+                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                      Project [ws_quantity,ws_sold_date_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                        BroadcastHashJoin [wr_refunded_addr_sk,ca_address_sk,ca_state,ws_net_profit]
+                          Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                            BroadcastHashJoin [wr_returning_cdemo_sk,cd_marital_status,cd_education_status,cd_demo_sk,cd_marital_status,cd_education_status]
+                              Project [ws_quantity,ws_net_profit,ws_sold_date_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash,cd_marital_status,cd_education_status]
+                                BroadcastHashJoin [wr_refunded_cdemo_sk,cd_demo_sk,cd_marital_status,cd_education_status,ws_sales_price]
+                                  Project [ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                                    BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                                      Project [ws_web_page_sk,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_fee,wr_refunded_cash]
+                                        BroadcastHashJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
                                           InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (2)
+                                            BroadcastExchange #2
+                                              WholeStageCodegen (1)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometFilter [wp_web_page_sk]
-                                                      CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
+                                                    CometFilter [ws_item_sk,ws_order_number,ws_web_page_sk,ws_sales_price,ws_net_profit]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_page_sk,ws_order_number,ws_quantity,ws_sales_price,ws_net_profit,ws_sold_date_sk]
+                                                        SubqueryBroadcast [d_date_sk] #1
+                                                          BroadcastExchange #3
+                                                            WholeStageCodegen (1)
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometProject [d_date_sk]
+                                                                    CometFilter [d_year,d_date_sk]
+                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash]
+                                                CometFilter [wr_item_sk,wr_order_number,wr_refunded_cdemo_sk,wr_returning_cdemo_sk,wr_refunded_addr_sk,wr_reason_sk]
+                                                  CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_refunded_cdemo_sk,wr_refunded_addr_sk,wr_returning_cdemo_sk,wr_reason_sk,wr_order_number,wr_fee,wr_refunded_cash,wr_returned_date_sk]
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (3)
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (2)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
-                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
+                                                CometFilter [wp_web_page_sk]
+                                                  CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
                                   InputAdapter
-                                    BroadcastExchange #6
-                                      WholeStageCodegen (4)
+                                    BroadcastExchange #5
+                                      WholeStageCodegen (3)
                                         ColumnarToRow
                                           InputAdapter
                                             CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
                                               CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                               InputAdapter
-                                BroadcastExchange #7
-                                  WholeStageCodegen (5)
+                                BroadcastExchange #6
+                                  WholeStageCodegen (4)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometProject [ca_address_sk,ca_state]
-                                          CometFilter [ca_country,ca_address_sk,ca_state]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                                        CometFilter [cd_demo_sk,cd_marital_status,cd_education_status]
+                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status,cd_education_status]
                           InputAdapter
-                            ReusedExchange [d_date_sk] #3
+                            BroadcastExchange #7
+                              WholeStageCodegen (5)
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ca_address_sk,ca_state]
+                                      CometFilter [ca_country,ca_address_sk,ca_state]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                       InputAdapter
-                        BroadcastExchange #8
-                          WholeStageCodegen (7)
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [r_reason_sk]
-                                  CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
+                        ReusedExchange [d_date_sk] #3
+                  InputAdapter
+                    BroadcastExchange #8
+                      WholeStageCodegen (7)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [r_reason_sk]
+                              CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt
index 5bd7bc5594..cab784da58 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/explain.txt
@@ -1,27 +1,25 @@
 == Physical Plan ==
-TakeOrderedAndProject (23)
-+- * Project (22)
-   +- Window (21)
-      +- * ColumnarToRow (20)
-         +- CometSort (19)
-            +- CometColumnarExchange (18)
-               +- CometHashAggregate (17)
-                  +- CometColumnarExchange (16)
-                     +- RowToColumnar (15)
-                        +- * HashAggregate (14)
-                           +- * Expand (13)
-                              +- * Project (12)
-                                 +- * BroadcastHashJoin Inner BuildRight (11)
-                                    :- * Project (6)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-                                    :     :- * ColumnarToRow (3)
-                                    :     :  +- CometFilter (2)
-                                    :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                                    :     +- ReusedExchange (4)
-                                    +- BroadcastExchange (10)
-                                       +- * ColumnarToRow (9)
-                                          +- CometFilter (8)
-                                             +- CometScan parquet spark_catalog.default.item (7)
+TakeOrderedAndProject (21)
++- * Project (20)
+   +- Window (19)
+      +- * Sort (18)
+         +- Exchange (17)
+            +- * HashAggregate (16)
+               +- Exchange (15)
+                  +- * HashAggregate (14)
+                     +- * Expand (13)
+                        +- * Project (12)
+                           +- * BroadcastHashJoin Inner BuildRight (11)
+                              :- * Project (6)
+                              :  +- * BroadcastHashJoin Inner BuildRight (5)
+                              :     :- * ColumnarToRow (3)
+                              :     :  +- CometFilter (2)
+                              :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                              :     +- ReusedExchange (4)
+                              +- BroadcastExchange (10)
+                                 +- * ColumnarToRow (9)
+                                    +- CometFilter (8)
+                                       +- CometScan parquet spark_catalog.default.item (7)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -39,7 +37,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [3]: [ws_item_sk#1, ws_net_paid#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 28]
+(4) ReusedExchange [Reuses operator id: 26]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -91,70 +89,66 @@ Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
 
-(15) RowToColumnar
+(15) Exchange
 Input [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
+Arguments: hashpartitioning(i_category#9, i_class#10, spark_grouping_id#11, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(16) CometColumnarExchange
-Input [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
-Arguments: hashpartitioning(i_category#9, i_class#10, spark_grouping_id#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(17) CometHashAggregate
+(16) HashAggregate [codegen id : 4]
 Input [4]: [i_category#9, i_class#10, spark_grouping_id#11, sum#13]
 Keys [3]: [i_category#9, i_class#10, spark_grouping_id#11]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#14]
+Results [7]: [MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#14,17,2) AS total_sum#15, i_category#9, i_class#10, (cast((shiftright(spark_grouping_id#11, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#11, 0) & 1) as tinyint)) AS lochierarchy#16, MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#14,17,2) AS _w0#17, (cast((shiftright(spark_grouping_id#11, 1) & 1) as tinyint) + cast((shiftright(spark_grouping_id#11, 0) & 1) as tinyint)) AS _w1#18, CASE WHEN (cast((shiftright(spark_grouping_id#11, 0) & 1) as tinyint) = 0) THEN i_category#9 END AS _w2#19]
 
-(18) CometColumnarExchange
-Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
-Arguments: hashpartitioning(_w1#17, _w2#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(19) CometSort
-Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
-Arguments: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18], [_w1#17 ASC NULLS FIRST, _w2#18 ASC NULLS FIRST, _w0#16 DESC NULLS LAST]
+(17) Exchange
+Input [7]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19]
+Arguments: hashpartitioning(_w1#18, _w2#19, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(20) ColumnarToRow [codegen id : 4]
-Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
+(18) Sort [codegen id : 5]
+Input [7]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19]
+Arguments: [_w1#18 ASC NULLS FIRST, _w2#19 ASC NULLS FIRST, _w0#17 DESC NULLS LAST], false, 0
 
-(21) Window
-Input [7]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18]
-Arguments: [rank(_w0#16) windowspecdefinition(_w1#17, _w2#18, _w0#16 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#19], [_w1#17, _w2#18], [_w0#16 DESC NULLS LAST]
+(19) Window
+Input [7]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19]
+Arguments: [rank(_w0#17) windowspecdefinition(_w1#18, _w2#19, _w0#17 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#20], [_w1#18, _w2#19], [_w0#17 DESC NULLS LAST]
 
-(22) Project [codegen id : 5]
-Output [5]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, rank_within_parent#19]
-Input [8]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, _w0#16, _w1#17, _w2#18, rank_within_parent#19]
+(20) Project [codegen id : 6]
+Output [5]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, rank_within_parent#20]
+Input [8]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, _w0#17, _w1#18, _w2#19, rank_within_parent#20]
 
-(23) TakeOrderedAndProject
-Input [5]: [total_sum#14, i_category#9, i_class#10, lochierarchy#15, rank_within_parent#19]
-Arguments: 100, [lochierarchy#15 DESC NULLS LAST, CASE WHEN (lochierarchy#15 = 0) THEN i_category#9 END ASC NULLS FIRST, rank_within_parent#19 ASC NULLS FIRST], [total_sum#14, i_category#9, i_class#10, lochierarchy#15, rank_within_parent#19]
+(21) TakeOrderedAndProject
+Input [5]: [total_sum#15, i_category#9, i_class#10, lochierarchy#16, rank_within_parent#20]
+Arguments: 100, [lochierarchy#16 DESC NULLS LAST, CASE WHEN (lochierarchy#16 = 0) THEN i_category#9 END ASC NULLS FIRST, rank_within_parent#20 ASC NULLS FIRST], [total_sum#15, i_category#9, i_class#10, lochierarchy#16, rank_within_parent#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (28)
-+- * ColumnarToRow (27)
-   +- CometProject (26)
-      +- CometFilter (25)
-         +- CometScan parquet spark_catalog.default.date_dim (24)
+BroadcastExchange (26)
++- * ColumnarToRow (25)
+   +- CometProject (24)
+      +- CometFilter (23)
+         +- CometScan parquet spark_catalog.default.date_dim (22)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#20]
+Output [2]: [d_date_sk#5, d_month_seq#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(25) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#20]
-Condition : (((isnotnull(d_month_seq#20) AND (d_month_seq#20 >= 1200)) AND (d_month_seq#20 <= 1211)) AND isnotnull(d_date_sk#5))
+(23) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#21]
+Condition : (((isnotnull(d_month_seq#21) AND (d_month_seq#21 >= 1200)) AND (d_month_seq#21 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(26) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#20]
+(24) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#21]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(27) ColumnarToRow [codegen id : 1]
+(25) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(28) BroadcastExchange
+(26) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt
index b4fcc80345..f9db2ce7a4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q86/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,total_sum,i_class]
-  WholeStageCodegen (5)
+  WholeStageCodegen (6)
     Project [total_sum,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [_w0,_w1,_w2]
-          WholeStageCodegen (4)
-            ColumnarToRow
+          WholeStageCodegen (5)
+            Sort [_w1,_w2,_w0]
               InputAdapter
-                CometSort [_w1,_w2,_w0]
-                  CometColumnarExchange [_w1,_w2] #1
-                    CometHashAggregate [i_category,i_class,spark_grouping_id,sum]
-                      CometColumnarExchange [i_category,i_class,spark_grouping_id] #2
-                        RowToColumnar
+                Exchange [_w1,_w2] #1
+                  WholeStageCodegen (4)
+                    HashAggregate [i_category,i_class,spark_grouping_id,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,lochierarchy,_w0,_w1,_w2,sum]
+                      InputAdapter
+                        Exchange [i_category,i_class,spark_grouping_id] #2
                           WholeStageCodegen (3)
                             HashAggregate [i_category,i_class,spark_grouping_id,ws_net_paid] [sum,sum]
                               Expand [ws_net_paid,i_category,i_class]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt
index 78435aff4b..a82b90a2a9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/explain.txt
@@ -1,59 +1,51 @@
 == Physical Plan ==
-* ColumnarToRow (55)
-+- CometHashAggregate (54)
-   +- CometColumnarExchange (53)
-      +- RowToColumnar (52)
-         +- * HashAggregate (51)
-            +- * Project (50)
-               +- * BroadcastHashJoin LeftAnti BuildRight (49)
-                  :- * BroadcastHashJoin LeftAnti BuildRight (33)
-                  :  :- * ColumnarToRow (17)
-                  :  :  +- CometHashAggregate (16)
-                  :  :     +- CometColumnarExchange (15)
-                  :  :        +- RowToColumnar (14)
-                  :  :           +- * HashAggregate (13)
-                  :  :              +- * Project (12)
-                  :  :                 +- * BroadcastHashJoin Inner BuildRight (11)
-                  :  :                    :- * Project (6)
-                  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-                  :  :                    :     :- * ColumnarToRow (3)
-                  :  :                    :     :  +- CometFilter (2)
-                  :  :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :  :                    :     +- ReusedExchange (4)
-                  :  :                    +- BroadcastExchange (10)
-                  :  :                       +- * ColumnarToRow (9)
-                  :  :                          +- CometFilter (8)
-                  :  :                             +- CometScan parquet spark_catalog.default.customer (7)
-                  :  +- BroadcastExchange (32)
-                  :     +- * ColumnarToRow (31)
-                  :        +- CometHashAggregate (30)
-                  :           +- CometColumnarExchange (29)
-                  :              +- RowToColumnar (28)
-                  :                 +- * HashAggregate (27)
-                  :                    +- * Project (26)
-                  :                       +- * BroadcastHashJoin Inner BuildRight (25)
-                  :                          :- * Project (23)
-                  :                          :  +- * BroadcastHashJoin Inner BuildRight (22)
-                  :                          :     :- * ColumnarToRow (20)
-                  :                          :     :  +- CometFilter (19)
-                  :                          :     :     +- CometScan parquet spark_catalog.default.catalog_sales (18)
-                  :                          :     +- ReusedExchange (21)
-                  :                          +- ReusedExchange (24)
-                  +- BroadcastExchange (48)
-                     +- * ColumnarToRow (47)
-                        +- CometHashAggregate (46)
-                           +- CometColumnarExchange (45)
-                              +- RowToColumnar (44)
-                                 +- * HashAggregate (43)
-                                    +- * Project (42)
-                                       +- * BroadcastHashJoin Inner BuildRight (41)
-                                          :- * Project (39)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (38)
-                                          :     :- * ColumnarToRow (36)
-                                          :     :  +- CometFilter (35)
-                                          :     :     +- CometScan parquet spark_catalog.default.web_sales (34)
-                                          :     +- ReusedExchange (37)
-                                          +- ReusedExchange (40)
+* HashAggregate (47)
++- Exchange (46)
+   +- * HashAggregate (45)
+      +- * Project (44)
+         +- * BroadcastHashJoin LeftAnti BuildRight (43)
+            :- * BroadcastHashJoin LeftAnti BuildRight (29)
+            :  :- * HashAggregate (15)
+            :  :  +- Exchange (14)
+            :  :     +- * HashAggregate (13)
+            :  :        +- * Project (12)
+            :  :           +- * BroadcastHashJoin Inner BuildRight (11)
+            :  :              :- * Project (6)
+            :  :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+            :  :              :     :- * ColumnarToRow (3)
+            :  :              :     :  +- CometFilter (2)
+            :  :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :  :              :     +- ReusedExchange (4)
+            :  :              +- BroadcastExchange (10)
+            :  :                 +- * ColumnarToRow (9)
+            :  :                    +- CometFilter (8)
+            :  :                       +- CometScan parquet spark_catalog.default.customer (7)
+            :  +- BroadcastExchange (28)
+            :     +- * HashAggregate (27)
+            :        +- Exchange (26)
+            :           +- * HashAggregate (25)
+            :              +- * Project (24)
+            :                 +- * BroadcastHashJoin Inner BuildRight (23)
+            :                    :- * Project (21)
+            :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+            :                    :     :- * ColumnarToRow (18)
+            :                    :     :  +- CometFilter (17)
+            :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (16)
+            :                    :     +- ReusedExchange (19)
+            :                    +- ReusedExchange (22)
+            +- BroadcastExchange (42)
+               +- * HashAggregate (41)
+                  +- Exchange (40)
+                     +- * HashAggregate (39)
+                        +- * Project (38)
+                           +- * BroadcastHashJoin Inner BuildRight (37)
+                              :- * Project (35)
+                              :  +- * BroadcastHashJoin Inner BuildRight (34)
+                              :     :- * ColumnarToRow (32)
+                              :     :  +- CometFilter (31)
+                              :     :     +- CometScan parquet spark_catalog.default.web_sales (30)
+                              :     +- ReusedExchange (33)
+                              +- ReusedExchange (36)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -71,7 +63,7 @@ Condition : isnotnull(ss_customer_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [2]: [ss_customer_sk#1, ss_sold_date_sk#2]
 
-(4) ReusedExchange [Reuses operator id: 60]
+(4) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#4, d_date#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -119,20 +111,16 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
+Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
-Arguments: hashpartitioning(c_last_name#8, c_first_name#7, d_date#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 12]
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Keys [3]: [c_last_name#8, c_first_name#7, d_date#5]
 Functions: []
-
-(17) ColumnarToRow [codegen id : 12]
-Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
+Aggregate Attributes: []
+Results [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
@@ -142,66 +130,62 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#10), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int>
 
-(19) CometFilter
+(17) CometFilter
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 Condition : isnotnull(cs_bill_customer_sk#9)
 
-(20) ColumnarToRow [codegen id : 6]
+(18) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_bill_customer_sk#9, cs_sold_date_sk#10]
 
-(21) ReusedExchange [Reuses operator id: 60]
+(19) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#12, d_date#13]
 
-(22) BroadcastHashJoin [codegen id : 6]
+(20) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_sold_date_sk#10]
 Right keys [1]: [d_date_sk#12]
 Join type: Inner
 Join condition: None
 
-(23) Project [codegen id : 6]
+(21) Project [codegen id : 6]
 Output [2]: [cs_bill_customer_sk#9, d_date#13]
 Input [4]: [cs_bill_customer_sk#9, cs_sold_date_sk#10, d_date_sk#12, d_date#13]
 
-(24) ReusedExchange [Reuses operator id: 10]
+(22) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(25) BroadcastHashJoin [codegen id : 6]
+(23) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [cs_bill_customer_sk#9]
 Right keys [1]: [c_customer_sk#14]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
+(24) Project [codegen id : 6]
 Output [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Input [5]: [cs_bill_customer_sk#9, d_date#13, c_customer_sk#14, c_first_name#15, c_last_name#16]
 
-(27) HashAggregate [codegen id : 6]
+(25) HashAggregate [codegen id : 6]
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(28) RowToColumnar
+(26) Exchange
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
+Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(29) CometColumnarExchange
-Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
-Arguments: hashpartitioning(c_last_name#16, c_first_name#15, d_date#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
+(27) HashAggregate [codegen id : 7]
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Keys [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Functions: []
+Aggregate Attributes: []
+Results [3]: [c_last_name#16, c_first_name#15, d_date#13]
 
-(31) ColumnarToRow [codegen id : 7]
-Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
-
-(32) BroadcastExchange
+(28) BroadcastExchange
 Input [3]: [c_last_name#16, c_first_name#15, d_date#13]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 12]
+(29) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#16, ), isnull(c_last_name#16), coalesce(c_first_name#15, ), isnull(c_first_name#15), coalesce(d_date#13, 1970-01-01), isnull(d_date#13)]
 Join type: LeftAnti
@@ -215,131 +199,123 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#18), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int>
 
-(35) CometFilter
+(31) CometFilter
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 Condition : isnotnull(ws_bill_customer_sk#17)
 
-(36) ColumnarToRow [codegen id : 10]
+(32) ColumnarToRow [codegen id : 10]
 Input [2]: [ws_bill_customer_sk#17, ws_sold_date_sk#18]
 
-(37) ReusedExchange [Reuses operator id: 60]
+(33) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#20, d_date#21]
 
-(38) BroadcastHashJoin [codegen id : 10]
+(34) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_sold_date_sk#18]
 Right keys [1]: [d_date_sk#20]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 10]
+(35) Project [codegen id : 10]
 Output [2]: [ws_bill_customer_sk#17, d_date#21]
 Input [4]: [ws_bill_customer_sk#17, ws_sold_date_sk#18, d_date_sk#20, d_date#21]
 
-(40) ReusedExchange [Reuses operator id: 10]
+(36) ReusedExchange [Reuses operator id: 10]
 Output [3]: [c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(41) BroadcastHashJoin [codegen id : 10]
+(37) BroadcastHashJoin [codegen id : 10]
 Left keys [1]: [ws_bill_customer_sk#17]
 Right keys [1]: [c_customer_sk#22]
 Join type: Inner
 Join condition: None
 
-(42) Project [codegen id : 10]
+(38) Project [codegen id : 10]
 Output [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Input [5]: [ws_bill_customer_sk#17, d_date#21, c_customer_sk#22, c_first_name#23, c_last_name#24]
 
-(43) HashAggregate [codegen id : 10]
+(39) HashAggregate [codegen id : 10]
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
 Aggregate Attributes: []
 Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(44) RowToColumnar
-Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-
-(45) CometColumnarExchange
+(40) Exchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, d_date#21, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(46) CometHashAggregate
+(41) HashAggregate [codegen id : 11]
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Keys [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Functions: []
+Aggregate Attributes: []
+Results [3]: [c_last_name#24, c_first_name#23, d_date#21]
 
-(47) ColumnarToRow [codegen id : 11]
-Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
-
-(48) BroadcastExchange
+(42) BroadcastExchange
 Input [3]: [c_last_name#24, c_first_name#23, d_date#21]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, string, true], ), isnull(input[0, string, true]), coalesce(input[1, string, true], ), isnull(input[1, string, true]), coalesce(input[2, date, true], 1970-01-01), isnull(input[2, date, true])),false), [plan_id=6]
 
-(49) BroadcastHashJoin [codegen id : 12]
+(43) BroadcastHashJoin [codegen id : 12]
 Left keys [6]: [coalesce(c_last_name#8, ), isnull(c_last_name#8), coalesce(c_first_name#7, ), isnull(c_first_name#7), coalesce(d_date#5, 1970-01-01), isnull(d_date#5)]
 Right keys [6]: [coalesce(c_last_name#24, ), isnull(c_last_name#24), coalesce(c_first_name#23, ), isnull(c_first_name#23), coalesce(d_date#21, 1970-01-01), isnull(d_date#21)]
 Join type: LeftAnti
 Join condition: None
 
-(50) Project [codegen id : 12]
+(44) Project [codegen id : 12]
 Output: []
 Input [3]: [c_last_name#8, c_first_name#7, d_date#5]
 
-(51) HashAggregate [codegen id : 12]
+(45) HashAggregate [codegen id : 12]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#25]
 Results [1]: [count#26]
 
-(52) RowToColumnar
+(46) Exchange
 Input [1]: [count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(53) CometColumnarExchange
-Input [1]: [count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(54) CometHashAggregate
+(47) HashAggregate [codegen id : 13]
 Input [1]: [count#26]
 Keys: []
 Functions [1]: [count(1)]
-
-(55) ColumnarToRow [codegen id : 13]
-Input [1]: [count(1)#27]
+Aggregate Attributes [1]: [count(1)#27]
+Results [1]: [count(1)#27 AS count(1)#28]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#2 IN dynamicpruning#3
-BroadcastExchange (60)
-+- * ColumnarToRow (59)
-   +- CometProject (58)
-      +- CometFilter (57)
-         +- CometScan parquet spark_catalog.default.date_dim (56)
+BroadcastExchange (52)
++- * ColumnarToRow (51)
+   +- CometProject (50)
+      +- CometFilter (49)
+         +- CometScan parquet spark_catalog.default.date_dim (48)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
+Output [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(57) CometFilter
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
-Condition : (((isnotnull(d_month_seq#28) AND (d_month_seq#28 >= 1200)) AND (d_month_seq#28 <= 1211)) AND isnotnull(d_date_sk#4))
+(49) CometFilter
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
+Condition : (((isnotnull(d_month_seq#29) AND (d_month_seq#29 >= 1200)) AND (d_month_seq#29 <= 1211)) AND isnotnull(d_date_sk#4))
 
-(58) CometProject
-Input [3]: [d_date_sk#4, d_date#5, d_month_seq#28]
+(50) CometProject
+Input [3]: [d_date_sk#4, d_date#5, d_month_seq#29]
 Arguments: [d_date_sk#4, d_date#5], [d_date_sk#4, d_date#5]
 
-(59) ColumnarToRow [codegen id : 1]
+(51) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#4, d_date#5]
 
-(60) BroadcastExchange
+(52) BroadcastExchange
 Input [2]: [d_date_sk#4, d_date#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-Subquery:2 Hosting operator id = 18 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
+Subquery:2 Hosting operator id = 16 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#3
 
-Subquery:3 Hosting operator id = 34 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
+Subquery:3 Hosting operator id = 30 Hosting Expression = ws_sold_date_sk#18 IN dynamicpruning#3
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt
index 28771f9d42..315afe6602 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q87/simplified.txt
@@ -1,89 +1,81 @@
 WholeStageCodegen (13)
-  ColumnarToRow
+  HashAggregate [count] [count(1),count(1),count]
     InputAdapter
-      CometHashAggregate [count]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (12)
-              HashAggregate [count,count]
-                Project
-                  BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                    BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
-                      ColumnarToRow
-                        InputAdapter
-                          CometHashAggregate [c_last_name,c_first_name,d_date]
-                            CometColumnarExchange [c_last_name,c_first_name,d_date] #2
-                              RowToColumnar
-                                WholeStageCodegen (3)
-                                  HashAggregate [c_last_name,c_first_name,d_date]
-                                    Project [c_last_name,c_first_name,d_date]
-                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                        Project [ss_customer_sk,d_date]
-                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [ss_customer_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk,d_date]
-                                                                CometFilter [d_month_seq,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk,d_date] #3
-                                        InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [c_customer_sk]
-                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
-                      InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (7)
-                            ColumnarToRow
-                              InputAdapter
-                                CometHashAggregate [c_last_name,c_first_name,d_date]
-                                  CometColumnarExchange [c_last_name,c_first_name,d_date] #6
-                                    RowToColumnar
-                                      WholeStageCodegen (6)
-                                        HashAggregate [c_last_name,c_first_name,d_date]
-                                          Project [c_last_name,c_first_name,d_date]
-                                            BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                              Project [cs_bill_customer_sk,d_date]
-                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+      Exchange #1
+        WholeStageCodegen (12)
+          HashAggregate [count,count]
+            Project
+              BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                BroadcastHashJoin [c_last_name,c_first_name,d_date,c_last_name,c_first_name,d_date]
+                  HashAggregate [c_last_name,c_first_name,d_date]
+                    InputAdapter
+                      Exchange [c_last_name,c_first_name,d_date] #2
+                        WholeStageCodegen (3)
+                          HashAggregate [c_last_name,c_first_name,d_date]
+                            Project [c_last_name,c_first_name,d_date]
+                              BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                Project [ss_customer_sk,d_date]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [ss_customer_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometFilter [cs_bill_customer_sk]
-                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
-                                                  InputAdapter
-                                                    ReusedExchange [d_date_sk,d_date] #3
-                                              InputAdapter
-                                                ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
-                    InputAdapter
-                      BroadcastExchange #7
-                        WholeStageCodegen (11)
-                          ColumnarToRow
-                            InputAdapter
-                              CometHashAggregate [c_last_name,c_first_name,d_date]
-                                CometColumnarExchange [c_last_name,c_first_name,d_date] #8
-                                  RowToColumnar
-                                    WholeStageCodegen (10)
-                                      HashAggregate [c_last_name,c_first_name,d_date]
-                                        Project [c_last_name,c_first_name,d_date]
-                                          BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
-                                            Project [ws_bill_customer_sk,d_date]
-                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
-                                                InputAdapter
-                                                  ReusedExchange [d_date_sk,d_date] #3
+                                                      CometProject [d_date_sk,d_date]
+                                                        CometFilter [d_month_seq,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk,d_date] #3
+                                InputAdapter
+                                  BroadcastExchange #4
+                                    WholeStageCodegen (2)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_first_name,c_last_name]
+                  InputAdapter
+                    BroadcastExchange #5
+                      WholeStageCodegen (7)
+                        HashAggregate [c_last_name,c_first_name,d_date]
+                          InputAdapter
+                            Exchange [c_last_name,c_first_name,d_date] #6
+                              WholeStageCodegen (6)
+                                HashAggregate [c_last_name,c_first_name,d_date]
+                                  Project [c_last_name,c_first_name,d_date]
+                                    BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                      Project [cs_bill_customer_sk,d_date]
+                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
                                             InputAdapter
-                                              ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                                              CometFilter [cs_bill_customer_sk]
+                                                CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk,d_date] #3
+                                      InputAdapter
+                                        ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
+                InputAdapter
+                  BroadcastExchange #7
+                    WholeStageCodegen (11)
+                      HashAggregate [c_last_name,c_first_name,d_date]
+                        InputAdapter
+                          Exchange [c_last_name,c_first_name,d_date] #8
+                            WholeStageCodegen (10)
+                              HashAggregate [c_last_name,c_first_name,d_date]
+                                Project [c_last_name,c_first_name,d_date]
+                                  BroadcastHashJoin [ws_bill_customer_sk,c_customer_sk]
+                                    Project [ws_bill_customer_sk,d_date]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ws_bill_customer_sk]
+                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk,d_date] #3
+                                    InputAdapter
+                                      ReusedExchange [c_customer_sk,c_first_name,c_last_name] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt
index 0794d36e95..26821dfd2a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/explain.txt
@@ -1,202 +1,186 @@
 == Physical Plan ==
-* BroadcastNestedLoopJoin Inner BuildRight (198)
-:- * BroadcastNestedLoopJoin Inner BuildRight (174)
-:  :- * BroadcastNestedLoopJoin Inner BuildRight (150)
-:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (126)
-:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (102)
-:  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (78)
-:  :  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (54)
-:  :  :  :  :  :  :- * ColumnarToRow (30)
-:  :  :  :  :  :  :  +- CometHashAggregate (29)
-:  :  :  :  :  :  :     +- CometColumnarExchange (28)
-:  :  :  :  :  :  :        +- RowToColumnar (27)
-:  :  :  :  :  :  :           +- * HashAggregate (26)
-:  :  :  :  :  :  :              +- * Project (25)
-:  :  :  :  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (24)
-:  :  :  :  :  :  :                    :- * Project (18)
-:  :  :  :  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (17)
-:  :  :  :  :  :  :                    :     :- * Project (11)
-:  :  :  :  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (10)
-:  :  :  :  :  :  :                    :     :     :- * ColumnarToRow (4)
-:  :  :  :  :  :  :                    :     :     :  +- CometProject (3)
-:  :  :  :  :  :  :                    :     :     :     +- CometFilter (2)
-:  :  :  :  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
-:  :  :  :  :  :  :                    :     :     +- BroadcastExchange (9)
-:  :  :  :  :  :  :                    :     :        +- * ColumnarToRow (8)
-:  :  :  :  :  :  :                    :     :           +- CometProject (7)
-:  :  :  :  :  :  :                    :     :              +- CometFilter (6)
-:  :  :  :  :  :  :                    :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
-:  :  :  :  :  :  :                    :     +- BroadcastExchange (16)
-:  :  :  :  :  :  :                    :        +- * ColumnarToRow (15)
-:  :  :  :  :  :  :                    :           +- CometProject (14)
-:  :  :  :  :  :  :                    :              +- CometFilter (13)
-:  :  :  :  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (12)
-:  :  :  :  :  :  :                    +- BroadcastExchange (23)
-:  :  :  :  :  :  :                       +- * ColumnarToRow (22)
-:  :  :  :  :  :  :                          +- CometProject (21)
-:  :  :  :  :  :  :                             +- CometFilter (20)
-:  :  :  :  :  :  :                                +- CometScan parquet spark_catalog.default.store (19)
-:  :  :  :  :  :  +- BroadcastExchange (53)
-:  :  :  :  :  :     +- * ColumnarToRow (52)
-:  :  :  :  :  :        +- CometHashAggregate (51)
-:  :  :  :  :  :           +- CometColumnarExchange (50)
-:  :  :  :  :  :              +- RowToColumnar (49)
-:  :  :  :  :  :                 +- * HashAggregate (48)
-:  :  :  :  :  :                    +- * Project (47)
-:  :  :  :  :  :                       +- * BroadcastHashJoin Inner BuildRight (46)
-:  :  :  :  :  :                          :- * Project (44)
-:  :  :  :  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (43)
-:  :  :  :  :  :                          :     :- * Project (37)
-:  :  :  :  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (36)
-:  :  :  :  :  :                          :     :     :- * ColumnarToRow (34)
-:  :  :  :  :  :                          :     :     :  +- CometProject (33)
-:  :  :  :  :  :                          :     :     :     +- CometFilter (32)
-:  :  :  :  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (31)
-:  :  :  :  :  :                          :     :     +- ReusedExchange (35)
-:  :  :  :  :  :                          :     +- BroadcastExchange (42)
-:  :  :  :  :  :                          :        +- * ColumnarToRow (41)
-:  :  :  :  :  :                          :           +- CometProject (40)
-:  :  :  :  :  :                          :              +- CometFilter (39)
-:  :  :  :  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (38)
-:  :  :  :  :  :                          +- ReusedExchange (45)
-:  :  :  :  :  +- BroadcastExchange (77)
-:  :  :  :  :     +- * ColumnarToRow (76)
-:  :  :  :  :        +- CometHashAggregate (75)
-:  :  :  :  :           +- CometColumnarExchange (74)
-:  :  :  :  :              +- RowToColumnar (73)
-:  :  :  :  :                 +- * HashAggregate (72)
-:  :  :  :  :                    +- * Project (71)
-:  :  :  :  :                       +- * BroadcastHashJoin Inner BuildRight (70)
-:  :  :  :  :                          :- * Project (68)
-:  :  :  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (67)
-:  :  :  :  :                          :     :- * Project (61)
-:  :  :  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (60)
-:  :  :  :  :                          :     :     :- * ColumnarToRow (58)
-:  :  :  :  :                          :     :     :  +- CometProject (57)
-:  :  :  :  :                          :     :     :     +- CometFilter (56)
-:  :  :  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (55)
-:  :  :  :  :                          :     :     +- ReusedExchange (59)
-:  :  :  :  :                          :     +- BroadcastExchange (66)
-:  :  :  :  :                          :        +- * ColumnarToRow (65)
-:  :  :  :  :                          :           +- CometProject (64)
-:  :  :  :  :                          :              +- CometFilter (63)
-:  :  :  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (62)
-:  :  :  :  :                          +- ReusedExchange (69)
-:  :  :  :  +- BroadcastExchange (101)
-:  :  :  :     +- * ColumnarToRow (100)
-:  :  :  :        +- CometHashAggregate (99)
-:  :  :  :           +- CometColumnarExchange (98)
-:  :  :  :              +- RowToColumnar (97)
-:  :  :  :                 +- * HashAggregate (96)
-:  :  :  :                    +- * Project (95)
-:  :  :  :                       +- * BroadcastHashJoin Inner BuildRight (94)
-:  :  :  :                          :- * Project (92)
-:  :  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (91)
-:  :  :  :                          :     :- * Project (85)
-:  :  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (84)
-:  :  :  :                          :     :     :- * ColumnarToRow (82)
-:  :  :  :                          :     :     :  +- CometProject (81)
-:  :  :  :                          :     :     :     +- CometFilter (80)
-:  :  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (79)
-:  :  :  :                          :     :     +- ReusedExchange (83)
-:  :  :  :                          :     +- BroadcastExchange (90)
-:  :  :  :                          :        +- * ColumnarToRow (89)
-:  :  :  :                          :           +- CometProject (88)
-:  :  :  :                          :              +- CometFilter (87)
-:  :  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (86)
-:  :  :  :                          +- ReusedExchange (93)
-:  :  :  +- BroadcastExchange (125)
-:  :  :     +- * ColumnarToRow (124)
-:  :  :        +- CometHashAggregate (123)
-:  :  :           +- CometColumnarExchange (122)
-:  :  :              +- RowToColumnar (121)
-:  :  :                 +- * HashAggregate (120)
-:  :  :                    +- * Project (119)
-:  :  :                       +- * BroadcastHashJoin Inner BuildRight (118)
-:  :  :                          :- * Project (116)
-:  :  :                          :  +- * BroadcastHashJoin Inner BuildRight (115)
-:  :  :                          :     :- * Project (109)
-:  :  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (108)
-:  :  :                          :     :     :- * ColumnarToRow (106)
-:  :  :                          :     :     :  +- CometProject (105)
-:  :  :                          :     :     :     +- CometFilter (104)
-:  :  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (103)
-:  :  :                          :     :     +- ReusedExchange (107)
-:  :  :                          :     +- BroadcastExchange (114)
-:  :  :                          :        +- * ColumnarToRow (113)
-:  :  :                          :           +- CometProject (112)
-:  :  :                          :              +- CometFilter (111)
-:  :  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (110)
-:  :  :                          +- ReusedExchange (117)
-:  :  +- BroadcastExchange (149)
-:  :     +- * ColumnarToRow (148)
-:  :        +- CometHashAggregate (147)
-:  :           +- CometColumnarExchange (146)
-:  :              +- RowToColumnar (145)
-:  :                 +- * HashAggregate (144)
-:  :                    +- * Project (143)
-:  :                       +- * BroadcastHashJoin Inner BuildRight (142)
-:  :                          :- * Project (140)
-:  :                          :  +- * BroadcastHashJoin Inner BuildRight (139)
-:  :                          :     :- * Project (133)
-:  :                          :     :  +- * BroadcastHashJoin Inner BuildRight (132)
-:  :                          :     :     :- * ColumnarToRow (130)
-:  :                          :     :     :  +- CometProject (129)
-:  :                          :     :     :     +- CometFilter (128)
-:  :                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (127)
-:  :                          :     :     +- ReusedExchange (131)
-:  :                          :     +- BroadcastExchange (138)
-:  :                          :        +- * ColumnarToRow (137)
-:  :                          :           +- CometProject (136)
-:  :                          :              +- CometFilter (135)
-:  :                          :                 +- CometScan parquet spark_catalog.default.time_dim (134)
-:  :                          +- ReusedExchange (141)
-:  +- BroadcastExchange (173)
-:     +- * ColumnarToRow (172)
-:        +- CometHashAggregate (171)
-:           +- CometColumnarExchange (170)
-:              +- RowToColumnar (169)
-:                 +- * HashAggregate (168)
-:                    +- * Project (167)
-:                       +- * BroadcastHashJoin Inner BuildRight (166)
-:                          :- * Project (164)
-:                          :  +- * BroadcastHashJoin Inner BuildRight (163)
-:                          :     :- * Project (157)
-:                          :     :  +- * BroadcastHashJoin Inner BuildRight (156)
-:                          :     :     :- * ColumnarToRow (154)
-:                          :     :     :  +- CometProject (153)
-:                          :     :     :     +- CometFilter (152)
-:                          :     :     :        +- CometScan parquet spark_catalog.default.store_sales (151)
-:                          :     :     +- ReusedExchange (155)
-:                          :     +- BroadcastExchange (162)
-:                          :        +- * ColumnarToRow (161)
-:                          :           +- CometProject (160)
-:                          :              +- CometFilter (159)
-:                          :                 +- CometScan parquet spark_catalog.default.time_dim (158)
-:                          +- ReusedExchange (165)
-+- BroadcastExchange (197)
-   +- * ColumnarToRow (196)
-      +- CometHashAggregate (195)
-         +- CometColumnarExchange (194)
-            +- RowToColumnar (193)
-               +- * HashAggregate (192)
-                  +- * Project (191)
-                     +- * BroadcastHashJoin Inner BuildRight (190)
-                        :- * Project (188)
-                        :  +- * BroadcastHashJoin Inner BuildRight (187)
-                        :     :- * Project (181)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (180)
-                        :     :     :- * ColumnarToRow (178)
-                        :     :     :  +- CometProject (177)
-                        :     :     :     +- CometFilter (176)
-                        :     :     :        +- CometScan parquet spark_catalog.default.store_sales (175)
-                        :     :     +- ReusedExchange (179)
-                        :     +- BroadcastExchange (186)
-                        :        +- * ColumnarToRow (185)
-                        :           +- CometProject (184)
-                        :              +- CometFilter (183)
-                        :                 +- CometScan parquet spark_catalog.default.time_dim (182)
-                        +- ReusedExchange (189)
+* BroadcastNestedLoopJoin Inner BuildRight (182)
+:- * BroadcastNestedLoopJoin Inner BuildRight (160)
+:  :- * BroadcastNestedLoopJoin Inner BuildRight (138)
+:  :  :- * BroadcastNestedLoopJoin Inner BuildRight (116)
+:  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (94)
+:  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (72)
+:  :  :  :  :  :- * BroadcastNestedLoopJoin Inner BuildRight (50)
+:  :  :  :  :  :  :- * HashAggregate (28)
+:  :  :  :  :  :  :  +- Exchange (27)
+:  :  :  :  :  :  :     +- * HashAggregate (26)
+:  :  :  :  :  :  :        +- * Project (25)
+:  :  :  :  :  :  :           +- * BroadcastHashJoin Inner BuildRight (24)
+:  :  :  :  :  :  :              :- * Project (18)
+:  :  :  :  :  :  :              :  +- * BroadcastHashJoin Inner BuildRight (17)
+:  :  :  :  :  :  :              :     :- * Project (11)
+:  :  :  :  :  :  :              :     :  +- * BroadcastHashJoin Inner BuildRight (10)
+:  :  :  :  :  :  :              :     :     :- * ColumnarToRow (4)
+:  :  :  :  :  :  :              :     :     :  +- CometProject (3)
+:  :  :  :  :  :  :              :     :     :     +- CometFilter (2)
+:  :  :  :  :  :  :              :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
+:  :  :  :  :  :  :              :     :     +- BroadcastExchange (9)
+:  :  :  :  :  :  :              :     :        +- * ColumnarToRow (8)
+:  :  :  :  :  :  :              :     :           +- CometProject (7)
+:  :  :  :  :  :  :              :     :              +- CometFilter (6)
+:  :  :  :  :  :  :              :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
+:  :  :  :  :  :  :              :     +- BroadcastExchange (16)
+:  :  :  :  :  :  :              :        +- * ColumnarToRow (15)
+:  :  :  :  :  :  :              :           +- CometProject (14)
+:  :  :  :  :  :  :              :              +- CometFilter (13)
+:  :  :  :  :  :  :              :                 +- CometScan parquet spark_catalog.default.time_dim (12)
+:  :  :  :  :  :  :              +- BroadcastExchange (23)
+:  :  :  :  :  :  :                 +- * ColumnarToRow (22)
+:  :  :  :  :  :  :                    +- CometProject (21)
+:  :  :  :  :  :  :                       +- CometFilter (20)
+:  :  :  :  :  :  :                          +- CometScan parquet spark_catalog.default.store (19)
+:  :  :  :  :  :  +- BroadcastExchange (49)
+:  :  :  :  :  :     +- * HashAggregate (48)
+:  :  :  :  :  :        +- Exchange (47)
+:  :  :  :  :  :           +- * HashAggregate (46)
+:  :  :  :  :  :              +- * Project (45)
+:  :  :  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (44)
+:  :  :  :  :  :                    :- * Project (42)
+:  :  :  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (41)
+:  :  :  :  :  :                    :     :- * Project (35)
+:  :  :  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+:  :  :  :  :  :                    :     :     :- * ColumnarToRow (32)
+:  :  :  :  :  :                    :     :     :  +- CometProject (31)
+:  :  :  :  :  :                    :     :     :     +- CometFilter (30)
+:  :  :  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (29)
+:  :  :  :  :  :                    :     :     +- ReusedExchange (33)
+:  :  :  :  :  :                    :     +- BroadcastExchange (40)
+:  :  :  :  :  :                    :        +- * ColumnarToRow (39)
+:  :  :  :  :  :                    :           +- CometProject (38)
+:  :  :  :  :  :                    :              +- CometFilter (37)
+:  :  :  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (36)
+:  :  :  :  :  :                    +- ReusedExchange (43)
+:  :  :  :  :  +- BroadcastExchange (71)
+:  :  :  :  :     +- * HashAggregate (70)
+:  :  :  :  :        +- Exchange (69)
+:  :  :  :  :           +- * HashAggregate (68)
+:  :  :  :  :              +- * Project (67)
+:  :  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (66)
+:  :  :  :  :                    :- * Project (64)
+:  :  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (63)
+:  :  :  :  :                    :     :- * Project (57)
+:  :  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+:  :  :  :  :                    :     :     :- * ColumnarToRow (54)
+:  :  :  :  :                    :     :     :  +- CometProject (53)
+:  :  :  :  :                    :     :     :     +- CometFilter (52)
+:  :  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (51)
+:  :  :  :  :                    :     :     +- ReusedExchange (55)
+:  :  :  :  :                    :     +- BroadcastExchange (62)
+:  :  :  :  :                    :        +- * ColumnarToRow (61)
+:  :  :  :  :                    :           +- CometProject (60)
+:  :  :  :  :                    :              +- CometFilter (59)
+:  :  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (58)
+:  :  :  :  :                    +- ReusedExchange (65)
+:  :  :  :  +- BroadcastExchange (93)
+:  :  :  :     +- * HashAggregate (92)
+:  :  :  :        +- Exchange (91)
+:  :  :  :           +- * HashAggregate (90)
+:  :  :  :              +- * Project (89)
+:  :  :  :                 +- * BroadcastHashJoin Inner BuildRight (88)
+:  :  :  :                    :- * Project (86)
+:  :  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (85)
+:  :  :  :                    :     :- * Project (79)
+:  :  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (78)
+:  :  :  :                    :     :     :- * ColumnarToRow (76)
+:  :  :  :                    :     :     :  +- CometProject (75)
+:  :  :  :                    :     :     :     +- CometFilter (74)
+:  :  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (73)
+:  :  :  :                    :     :     +- ReusedExchange (77)
+:  :  :  :                    :     +- BroadcastExchange (84)
+:  :  :  :                    :        +- * ColumnarToRow (83)
+:  :  :  :                    :           +- CometProject (82)
+:  :  :  :                    :              +- CometFilter (81)
+:  :  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (80)
+:  :  :  :                    +- ReusedExchange (87)
+:  :  :  +- BroadcastExchange (115)
+:  :  :     +- * HashAggregate (114)
+:  :  :        +- Exchange (113)
+:  :  :           +- * HashAggregate (112)
+:  :  :              +- * Project (111)
+:  :  :                 +- * BroadcastHashJoin Inner BuildRight (110)
+:  :  :                    :- * Project (108)
+:  :  :                    :  +- * BroadcastHashJoin Inner BuildRight (107)
+:  :  :                    :     :- * Project (101)
+:  :  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (100)
+:  :  :                    :     :     :- * ColumnarToRow (98)
+:  :  :                    :     :     :  +- CometProject (97)
+:  :  :                    :     :     :     +- CometFilter (96)
+:  :  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (95)
+:  :  :                    :     :     +- ReusedExchange (99)
+:  :  :                    :     +- BroadcastExchange (106)
+:  :  :                    :        +- * ColumnarToRow (105)
+:  :  :                    :           +- CometProject (104)
+:  :  :                    :              +- CometFilter (103)
+:  :  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (102)
+:  :  :                    +- ReusedExchange (109)
+:  :  +- BroadcastExchange (137)
+:  :     +- * HashAggregate (136)
+:  :        +- Exchange (135)
+:  :           +- * HashAggregate (134)
+:  :              +- * Project (133)
+:  :                 +- * BroadcastHashJoin Inner BuildRight (132)
+:  :                    :- * Project (130)
+:  :                    :  +- * BroadcastHashJoin Inner BuildRight (129)
+:  :                    :     :- * Project (123)
+:  :                    :     :  +- * BroadcastHashJoin Inner BuildRight (122)
+:  :                    :     :     :- * ColumnarToRow (120)
+:  :                    :     :     :  +- CometProject (119)
+:  :                    :     :     :     +- CometFilter (118)
+:  :                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (117)
+:  :                    :     :     +- ReusedExchange (121)
+:  :                    :     +- BroadcastExchange (128)
+:  :                    :        +- * ColumnarToRow (127)
+:  :                    :           +- CometProject (126)
+:  :                    :              +- CometFilter (125)
+:  :                    :                 +- CometScan parquet spark_catalog.default.time_dim (124)
+:  :                    +- ReusedExchange (131)
+:  +- BroadcastExchange (159)
+:     +- * HashAggregate (158)
+:        +- Exchange (157)
+:           +- * HashAggregate (156)
+:              +- * Project (155)
+:                 +- * BroadcastHashJoin Inner BuildRight (154)
+:                    :- * Project (152)
+:                    :  +- * BroadcastHashJoin Inner BuildRight (151)
+:                    :     :- * Project (145)
+:                    :     :  +- * BroadcastHashJoin Inner BuildRight (144)
+:                    :     :     :- * ColumnarToRow (142)
+:                    :     :     :  +- CometProject (141)
+:                    :     :     :     +- CometFilter (140)
+:                    :     :     :        +- CometScan parquet spark_catalog.default.store_sales (139)
+:                    :     :     +- ReusedExchange (143)
+:                    :     +- BroadcastExchange (150)
+:                    :        +- * ColumnarToRow (149)
+:                    :           +- CometProject (148)
+:                    :              +- CometFilter (147)
+:                    :                 +- CometScan parquet spark_catalog.default.time_dim (146)
+:                    +- ReusedExchange (153)
++- BroadcastExchange (181)
+   +- * HashAggregate (180)
+      +- Exchange (179)
+         +- * HashAggregate (178)
+            +- * Project (177)
+               +- * BroadcastHashJoin Inner BuildRight (176)
+                  :- * Project (174)
+                  :  +- * BroadcastHashJoin Inner BuildRight (173)
+                  :     :- * Project (167)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (166)
+                  :     :     :- * ColumnarToRow (164)
+                  :     :     :  +- CometProject (163)
+                  :     :     :     +- CometFilter (162)
+                  :     :     :        +- CometScan parquet spark_catalog.default.store_sales (161)
+                  :     :     +- ReusedExchange (165)
+                  :     +- BroadcastExchange (172)
+                  :        +- * ColumnarToRow (171)
+                  :           +- CometProject (170)
+                  :              +- CometFilter (169)
+                  :                 +- CometScan parquet spark_catalog.default.time_dim (168)
+                  +- ReusedExchange (175)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -320,760 +304,728 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#13]
 Results [1]: [count#14]
 
-(27) RowToColumnar
+(27) Exchange
 Input [1]: [count#14]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [1]: [count#14]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 40]
 Input [1]: [count#14]
 Keys: []
 Functions [1]: [count(1)]
-
-(30) ColumnarToRow [codegen id : 40]
-Input [1]: [h8_30_to_9#15]
+Aggregate Attributes [1]: [count(1)#15]
+Results [1]: [count(1)#15 AS h8_30_to_9#16]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, ss_sold_date_sk#19]
+Output [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, ss_sold_date_sk#20]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(32) CometFilter
-Input [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, ss_sold_date_sk#19]
-Condition : ((isnotnull(ss_hdemo_sk#17) AND isnotnull(ss_sold_time_sk#16)) AND isnotnull(ss_store_sk#18))
+(30) CometFilter
+Input [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, ss_sold_date_sk#20]
+Condition : ((isnotnull(ss_hdemo_sk#18) AND isnotnull(ss_sold_time_sk#17)) AND isnotnull(ss_store_sk#19))
 
-(33) CometProject
-Input [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, ss_sold_date_sk#19]
-Arguments: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18], [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18]
+(31) CometProject
+Input [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, ss_sold_date_sk#20]
+Arguments: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19], [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19]
 
-(34) ColumnarToRow [codegen id : 8]
-Input [3]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18]
+(32) ColumnarToRow [codegen id : 8]
+Input [3]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19]
 
-(35) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#20]
+(33) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#21]
 
-(36) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_hdemo_sk#17]
-Right keys [1]: [hd_demo_sk#20]
+(34) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_hdemo_sk#18]
+Right keys [1]: [hd_demo_sk#21]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
-Output [2]: [ss_sold_time_sk#16, ss_store_sk#18]
-Input [4]: [ss_sold_time_sk#16, ss_hdemo_sk#17, ss_store_sk#18, hd_demo_sk#20]
+(35) Project [codegen id : 8]
+Output [2]: [ss_sold_time_sk#17, ss_store_sk#19]
+Input [4]: [ss_sold_time_sk#17, ss_hdemo_sk#18, ss_store_sk#19, hd_demo_sk#21]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#21, t_hour#22, t_minute#23]
+Output [3]: [t_time_sk#22, t_hour#23, t_minute#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,9), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(39) CometFilter
-Input [3]: [t_time_sk#21, t_hour#22, t_minute#23]
-Condition : ((((isnotnull(t_hour#22) AND isnotnull(t_minute#23)) AND (t_hour#22 = 9)) AND (t_minute#23 < 30)) AND isnotnull(t_time_sk#21))
+(37) CometFilter
+Input [3]: [t_time_sk#22, t_hour#23, t_minute#24]
+Condition : ((((isnotnull(t_hour#23) AND isnotnull(t_minute#24)) AND (t_hour#23 = 9)) AND (t_minute#24 < 30)) AND isnotnull(t_time_sk#22))
 
-(40) CometProject
-Input [3]: [t_time_sk#21, t_hour#22, t_minute#23]
-Arguments: [t_time_sk#21], [t_time_sk#21]
+(38) CometProject
+Input [3]: [t_time_sk#22, t_hour#23, t_minute#24]
+Arguments: [t_time_sk#22], [t_time_sk#22]
 
-(41) ColumnarToRow [codegen id : 6]
-Input [1]: [t_time_sk#21]
+(39) ColumnarToRow [codegen id : 6]
+Input [1]: [t_time_sk#22]
 
-(42) BroadcastExchange
-Input [1]: [t_time_sk#21]
+(40) BroadcastExchange
+Input [1]: [t_time_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(43) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_sold_time_sk#16]
-Right keys [1]: [t_time_sk#21]
+(41) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_sold_time_sk#17]
+Right keys [1]: [t_time_sk#22]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 8]
-Output [1]: [ss_store_sk#18]
-Input [3]: [ss_sold_time_sk#16, ss_store_sk#18, t_time_sk#21]
+(42) Project [codegen id : 8]
+Output [1]: [ss_store_sk#19]
+Input [3]: [ss_sold_time_sk#17, ss_store_sk#19, t_time_sk#22]
 
-(45) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#24]
+(43) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#25]
 
-(46) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ss_store_sk#18]
-Right keys [1]: [s_store_sk#24]
+(44) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ss_store_sk#19]
+Right keys [1]: [s_store_sk#25]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 8]
+(45) Project [codegen id : 8]
 Output: []
-Input [2]: [ss_store_sk#18, s_store_sk#24]
+Input [2]: [ss_store_sk#19, s_store_sk#25]
 
-(48) HashAggregate [codegen id : 8]
+(46) HashAggregate [codegen id : 8]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#25]
-Results [1]: [count#26]
+Aggregate Attributes [1]: [count#26]
+Results [1]: [count#27]
 
-(49) RowToColumnar
-Input [1]: [count#26]
+(47) Exchange
+Input [1]: [count#27]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
 
-(50) CometColumnarExchange
-Input [1]: [count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(51) CometHashAggregate
-Input [1]: [count#26]
+(48) HashAggregate [codegen id : 9]
+Input [1]: [count#27]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#28]
+Results [1]: [count(1)#28 AS h9_to_9_30#29]
 
-(52) ColumnarToRow [codegen id : 9]
-Input [1]: [h9_to_9_30#27]
-
-(53) BroadcastExchange
-Input [1]: [h9_to_9_30#27]
+(49) BroadcastExchange
+Input [1]: [h9_to_9_30#29]
 Arguments: IdentityBroadcastMode, [plan_id=7]
 
-(54) BroadcastNestedLoopJoin [codegen id : 40]
+(50) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, ss_sold_date_sk#31]
+Output [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, ss_sold_date_sk#33]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(56) CometFilter
-Input [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, ss_sold_date_sk#31]
-Condition : ((isnotnull(ss_hdemo_sk#29) AND isnotnull(ss_sold_time_sk#28)) AND isnotnull(ss_store_sk#30))
+(52) CometFilter
+Input [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, ss_sold_date_sk#33]
+Condition : ((isnotnull(ss_hdemo_sk#31) AND isnotnull(ss_sold_time_sk#30)) AND isnotnull(ss_store_sk#32))
 
-(57) CometProject
-Input [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, ss_sold_date_sk#31]
-Arguments: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30], [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30]
+(53) CometProject
+Input [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, ss_sold_date_sk#33]
+Arguments: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32], [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32]
 
-(58) ColumnarToRow [codegen id : 13]
-Input [3]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30]
+(54) ColumnarToRow [codegen id : 13]
+Input [3]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32]
 
-(59) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#32]
+(55) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#34]
 
-(60) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_hdemo_sk#29]
-Right keys [1]: [hd_demo_sk#32]
+(56) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_hdemo_sk#31]
+Right keys [1]: [hd_demo_sk#34]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 13]
-Output [2]: [ss_sold_time_sk#28, ss_store_sk#30]
-Input [4]: [ss_sold_time_sk#28, ss_hdemo_sk#29, ss_store_sk#30, hd_demo_sk#32]
+(57) Project [codegen id : 13]
+Output [2]: [ss_sold_time_sk#30, ss_store_sk#32]
+Input [4]: [ss_sold_time_sk#30, ss_hdemo_sk#31, ss_store_sk#32, hd_demo_sk#34]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#33, t_hour#34, t_minute#35]
+Output [3]: [t_time_sk#35, t_hour#36, t_minute#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,9), GreaterThanOrEqual(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(63) CometFilter
-Input [3]: [t_time_sk#33, t_hour#34, t_minute#35]
-Condition : ((((isnotnull(t_hour#34) AND isnotnull(t_minute#35)) AND (t_hour#34 = 9)) AND (t_minute#35 >= 30)) AND isnotnull(t_time_sk#33))
+(59) CometFilter
+Input [3]: [t_time_sk#35, t_hour#36, t_minute#37]
+Condition : ((((isnotnull(t_hour#36) AND isnotnull(t_minute#37)) AND (t_hour#36 = 9)) AND (t_minute#37 >= 30)) AND isnotnull(t_time_sk#35))
 
-(64) CometProject
-Input [3]: [t_time_sk#33, t_hour#34, t_minute#35]
-Arguments: [t_time_sk#33], [t_time_sk#33]
+(60) CometProject
+Input [3]: [t_time_sk#35, t_hour#36, t_minute#37]
+Arguments: [t_time_sk#35], [t_time_sk#35]
 
-(65) ColumnarToRow [codegen id : 11]
-Input [1]: [t_time_sk#33]
+(61) ColumnarToRow [codegen id : 11]
+Input [1]: [t_time_sk#35]
 
-(66) BroadcastExchange
-Input [1]: [t_time_sk#33]
+(62) BroadcastExchange
+Input [1]: [t_time_sk#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-(67) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_sold_time_sk#28]
-Right keys [1]: [t_time_sk#33]
+(63) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_sold_time_sk#30]
+Right keys [1]: [t_time_sk#35]
 Join type: Inner
 Join condition: None
 
-(68) Project [codegen id : 13]
-Output [1]: [ss_store_sk#30]
-Input [3]: [ss_sold_time_sk#28, ss_store_sk#30, t_time_sk#33]
+(64) Project [codegen id : 13]
+Output [1]: [ss_store_sk#32]
+Input [3]: [ss_sold_time_sk#30, ss_store_sk#32, t_time_sk#35]
 
-(69) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#36]
+(65) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#38]
 
-(70) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [ss_store_sk#30]
-Right keys [1]: [s_store_sk#36]
+(66) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [ss_store_sk#32]
+Right keys [1]: [s_store_sk#38]
 Join type: Inner
 Join condition: None
 
-(71) Project [codegen id : 13]
+(67) Project [codegen id : 13]
 Output: []
-Input [2]: [ss_store_sk#30, s_store_sk#36]
+Input [2]: [ss_store_sk#32, s_store_sk#38]
 
-(72) HashAggregate [codegen id : 13]
+(68) HashAggregate [codegen id : 13]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#37]
-Results [1]: [count#38]
-
-(73) RowToColumnar
-Input [1]: [count#38]
+Aggregate Attributes [1]: [count#39]
+Results [1]: [count#40]
 
-(74) CometColumnarExchange
-Input [1]: [count#38]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(69) Exchange
+Input [1]: [count#40]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=9]
 
-(75) CometHashAggregate
-Input [1]: [count#38]
+(70) HashAggregate [codegen id : 14]
+Input [1]: [count#40]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#41]
+Results [1]: [count(1)#41 AS h9_30_to_10#42]
 
-(76) ColumnarToRow [codegen id : 14]
-Input [1]: [h9_30_to_10#39]
-
-(77) BroadcastExchange
-Input [1]: [h9_30_to_10#39]
+(71) BroadcastExchange
+Input [1]: [h9_30_to_10#42]
 Arguments: IdentityBroadcastMode, [plan_id=10]
 
-(78) BroadcastNestedLoopJoin [codegen id : 40]
+(72) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, ss_sold_date_sk#43]
+Output [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, ss_sold_date_sk#46]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(80) CometFilter
-Input [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, ss_sold_date_sk#43]
-Condition : ((isnotnull(ss_hdemo_sk#41) AND isnotnull(ss_sold_time_sk#40)) AND isnotnull(ss_store_sk#42))
+(74) CometFilter
+Input [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, ss_sold_date_sk#46]
+Condition : ((isnotnull(ss_hdemo_sk#44) AND isnotnull(ss_sold_time_sk#43)) AND isnotnull(ss_store_sk#45))
 
-(81) CometProject
-Input [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, ss_sold_date_sk#43]
-Arguments: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42], [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42]
+(75) CometProject
+Input [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, ss_sold_date_sk#46]
+Arguments: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45], [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45]
 
-(82) ColumnarToRow [codegen id : 18]
-Input [3]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42]
+(76) ColumnarToRow [codegen id : 18]
+Input [3]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45]
 
-(83) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#44]
+(77) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#47]
 
-(84) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ss_hdemo_sk#41]
-Right keys [1]: [hd_demo_sk#44]
+(78) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ss_hdemo_sk#44]
+Right keys [1]: [hd_demo_sk#47]
 Join type: Inner
 Join condition: None
 
-(85) Project [codegen id : 18]
-Output [2]: [ss_sold_time_sk#40, ss_store_sk#42]
-Input [4]: [ss_sold_time_sk#40, ss_hdemo_sk#41, ss_store_sk#42, hd_demo_sk#44]
+(79) Project [codegen id : 18]
+Output [2]: [ss_sold_time_sk#43, ss_store_sk#45]
+Input [4]: [ss_sold_time_sk#43, ss_hdemo_sk#44, ss_store_sk#45, hd_demo_sk#47]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#45, t_hour#46, t_minute#47]
+Output [3]: [t_time_sk#48, t_hour#49, t_minute#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,10), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(87) CometFilter
-Input [3]: [t_time_sk#45, t_hour#46, t_minute#47]
-Condition : ((((isnotnull(t_hour#46) AND isnotnull(t_minute#47)) AND (t_hour#46 = 10)) AND (t_minute#47 < 30)) AND isnotnull(t_time_sk#45))
+(81) CometFilter
+Input [3]: [t_time_sk#48, t_hour#49, t_minute#50]
+Condition : ((((isnotnull(t_hour#49) AND isnotnull(t_minute#50)) AND (t_hour#49 = 10)) AND (t_minute#50 < 30)) AND isnotnull(t_time_sk#48))
 
-(88) CometProject
-Input [3]: [t_time_sk#45, t_hour#46, t_minute#47]
-Arguments: [t_time_sk#45], [t_time_sk#45]
+(82) CometProject
+Input [3]: [t_time_sk#48, t_hour#49, t_minute#50]
+Arguments: [t_time_sk#48], [t_time_sk#48]
 
-(89) ColumnarToRow [codegen id : 16]
-Input [1]: [t_time_sk#45]
+(83) ColumnarToRow [codegen id : 16]
+Input [1]: [t_time_sk#48]
 
-(90) BroadcastExchange
-Input [1]: [t_time_sk#45]
+(84) BroadcastExchange
+Input [1]: [t_time_sk#48]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(91) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ss_sold_time_sk#40]
-Right keys [1]: [t_time_sk#45]
+(85) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ss_sold_time_sk#43]
+Right keys [1]: [t_time_sk#48]
 Join type: Inner
 Join condition: None
 
-(92) Project [codegen id : 18]
-Output [1]: [ss_store_sk#42]
-Input [3]: [ss_sold_time_sk#40, ss_store_sk#42, t_time_sk#45]
+(86) Project [codegen id : 18]
+Output [1]: [ss_store_sk#45]
+Input [3]: [ss_sold_time_sk#43, ss_store_sk#45, t_time_sk#48]
 
-(93) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#48]
+(87) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#51]
 
-(94) BroadcastHashJoin [codegen id : 18]
-Left keys [1]: [ss_store_sk#42]
-Right keys [1]: [s_store_sk#48]
+(88) BroadcastHashJoin [codegen id : 18]
+Left keys [1]: [ss_store_sk#45]
+Right keys [1]: [s_store_sk#51]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 18]
+(89) Project [codegen id : 18]
 Output: []
-Input [2]: [ss_store_sk#42, s_store_sk#48]
+Input [2]: [ss_store_sk#45, s_store_sk#51]
 
-(96) HashAggregate [codegen id : 18]
+(90) HashAggregate [codegen id : 18]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#49]
-Results [1]: [count#50]
-
-(97) RowToColumnar
-Input [1]: [count#50]
+Aggregate Attributes [1]: [count#52]
+Results [1]: [count#53]
 
-(98) CometColumnarExchange
-Input [1]: [count#50]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(91) Exchange
+Input [1]: [count#53]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
 
-(99) CometHashAggregate
-Input [1]: [count#50]
+(92) HashAggregate [codegen id : 19]
+Input [1]: [count#53]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#54]
+Results [1]: [count(1)#54 AS h10_to_10_30#55]
 
-(100) ColumnarToRow [codegen id : 19]
-Input [1]: [h10_to_10_30#51]
-
-(101) BroadcastExchange
-Input [1]: [h10_to_10_30#51]
+(93) BroadcastExchange
+Input [1]: [h10_to_10_30#55]
 Arguments: IdentityBroadcastMode, [plan_id=13]
 
-(102) BroadcastNestedLoopJoin [codegen id : 40]
+(94) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, ss_sold_date_sk#55]
+Output [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, ss_sold_date_sk#59]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(104) CometFilter
-Input [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, ss_sold_date_sk#55]
-Condition : ((isnotnull(ss_hdemo_sk#53) AND isnotnull(ss_sold_time_sk#52)) AND isnotnull(ss_store_sk#54))
+(96) CometFilter
+Input [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, ss_sold_date_sk#59]
+Condition : ((isnotnull(ss_hdemo_sk#57) AND isnotnull(ss_sold_time_sk#56)) AND isnotnull(ss_store_sk#58))
 
-(105) CometProject
-Input [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, ss_sold_date_sk#55]
-Arguments: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54], [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54]
+(97) CometProject
+Input [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, ss_sold_date_sk#59]
+Arguments: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58], [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58]
 
-(106) ColumnarToRow [codegen id : 23]
-Input [3]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54]
+(98) ColumnarToRow [codegen id : 23]
+Input [3]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58]
 
-(107) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#56]
+(99) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#60]
 
-(108) BroadcastHashJoin [codegen id : 23]
-Left keys [1]: [ss_hdemo_sk#53]
-Right keys [1]: [hd_demo_sk#56]
+(100) BroadcastHashJoin [codegen id : 23]
+Left keys [1]: [ss_hdemo_sk#57]
+Right keys [1]: [hd_demo_sk#60]
 Join type: Inner
 Join condition: None
 
-(109) Project [codegen id : 23]
-Output [2]: [ss_sold_time_sk#52, ss_store_sk#54]
-Input [4]: [ss_sold_time_sk#52, ss_hdemo_sk#53, ss_store_sk#54, hd_demo_sk#56]
+(101) Project [codegen id : 23]
+Output [2]: [ss_sold_time_sk#56, ss_store_sk#58]
+Input [4]: [ss_sold_time_sk#56, ss_hdemo_sk#57, ss_store_sk#58, hd_demo_sk#60]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#57, t_hour#58, t_minute#59]
+Output [3]: [t_time_sk#61, t_hour#62, t_minute#63]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,10), GreaterThanOrEqual(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(111) CometFilter
-Input [3]: [t_time_sk#57, t_hour#58, t_minute#59]
-Condition : ((((isnotnull(t_hour#58) AND isnotnull(t_minute#59)) AND (t_hour#58 = 10)) AND (t_minute#59 >= 30)) AND isnotnull(t_time_sk#57))
+(103) CometFilter
+Input [3]: [t_time_sk#61, t_hour#62, t_minute#63]
+Condition : ((((isnotnull(t_hour#62) AND isnotnull(t_minute#63)) AND (t_hour#62 = 10)) AND (t_minute#63 >= 30)) AND isnotnull(t_time_sk#61))
 
-(112) CometProject
-Input [3]: [t_time_sk#57, t_hour#58, t_minute#59]
-Arguments: [t_time_sk#57], [t_time_sk#57]
+(104) CometProject
+Input [3]: [t_time_sk#61, t_hour#62, t_minute#63]
+Arguments: [t_time_sk#61], [t_time_sk#61]
 
-(113) ColumnarToRow [codegen id : 21]
-Input [1]: [t_time_sk#57]
+(105) ColumnarToRow [codegen id : 21]
+Input [1]: [t_time_sk#61]
 
-(114) BroadcastExchange
-Input [1]: [t_time_sk#57]
+(106) BroadcastExchange
+Input [1]: [t_time_sk#61]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
-(115) BroadcastHashJoin [codegen id : 23]
-Left keys [1]: [ss_sold_time_sk#52]
-Right keys [1]: [t_time_sk#57]
+(107) BroadcastHashJoin [codegen id : 23]
+Left keys [1]: [ss_sold_time_sk#56]
+Right keys [1]: [t_time_sk#61]
 Join type: Inner
 Join condition: None
 
-(116) Project [codegen id : 23]
-Output [1]: [ss_store_sk#54]
-Input [3]: [ss_sold_time_sk#52, ss_store_sk#54, t_time_sk#57]
+(108) Project [codegen id : 23]
+Output [1]: [ss_store_sk#58]
+Input [3]: [ss_sold_time_sk#56, ss_store_sk#58, t_time_sk#61]
 
-(117) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#60]
+(109) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#64]
 
-(118) BroadcastHashJoin [codegen id : 23]
-Left keys [1]: [ss_store_sk#54]
-Right keys [1]: [s_store_sk#60]
+(110) BroadcastHashJoin [codegen id : 23]
+Left keys [1]: [ss_store_sk#58]
+Right keys [1]: [s_store_sk#64]
 Join type: Inner
 Join condition: None
 
-(119) Project [codegen id : 23]
+(111) Project [codegen id : 23]
 Output: []
-Input [2]: [ss_store_sk#54, s_store_sk#60]
+Input [2]: [ss_store_sk#58, s_store_sk#64]
 
-(120) HashAggregate [codegen id : 23]
+(112) HashAggregate [codegen id : 23]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#61]
-Results [1]: [count#62]
+Aggregate Attributes [1]: [count#65]
+Results [1]: [count#66]
 
-(121) RowToColumnar
-Input [1]: [count#62]
+(113) Exchange
+Input [1]: [count#66]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=15]
 
-(122) CometColumnarExchange
-Input [1]: [count#62]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
-
-(123) CometHashAggregate
-Input [1]: [count#62]
+(114) HashAggregate [codegen id : 24]
+Input [1]: [count#66]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#67]
+Results [1]: [count(1)#67 AS h10_30_to_11#68]
 
-(124) ColumnarToRow [codegen id : 24]
-Input [1]: [h10_30_to_11#63]
-
-(125) BroadcastExchange
-Input [1]: [h10_30_to_11#63]
+(115) BroadcastExchange
+Input [1]: [h10_30_to_11#68]
 Arguments: IdentityBroadcastMode, [plan_id=16]
 
-(126) BroadcastNestedLoopJoin [codegen id : 40]
+(116) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, ss_sold_date_sk#67]
+Output [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, ss_sold_date_sk#72]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(128) CometFilter
-Input [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, ss_sold_date_sk#67]
-Condition : ((isnotnull(ss_hdemo_sk#65) AND isnotnull(ss_sold_time_sk#64)) AND isnotnull(ss_store_sk#66))
+(118) CometFilter
+Input [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, ss_sold_date_sk#72]
+Condition : ((isnotnull(ss_hdemo_sk#70) AND isnotnull(ss_sold_time_sk#69)) AND isnotnull(ss_store_sk#71))
 
-(129) CometProject
-Input [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, ss_sold_date_sk#67]
-Arguments: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66], [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66]
+(119) CometProject
+Input [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, ss_sold_date_sk#72]
+Arguments: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71], [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71]
 
-(130) ColumnarToRow [codegen id : 28]
-Input [3]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66]
+(120) ColumnarToRow [codegen id : 28]
+Input [3]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71]
 
-(131) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#68]
+(121) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#73]
 
-(132) BroadcastHashJoin [codegen id : 28]
-Left keys [1]: [ss_hdemo_sk#65]
-Right keys [1]: [hd_demo_sk#68]
+(122) BroadcastHashJoin [codegen id : 28]
+Left keys [1]: [ss_hdemo_sk#70]
+Right keys [1]: [hd_demo_sk#73]
 Join type: Inner
 Join condition: None
 
-(133) Project [codegen id : 28]
-Output [2]: [ss_sold_time_sk#64, ss_store_sk#66]
-Input [4]: [ss_sold_time_sk#64, ss_hdemo_sk#65, ss_store_sk#66, hd_demo_sk#68]
+(123) Project [codegen id : 28]
+Output [2]: [ss_sold_time_sk#69, ss_store_sk#71]
+Input [4]: [ss_sold_time_sk#69, ss_hdemo_sk#70, ss_store_sk#71, hd_demo_sk#73]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#69, t_hour#70, t_minute#71]
+Output [3]: [t_time_sk#74, t_hour#75, t_minute#76]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,11), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(135) CometFilter
-Input [3]: [t_time_sk#69, t_hour#70, t_minute#71]
-Condition : ((((isnotnull(t_hour#70) AND isnotnull(t_minute#71)) AND (t_hour#70 = 11)) AND (t_minute#71 < 30)) AND isnotnull(t_time_sk#69))
+(125) CometFilter
+Input [3]: [t_time_sk#74, t_hour#75, t_minute#76]
+Condition : ((((isnotnull(t_hour#75) AND isnotnull(t_minute#76)) AND (t_hour#75 = 11)) AND (t_minute#76 < 30)) AND isnotnull(t_time_sk#74))
 
-(136) CometProject
-Input [3]: [t_time_sk#69, t_hour#70, t_minute#71]
-Arguments: [t_time_sk#69], [t_time_sk#69]
+(126) CometProject
+Input [3]: [t_time_sk#74, t_hour#75, t_minute#76]
+Arguments: [t_time_sk#74], [t_time_sk#74]
 
-(137) ColumnarToRow [codegen id : 26]
-Input [1]: [t_time_sk#69]
+(127) ColumnarToRow [codegen id : 26]
+Input [1]: [t_time_sk#74]
 
-(138) BroadcastExchange
-Input [1]: [t_time_sk#69]
+(128) BroadcastExchange
+Input [1]: [t_time_sk#74]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=17]
 
-(139) BroadcastHashJoin [codegen id : 28]
-Left keys [1]: [ss_sold_time_sk#64]
-Right keys [1]: [t_time_sk#69]
+(129) BroadcastHashJoin [codegen id : 28]
+Left keys [1]: [ss_sold_time_sk#69]
+Right keys [1]: [t_time_sk#74]
 Join type: Inner
 Join condition: None
 
-(140) Project [codegen id : 28]
-Output [1]: [ss_store_sk#66]
-Input [3]: [ss_sold_time_sk#64, ss_store_sk#66, t_time_sk#69]
+(130) Project [codegen id : 28]
+Output [1]: [ss_store_sk#71]
+Input [3]: [ss_sold_time_sk#69, ss_store_sk#71, t_time_sk#74]
 
-(141) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#72]
+(131) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#77]
 
-(142) BroadcastHashJoin [codegen id : 28]
-Left keys [1]: [ss_store_sk#66]
-Right keys [1]: [s_store_sk#72]
+(132) BroadcastHashJoin [codegen id : 28]
+Left keys [1]: [ss_store_sk#71]
+Right keys [1]: [s_store_sk#77]
 Join type: Inner
 Join condition: None
 
-(143) Project [codegen id : 28]
+(133) Project [codegen id : 28]
 Output: []
-Input [2]: [ss_store_sk#66, s_store_sk#72]
+Input [2]: [ss_store_sk#71, s_store_sk#77]
 
-(144) HashAggregate [codegen id : 28]
+(134) HashAggregate [codegen id : 28]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#73]
-Results [1]: [count#74]
-
-(145) RowToColumnar
-Input [1]: [count#74]
+Aggregate Attributes [1]: [count#78]
+Results [1]: [count#79]
 
-(146) CometColumnarExchange
-Input [1]: [count#74]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
+(135) Exchange
+Input [1]: [count#79]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=18]
 
-(147) CometHashAggregate
-Input [1]: [count#74]
+(136) HashAggregate [codegen id : 29]
+Input [1]: [count#79]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#80]
+Results [1]: [count(1)#80 AS h11_to_11_30#81]
 
-(148) ColumnarToRow [codegen id : 29]
-Input [1]: [h11_to_11_30#75]
-
-(149) BroadcastExchange
-Input [1]: [h11_to_11_30#75]
+(137) BroadcastExchange
+Input [1]: [h11_to_11_30#81]
 Arguments: IdentityBroadcastMode, [plan_id=19]
 
-(150) BroadcastNestedLoopJoin [codegen id : 40]
+(138) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, ss_sold_date_sk#79]
+Output [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, ss_sold_date_sk#85]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(152) CometFilter
-Input [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, ss_sold_date_sk#79]
-Condition : ((isnotnull(ss_hdemo_sk#77) AND isnotnull(ss_sold_time_sk#76)) AND isnotnull(ss_store_sk#78))
+(140) CometFilter
+Input [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, ss_sold_date_sk#85]
+Condition : ((isnotnull(ss_hdemo_sk#83) AND isnotnull(ss_sold_time_sk#82)) AND isnotnull(ss_store_sk#84))
 
-(153) CometProject
-Input [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, ss_sold_date_sk#79]
-Arguments: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78], [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78]
+(141) CometProject
+Input [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, ss_sold_date_sk#85]
+Arguments: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84], [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84]
 
-(154) ColumnarToRow [codegen id : 33]
-Input [3]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78]
+(142) ColumnarToRow [codegen id : 33]
+Input [3]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84]
 
-(155) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#80]
+(143) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#86]
 
-(156) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ss_hdemo_sk#77]
-Right keys [1]: [hd_demo_sk#80]
+(144) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ss_hdemo_sk#83]
+Right keys [1]: [hd_demo_sk#86]
 Join type: Inner
 Join condition: None
 
-(157) Project [codegen id : 33]
-Output [2]: [ss_sold_time_sk#76, ss_store_sk#78]
-Input [4]: [ss_sold_time_sk#76, ss_hdemo_sk#77, ss_store_sk#78, hd_demo_sk#80]
+(145) Project [codegen id : 33]
+Output [2]: [ss_sold_time_sk#82, ss_store_sk#84]
+Input [4]: [ss_sold_time_sk#82, ss_hdemo_sk#83, ss_store_sk#84, hd_demo_sk#86]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#81, t_hour#82, t_minute#83]
+Output [3]: [t_time_sk#87, t_hour#88, t_minute#89]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,11), GreaterThanOrEqual(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(159) CometFilter
-Input [3]: [t_time_sk#81, t_hour#82, t_minute#83]
-Condition : ((((isnotnull(t_hour#82) AND isnotnull(t_minute#83)) AND (t_hour#82 = 11)) AND (t_minute#83 >= 30)) AND isnotnull(t_time_sk#81))
+(147) CometFilter
+Input [3]: [t_time_sk#87, t_hour#88, t_minute#89]
+Condition : ((((isnotnull(t_hour#88) AND isnotnull(t_minute#89)) AND (t_hour#88 = 11)) AND (t_minute#89 >= 30)) AND isnotnull(t_time_sk#87))
 
-(160) CometProject
-Input [3]: [t_time_sk#81, t_hour#82, t_minute#83]
-Arguments: [t_time_sk#81], [t_time_sk#81]
+(148) CometProject
+Input [3]: [t_time_sk#87, t_hour#88, t_minute#89]
+Arguments: [t_time_sk#87], [t_time_sk#87]
 
-(161) ColumnarToRow [codegen id : 31]
-Input [1]: [t_time_sk#81]
+(149) ColumnarToRow [codegen id : 31]
+Input [1]: [t_time_sk#87]
 
-(162) BroadcastExchange
-Input [1]: [t_time_sk#81]
+(150) BroadcastExchange
+Input [1]: [t_time_sk#87]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=20]
 
-(163) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ss_sold_time_sk#76]
-Right keys [1]: [t_time_sk#81]
+(151) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ss_sold_time_sk#82]
+Right keys [1]: [t_time_sk#87]
 Join type: Inner
 Join condition: None
 
-(164) Project [codegen id : 33]
-Output [1]: [ss_store_sk#78]
-Input [3]: [ss_sold_time_sk#76, ss_store_sk#78, t_time_sk#81]
+(152) Project [codegen id : 33]
+Output [1]: [ss_store_sk#84]
+Input [3]: [ss_sold_time_sk#82, ss_store_sk#84, t_time_sk#87]
 
-(165) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#84]
+(153) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#90]
 
-(166) BroadcastHashJoin [codegen id : 33]
-Left keys [1]: [ss_store_sk#78]
-Right keys [1]: [s_store_sk#84]
+(154) BroadcastHashJoin [codegen id : 33]
+Left keys [1]: [ss_store_sk#84]
+Right keys [1]: [s_store_sk#90]
 Join type: Inner
 Join condition: None
 
-(167) Project [codegen id : 33]
+(155) Project [codegen id : 33]
 Output: []
-Input [2]: [ss_store_sk#78, s_store_sk#84]
+Input [2]: [ss_store_sk#84, s_store_sk#90]
 
-(168) HashAggregate [codegen id : 33]
+(156) HashAggregate [codegen id : 33]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#85]
-Results [1]: [count#86]
-
-(169) RowToColumnar
-Input [1]: [count#86]
+Aggregate Attributes [1]: [count#91]
+Results [1]: [count#92]
 
-(170) CometColumnarExchange
-Input [1]: [count#86]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=21]
+(157) Exchange
+Input [1]: [count#92]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=21]
 
-(171) CometHashAggregate
-Input [1]: [count#86]
+(158) HashAggregate [codegen id : 34]
+Input [1]: [count#92]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#93]
+Results [1]: [count(1)#93 AS h11_30_to_12#94]
 
-(172) ColumnarToRow [codegen id : 34]
-Input [1]: [h11_30_to_12#87]
-
-(173) BroadcastExchange
-Input [1]: [h11_30_to_12#87]
+(159) BroadcastExchange
+Input [1]: [h11_30_to_12#94]
 Arguments: IdentityBroadcastMode, [plan_id=22]
 
-(174) BroadcastNestedLoopJoin [codegen id : 40]
+(160) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, ss_sold_date_sk#91]
+Output [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, ss_sold_date_sk#98]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_sales]
 PushedFilters: [IsNotNull(ss_hdemo_sk), IsNotNull(ss_sold_time_sk), IsNotNull(ss_store_sk)]
 ReadSchema: struct<ss_sold_time_sk:int,ss_hdemo_sk:int,ss_store_sk:int>
 
-(176) CometFilter
-Input [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, ss_sold_date_sk#91]
-Condition : ((isnotnull(ss_hdemo_sk#89) AND isnotnull(ss_sold_time_sk#88)) AND isnotnull(ss_store_sk#90))
+(162) CometFilter
+Input [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, ss_sold_date_sk#98]
+Condition : ((isnotnull(ss_hdemo_sk#96) AND isnotnull(ss_sold_time_sk#95)) AND isnotnull(ss_store_sk#97))
 
-(177) CometProject
-Input [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, ss_sold_date_sk#91]
-Arguments: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90], [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90]
+(163) CometProject
+Input [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, ss_sold_date_sk#98]
+Arguments: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97], [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97]
 
-(178) ColumnarToRow [codegen id : 38]
-Input [3]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90]
+(164) ColumnarToRow [codegen id : 38]
+Input [3]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97]
 
-(179) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#92]
+(165) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#99]
 
-(180) BroadcastHashJoin [codegen id : 38]
-Left keys [1]: [ss_hdemo_sk#89]
-Right keys [1]: [hd_demo_sk#92]
+(166) BroadcastHashJoin [codegen id : 38]
+Left keys [1]: [ss_hdemo_sk#96]
+Right keys [1]: [hd_demo_sk#99]
 Join type: Inner
 Join condition: None
 
-(181) Project [codegen id : 38]
-Output [2]: [ss_sold_time_sk#88, ss_store_sk#90]
-Input [4]: [ss_sold_time_sk#88, ss_hdemo_sk#89, ss_store_sk#90, hd_demo_sk#92]
+(167) Project [codegen id : 38]
+Output [2]: [ss_sold_time_sk#95, ss_store_sk#97]
+Input [4]: [ss_sold_time_sk#95, ss_hdemo_sk#96, ss_store_sk#97, hd_demo_sk#99]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [3]: [t_time_sk#93, t_hour#94, t_minute#95]
+Output [3]: [t_time_sk#100, t_hour#101, t_minute#102]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), IsNotNull(t_minute), EqualTo(t_hour,12), LessThan(t_minute,30), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int,t_minute:int>
 
-(183) CometFilter
-Input [3]: [t_time_sk#93, t_hour#94, t_minute#95]
-Condition : ((((isnotnull(t_hour#94) AND isnotnull(t_minute#95)) AND (t_hour#94 = 12)) AND (t_minute#95 < 30)) AND isnotnull(t_time_sk#93))
+(169) CometFilter
+Input [3]: [t_time_sk#100, t_hour#101, t_minute#102]
+Condition : ((((isnotnull(t_hour#101) AND isnotnull(t_minute#102)) AND (t_hour#101 = 12)) AND (t_minute#102 < 30)) AND isnotnull(t_time_sk#100))
 
-(184) CometProject
-Input [3]: [t_time_sk#93, t_hour#94, t_minute#95]
-Arguments: [t_time_sk#93], [t_time_sk#93]
+(170) CometProject
+Input [3]: [t_time_sk#100, t_hour#101, t_minute#102]
+Arguments: [t_time_sk#100], [t_time_sk#100]
 
-(185) ColumnarToRow [codegen id : 36]
-Input [1]: [t_time_sk#93]
+(171) ColumnarToRow [codegen id : 36]
+Input [1]: [t_time_sk#100]
 
-(186) BroadcastExchange
-Input [1]: [t_time_sk#93]
+(172) BroadcastExchange
+Input [1]: [t_time_sk#100]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=23]
 
-(187) BroadcastHashJoin [codegen id : 38]
-Left keys [1]: [ss_sold_time_sk#88]
-Right keys [1]: [t_time_sk#93]
+(173) BroadcastHashJoin [codegen id : 38]
+Left keys [1]: [ss_sold_time_sk#95]
+Right keys [1]: [t_time_sk#100]
 Join type: Inner
 Join condition: None
 
-(188) Project [codegen id : 38]
-Output [1]: [ss_store_sk#90]
-Input [3]: [ss_sold_time_sk#88, ss_store_sk#90, t_time_sk#93]
+(174) Project [codegen id : 38]
+Output [1]: [ss_store_sk#97]
+Input [3]: [ss_sold_time_sk#95, ss_store_sk#97, t_time_sk#100]
 
-(189) ReusedExchange [Reuses operator id: 23]
-Output [1]: [s_store_sk#96]
+(175) ReusedExchange [Reuses operator id: 23]
+Output [1]: [s_store_sk#103]
 
-(190) BroadcastHashJoin [codegen id : 38]
-Left keys [1]: [ss_store_sk#90]
-Right keys [1]: [s_store_sk#96]
+(176) BroadcastHashJoin [codegen id : 38]
+Left keys [1]: [ss_store_sk#97]
+Right keys [1]: [s_store_sk#103]
 Join type: Inner
 Join condition: None
 
-(191) Project [codegen id : 38]
+(177) Project [codegen id : 38]
 Output: []
-Input [2]: [ss_store_sk#90, s_store_sk#96]
+Input [2]: [ss_store_sk#97, s_store_sk#103]
 
-(192) HashAggregate [codegen id : 38]
+(178) HashAggregate [codegen id : 38]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#97]
-Results [1]: [count#98]
+Aggregate Attributes [1]: [count#104]
+Results [1]: [count#105]
 
-(193) RowToColumnar
-Input [1]: [count#98]
+(179) Exchange
+Input [1]: [count#105]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=24]
 
-(194) CometColumnarExchange
-Input [1]: [count#98]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=24]
-
-(195) CometHashAggregate
-Input [1]: [count#98]
+(180) HashAggregate [codegen id : 39]
+Input [1]: [count#105]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#106]
+Results [1]: [count(1)#106 AS h12_to_12_30#107]
 
-(196) ColumnarToRow [codegen id : 39]
-Input [1]: [h12_to_12_30#99]
-
-(197) BroadcastExchange
-Input [1]: [h12_to_12_30#99]
+(181) BroadcastExchange
+Input [1]: [h12_to_12_30#107]
 Arguments: IdentityBroadcastMode, [plan_id=25]
 
-(198) BroadcastNestedLoopJoin [codegen id : 40]
+(182) BroadcastNestedLoopJoin [codegen id : 40]
 Join type: Inner
 Join condition: None
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt
index b80f512c53..b497e0bab6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q88/simplified.txt
@@ -6,123 +6,53 @@ WholeStageCodegen (40)
           BroadcastNestedLoopJoin
             BroadcastNestedLoopJoin
               BroadcastNestedLoopJoin
-                ColumnarToRow
+                HashAggregate [count] [count(1),h8_30_to_9,count]
                   InputAdapter
-                    CometHashAggregate [count]
-                      CometColumnarExchange #1
-                        RowToColumnar
-                          WholeStageCodegen (4)
-                            HashAggregate [count,count]
-                              Project
-                                BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                  Project [ss_store_sk]
-                                    BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                                      Project [ss_sold_time_sk,ss_store_sk]
-                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                                CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
-                                          InputAdapter
-                                            BroadcastExchange #2
-                                              WholeStageCodegen (1)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [hd_demo_sk]
-                                                      CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
-                                                        CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
+                    Exchange #1
+                      WholeStageCodegen (4)
+                        HashAggregate [count,count]
+                          Project
+                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                              Project [ss_store_sk]
+                                BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                                  Project [ss_sold_time_sk,ss_store_sk]
+                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                            CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
                                       InputAdapter
-                                        BroadcastExchange #3
-                                          WholeStageCodegen (2)
+                                        BroadcastExchange #2
+                                          WholeStageCodegen (1)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometProject [t_time_sk]
-                                                  CometFilter [t_hour,t_minute,t_time_sk]
-                                                    CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                                                CometProject [hd_demo_sk]
+                                                  CometFilter [hd_dep_count,hd_vehicle_count,hd_demo_sk]
+                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count,hd_vehicle_count]
                                   InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (3)
+                                    BroadcastExchange #3
+                                      WholeStageCodegen (2)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometProject [s_store_sk]
-                                              CometFilter [s_store_name,s_store_sk]
-                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
+                                            CometProject [t_time_sk]
+                                              CometFilter [t_hour,t_minute,t_time_sk]
+                                                CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                              InputAdapter
+                                BroadcastExchange #4
+                                  WholeStageCodegen (3)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [s_store_sk]
+                                          CometFilter [s_store_name,s_store_sk]
+                                            CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
                 InputAdapter
                   BroadcastExchange #5
                     WholeStageCodegen (9)
-                      ColumnarToRow
+                      HashAggregate [count] [count(1),h9_to_9_30,count]
                         InputAdapter
-                          CometHashAggregate [count]
-                            CometColumnarExchange #6
-                              RowToColumnar
-                                WholeStageCodegen (8)
-                                  HashAggregate [count,count]
-                                    Project
-                                      BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                        Project [ss_store_sk]
-                                          BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                                            Project [ss_sold_time_sk,ss_store_sk]
-                                              BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                                      CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                                        CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
-                                                InputAdapter
-                                                  ReusedExchange [hd_demo_sk] #2
-                                            InputAdapter
-                                              BroadcastExchange #7
-                                                WholeStageCodegen (6)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [t_time_sk]
-                                                        CometFilter [t_hour,t_minute,t_time_sk]
-                                                          CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
-                                        InputAdapter
-                                          ReusedExchange [s_store_sk] #4
-              InputAdapter
-                BroadcastExchange #8
-                  WholeStageCodegen (14)
-                    ColumnarToRow
-                      InputAdapter
-                        CometHashAggregate [count]
-                          CometColumnarExchange #9
-                            RowToColumnar
-                              WholeStageCodegen (13)
-                                HashAggregate [count,count]
-                                  Project
-                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                      Project [ss_store_sk]
-                                        BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                                          Project [ss_sold_time_sk,ss_store_sk]
-                                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                                    CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
-                                              InputAdapter
-                                                ReusedExchange [hd_demo_sk] #2
-                                          InputAdapter
-                                            BroadcastExchange #10
-                                              WholeStageCodegen (11)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [t_time_sk]
-                                                      CometFilter [t_hour,t_minute,t_time_sk]
-                                                        CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
-                                      InputAdapter
-                                        ReusedExchange [s_store_sk] #4
-            InputAdapter
-              BroadcastExchange #11
-                WholeStageCodegen (19)
-                  ColumnarToRow
-                    InputAdapter
-                      CometHashAggregate [count]
-                        CometColumnarExchange #12
-                          RowToColumnar
-                            WholeStageCodegen (18)
+                          Exchange #6
+                            WholeStageCodegen (8)
                               HashAggregate [count,count]
                                 Project
                                   BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -138,8 +68,8 @@ WholeStageCodegen (40)
                                             InputAdapter
                                               ReusedExchange [hd_demo_sk] #2
                                         InputAdapter
-                                          BroadcastExchange #13
-                                            WholeStageCodegen (16)
+                                          BroadcastExchange #7
+                                            WholeStageCodegen (6)
                                               ColumnarToRow
                                                 InputAdapter
                                                   CometProject [t_time_sk]
@@ -147,15 +77,13 @@ WholeStageCodegen (40)
                                                       CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                     InputAdapter
                                       ReusedExchange [s_store_sk] #4
-          InputAdapter
-            BroadcastExchange #14
-              WholeStageCodegen (24)
-                ColumnarToRow
-                  InputAdapter
-                    CometHashAggregate [count]
-                      CometColumnarExchange #15
-                        RowToColumnar
-                          WholeStageCodegen (23)
+              InputAdapter
+                BroadcastExchange #8
+                  WholeStageCodegen (14)
+                    HashAggregate [count] [count(1),h9_30_to_10,count]
+                      InputAdapter
+                        Exchange #9
+                          WholeStageCodegen (13)
                             HashAggregate [count,count]
                               Project
                                 BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -171,8 +99,8 @@ WholeStageCodegen (40)
                                           InputAdapter
                                             ReusedExchange [hd_demo_sk] #2
                                       InputAdapter
-                                        BroadcastExchange #16
-                                          WholeStageCodegen (21)
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (11)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometProject [t_time_sk]
@@ -180,15 +108,13 @@ WholeStageCodegen (40)
                                                     CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                   InputAdapter
                                     ReusedExchange [s_store_sk] #4
-        InputAdapter
-          BroadcastExchange #17
-            WholeStageCodegen (29)
-              ColumnarToRow
-                InputAdapter
-                  CometHashAggregate [count]
-                    CometColumnarExchange #18
-                      RowToColumnar
-                        WholeStageCodegen (28)
+            InputAdapter
+              BroadcastExchange #11
+                WholeStageCodegen (19)
+                  HashAggregate [count] [count(1),h10_to_10_30,count]
+                    InputAdapter
+                      Exchange #12
+                        WholeStageCodegen (18)
                           HashAggregate [count,count]
                             Project
                               BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -204,8 +130,8 @@ WholeStageCodegen (40)
                                         InputAdapter
                                           ReusedExchange [hd_demo_sk] #2
                                     InputAdapter
-                                      BroadcastExchange #19
-                                        WholeStageCodegen (26)
+                                      BroadcastExchange #13
+                                        WholeStageCodegen (16)
                                           ColumnarToRow
                                             InputAdapter
                                               CometProject [t_time_sk]
@@ -213,15 +139,13 @@ WholeStageCodegen (40)
                                                   CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                                 InputAdapter
                                   ReusedExchange [s_store_sk] #4
-      InputAdapter
-        BroadcastExchange #20
-          WholeStageCodegen (34)
-            ColumnarToRow
-              InputAdapter
-                CometHashAggregate [count]
-                  CometColumnarExchange #21
-                    RowToColumnar
-                      WholeStageCodegen (33)
+          InputAdapter
+            BroadcastExchange #14
+              WholeStageCodegen (24)
+                HashAggregate [count] [count(1),h10_30_to_11,count]
+                  InputAdapter
+                    Exchange #15
+                      WholeStageCodegen (23)
                         HashAggregate [count,count]
                           Project
                             BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -237,8 +161,8 @@ WholeStageCodegen (40)
                                       InputAdapter
                                         ReusedExchange [hd_demo_sk] #2
                                   InputAdapter
-                                    BroadcastExchange #22
-                                      WholeStageCodegen (31)
+                                    BroadcastExchange #16
+                                      WholeStageCodegen (21)
                                         ColumnarToRow
                                           InputAdapter
                                             CometProject [t_time_sk]
@@ -246,15 +170,13 @@ WholeStageCodegen (40)
                                                 CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                               InputAdapter
                                 ReusedExchange [s_store_sk] #4
-    InputAdapter
-      BroadcastExchange #23
-        WholeStageCodegen (39)
-          ColumnarToRow
-            InputAdapter
-              CometHashAggregate [count]
-                CometColumnarExchange #24
-                  RowToColumnar
-                    WholeStageCodegen (38)
+        InputAdapter
+          BroadcastExchange #17
+            WholeStageCodegen (29)
+              HashAggregate [count] [count(1),h11_to_11_30,count]
+                InputAdapter
+                  Exchange #18
+                    WholeStageCodegen (28)
                       HashAggregate [count,count]
                         Project
                           BroadcastHashJoin [ss_store_sk,s_store_sk]
@@ -270,8 +192,8 @@ WholeStageCodegen (40)
                                     InputAdapter
                                       ReusedExchange [hd_demo_sk] #2
                                 InputAdapter
-                                  BroadcastExchange #25
-                                    WholeStageCodegen (36)
+                                  BroadcastExchange #19
+                                    WholeStageCodegen (26)
                                       ColumnarToRow
                                         InputAdapter
                                           CometProject [t_time_sk]
@@ -279,3 +201,65 @@ WholeStageCodegen (40)
                                               CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
                             InputAdapter
                               ReusedExchange [s_store_sk] #4
+      InputAdapter
+        BroadcastExchange #20
+          WholeStageCodegen (34)
+            HashAggregate [count] [count(1),h11_30_to_12,count]
+              InputAdapter
+                Exchange #21
+                  WholeStageCodegen (33)
+                    HashAggregate [count,count]
+                      Project
+                        BroadcastHashJoin [ss_store_sk,s_store_sk]
+                          Project [ss_store_sk]
+                            BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                              Project [ss_sold_time_sk,ss_store_sk]
+                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                        CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                          CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                                  InputAdapter
+                                    ReusedExchange [hd_demo_sk] #2
+                              InputAdapter
+                                BroadcastExchange #22
+                                  WholeStageCodegen (31)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [t_time_sk]
+                                          CometFilter [t_hour,t_minute,t_time_sk]
+                                            CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                          InputAdapter
+                            ReusedExchange [s_store_sk] #4
+    InputAdapter
+      BroadcastExchange #23
+        WholeStageCodegen (39)
+          HashAggregate [count] [count(1),h12_to_12_30,count]
+            InputAdapter
+              Exchange #24
+                WholeStageCodegen (38)
+                  HashAggregate [count,count]
+                    Project
+                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                        Project [ss_store_sk]
+                          BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                            Project [ss_sold_time_sk,ss_store_sk]
+                              BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                                      CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
+                                InputAdapter
+                                  ReusedExchange [hd_demo_sk] #2
+                            InputAdapter
+                              BroadcastExchange #25
+                                WholeStageCodegen (36)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [t_time_sk]
+                                        CometFilter [t_hour,t_minute,t_time_sk]
+                                          CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                        InputAdapter
+                          ReusedExchange [s_store_sk] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt
index 66c4896f4c..a59560090d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/explain.txt
@@ -1,33 +1,31 @@
 == Physical Plan ==
-TakeOrderedAndProject (29)
-+- * Project (28)
-   +- * Filter (27)
-      +- Window (26)
-         +- * ColumnarToRow (25)
-            +- CometSort (24)
-               +- CometColumnarExchange (23)
-                  +- CometHashAggregate (22)
-                     +- CometColumnarExchange (21)
-                        +- RowToColumnar (20)
-                           +- * HashAggregate (19)
-                              +- * Project (18)
-                                 +- * BroadcastHashJoin Inner BuildRight (17)
-                                    :- * Project (12)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (11)
-                                    :     :- * Project (9)
-                                    :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                    :     :     :- * ColumnarToRow (3)
-                                    :     :     :  +- CometFilter (2)
-                                    :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-                                    :     :     +- BroadcastExchange (7)
-                                    :     :        +- * ColumnarToRow (6)
-                                    :     :           +- CometFilter (5)
-                                    :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
-                                    :     +- ReusedExchange (10)
-                                    +- BroadcastExchange (16)
-                                       +- * ColumnarToRow (15)
-                                          +- CometFilter (14)
-                                             +- CometScan parquet spark_catalog.default.store (13)
+TakeOrderedAndProject (27)
++- * Project (26)
+   +- * Filter (25)
+      +- Window (24)
+         +- * Sort (23)
+            +- Exchange (22)
+               +- * HashAggregate (21)
+                  +- Exchange (20)
+                     +- * HashAggregate (19)
+                        +- * Project (18)
+                           +- * BroadcastHashJoin Inner BuildRight (17)
+                              :- * Project (12)
+                              :  +- * BroadcastHashJoin Inner BuildRight (11)
+                              :     :- * Project (9)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                              :     :     :- * ColumnarToRow (3)
+                              :     :     :  +- CometFilter (2)
+                              :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+                              :     :     +- BroadcastExchange (7)
+                              :     :        +- * ColumnarToRow (6)
+                              :     :           +- CometFilter (5)
+                              :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
+                              :     +- ReusedExchange (10)
+                              +- BroadcastExchange (16)
+                                 +- * ColumnarToRow (15)
+                                    +- CometFilter (14)
+                                       +- CometScan parquet spark_catalog.default.store (13)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -73,7 +71,7 @@ Join condition: None
 Output [6]: [i_brand#2, i_class#3, i_category#4, ss_store_sk#6, ss_sales_price#7, ss_sold_date_sk#8]
 Input [8]: [i_item_sk#1, i_brand#2, i_class#3, i_category#4, ss_item_sk#5, ss_store_sk#6, ss_sales_price#7, ss_sold_date_sk#8]
 
-(10) ReusedExchange [Reuses operator id: 34]
+(10) ReusedExchange [Reuses operator id: 32]
 Output [2]: [d_date_sk#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -121,74 +119,70 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#7))]
 Aggregate Attributes [1]: [sum#15]
 Results [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
 
-(20) RowToColumnar
+(20) Exchange
 Input [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
+Arguments: hashpartitioning(i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
-Arguments: hashpartitioning(i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [7]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum#16]
 Keys [6]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#7))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#7))#17]
+Results [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, MakeDecimal(sum(UnscaledValue(ss_sales_price#7))#17,17,2) AS sum_sales#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#7))#17,17,2) AS _w0#19]
 
-(23) CometColumnarExchange
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
-Arguments: hashpartitioning(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(24) CometSort
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18], [i_category#4 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST]
+(22) Exchange
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19]
+Arguments: hashpartitioning(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(25) ColumnarToRow [codegen id : 5]
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
+(23) Sort [codegen id : 6]
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19]
+Arguments: [i_category#4 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST], false, 0
 
-(26) Window
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [avg(_w0#18) windowspecdefinition(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#19], [i_category#4, i_brand#2, s_store_name#13, s_company_name#14]
+(24) Window
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19]
+Arguments: [avg(_w0#19) windowspecdefinition(i_category#4, i_brand#2, s_store_name#13, s_company_name#14, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#4, i_brand#2, s_store_name#13, s_company_name#14]
 
-(27) Filter [codegen id : 6]
-Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18, avg_monthly_sales#19]
-Condition : CASE WHEN NOT (avg_monthly_sales#19 = 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#19)) / avg_monthly_sales#19) > 0.1000000000000000) END
+(25) Filter [codegen id : 7]
+Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19, avg_monthly_sales#20]
+Condition : CASE WHEN NOT (avg_monthly_sales#20 = 0.000000) THEN ((abs((sum_sales#18 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END
 
-(28) Project [codegen id : 6]
-Output [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, avg_monthly_sales#19]
-Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, _w0#18, avg_monthly_sales#19]
+(26) Project [codegen id : 7]
+Output [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, avg_monthly_sales#20]
+Input [9]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, _w0#19, avg_monthly_sales#20]
 
-(29) TakeOrderedAndProject
-Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, avg_monthly_sales#19]
-Arguments: 100, [(sum_sales#17 - avg_monthly_sales#19) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#17, avg_monthly_sales#19]
+(27) TakeOrderedAndProject
+Input [8]: [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, avg_monthly_sales#20]
+Arguments: 100, [(sum_sales#18 - avg_monthly_sales#20) ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST], [i_category#4, i_class#3, i_brand#2, s_store_name#13, s_company_name#14, d_moy#11, sum_sales#18, avg_monthly_sales#20]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (34)
-+- * ColumnarToRow (33)
-   +- CometProject (32)
-      +- CometFilter (31)
-         +- CometScan parquet spark_catalog.default.date_dim (30)
+BroadcastExchange (32)
++- * ColumnarToRow (31)
+   +- CometProject (30)
+      +- CometFilter (29)
+         +- CometScan parquet spark_catalog.default.date_dim (28)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#20, d_moy#11]
+Output [3]: [d_date_sk#10, d_year#21, d_moy#11]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(31) CometFilter
-Input [3]: [d_date_sk#10, d_year#20, d_moy#11]
-Condition : ((isnotnull(d_year#20) AND (d_year#20 = 1999)) AND isnotnull(d_date_sk#10))
+(29) CometFilter
+Input [3]: [d_date_sk#10, d_year#21, d_moy#11]
+Condition : ((isnotnull(d_year#21) AND (d_year#21 = 1999)) AND isnotnull(d_date_sk#10))
 
-(32) CometProject
-Input [3]: [d_date_sk#10, d_year#20, d_moy#11]
+(30) CometProject
+Input [3]: [d_date_sk#10, d_year#21, d_moy#11]
 Arguments: [d_date_sk#10, d_moy#11], [d_date_sk#10, d_moy#11]
 
-(33) ColumnarToRow [codegen id : 1]
+(31) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#10, d_moy#11]
 
-(34) BroadcastExchange
+(32) BroadcastExchange
 Input [2]: [d_date_sk#10, d_moy#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt
index 8007b3089e..bb9e4e17e2 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q89/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,s_store_name,i_category,i_class,i_brand,s_company_name,d_moy]
-  WholeStageCodegen (6)
+  WholeStageCodegen (7)
     Project [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,sum_sales,avg_monthly_sales]
       Filter [avg_monthly_sales,sum_sales]
         InputAdapter
           Window [_w0,i_category,i_brand,s_store_name,s_company_name]
-            WholeStageCodegen (5)
-              ColumnarToRow
+            WholeStageCodegen (6)
+              Sort [i_category,i_brand,s_store_name,s_company_name]
                 InputAdapter
-                  CometSort [i_category,i_brand,s_store_name,s_company_name]
-                    CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name] #1
-                      CometHashAggregate [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,sum]
-                        CometColumnarExchange [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy] #2
-                          RowToColumnar
+                  Exchange [i_category,i_brand,s_store_name,s_company_name] #1
+                    WholeStageCodegen (5)
+                      HashAggregate [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy] #2
                             WholeStageCodegen (4)
                               HashAggregate [i_category,i_class,i_brand,s_store_name,s_company_name,d_moy,ss_sales_price] [sum,sum]
                                 Project [i_brand,i_class,i_category,ss_sales_price,d_moy,s_store_name,s_company_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt
index f277fc9feb..1671811424 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/explain.txt
@@ -29,7 +29,7 @@ Subquery:1 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquery
 * Project (12)
 +- * ColumnarToRow (11)
    +- CometHashAggregate (10)
-      +- CometColumnarExchange (9)
+      +- CometExchange (9)
          +- CometHashAggregate (8)
             +- CometProject (7)
                +- CometFilter (6)
@@ -56,9 +56,9 @@ Input [2]: [ss_ext_discount_amt#18, ss_net_paid#19]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#18)), partial_avg(UnscaledValue(ss_net_paid#19))]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [5]: [count#21, sum#22, count#23, sum#24, count#25]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (10) CometHashAggregate
 Input [5]: [count#21, sum#22, count#23, sum#24, count#25]
@@ -80,7 +80,7 @@ Subquery:4 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquery
 * Project (20)
 +- * ColumnarToRow (19)
    +- CometHashAggregate (18)
-      +- CometColumnarExchange (17)
+      +- CometExchange (17)
          +- CometHashAggregate (16)
             +- CometProject (15)
                +- CometFilter (14)
@@ -107,9 +107,9 @@ Input [2]: [ss_ext_discount_amt#31, ss_net_paid#32]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#31)), partial_avg(UnscaledValue(ss_net_paid#32))]
 
-(17) CometColumnarExchange
+(17) CometExchange
 Input [5]: [count#34, sum#35, count#36, sum#37, count#38]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (18) CometHashAggregate
 Input [5]: [count#34, sum#35, count#36, sum#37, count#38]
@@ -131,7 +131,7 @@ Subquery:7 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquery
 * Project (28)
 +- * ColumnarToRow (27)
    +- CometHashAggregate (26)
-      +- CometColumnarExchange (25)
+      +- CometExchange (25)
          +- CometHashAggregate (24)
             +- CometProject (23)
                +- CometFilter (22)
@@ -158,9 +158,9 @@ Input [2]: [ss_ext_discount_amt#44, ss_net_paid#45]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#44)), partial_avg(UnscaledValue(ss_net_paid#45))]
 
-(25) CometColumnarExchange
+(25) CometExchange
 Input [5]: [count#47, sum#48, count#49, sum#50, count#51]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
 (26) CometHashAggregate
 Input [5]: [count#47, sum#48, count#49, sum#50, count#51]
@@ -182,7 +182,7 @@ Subquery:10 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquer
 * Project (36)
 +- * ColumnarToRow (35)
    +- CometHashAggregate (34)
-      +- CometColumnarExchange (33)
+      +- CometExchange (33)
          +- CometHashAggregate (32)
             +- CometProject (31)
                +- CometFilter (30)
@@ -209,9 +209,9 @@ Input [2]: [ss_ext_discount_amt#57, ss_net_paid#58]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#57)), partial_avg(UnscaledValue(ss_net_paid#58))]
 
-(33) CometColumnarExchange
+(33) CometExchange
 Input [5]: [count#60, sum#61, count#62, sum#63, count#64]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
 
 (34) CometHashAggregate
 Input [5]: [count#60, sum#61, count#62, sum#63, count#64]
@@ -233,7 +233,7 @@ Subquery:13 Hosting operator id = 4 Hosting Expression = Subquery scalar-subquer
 * Project (44)
 +- * ColumnarToRow (43)
    +- CometHashAggregate (42)
-      +- CometColumnarExchange (41)
+      +- CometExchange (41)
          +- CometHashAggregate (40)
             +- CometProject (39)
                +- CometFilter (38)
@@ -260,9 +260,9 @@ Input [2]: [ss_ext_discount_amt#70, ss_net_paid#71]
 Keys: []
 Functions [3]: [partial_count(1), partial_avg(UnscaledValue(ss_ext_discount_amt#70)), partial_avg(UnscaledValue(ss_net_paid#71))]
 
-(41) CometColumnarExchange
+(41) CometExchange
 Input [5]: [count#73, sum#74, count#75, sum#76, count#77]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
 (42) CometHashAggregate
 Input [5]: [count#73, sum#74, count#75, sum#76, count#77]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt
index eb47e062d4..a1fd64ecdc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q9/simplified.txt
@@ -6,7 +6,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometColumnarExchange #1
+                CometExchange #1
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -19,7 +19,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometColumnarExchange #2
+                CometExchange #2
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -32,7 +32,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometColumnarExchange #3
+                CometExchange #3
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -45,7 +45,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometColumnarExchange #4
+                CometExchange #4
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
@@ -58,7 +58,7 @@ WholeStageCodegen (1)
           ColumnarToRow
             InputAdapter
               CometHashAggregate [count,sum,count,sum,count]
-                CometColumnarExchange #5
+                CometExchange #5
                   CometHashAggregate [ss_ext_discount_amt,ss_net_paid]
                     CometProject [ss_ext_discount_amt,ss_net_paid]
                       CometFilter [ss_quantity]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt
index f75f1c1908..bb9bf128e7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/explain.txt
@@ -1,59 +1,55 @@
 == Physical Plan ==
-* Project (55)
-+- * BroadcastNestedLoopJoin Inner BuildRight (54)
-   :- * ColumnarToRow (30)
-   :  +- CometHashAggregate (29)
-   :     +- CometColumnarExchange (28)
-   :        +- RowToColumnar (27)
-   :           +- * HashAggregate (26)
-   :              +- * Project (25)
-   :                 +- * BroadcastHashJoin Inner BuildRight (24)
-   :                    :- * Project (18)
-   :                    :  +- * BroadcastHashJoin Inner BuildRight (17)
-   :                    :     :- * Project (11)
-   :                    :     :  +- * BroadcastHashJoin Inner BuildRight (10)
-   :                    :     :     :- * ColumnarToRow (4)
-   :                    :     :     :  +- CometProject (3)
-   :                    :     :     :     +- CometFilter (2)
-   :                    :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
-   :                    :     :     +- BroadcastExchange (9)
-   :                    :     :        +- * ColumnarToRow (8)
-   :                    :     :           +- CometProject (7)
-   :                    :     :              +- CometFilter (6)
-   :                    :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
-   :                    :     +- BroadcastExchange (16)
-   :                    :        +- * ColumnarToRow (15)
-   :                    :           +- CometProject (14)
-   :                    :              +- CometFilter (13)
-   :                    :                 +- CometScan parquet spark_catalog.default.time_dim (12)
-   :                    +- BroadcastExchange (23)
-   :                       +- * ColumnarToRow (22)
-   :                          +- CometProject (21)
-   :                             +- CometFilter (20)
-   :                                +- CometScan parquet spark_catalog.default.web_page (19)
-   +- BroadcastExchange (53)
-      +- * ColumnarToRow (52)
-         +- CometHashAggregate (51)
-            +- CometColumnarExchange (50)
-               +- RowToColumnar (49)
-                  +- * HashAggregate (48)
-                     +- * Project (47)
-                        +- * BroadcastHashJoin Inner BuildRight (46)
-                           :- * Project (44)
-                           :  +- * BroadcastHashJoin Inner BuildRight (43)
-                           :     :- * Project (37)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (36)
-                           :     :     :- * ColumnarToRow (34)
-                           :     :     :  +- CometProject (33)
-                           :     :     :     +- CometFilter (32)
-                           :     :     :        +- CometScan parquet spark_catalog.default.web_sales (31)
-                           :     :     +- ReusedExchange (35)
-                           :     +- BroadcastExchange (42)
-                           :        +- * ColumnarToRow (41)
-                           :           +- CometProject (40)
-                           :              +- CometFilter (39)
-                           :                 +- CometScan parquet spark_catalog.default.time_dim (38)
-                           +- ReusedExchange (45)
+* Project (51)
++- * BroadcastNestedLoopJoin Inner BuildRight (50)
+   :- * HashAggregate (28)
+   :  +- Exchange (27)
+   :     +- * HashAggregate (26)
+   :        +- * Project (25)
+   :           +- * BroadcastHashJoin Inner BuildRight (24)
+   :              :- * Project (18)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (17)
+   :              :     :- * Project (11)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (10)
+   :              :     :     :- * ColumnarToRow (4)
+   :              :     :     :  +- CometProject (3)
+   :              :     :     :     +- CometFilter (2)
+   :              :     :     :        +- CometScan parquet spark_catalog.default.web_sales (1)
+   :              :     :     +- BroadcastExchange (9)
+   :              :     :        +- * ColumnarToRow (8)
+   :              :     :           +- CometProject (7)
+   :              :     :              +- CometFilter (6)
+   :              :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
+   :              :     +- BroadcastExchange (16)
+   :              :        +- * ColumnarToRow (15)
+   :              :           +- CometProject (14)
+   :              :              +- CometFilter (13)
+   :              :                 +- CometScan parquet spark_catalog.default.time_dim (12)
+   :              +- BroadcastExchange (23)
+   :                 +- * ColumnarToRow (22)
+   :                    +- CometProject (21)
+   :                       +- CometFilter (20)
+   :                          +- CometScan parquet spark_catalog.default.web_page (19)
+   +- BroadcastExchange (49)
+      +- * HashAggregate (48)
+         +- Exchange (47)
+            +- * HashAggregate (46)
+               +- * Project (45)
+                  +- * BroadcastHashJoin Inner BuildRight (44)
+                     :- * Project (42)
+                     :  +- * BroadcastHashJoin Inner BuildRight (41)
+                     :     :- * Project (35)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+                     :     :     :- * ColumnarToRow (32)
+                     :     :     :  +- CometProject (31)
+                     :     :     :     +- CometFilter (30)
+                     :     :     :        +- CometScan parquet spark_catalog.default.web_sales (29)
+                     :     :     +- ReusedExchange (33)
+                     :     +- BroadcastExchange (40)
+                     :        +- * ColumnarToRow (39)
+                     :           +- CometProject (38)
+                     :              +- CometFilter (37)
+                     :                 +- CometScan parquet spark_catalog.default.time_dim (36)
+                     +- ReusedExchange (43)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -177,128 +173,120 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#11]
 Results [1]: [count#12]
 
-(27) RowToColumnar
+(27) Exchange
 Input [1]: [count#12]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [1]: [count#12]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 10]
 Input [1]: [count#12]
 Keys: []
 Functions [1]: [count(1)]
-
-(30) ColumnarToRow [codegen id : 10]
-Input [1]: [amc#13]
+Aggregate Attributes [1]: [count(1)#13]
+Results [1]: [count(1)#13 AS amc#14]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, ws_sold_date_sk#17]
+Output [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, ws_sold_date_sk#18]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_sales]
 PushedFilters: [IsNotNull(ws_ship_hdemo_sk), IsNotNull(ws_sold_time_sk), IsNotNull(ws_web_page_sk)]
 ReadSchema: struct<ws_sold_time_sk:int,ws_ship_hdemo_sk:int,ws_web_page_sk:int>
 
-(32) CometFilter
-Input [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, ws_sold_date_sk#17]
-Condition : ((isnotnull(ws_ship_hdemo_sk#15) AND isnotnull(ws_sold_time_sk#14)) AND isnotnull(ws_web_page_sk#16))
+(30) CometFilter
+Input [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, ws_sold_date_sk#18]
+Condition : ((isnotnull(ws_ship_hdemo_sk#16) AND isnotnull(ws_sold_time_sk#15)) AND isnotnull(ws_web_page_sk#17))
 
-(33) CometProject
-Input [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, ws_sold_date_sk#17]
-Arguments: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16], [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16]
+(31) CometProject
+Input [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, ws_sold_date_sk#18]
+Arguments: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17], [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17]
 
-(34) ColumnarToRow [codegen id : 8]
-Input [3]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16]
+(32) ColumnarToRow [codegen id : 8]
+Input [3]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17]
 
-(35) ReusedExchange [Reuses operator id: 9]
-Output [1]: [hd_demo_sk#18]
+(33) ReusedExchange [Reuses operator id: 9]
+Output [1]: [hd_demo_sk#19]
 
-(36) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ws_ship_hdemo_sk#15]
-Right keys [1]: [hd_demo_sk#18]
+(34) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ws_ship_hdemo_sk#16]
+Right keys [1]: [hd_demo_sk#19]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 8]
-Output [2]: [ws_sold_time_sk#14, ws_web_page_sk#16]
-Input [4]: [ws_sold_time_sk#14, ws_ship_hdemo_sk#15, ws_web_page_sk#16, hd_demo_sk#18]
+(35) Project [codegen id : 8]
+Output [2]: [ws_sold_time_sk#15, ws_web_page_sk#17]
+Input [4]: [ws_sold_time_sk#15, ws_ship_hdemo_sk#16, ws_web_page_sk#17, hd_demo_sk#19]
 
 (unknown) Scan parquet spark_catalog.default.time_dim
-Output [2]: [t_time_sk#19, t_hour#20]
+Output [2]: [t_time_sk#20, t_hour#21]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/time_dim]
 PushedFilters: [IsNotNull(t_hour), GreaterThanOrEqual(t_hour,19), LessThanOrEqual(t_hour,20), IsNotNull(t_time_sk)]
 ReadSchema: struct<t_time_sk:int,t_hour:int>
 
-(39) CometFilter
-Input [2]: [t_time_sk#19, t_hour#20]
-Condition : (((isnotnull(t_hour#20) AND (t_hour#20 >= 19)) AND (t_hour#20 <= 20)) AND isnotnull(t_time_sk#19))
+(37) CometFilter
+Input [2]: [t_time_sk#20, t_hour#21]
+Condition : (((isnotnull(t_hour#21) AND (t_hour#21 >= 19)) AND (t_hour#21 <= 20)) AND isnotnull(t_time_sk#20))
 
-(40) CometProject
-Input [2]: [t_time_sk#19, t_hour#20]
-Arguments: [t_time_sk#19], [t_time_sk#19]
+(38) CometProject
+Input [2]: [t_time_sk#20, t_hour#21]
+Arguments: [t_time_sk#20], [t_time_sk#20]
 
-(41) ColumnarToRow [codegen id : 6]
-Input [1]: [t_time_sk#19]
+(39) ColumnarToRow [codegen id : 6]
+Input [1]: [t_time_sk#20]
 
-(42) BroadcastExchange
-Input [1]: [t_time_sk#19]
+(40) BroadcastExchange
+Input [1]: [t_time_sk#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(43) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ws_sold_time_sk#14]
-Right keys [1]: [t_time_sk#19]
+(41) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ws_sold_time_sk#15]
+Right keys [1]: [t_time_sk#20]
 Join type: Inner
 Join condition: None
 
-(44) Project [codegen id : 8]
-Output [1]: [ws_web_page_sk#16]
-Input [3]: [ws_sold_time_sk#14, ws_web_page_sk#16, t_time_sk#19]
+(42) Project [codegen id : 8]
+Output [1]: [ws_web_page_sk#17]
+Input [3]: [ws_sold_time_sk#15, ws_web_page_sk#17, t_time_sk#20]
 
-(45) ReusedExchange [Reuses operator id: 23]
-Output [1]: [wp_web_page_sk#21]
+(43) ReusedExchange [Reuses operator id: 23]
+Output [1]: [wp_web_page_sk#22]
 
-(46) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [ws_web_page_sk#16]
-Right keys [1]: [wp_web_page_sk#21]
+(44) BroadcastHashJoin [codegen id : 8]
+Left keys [1]: [ws_web_page_sk#17]
+Right keys [1]: [wp_web_page_sk#22]
 Join type: Inner
 Join condition: None
 
-(47) Project [codegen id : 8]
+(45) Project [codegen id : 8]
 Output: []
-Input [2]: [ws_web_page_sk#16, wp_web_page_sk#21]
+Input [2]: [ws_web_page_sk#17, wp_web_page_sk#22]
 
-(48) HashAggregate [codegen id : 8]
+(46) HashAggregate [codegen id : 8]
 Input: []
 Keys: []
 Functions [1]: [partial_count(1)]
-Aggregate Attributes [1]: [count#22]
-Results [1]: [count#23]
+Aggregate Attributes [1]: [count#23]
+Results [1]: [count#24]
 
-(49) RowToColumnar
-Input [1]: [count#23]
+(47) Exchange
+Input [1]: [count#24]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
 
-(50) CometColumnarExchange
-Input [1]: [count#23]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(51) CometHashAggregate
-Input [1]: [count#23]
+(48) HashAggregate [codegen id : 9]
+Input [1]: [count#24]
 Keys: []
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#25]
+Results [1]: [count(1)#25 AS pmc#26]
 
-(52) ColumnarToRow [codegen id : 9]
-Input [1]: [pmc#24]
-
-(53) BroadcastExchange
-Input [1]: [pmc#24]
+(49) BroadcastExchange
+Input [1]: [pmc#26]
 Arguments: IdentityBroadcastMode, [plan_id=7]
 
-(54) BroadcastNestedLoopJoin [codegen id : 10]
+(50) BroadcastNestedLoopJoin [codegen id : 10]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 10]
-Output [1]: [(cast(amc#13 as decimal(15,4)) / cast(pmc#24 as decimal(15,4))) AS am_pm_ratio#25]
-Input [2]: [amc#13, pmc#24]
+(51) Project [codegen id : 10]
+Output [1]: [(cast(amc#14 as decimal(15,4)) / cast(pmc#26 as decimal(15,4))) AS am_pm_ratio#27]
+Input [2]: [amc#14, pmc#26]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt
index 61f38f3615..c4e04b06bc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q90/simplified.txt
@@ -1,78 +1,74 @@
 WholeStageCodegen (10)
   Project [amc,pmc]
     BroadcastNestedLoopJoin
-      ColumnarToRow
+      HashAggregate [count] [count(1),amc,count]
         InputAdapter
-          CometHashAggregate [count]
-            CometColumnarExchange #1
-              RowToColumnar
-                WholeStageCodegen (4)
-                  HashAggregate [count,count]
-                    Project
-                      BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                        Project [ws_web_page_sk]
-                          BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
-                            Project [ws_sold_time_sk,ws_web_page_sk]
-                              BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
-                                      CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
-                                        CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
-                                InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (1)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [hd_demo_sk]
-                                            CometFilter [hd_dep_count,hd_demo_sk]
-                                              CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
+          Exchange #1
+            WholeStageCodegen (4)
+              HashAggregate [count,count]
+                Project
+                  BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                    Project [ws_web_page_sk]
+                      BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
+                        Project [ws_sold_time_sk,ws_web_page_sk]
+                          BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
+                                  CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
+                                    CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
+                              BroadcastExchange #2
+                                WholeStageCodegen (1)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [t_time_sk]
-                                        CometFilter [t_hour,t_time_sk]
-                                          CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
+                                      CometProject [hd_demo_sk]
+                                        CometFilter [hd_dep_count,hd_demo_sk]
+                                          CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (3)
+                          BroadcastExchange #3
+                            WholeStageCodegen (2)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [wp_web_page_sk]
-                                    CometFilter [wp_char_count,wp_web_page_sk]
-                                      CometScan parquet spark_catalog.default.web_page [wp_web_page_sk,wp_char_count]
+                                  CometProject [t_time_sk]
+                                    CometFilter [t_hour,t_time_sk]
+                                      CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
+                    InputAdapter
+                      BroadcastExchange #4
+                        WholeStageCodegen (3)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [wp_web_page_sk]
+                                CometFilter [wp_char_count,wp_web_page_sk]
+                                  CometScan parquet spark_catalog.default.web_page [wp_web_page_sk,wp_char_count]
       InputAdapter
         BroadcastExchange #5
           WholeStageCodegen (9)
-            ColumnarToRow
+            HashAggregate [count] [count(1),pmc,count]
               InputAdapter
-                CometHashAggregate [count]
-                  CometColumnarExchange #6
-                    RowToColumnar
-                      WholeStageCodegen (8)
-                        HashAggregate [count,count]
-                          Project
-                            BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
-                              Project [ws_web_page_sk]
-                                BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
-                                  Project [ws_sold_time_sk,ws_web_page_sk]
-                                    BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
-                                            CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
-                                              CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
-                                      InputAdapter
-                                        ReusedExchange [hd_demo_sk] #2
+                Exchange #6
+                  WholeStageCodegen (8)
+                    HashAggregate [count,count]
+                      Project
+                        BroadcastHashJoin [ws_web_page_sk,wp_web_page_sk]
+                          Project [ws_web_page_sk]
+                            BroadcastHashJoin [ws_sold_time_sk,t_time_sk]
+                              Project [ws_sold_time_sk,ws_web_page_sk]
+                                BroadcastHashJoin [ws_ship_hdemo_sk,hd_demo_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk]
+                                        CometFilter [ws_ship_hdemo_sk,ws_sold_time_sk,ws_web_page_sk]
+                                          CometScan parquet spark_catalog.default.web_sales [ws_sold_time_sk,ws_ship_hdemo_sk,ws_web_page_sk,ws_sold_date_sk]
                                   InputAdapter
-                                    BroadcastExchange #7
-                                      WholeStageCodegen (6)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometProject [t_time_sk]
-                                              CometFilter [t_hour,t_time_sk]
-                                                CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
+                                    ReusedExchange [hd_demo_sk] #2
                               InputAdapter
-                                ReusedExchange [wp_web_page_sk] #4
+                                BroadcastExchange #7
+                                  WholeStageCodegen (6)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [t_time_sk]
+                                          CometFilter [t_hour,t_time_sk]
+                                            CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour]
+                          InputAdapter
+                            ReusedExchange [wp_web_page_sk] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt
index 2d0c9fd987..c8110434e8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/explain.txt
@@ -1,49 +1,47 @@
 == Physical Plan ==
-* ColumnarToRow (45)
-+- CometSort (44)
-   +- CometColumnarExchange (43)
-      +- CometHashAggregate (42)
-         +- CometColumnarExchange (41)
-            +- RowToColumnar (40)
-               +- * HashAggregate (39)
-                  +- * Project (38)
-                     +- * BroadcastHashJoin Inner BuildRight (37)
-                        :- * Project (31)
-                        :  +- * BroadcastHashJoin Inner BuildRight (30)
-                        :     :- * Project (25)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (24)
-                        :     :     :- * Project (18)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
-                        :     :     :     :- * Project (12)
-                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (11)
-                        :     :     :     :     :- * Project (9)
-                        :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                        :     :     :     :     :     :- * ColumnarToRow (3)
-                        :     :     :     :     :     :  +- CometFilter (2)
-                        :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.call_center (1)
-                        :     :     :     :     :     +- BroadcastExchange (7)
-                        :     :     :     :     :        +- * ColumnarToRow (6)
-                        :     :     :     :     :           +- CometFilter (5)
-                        :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (4)
-                        :     :     :     :     +- ReusedExchange (10)
-                        :     :     :     +- BroadcastExchange (16)
-                        :     :     :        +- * ColumnarToRow (15)
-                        :     :     :           +- CometFilter (14)
-                        :     :     :              +- CometScan parquet spark_catalog.default.customer (13)
-                        :     :     +- BroadcastExchange (23)
-                        :     :        +- * ColumnarToRow (22)
-                        :     :           +- CometProject (21)
-                        :     :              +- CometFilter (20)
-                        :     :                 +- CometScan parquet spark_catalog.default.customer_address (19)
-                        :     +- BroadcastExchange (29)
-                        :        +- * ColumnarToRow (28)
-                        :           +- CometFilter (27)
-                        :              +- CometScan parquet spark_catalog.default.customer_demographics (26)
-                        +- BroadcastExchange (36)
-                           +- * ColumnarToRow (35)
-                              +- CometProject (34)
-                                 +- CometFilter (33)
-                                    +- CometScan parquet spark_catalog.default.household_demographics (32)
+* Sort (43)
++- Exchange (42)
+   +- * HashAggregate (41)
+      +- Exchange (40)
+         +- * HashAggregate (39)
+            +- * Project (38)
+               +- * BroadcastHashJoin Inner BuildRight (37)
+                  :- * Project (31)
+                  :  +- * BroadcastHashJoin Inner BuildRight (30)
+                  :     :- * Project (25)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (24)
+                  :     :     :- * Project (18)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (17)
+                  :     :     :     :- * Project (12)
+                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (11)
+                  :     :     :     :     :- * Project (9)
+                  :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.call_center (1)
+                  :     :     :     :     :     +- BroadcastExchange (7)
+                  :     :     :     :     :        +- * ColumnarToRow (6)
+                  :     :     :     :     :           +- CometFilter (5)
+                  :     :     :     :     :              +- CometScan parquet spark_catalog.default.catalog_returns (4)
+                  :     :     :     :     +- ReusedExchange (10)
+                  :     :     :     +- BroadcastExchange (16)
+                  :     :     :        +- * ColumnarToRow (15)
+                  :     :     :           +- CometFilter (14)
+                  :     :     :              +- CometScan parquet spark_catalog.default.customer (13)
+                  :     :     +- BroadcastExchange (23)
+                  :     :        +- * ColumnarToRow (22)
+                  :     :           +- CometProject (21)
+                  :     :              +- CometFilter (20)
+                  :     :                 +- CometScan parquet spark_catalog.default.customer_address (19)
+                  :     +- BroadcastExchange (29)
+                  :        +- * ColumnarToRow (28)
+                  :           +- CometFilter (27)
+                  :              +- CometScan parquet spark_catalog.default.customer_demographics (26)
+                  +- BroadcastExchange (36)
+                     +- * ColumnarToRow (35)
+                        +- CometProject (34)
+                           +- CometFilter (33)
+                              +- CometScan parquet spark_catalog.default.household_demographics (32)
 
 
 (unknown) Scan parquet spark_catalog.default.call_center
@@ -89,7 +87,7 @@ Join condition: None
 Output [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cr_returning_customer_sk#5, cr_net_loss#7, cr_returned_date_sk#8]
 Input [8]: [cc_call_center_sk#1, cc_call_center_id#2, cc_name#3, cc_manager#4, cr_returning_customer_sk#5, cr_call_center_sk#6, cr_net_loss#7, cr_returned_date_sk#8]
 
-(10) ReusedExchange [Reuses operator id: 50]
+(10) ReusedExchange [Reuses operator id: 48]
 Output [1]: [d_date_sk#10]
 
 (11) BroadcastHashJoin [codegen id : 7]
@@ -229,58 +227,54 @@ Functions [1]: [partial_sum(UnscaledValue(cr_net_loss#7))]
 Aggregate Attributes [1]: [sum#22]
 Results [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
 
-(40) RowToColumnar
+(40) Exchange
 Input [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
+Arguments: hashpartitioning(cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) CometColumnarExchange
-Input [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
-Arguments: hashpartitioning(cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 8]
 Input [6]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19, sum#23]
 Keys [5]: [cc_call_center_id#2, cc_name#3, cc_manager#4, cd_marital_status#18, cd_education_status#19]
 Functions [1]: [sum(UnscaledValue(cr_net_loss#7))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cr_net_loss#7))#24]
+Results [4]: [cc_call_center_id#2 AS Call_Center#25, cc_name#3 AS Call_Center_Name#26, cc_manager#4 AS Manager#27, MakeDecimal(sum(UnscaledValue(cr_net_loss#7))#24,17,2) AS Returns_Loss#28]
 
-(43) CometColumnarExchange
-Input [4]: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27]
-Arguments: rangepartitioning(Returns_Loss#27 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(44) CometSort
-Input [4]: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27]
-Arguments: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27], [Returns_Loss#27 DESC NULLS LAST]
+(42) Exchange
+Input [4]: [Call_Center#25, Call_Center_Name#26, Manager#27, Returns_Loss#28]
+Arguments: rangepartitioning(Returns_Loss#28 DESC NULLS LAST, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(45) ColumnarToRow [codegen id : 8]
-Input [4]: [Call_Center#24, Call_Center_Name#25, Manager#26, Returns_Loss#27]
+(43) Sort [codegen id : 9]
+Input [4]: [Call_Center#25, Call_Center_Name#26, Manager#27, Returns_Loss#28]
+Arguments: [Returns_Loss#28 DESC NULLS LAST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = cr_returned_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (50)
-+- * ColumnarToRow (49)
-   +- CometProject (48)
-      +- CometFilter (47)
-         +- CometScan parquet spark_catalog.default.date_dim (46)
+BroadcastExchange (48)
++- * ColumnarToRow (47)
+   +- CometProject (46)
+      +- CometFilter (45)
+         +- CometScan parquet spark_catalog.default.date_dim (44)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#10, d_year#28, d_moy#29]
+Output [3]: [d_date_sk#10, d_year#29, d_moy#30]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,1998), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(47) CometFilter
-Input [3]: [d_date_sk#10, d_year#28, d_moy#29]
-Condition : ((((isnotnull(d_year#28) AND isnotnull(d_moy#29)) AND (d_year#28 = 1998)) AND (d_moy#29 = 11)) AND isnotnull(d_date_sk#10))
+(45) CometFilter
+Input [3]: [d_date_sk#10, d_year#29, d_moy#30]
+Condition : ((((isnotnull(d_year#29) AND isnotnull(d_moy#30)) AND (d_year#29 = 1998)) AND (d_moy#30 = 11)) AND isnotnull(d_date_sk#10))
 
-(48) CometProject
-Input [3]: [d_date_sk#10, d_year#28, d_moy#29]
+(46) CometProject
+Input [3]: [d_date_sk#10, d_year#29, d_moy#30]
 Arguments: [d_date_sk#10], [d_date_sk#10]
 
-(49) ColumnarToRow [codegen id : 1]
+(47) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#10]
 
-(50) BroadcastExchange
+(48) BroadcastExchange
 Input [1]: [d_date_sk#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt
index c2b89020cb..e5d62e3c0b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q91/simplified.txt
@@ -1,11 +1,11 @@
-WholeStageCodegen (8)
-  ColumnarToRow
+WholeStageCodegen (9)
+  Sort [Returns_Loss]
     InputAdapter
-      CometSort [Returns_Loss]
-        CometColumnarExchange [Returns_Loss] #1
-          CometHashAggregate [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status,sum]
-            CometColumnarExchange [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status] #2
-              RowToColumnar
+      Exchange [Returns_Loss] #1
+        WholeStageCodegen (8)
+          HashAggregate [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status,sum] [sum(UnscaledValue(cr_net_loss)),Call_Center,Call_Center_Name,Manager,Returns_Loss,sum]
+            InputAdapter
+              Exchange [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status] #2
                 WholeStageCodegen (7)
                   HashAggregate [cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status,cr_net_loss] [sum,sum]
                     Project [cc_call_center_id,cc_name,cc_manager,cr_net_loss,cd_marital_status,cd_education_status]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt
index f4d3879699..111c30960b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/explain.txt
@@ -1,37 +1,33 @@
 == Physical Plan ==
-* ColumnarToRow (33)
-+- CometHashAggregate (32)
-   +- CometColumnarExchange (31)
-      +- RowToColumnar (30)
-         +- * HashAggregate (29)
-            +- * Project (28)
-               +- * BroadcastHashJoin Inner BuildRight (27)
-                  :- * Project (25)
-                  :  +- * BroadcastHashJoin Inner BuildRight (24)
-                  :     :- * Project (10)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-                  :     :     :- * ColumnarToRow (3)
-                  :     :     :  +- CometFilter (2)
-                  :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :     :     +- BroadcastExchange (8)
-                  :     :        +- * ColumnarToRow (7)
-                  :     :           +- CometProject (6)
-                  :     :              +- CometFilter (5)
-                  :     :                 +- CometScan parquet spark_catalog.default.item (4)
-                  :     +- BroadcastExchange (23)
-                  :        +- * ColumnarToRow (22)
-                  :           +- CometFilter (21)
-                  :              +- CometHashAggregate (20)
-                  :                 +- CometColumnarExchange (19)
-                  :                    +- RowToColumnar (18)
-                  :                       +- * HashAggregate (17)
-                  :                          +- * Project (16)
-                  :                             +- * BroadcastHashJoin Inner BuildRight (15)
-                  :                                :- * ColumnarToRow (13)
-                  :                                :  +- CometFilter (12)
-                  :                                :     +- CometScan parquet spark_catalog.default.web_sales (11)
-                  :                                +- ReusedExchange (14)
-                  +- ReusedExchange (26)
+* HashAggregate (29)
++- Exchange (28)
+   +- * HashAggregate (27)
+      +- * Project (26)
+         +- * BroadcastHashJoin Inner BuildRight (25)
+            :- * Project (23)
+            :  +- * BroadcastHashJoin Inner BuildRight (22)
+            :     :- * Project (10)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+            :     :     :- * ColumnarToRow (3)
+            :     :     :  +- CometFilter (2)
+            :     :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+            :     :     +- BroadcastExchange (8)
+            :     :        +- * ColumnarToRow (7)
+            :     :           +- CometProject (6)
+            :     :              +- CometFilter (5)
+            :     :                 +- CometScan parquet spark_catalog.default.item (4)
+            :     +- BroadcastExchange (21)
+            :        +- * Filter (20)
+            :           +- * HashAggregate (19)
+            :              +- Exchange (18)
+            :                 +- * HashAggregate (17)
+            :                    +- * Project (16)
+            :                       +- * BroadcastHashJoin Inner BuildRight (15)
+            :                          :- * ColumnarToRow (13)
+            :                          :  +- CometFilter (12)
+            :                          :     +- CometScan parquet spark_catalog.default.web_sales (11)
+            :                          +- ReusedExchange (14)
+            +- ReusedExchange (24)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -96,7 +92,7 @@ Condition : isnotnull(ws_item_sk#7)
 (13) ColumnarToRow [codegen id : 3]
 Input [3]: [ws_item_sk#7, ws_ext_discount_amt#8, ws_sold_date_sk#9]
 
-(14) ReusedExchange [Reuses operator id: 38]
+(14) ReusedExchange [Reuses operator id: 34]
 Output [1]: [d_date_sk#11]
 
 (15) BroadcastHashJoin [codegen id : 3]
@@ -116,104 +112,96 @@ Functions [1]: [partial_avg(UnscaledValue(ws_ext_discount_amt#8))]
 Aggregate Attributes [2]: [sum#12, count#13]
 Results [3]: [ws_item_sk#7, sum#14, count#15]
 
-(18) RowToColumnar
+(18) Exchange
 Input [3]: [ws_item_sk#7, sum#14, count#15]
+Arguments: hashpartitioning(ws_item_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(19) CometColumnarExchange
-Input [3]: [ws_item_sk#7, sum#14, count#15]
-Arguments: hashpartitioning(ws_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(20) CometHashAggregate
+(19) HashAggregate [codegen id : 4]
 Input [3]: [ws_item_sk#7, sum#14, count#15]
 Keys [1]: [ws_item_sk#7]
 Functions [1]: [avg(UnscaledValue(ws_ext_discount_amt#8))]
+Aggregate Attributes [1]: [avg(UnscaledValue(ws_ext_discount_amt#8))#16]
+Results [2]: [(1.3 * cast((avg(UnscaledValue(ws_ext_discount_amt#8))#16 / 100.0) as decimal(11,6))) AS (1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
 
-(21) CometFilter
-Input [2]: [(1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
-Condition : isnotnull((1.3 * avg(ws_ext_discount_amt))#16)
-
-(22) ColumnarToRow [codegen id : 4]
-Input [2]: [(1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
+(20) Filter [codegen id : 4]
+Input [2]: [(1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
+Condition : isnotnull((1.3 * avg(ws_ext_discount_amt))#17)
 
-(23) BroadcastExchange
-Input [2]: [(1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
+(21) BroadcastExchange
+Input [2]: [(1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[1, int, true] as bigint)),false), [plan_id=3]
 
-(24) BroadcastHashJoin [codegen id : 6]
+(22) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [i_item_sk#5]
 Right keys [1]: [ws_item_sk#7]
 Join type: Inner
-Join condition: (cast(ws_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(ws_ext_discount_amt))#16)
+Join condition: (cast(ws_ext_discount_amt#2 as decimal(14,7)) > (1.3 * avg(ws_ext_discount_amt))#17)
 
-(25) Project [codegen id : 6]
+(23) Project [codegen id : 6]
 Output [2]: [ws_ext_discount_amt#2, ws_sold_date_sk#3]
-Input [5]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, i_item_sk#5, (1.3 * avg(ws_ext_discount_amt))#16, ws_item_sk#7]
+Input [5]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, i_item_sk#5, (1.3 * avg(ws_ext_discount_amt))#17, ws_item_sk#7]
 
-(26) ReusedExchange [Reuses operator id: 38]
-Output [1]: [d_date_sk#17]
+(24) ReusedExchange [Reuses operator id: 34]
+Output [1]: [d_date_sk#18]
 
-(27) BroadcastHashJoin [codegen id : 6]
+(25) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ws_sold_date_sk#3]
-Right keys [1]: [d_date_sk#17]
+Right keys [1]: [d_date_sk#18]
 Join type: Inner
 Join condition: None
 
-(28) Project [codegen id : 6]
+(26) Project [codegen id : 6]
 Output [1]: [ws_ext_discount_amt#2]
-Input [3]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, d_date_sk#17]
+Input [3]: [ws_ext_discount_amt#2, ws_sold_date_sk#3, d_date_sk#18]
 
-(29) HashAggregate [codegen id : 6]
+(27) HashAggregate [codegen id : 6]
 Input [1]: [ws_ext_discount_amt#2]
 Keys: []
 Functions [1]: [partial_sum(UnscaledValue(ws_ext_discount_amt#2))]
-Aggregate Attributes [1]: [sum#18]
-Results [1]: [sum#19]
+Aggregate Attributes [1]: [sum#19]
+Results [1]: [sum#20]
 
-(30) RowToColumnar
-Input [1]: [sum#19]
+(28) Exchange
+Input [1]: [sum#20]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(31) CometColumnarExchange
-Input [1]: [sum#19]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(32) CometHashAggregate
-Input [1]: [sum#19]
+(29) HashAggregate [codegen id : 7]
+Input [1]: [sum#20]
 Keys: []
 Functions [1]: [sum(UnscaledValue(ws_ext_discount_amt#2))]
-
-(33) ColumnarToRow [codegen id : 7]
-Input [1]: [Excess Discount Amount #20]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_discount_amt#2))#21]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ws_ext_discount_amt#2))#21,17,2) AS Excess Discount Amount #22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (38)
-+- * ColumnarToRow (37)
-   +- CometProject (36)
-      +- CometFilter (35)
-         +- CometScan parquet spark_catalog.default.date_dim (34)
+BroadcastExchange (34)
++- * ColumnarToRow (33)
+   +- CometProject (32)
+      +- CometFilter (31)
+         +- CometScan parquet spark_catalog.default.date_dim (30)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#17, d_date#21]
+Output [2]: [d_date_sk#18, d_date#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,2000-01-27), LessThanOrEqual(d_date,2000-04-26), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(35) CometFilter
-Input [2]: [d_date_sk#17, d_date#21]
-Condition : (((isnotnull(d_date#21) AND (d_date#21 >= 2000-01-27)) AND (d_date#21 <= 2000-04-26)) AND isnotnull(d_date_sk#17))
+(31) CometFilter
+Input [2]: [d_date_sk#18, d_date#23]
+Condition : (((isnotnull(d_date#23) AND (d_date#23 >= 2000-01-27)) AND (d_date#23 <= 2000-04-26)) AND isnotnull(d_date_sk#18))
 
-(36) CometProject
-Input [2]: [d_date_sk#17, d_date#21]
-Arguments: [d_date_sk#17], [d_date_sk#17]
+(32) CometProject
+Input [2]: [d_date_sk#18, d_date#23]
+Arguments: [d_date_sk#18], [d_date_sk#18]
 
-(37) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#17]
+(33) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#18]
 
-(38) BroadcastExchange
-Input [1]: [d_date_sk#17]
+(34) BroadcastExchange
+Input [1]: [d_date_sk#18]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
 Subquery:2 Hosting operator id = 11 Hosting Expression = ws_sold_date_sk#9 IN dynamicpruning#4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt
index 3ef3c57493..a5e724c1ff 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q92/simplified.txt
@@ -1,56 +1,52 @@
 WholeStageCodegen (7)
-  ColumnarToRow
+  HashAggregate [sum] [sum(UnscaledValue(ws_ext_discount_amt)),Excess Discount Amount ,sum]
     InputAdapter
-      CometHashAggregate [sum]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (6)
-              HashAggregate [ws_ext_discount_amt] [sum,sum]
-                Project [ws_ext_discount_amt]
-                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                    Project [ws_ext_discount_amt,ws_sold_date_sk]
-                      BroadcastHashJoin [i_item_sk,ws_item_sk,ws_ext_discount_amt,(1.3 * avg(ws_ext_discount_amt))]
-                        Project [ws_ext_discount_amt,ws_sold_date_sk,i_item_sk]
-                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometFilter [ws_item_sk,ws_ext_discount_amt]
-                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
-                                    SubqueryBroadcast [d_date_sk] #1
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [d_date_sk]
-                                                CometFilter [d_date,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                            InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (1)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [i_item_sk]
-                                        CometFilter [i_manufact_id,i_item_sk]
-                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
+      Exchange #1
+        WholeStageCodegen (6)
+          HashAggregate [ws_ext_discount_amt] [sum,sum]
+            Project [ws_ext_discount_amt]
+              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                Project [ws_ext_discount_amt,ws_sold_date_sk]
+                  BroadcastHashJoin [i_item_sk,ws_item_sk,ws_ext_discount_amt,(1.3 * avg(ws_ext_discount_amt))]
+                    Project [ws_ext_discount_amt,ws_sold_date_sk,i_item_sk]
+                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [ws_item_sk,ws_ext_discount_amt]
+                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
+                                SubqueryBroadcast [d_date_sk] #1
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [d_date_sk]
+                                            CometFilter [d_date,d_date_sk]
+                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (4)
+                          BroadcastExchange #3
+                            WholeStageCodegen (1)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [(1.3 * avg(ws_ext_discount_amt))]
-                                    CometHashAggregate [ws_item_sk,sum,count]
-                                      CometColumnarExchange [ws_item_sk] #5
-                                        RowToColumnar
-                                          WholeStageCodegen (3)
-                                            HashAggregate [ws_item_sk,ws_ext_discount_amt] [sum,count,sum,count]
-                                              Project [ws_item_sk,ws_ext_discount_amt]
-                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [ws_item_sk]
-                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
-                                                          ReusedSubquery [d_date_sk] #1
-                                                  InputAdapter
-                                                    ReusedExchange [d_date_sk] #2
+                                  CometProject [i_item_sk]
+                                    CometFilter [i_manufact_id,i_item_sk]
+                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_manufact_id]
                     InputAdapter
-                      ReusedExchange [d_date_sk] #2
+                      BroadcastExchange #4
+                        WholeStageCodegen (4)
+                          Filter [(1.3 * avg(ws_ext_discount_amt))]
+                            HashAggregate [ws_item_sk,sum,count] [avg(UnscaledValue(ws_ext_discount_amt)),(1.3 * avg(ws_ext_discount_amt)),sum,count]
+                              InputAdapter
+                                Exchange [ws_item_sk] #5
+                                  WholeStageCodegen (3)
+                                    HashAggregate [ws_item_sk,ws_ext_discount_amt] [sum,count,sum,count]
+                                      Project [ws_item_sk,ws_ext_discount_amt]
+                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometFilter [ws_item_sk]
+                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_ext_discount_amt,ws_sold_date_sk]
+                                                  ReusedSubquery [d_date_sk] #1
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #2
+                InputAdapter
+                  ReusedExchange [d_date_sk] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
index c7490b740f..4b396dbc38 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/explain.txt
@@ -1,29 +1,27 @@
 == Physical Plan ==
-* ColumnarToRow (25)
-+- CometTakeOrderedAndProject (24)
-   +- CometHashAggregate (23)
-      +- CometColumnarExchange (22)
-         +- RowToColumnar (21)
-            +- * HashAggregate (20)
-               +- * Project (19)
-                  +- * BroadcastHashJoin Inner BuildRight (18)
-                     :- * ColumnarToRow (12)
-                     :  +- CometProject (11)
-                     :     +- CometSortMergeJoin (10)
-                     :        :- CometSort (4)
-                     :        :  +- CometColumnarExchange (3)
-                     :        :     +- CometProject (2)
-                     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
-                     :        +- CometSort (9)
-                     :           +- CometColumnarExchange (8)
-                     :              +- CometProject (7)
-                     :                 +- CometFilter (6)
-                     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-                     +- BroadcastExchange (17)
-                        +- * ColumnarToRow (16)
-                           +- CometProject (15)
-                              +- CometFilter (14)
-                                 +- CometScan parquet spark_catalog.default.reason (13)
+TakeOrderedAndProject (23)
++- * HashAggregate (22)
+   +- Exchange (21)
+      +- * HashAggregate (20)
+         +- * Project (19)
+            +- * BroadcastHashJoin Inner BuildRight (18)
+               :- * ColumnarToRow (12)
+               :  +- CometProject (11)
+               :     +- CometSortMergeJoin (10)
+               :        :- CometSort (4)
+               :        :  +- CometExchange (3)
+               :        :     +- CometProject (2)
+               :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
+               :        +- CometSort (9)
+               :           +- CometExchange (8)
+               :              +- CometProject (7)
+               :                 +- CometFilter (6)
+               :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+               +- BroadcastExchange (17)
+                  +- * ColumnarToRow (16)
+                     +- CometProject (15)
+                        +- CometFilter (14)
+                           +- CometScan parquet spark_catalog.default.reason (13)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -36,9 +34,9 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_ticket_number:int,ss_qua
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5], [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5]
 
-(3) CometColumnarExchange
+(3) CometExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5]
-Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#3, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#3, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (4) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_sales_price#5]
@@ -59,9 +57,9 @@ Condition : ((isnotnull(sr_item_sk#7) AND isnotnull(sr_ticket_number#9)) AND isn
 Input [5]: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10, sr_returned_date_sk#11]
 Arguments: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10], [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10]
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [4]: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10]
-Arguments: hashpartitioning(sr_item_sk#7, sr_ticket_number#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_item_sk#7, sr_ticket_number#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [4]: [sr_item_sk#7, sr_reason_sk#8, sr_ticket_number#9, sr_return_quantity#10]
@@ -118,22 +116,18 @@ Functions [1]: [partial_sum(act_sales#14)]
 Aggregate Attributes [2]: [sum#15, isEmpty#16]
 Results [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
 
-(21) RowToColumnar
+(21) Exchange
 Input [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
+Arguments: hashpartitioning(ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(22) CometColumnarExchange
-Input [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
-Arguments: hashpartitioning(ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 3]
 Input [3]: [ss_customer_sk#2, sum#17, isEmpty#18]
 Keys [1]: [ss_customer_sk#2]
 Functions [1]: [sum(act_sales#14)]
+Aggregate Attributes [1]: [sum(act_sales#14)#19]
+Results [2]: [ss_customer_sk#2, sum(act_sales#14)#19 AS sumsales#20]
 
-(24) CometTakeOrderedAndProject
-Input [2]: [ss_customer_sk#2, sumsales#19]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[sumsales#19 ASC NULLS FIRST,ss_customer_sk#2 ASC NULLS FIRST], output=[ss_customer_sk#2,sumsales#19]), 100, [sumsales#19 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], [ss_customer_sk#2, sumsales#19]
-
-(25) ColumnarToRow [codegen id : 3]
-Input [2]: [ss_customer_sk#2, sumsales#19]
+(23) TakeOrderedAndProject
+Input [2]: [ss_customer_sk#2, sumsales#20]
+Arguments: 100, [sumsales#20 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], [ss_customer_sk#2, sumsales#20]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt
index 85a37565ff..6178d5a371 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q93/simplified.txt
@@ -1,32 +1,30 @@
-WholeStageCodegen (3)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [sumsales,ss_customer_sk]
-        CometHashAggregate [ss_customer_sk,sum,isEmpty]
-          CometColumnarExchange [ss_customer_sk] #1
-            RowToColumnar
-              WholeStageCodegen (2)
-                HashAggregate [ss_customer_sk,act_sales] [sum,isEmpty,sum,isEmpty]
-                  Project [ss_customer_sk,sr_return_quantity,ss_quantity,ss_sales_price]
-                    BroadcastHashJoin [sr_reason_sk,r_reason_sk]
-                      ColumnarToRow
-                        InputAdapter
-                          CometProject [ss_customer_sk,ss_quantity,ss_sales_price,sr_reason_sk,sr_return_quantity]
-                            CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
-                              CometSort [ss_item_sk,ss_ticket_number]
-                                CometColumnarExchange [ss_item_sk,ss_ticket_number] #2
-                                  CometProject [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price,ss_sold_date_sk]
-                              CometSort [sr_item_sk,sr_ticket_number]
-                                CometColumnarExchange [sr_item_sk,sr_ticket_number] #3
-                                  CometProject [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity]
-                                    CometFilter [sr_item_sk,sr_ticket_number,sr_reason_sk]
-                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
-                      InputAdapter
-                        BroadcastExchange #4
-                          WholeStageCodegen (1)
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [r_reason_sk]
-                                  CometFilter [r_reason_desc,r_reason_sk]
-                                    CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
+TakeOrderedAndProject [sumsales,ss_customer_sk]
+  WholeStageCodegen (3)
+    HashAggregate [ss_customer_sk,sum,isEmpty] [sum(act_sales),sumsales,sum,isEmpty]
+      InputAdapter
+        Exchange [ss_customer_sk] #1
+          WholeStageCodegen (2)
+            HashAggregate [ss_customer_sk,act_sales] [sum,isEmpty,sum,isEmpty]
+              Project [ss_customer_sk,sr_return_quantity,ss_quantity,ss_sales_price]
+                BroadcastHashJoin [sr_reason_sk,r_reason_sk]
+                  ColumnarToRow
+                    InputAdapter
+                      CometProject [ss_customer_sk,ss_quantity,ss_sales_price,sr_reason_sk,sr_return_quantity]
+                        CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                          CometSort [ss_item_sk,ss_ticket_number]
+                            CometExchange [ss_item_sk,ss_ticket_number] #2
+                              CometProject [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price]
+                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_sales_price,ss_sold_date_sk]
+                          CometSort [sr_item_sk,sr_ticket_number]
+                            CometExchange [sr_item_sk,sr_ticket_number] #3
+                              CometProject [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity]
+                                CometFilter [sr_item_sk,sr_ticket_number,sr_reason_sk]
+                                  CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity,sr_returned_date_sk]
+                  InputAdapter
+                    BroadcastExchange #4
+                      WholeStageCodegen (1)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [r_reason_sk]
+                              CometFilter [r_reason_desc,r_reason_sk]
+                                CometScan parquet spark_catalog.default.reason [r_reason_sk,r_reason_desc]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
index 569baa88c6..aafe59a77e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-* ColumnarToRow (47)
-+- CometHashAggregate (46)
-   +- CometColumnarExchange (45)
-      +- RowToColumnar (44)
-         +- * HashAggregate (43)
-            +- * HashAggregate (42)
-               +- * HashAggregate (41)
-                  +- * Project (40)
-                     +- * BroadcastHashJoin Inner BuildRight (39)
-                        :- * Project (33)
-                        :  +- * BroadcastHashJoin Inner BuildRight (32)
-                        :     :- * Project (26)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                        :     :     :- * SortMergeJoin LeftAnti (19)
-                        :     :     :  :- * Project (13)
-                        :     :     :  :  +- * SortMergeJoin LeftSemi (12)
-                        :     :     :  :     :- * ColumnarToRow (6)
-                        :     :     :  :     :  +- CometSort (5)
-                        :     :     :  :     :     +- CometColumnarExchange (4)
-                        :     :     :  :     :        +- CometProject (3)
-                        :     :     :  :     :           +- CometFilter (2)
-                        :     :     :  :     :              +- CometScan parquet spark_catalog.default.web_sales (1)
-                        :     :     :  :     +- * ColumnarToRow (11)
-                        :     :     :  :        +- CometSort (10)
-                        :     :     :  :           +- CometColumnarExchange (9)
-                        :     :     :  :              +- CometProject (8)
-                        :     :     :  :                 +- CometScan parquet spark_catalog.default.web_sales (7)
-                        :     :     :  +- * ColumnarToRow (18)
-                        :     :     :     +- CometSort (17)
-                        :     :     :        +- CometColumnarExchange (16)
-                        :     :     :           +- CometProject (15)
-                        :     :     :              +- CometScan parquet spark_catalog.default.web_returns (14)
-                        :     :     +- BroadcastExchange (24)
-                        :     :        +- * ColumnarToRow (23)
-                        :     :           +- CometProject (22)
-                        :     :              +- CometFilter (21)
-                        :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
-                        :     +- BroadcastExchange (31)
-                        :        +- * ColumnarToRow (30)
-                        :           +- CometProject (29)
-                        :              +- CometFilter (28)
-                        :                 +- CometScan parquet spark_catalog.default.customer_address (27)
-                        +- BroadcastExchange (38)
-                           +- * ColumnarToRow (37)
-                              +- CometProject (36)
-                                 +- CometFilter (35)
-                                    +- CometScan parquet spark_catalog.default.web_site (34)
+* HashAggregate (45)
++- Exchange (44)
+   +- * HashAggregate (43)
+      +- * HashAggregate (42)
+         +- * HashAggregate (41)
+            +- * Project (40)
+               +- * BroadcastHashJoin Inner BuildRight (39)
+                  :- * Project (33)
+                  :  +- * BroadcastHashJoin Inner BuildRight (32)
+                  :     :- * Project (26)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                  :     :     :- * SortMergeJoin LeftAnti (19)
+                  :     :     :  :- * Project (13)
+                  :     :     :  :  +- * SortMergeJoin LeftSemi (12)
+                  :     :     :  :     :- * ColumnarToRow (6)
+                  :     :     :  :     :  +- CometSort (5)
+                  :     :     :  :     :     +- CometExchange (4)
+                  :     :     :  :     :        +- CometProject (3)
+                  :     :     :  :     :           +- CometFilter (2)
+                  :     :     :  :     :              +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :     :     :  :     +- * ColumnarToRow (11)
+                  :     :     :  :        +- CometSort (10)
+                  :     :     :  :           +- CometExchange (9)
+                  :     :     :  :              +- CometProject (8)
+                  :     :     :  :                 +- CometScan parquet spark_catalog.default.web_sales (7)
+                  :     :     :  +- * ColumnarToRow (18)
+                  :     :     :     +- CometSort (17)
+                  :     :     :        +- CometExchange (16)
+                  :     :     :           +- CometProject (15)
+                  :     :     :              +- CometScan parquet spark_catalog.default.web_returns (14)
+                  :     :     +- BroadcastExchange (24)
+                  :     :        +- * ColumnarToRow (23)
+                  :     :           +- CometProject (22)
+                  :     :              +- CometFilter (21)
+                  :     :                 +- CometScan parquet spark_catalog.default.date_dim (20)
+                  :     +- BroadcastExchange (31)
+                  :        +- * ColumnarToRow (30)
+                  :           +- CometProject (29)
+                  :              +- CometFilter (28)
+                  :                 +- CometScan parquet spark_catalog.default.customer_address (27)
+                  +- BroadcastExchange (38)
+                     +- * ColumnarToRow (37)
+                        +- CometProject (36)
+                           +- CometFilter (35)
+                              +- CometScan parquet spark_catalog.default.web_site (34)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -63,9 +61,9 @@ Condition : ((isnotnull(ws_ship_date_sk#1) AND isnotnull(ws_ship_addr_sk#2)) AND
 Input [8]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7, ws_sold_date_sk#8]
 Arguments: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7], [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7]
 
-(4) CometColumnarExchange
+(4) CometExchange
 Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7]
-Arguments: hashpartitioning(ws_order_number#5, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ws_order_number#5, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (5) CometSort
 Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_warehouse_sk#4, ws_order_number#5, ws_ext_ship_cost#6, ws_net_profit#7]
@@ -84,9 +82,9 @@ ReadSchema: struct<ws_warehouse_sk:int,ws_order_number:int>
 Input [3]: [ws_warehouse_sk#9, ws_order_number#10, ws_sold_date_sk#11]
 Arguments: [ws_warehouse_sk#9, ws_order_number#10], [ws_warehouse_sk#9, ws_order_number#10]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [2]: [ws_warehouse_sk#9, ws_order_number#10]
-Arguments: hashpartitioning(ws_order_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(ws_order_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [ws_warehouse_sk#9, ws_order_number#10]
@@ -115,9 +113,9 @@ ReadSchema: struct<wr_order_number:int>
 Input [2]: [wr_order_number#12, wr_returned_date_sk#13]
 Arguments: [wr_order_number#12], [wr_order_number#12]
 
-(16) CometColumnarExchange
+(16) CometExchange
 Input [1]: [wr_order_number#12]
-Arguments: hashpartitioning(wr_order_number#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(wr_order_number#12, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
 (17) CometSort
 Input [1]: [wr_order_number#12]
@@ -249,18 +247,14 @@ Functions [3]: [merge_sum(UnscaledValue(ws_ext_ship_cost#6)), merge_sum(Unscaled
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#6))#20, sum(UnscaledValue(ws_net_profit#7))#21, count(ws_order_number#5)#24]
 Results [3]: [sum#22, sum#23, count#25]
 
-(44) RowToColumnar
+(44) Exchange
 Input [3]: [sum#22, sum#23, count#25]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(45) CometColumnarExchange
-Input [3]: [sum#22, sum#23, count#25]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(46) CometHashAggregate
+(45) HashAggregate [codegen id : 9]
 Input [3]: [sum#22, sum#23, count#25]
 Keys: []
 Functions [3]: [sum(UnscaledValue(ws_ext_ship_cost#6)), sum(UnscaledValue(ws_net_profit#7)), count(distinct ws_order_number#5)]
-
-(47) ColumnarToRow [codegen id : 9]
-Input [3]: [order count #26, total shipping cost #27, total net profit #28]
+Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#6))#20, sum(UnscaledValue(ws_net_profit#7))#21, count(ws_order_number#5)#24]
+Results [3]: [count(ws_order_number#5)#24 AS order count #26, MakeDecimal(sum(UnscaledValue(ws_ext_ship_cost#6))#20,17,2) AS total shipping cost #27, MakeDecimal(sum(UnscaledValue(ws_net_profit#7))#21,17,2) AS total net profit #28]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt
index 1784692e7c..369065a668 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q94/simplified.txt
@@ -1,70 +1,68 @@
 WholeStageCodegen (9)
-  ColumnarToRow
+  HashAggregate [sum,sum,count] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
     InputAdapter
-      CometHashAggregate [sum,sum,count]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (8)
-              HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
-                HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-                  HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-                    Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                      BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                        Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                          BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
-                            Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                              BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
-                                SortMergeJoin [ws_order_number,wr_order_number]
-                                  InputAdapter
-                                    WholeStageCodegen (3)
-                                      Project [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                                        SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
-                                          InputAdapter
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometSort [ws_order_number]
-                                                    CometColumnarExchange [ws_order_number] #2
-                                                      CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                                                        CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
-                                          InputAdapter
-                                            WholeStageCodegen (2)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometSort [ws_order_number]
-                                                    CometColumnarExchange [ws_order_number] #3
-                                                      CometProject [ws_warehouse_sk,ws_order_number]
-                                                        CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
-                                  InputAdapter
-                                    WholeStageCodegen (4)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometSort [wr_order_number]
-                                            CometColumnarExchange [wr_order_number] #4
-                                              CometProject [wr_order_number]
-                                                CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
-                                InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (5)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [d_date_sk]
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+      Exchange #1
+        WholeStageCodegen (8)
+          HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
+            HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+              HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+                Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                  BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                    Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                      BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
+                        Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                          BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
+                            SortMergeJoin [ws_order_number,wr_order_number]
+                              InputAdapter
+                                WholeStageCodegen (3)
+                                  Project [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                                    SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
+                                      InputAdapter
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [ws_order_number]
+                                                CometExchange [ws_order_number] #2
+                                                  CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                                                    CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_warehouse_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
+                                      InputAdapter
+                                        WholeStageCodegen (2)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [ws_order_number]
+                                                CometExchange [ws_order_number] #3
+                                                  CometProject [ws_warehouse_sk,ws_order_number]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
+                              InputAdapter
+                                WholeStageCodegen (4)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometSort [wr_order_number]
+                                        CometExchange [wr_order_number] #4
+                                          CometProject [wr_order_number]
+                                            CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
                             InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (6)
+                              BroadcastExchange #5
+                                WholeStageCodegen (5)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [ca_address_sk]
-                                        CometFilter [ca_state,ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                      CometProject [d_date_sk]
+                                        CometFilter [d_date,d_date_sk]
+                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (7)
+                          BroadcastExchange #6
+                            WholeStageCodegen (6)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [web_site_sk]
-                                    CometFilter [web_company_name,web_site_sk]
-                                      CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
+                                  CometProject [ca_address_sk]
+                                    CometFilter [ca_state,ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (7)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [web_site_sk]
+                                CometFilter [web_company_name,web_site_sk]
+                                  CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
index c9e31178a9..375c7bf2f9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/explain.txt
@@ -1,67 +1,65 @@
 == Physical Plan ==
-* ColumnarToRow (63)
-+- CometHashAggregate (62)
-   +- CometColumnarExchange (61)
-      +- RowToColumnar (60)
-         +- * HashAggregate (59)
-            +- * HashAggregate (58)
-               +- * HashAggregate (57)
-                  +- * Project (56)
-                     +- * BroadcastHashJoin Inner BuildRight (55)
-                        :- * Project (49)
-                        :  +- * BroadcastHashJoin Inner BuildRight (48)
-                        :     :- * Project (42)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (41)
-                        :     :     :- * SortMergeJoin LeftSemi (35)
-                        :     :     :  :- * SortMergeJoin LeftSemi (18)
-                        :     :     :  :  :- * ColumnarToRow (6)
-                        :     :     :  :  :  +- CometSort (5)
-                        :     :     :  :  :     +- CometColumnarExchange (4)
-                        :     :     :  :  :        +- CometProject (3)
-                        :     :     :  :  :           +- CometFilter (2)
-                        :     :     :  :  :              +- CometScan parquet spark_catalog.default.web_sales (1)
-                        :     :     :  :  +- * Project (17)
-                        :     :     :  :     +- * SortMergeJoin Inner (16)
-                        :     :     :  :        :- * ColumnarToRow (12)
-                        :     :     :  :        :  +- CometSort (11)
-                        :     :     :  :        :     +- CometColumnarExchange (10)
-                        :     :     :  :        :        +- CometProject (9)
-                        :     :     :  :        :           +- CometFilter (8)
-                        :     :     :  :        :              +- CometScan parquet spark_catalog.default.web_sales (7)
-                        :     :     :  :        +- * ColumnarToRow (15)
-                        :     :     :  :           +- CometSort (14)
-                        :     :     :  :              +- ReusedExchange (13)
-                        :     :     :  +- * Project (34)
-                        :     :     :     +- * SortMergeJoin Inner (33)
-                        :     :     :        :- * ColumnarToRow (24)
-                        :     :     :        :  +- CometSort (23)
-                        :     :     :        :     +- CometColumnarExchange (22)
-                        :     :     :        :        +- CometProject (21)
-                        :     :     :        :           +- CometFilter (20)
-                        :     :     :        :              +- CometScan parquet spark_catalog.default.web_returns (19)
-                        :     :     :        +- * Project (32)
-                        :     :     :           +- * SortMergeJoin Inner (31)
-                        :     :     :              :- * ColumnarToRow (27)
-                        :     :     :              :  +- CometSort (26)
-                        :     :     :              :     +- ReusedExchange (25)
-                        :     :     :              +- * ColumnarToRow (30)
-                        :     :     :                 +- CometSort (29)
-                        :     :     :                    +- ReusedExchange (28)
-                        :     :     +- BroadcastExchange (40)
-                        :     :        +- * ColumnarToRow (39)
-                        :     :           +- CometProject (38)
-                        :     :              +- CometFilter (37)
-                        :     :                 +- CometScan parquet spark_catalog.default.date_dim (36)
-                        :     +- BroadcastExchange (47)
-                        :        +- * ColumnarToRow (46)
-                        :           +- CometProject (45)
-                        :              +- CometFilter (44)
-                        :                 +- CometScan parquet spark_catalog.default.customer_address (43)
-                        +- BroadcastExchange (54)
-                           +- * ColumnarToRow (53)
-                              +- CometProject (52)
-                                 +- CometFilter (51)
-                                    +- CometScan parquet spark_catalog.default.web_site (50)
+* HashAggregate (61)
++- Exchange (60)
+   +- * HashAggregate (59)
+      +- * HashAggregate (58)
+         +- * HashAggregate (57)
+            +- * Project (56)
+               +- * BroadcastHashJoin Inner BuildRight (55)
+                  :- * Project (49)
+                  :  +- * BroadcastHashJoin Inner BuildRight (48)
+                  :     :- * Project (42)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (41)
+                  :     :     :- * SortMergeJoin LeftSemi (35)
+                  :     :     :  :- * SortMergeJoin LeftSemi (18)
+                  :     :     :  :  :- * ColumnarToRow (6)
+                  :     :     :  :  :  +- CometSort (5)
+                  :     :     :  :  :     +- CometExchange (4)
+                  :     :     :  :  :        +- CometProject (3)
+                  :     :     :  :  :           +- CometFilter (2)
+                  :     :     :  :  :              +- CometScan parquet spark_catalog.default.web_sales (1)
+                  :     :     :  :  +- * Project (17)
+                  :     :     :  :     +- * SortMergeJoin Inner (16)
+                  :     :     :  :        :- * ColumnarToRow (12)
+                  :     :     :  :        :  +- CometSort (11)
+                  :     :     :  :        :     +- CometExchange (10)
+                  :     :     :  :        :        +- CometProject (9)
+                  :     :     :  :        :           +- CometFilter (8)
+                  :     :     :  :        :              +- CometScan parquet spark_catalog.default.web_sales (7)
+                  :     :     :  :        +- * ColumnarToRow (15)
+                  :     :     :  :           +- CometSort (14)
+                  :     :     :  :              +- ReusedExchange (13)
+                  :     :     :  +- * Project (34)
+                  :     :     :     +- * SortMergeJoin Inner (33)
+                  :     :     :        :- * ColumnarToRow (24)
+                  :     :     :        :  +- CometSort (23)
+                  :     :     :        :     +- CometExchange (22)
+                  :     :     :        :        +- CometProject (21)
+                  :     :     :        :           +- CometFilter (20)
+                  :     :     :        :              +- CometScan parquet spark_catalog.default.web_returns (19)
+                  :     :     :        +- * Project (32)
+                  :     :     :           +- * SortMergeJoin Inner (31)
+                  :     :     :              :- * ColumnarToRow (27)
+                  :     :     :              :  +- CometSort (26)
+                  :     :     :              :     +- ReusedExchange (25)
+                  :     :     :              +- * ColumnarToRow (30)
+                  :     :     :                 +- CometSort (29)
+                  :     :     :                    +- ReusedExchange (28)
+                  :     :     +- BroadcastExchange (40)
+                  :     :        +- * ColumnarToRow (39)
+                  :     :           +- CometProject (38)
+                  :     :              +- CometFilter (37)
+                  :     :                 +- CometScan parquet spark_catalog.default.date_dim (36)
+                  :     +- BroadcastExchange (47)
+                  :        +- * ColumnarToRow (46)
+                  :           +- CometProject (45)
+                  :              +- CometFilter (44)
+                  :                 +- CometScan parquet spark_catalog.default.customer_address (43)
+                  +- BroadcastExchange (54)
+                     +- * ColumnarToRow (53)
+                        +- CometProject (52)
+                           +- CometFilter (51)
+                              +- CometScan parquet spark_catalog.default.web_site (50)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -79,9 +77,9 @@ Condition : ((isnotnull(ws_ship_date_sk#1) AND isnotnull(ws_ship_addr_sk#2)) AND
 Input [7]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6, ws_sold_date_sk#7]
 Arguments: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6], [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6]
 
-(4) CometColumnarExchange
+(4) CometExchange
 Input [6]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6]
-Arguments: hashpartitioning(ws_order_number#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ws_order_number#4, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (5) CometSort
 Input [6]: [ws_ship_date_sk#1, ws_ship_addr_sk#2, ws_web_site_sk#3, ws_order_number#4, ws_ext_ship_cost#5, ws_net_profit#6]
@@ -105,9 +103,9 @@ Condition : (isnotnull(ws_order_number#9) AND isnotnull(ws_warehouse_sk#8))
 Input [3]: [ws_warehouse_sk#8, ws_order_number#9, ws_sold_date_sk#10]
 Arguments: [ws_warehouse_sk#8, ws_order_number#9], [ws_warehouse_sk#8, ws_order_number#9]
 
-(10) CometColumnarExchange
+(10) CometExchange
 Input [2]: [ws_warehouse_sk#8, ws_order_number#9]
-Arguments: hashpartitioning(ws_order_number#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(ws_order_number#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (11) CometSort
 Input [2]: [ws_warehouse_sk#8, ws_order_number#9]
@@ -157,9 +155,9 @@ Condition : isnotnull(wr_order_number#13)
 Input [2]: [wr_order_number#13, wr_returned_date_sk#14]
 Arguments: [wr_order_number#13], [wr_order_number#13]
 
-(22) CometColumnarExchange
+(22) CometExchange
 Input [1]: [wr_order_number#13]
-Arguments: hashpartitioning(wr_order_number#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(wr_order_number#13, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
 (23) CometSort
 Input [1]: [wr_order_number#13]
@@ -331,18 +329,14 @@ Functions [3]: [merge_sum(UnscaledValue(ws_ext_ship_cost#5)), merge_sum(Unscaled
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#5))#21, sum(UnscaledValue(ws_net_profit#6))#22, count(ws_order_number#4)#25]
 Results [3]: [sum#23, sum#24, count#26]
 
-(60) RowToColumnar
+(60) Exchange
 Input [3]: [sum#23, sum#24, count#26]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(61) CometColumnarExchange
-Input [3]: [sum#23, sum#24, count#26]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(62) CometHashAggregate
+(61) HashAggregate [codegen id : 15]
 Input [3]: [sum#23, sum#24, count#26]
 Keys: []
 Functions [3]: [sum(UnscaledValue(ws_ext_ship_cost#5)), sum(UnscaledValue(ws_net_profit#6)), count(distinct ws_order_number#4)]
-
-(63) ColumnarToRow [codegen id : 15]
-Input [3]: [order count #27, total shipping cost #28, total net profit #29]
+Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_ship_cost#5))#21, sum(UnscaledValue(ws_net_profit#6))#22, count(ws_order_number#4)#25]
+Results [3]: [count(ws_order_number#4)#25 AS order count #27, MakeDecimal(sum(UnscaledValue(ws_ext_ship_cost#5))#21,17,2) AS total shipping cost #28, MakeDecimal(sum(UnscaledValue(ws_net_profit#6))#22,17,2) AS total net profit #29]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt
index 335ef0af24..2ad651cb64 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q95/simplified.txt
@@ -1,101 +1,99 @@
 WholeStageCodegen (15)
-  ColumnarToRow
+  HashAggregate [sum,sum,count] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),order count ,total shipping cost ,total net profit ,sum,sum,count]
     InputAdapter
-      CometHashAggregate [sum,sum,count]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (14)
-              HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
-                HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-                  HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
-                    Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                      BroadcastHashJoin [ws_web_site_sk,web_site_sk]
-                        Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                          BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
-                            Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                              BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
-                                SortMergeJoin [ws_order_number,wr_order_number]
-                                  InputAdapter
-                                    WholeStageCodegen (5)
-                                      SortMergeJoin [ws_order_number,ws_order_number]
-                                        InputAdapter
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometSort [ws_order_number]
-                                                  CometColumnarExchange [ws_order_number] #2
-                                                    CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
-                                                      CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
-                                                        CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
-                                        InputAdapter
-                                          WholeStageCodegen (4)
-                                            Project [ws_order_number]
-                                              SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
-                                                InputAdapter
-                                                  WholeStageCodegen (2)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometSort [ws_order_number]
-                                                          CometColumnarExchange [ws_order_number] #3
-                                                            CometProject [ws_warehouse_sk,ws_order_number]
-                                                              CometFilter [ws_order_number,ws_warehouse_sk]
-                                                                CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
-                                                InputAdapter
-                                                  WholeStageCodegen (3)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometSort [ws_order_number]
-                                                          ReusedExchange [ws_warehouse_sk,ws_order_number] #3
-                                  InputAdapter
-                                    WholeStageCodegen (10)
-                                      Project [wr_order_number]
-                                        SortMergeJoin [wr_order_number,ws_order_number]
-                                          InputAdapter
-                                            WholeStageCodegen (6)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometSort [wr_order_number]
-                                                    CometColumnarExchange [wr_order_number] #4
-                                                      CometProject [wr_order_number]
-                                                        CometFilter [wr_order_number]
-                                                          CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
+      Exchange #1
+        WholeStageCodegen (14)
+          HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),count(ws_order_number),sum,sum,count,sum,sum,count]
+            HashAggregate [ws_order_number] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+              HashAggregate [ws_order_number,ws_ext_ship_cost,ws_net_profit] [sum(UnscaledValue(ws_ext_ship_cost)),sum(UnscaledValue(ws_net_profit)),sum,sum,sum,sum]
+                Project [ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                  BroadcastHashJoin [ws_web_site_sk,web_site_sk]
+                    Project [ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                      BroadcastHashJoin [ws_ship_addr_sk,ca_address_sk]
+                        Project [ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                          BroadcastHashJoin [ws_ship_date_sk,d_date_sk]
+                            SortMergeJoin [ws_order_number,wr_order_number]
+                              InputAdapter
+                                WholeStageCodegen (5)
+                                  SortMergeJoin [ws_order_number,ws_order_number]
+                                    InputAdapter
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
                                           InputAdapter
-                                            WholeStageCodegen (9)
-                                              Project [ws_order_number]
-                                                SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
+                                            CometSort [ws_order_number]
+                                              CometExchange [ws_order_number] #2
+                                                CometProject [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit]
+                                                  CometFilter [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk]
+                                                    CometScan parquet spark_catalog.default.web_sales [ws_ship_date_sk,ws_ship_addr_sk,ws_web_site_sk,ws_order_number,ws_ext_ship_cost,ws_net_profit,ws_sold_date_sk]
+                                    InputAdapter
+                                      WholeStageCodegen (4)
+                                        Project [ws_order_number]
+                                          SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
+                                            InputAdapter
+                                              WholeStageCodegen (2)
+                                                ColumnarToRow
                                                   InputAdapter
-                                                    WholeStageCodegen (7)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometSort [ws_order_number]
-                                                            ReusedExchange [ws_warehouse_sk,ws_order_number] #3
+                                                    CometSort [ws_order_number]
+                                                      CometExchange [ws_order_number] #3
+                                                        CometProject [ws_warehouse_sk,ws_order_number]
+                                                          CometFilter [ws_order_number,ws_warehouse_sk]
+                                                            CometScan parquet spark_catalog.default.web_sales [ws_warehouse_sk,ws_order_number,ws_sold_date_sk]
+                                            InputAdapter
+                                              WholeStageCodegen (3)
+                                                ColumnarToRow
                                                   InputAdapter
-                                                    WholeStageCodegen (8)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometSort [ws_order_number]
-                                                            ReusedExchange [ws_warehouse_sk,ws_order_number] #3
-                                InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (11)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [d_date_sk]
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
+                                                    CometSort [ws_order_number]
+                                                      ReusedExchange [ws_warehouse_sk,ws_order_number] #3
+                              InputAdapter
+                                WholeStageCodegen (10)
+                                  Project [wr_order_number]
+                                    SortMergeJoin [wr_order_number,ws_order_number]
+                                      InputAdapter
+                                        WholeStageCodegen (6)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometSort [wr_order_number]
+                                                CometExchange [wr_order_number] #4
+                                                  CometProject [wr_order_number]
+                                                    CometFilter [wr_order_number]
+                                                      CometScan parquet spark_catalog.default.web_returns [wr_order_number,wr_returned_date_sk]
+                                      InputAdapter
+                                        WholeStageCodegen (9)
+                                          Project [ws_order_number]
+                                            SortMergeJoin [ws_order_number,ws_order_number,ws_warehouse_sk,ws_warehouse_sk]
+                                              InputAdapter
+                                                WholeStageCodegen (7)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometSort [ws_order_number]
+                                                        ReusedExchange [ws_warehouse_sk,ws_order_number] #3
+                                              InputAdapter
+                                                WholeStageCodegen (8)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometSort [ws_order_number]
+                                                        ReusedExchange [ws_warehouse_sk,ws_order_number] #3
                             InputAdapter
-                              BroadcastExchange #6
-                                WholeStageCodegen (12)
+                              BroadcastExchange #5
+                                WholeStageCodegen (11)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometProject [ca_address_sk]
-                                        CometFilter [ca_state,ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                      CometProject [d_date_sk]
+                                        CometFilter [d_date,d_date_sk]
+                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (13)
+                          BroadcastExchange #6
+                            WholeStageCodegen (12)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [web_site_sk]
-                                    CometFilter [web_company_name,web_site_sk]
-                                      CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
+                                  CometProject [ca_address_sk]
+                                    CometFilter [ca_state,ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (13)
+                          ColumnarToRow
+                            InputAdapter
+                              CometProject [web_site_sk]
+                                CometFilter [web_company_name,web_site_sk]
+                                  CometScan parquet spark_catalog.default.web_site [web_site_sk,web_company_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt
index 49062fc63a..b55971ac80 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/explain.txt
@@ -1,34 +1,32 @@
 == Physical Plan ==
-* ColumnarToRow (30)
-+- CometHashAggregate (29)
-   +- CometColumnarExchange (28)
-      +- RowToColumnar (27)
-         +- * HashAggregate (26)
-            +- * Project (25)
-               +- * BroadcastHashJoin Inner BuildRight (24)
-                  :- * Project (18)
-                  :  +- * BroadcastHashJoin Inner BuildRight (17)
-                  :     :- * Project (11)
-                  :     :  +- * BroadcastHashJoin Inner BuildRight (10)
-                  :     :     :- * ColumnarToRow (4)
-                  :     :     :  +- CometProject (3)
-                  :     :     :     +- CometFilter (2)
-                  :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :     :     +- BroadcastExchange (9)
-                  :     :        +- * ColumnarToRow (8)
-                  :     :           +- CometProject (7)
-                  :     :              +- CometFilter (6)
-                  :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
-                  :     +- BroadcastExchange (16)
-                  :        +- * ColumnarToRow (15)
-                  :           +- CometProject (14)
-                  :              +- CometFilter (13)
-                  :                 +- CometScan parquet spark_catalog.default.time_dim (12)
-                  +- BroadcastExchange (23)
-                     +- * ColumnarToRow (22)
-                        +- CometProject (21)
-                           +- CometFilter (20)
-                              +- CometScan parquet spark_catalog.default.store (19)
+* HashAggregate (28)
++- Exchange (27)
+   +- * HashAggregate (26)
+      +- * Project (25)
+         +- * BroadcastHashJoin Inner BuildRight (24)
+            :- * Project (18)
+            :  +- * BroadcastHashJoin Inner BuildRight (17)
+            :     :- * Project (11)
+            :     :  +- * BroadcastHashJoin Inner BuildRight (10)
+            :     :     :- * ColumnarToRow (4)
+            :     :     :  +- CometProject (3)
+            :     :     :     +- CometFilter (2)
+            :     :     :        +- CometScan parquet spark_catalog.default.store_sales (1)
+            :     :     +- BroadcastExchange (9)
+            :     :        +- * ColumnarToRow (8)
+            :     :           +- CometProject (7)
+            :     :              +- CometFilter (6)
+            :     :                 +- CometScan parquet spark_catalog.default.household_demographics (5)
+            :     +- BroadcastExchange (16)
+            :        +- * ColumnarToRow (15)
+            :           +- CometProject (14)
+            :              +- CometFilter (13)
+            :                 +- CometScan parquet spark_catalog.default.time_dim (12)
+            +- BroadcastExchange (23)
+               +- * ColumnarToRow (22)
+                  +- CometProject (21)
+                     +- CometFilter (20)
+                        +- CometScan parquet spark_catalog.default.store (19)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -152,18 +150,14 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#12]
 Results [1]: [count#13]
 
-(27) RowToColumnar
+(27) Exchange
 Input [1]: [count#13]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [1]: [count#13]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 5]
 Input [1]: [count#13]
 Keys: []
 Functions [1]: [count(1)]
-
-(30) ColumnarToRow [codegen id : 5]
-Input [1]: [count(1)#14]
+Aggregate Attributes [1]: [count(1)#14]
+Results [1]: [count(1)#14 AS count(1)#15]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt
index 647015f01c..d1438f48eb 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q96/simplified.txt
@@ -1,43 +1,41 @@
 WholeStageCodegen (5)
-  ColumnarToRow
+  HashAggregate [count] [count(1),count(1),count]
     InputAdapter
-      CometHashAggregate [count]
-        CometColumnarExchange #1
-          RowToColumnar
-            WholeStageCodegen (4)
-              HashAggregate [count,count]
-                Project
-                  BroadcastHashJoin [ss_store_sk,s_store_sk]
-                    Project [ss_store_sk]
-                      BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
-                        Project [ss_sold_time_sk,ss_store_sk]
-                          BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                            ColumnarToRow
-                              InputAdapter
-                                CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
-                                  CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
-                                    CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
-                            InputAdapter
-                              BroadcastExchange #2
-                                WholeStageCodegen (1)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [hd_demo_sk]
-                                        CometFilter [hd_dep_count,hd_demo_sk]
-                                          CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
+      Exchange #1
+        WholeStageCodegen (4)
+          HashAggregate [count,count]
+            Project
+              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                Project [ss_store_sk]
+                  BroadcastHashJoin [ss_sold_time_sk,t_time_sk]
+                    Project [ss_sold_time_sk,ss_store_sk]
+                      BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk]
+                              CometFilter [ss_hdemo_sk,ss_sold_time_sk,ss_store_sk]
+                                CometScan parquet spark_catalog.default.store_sales [ss_sold_time_sk,ss_hdemo_sk,ss_store_sk,ss_sold_date_sk]
                         InputAdapter
-                          BroadcastExchange #3
-                            WholeStageCodegen (2)
+                          BroadcastExchange #2
+                            WholeStageCodegen (1)
                               ColumnarToRow
                                 InputAdapter
-                                  CometProject [t_time_sk]
-                                    CometFilter [t_hour,t_minute,t_time_sk]
-                                      CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                                  CometProject [hd_demo_sk]
+                                    CometFilter [hd_dep_count,hd_demo_sk]
+                                      CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_dep_count]
                     InputAdapter
-                      BroadcastExchange #4
-                        WholeStageCodegen (3)
+                      BroadcastExchange #3
+                        WholeStageCodegen (2)
                           ColumnarToRow
                             InputAdapter
-                              CometProject [s_store_sk]
-                                CometFilter [s_store_name,s_store_sk]
-                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
+                              CometProject [t_time_sk]
+                                CometFilter [t_hour,t_minute,t_time_sk]
+                                  CometScan parquet spark_catalog.default.time_dim [t_time_sk,t_hour,t_minute]
+                InputAdapter
+                  BroadcastExchange #4
+                    WholeStageCodegen (3)
+                      ColumnarToRow
+                        InputAdapter
+                          CometProject [s_store_sk]
+                            CometFilter [s_store_name,s_store_sk]
+                              CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt
index 7f3d3ee195..512037f6a3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/explain.txt
@@ -1,30 +1,27 @@
 == Physical Plan ==
-* ColumnarToRow (26)
-+- CometHashAggregate (25)
-   +- CometColumnarExchange (24)
-      +- CometHashAggregate (23)
-         +- CometProject (22)
-            +- CometSortMergeJoin (21)
-               :- CometSort (10)
-               :  +- CometHashAggregate (9)
-               :     +- CometColumnarExchange (8)
-               :        +- RowToColumnar (7)
-               :           +- * HashAggregate (6)
-               :              +- * Project (5)
-               :                 +- * BroadcastHashJoin Inner BuildRight (4)
-               :                    :- * ColumnarToRow (2)
-               :                    :  +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                    +- ReusedExchange (3)
-               +- CometSort (20)
-                  +- CometHashAggregate (19)
-                     +- CometColumnarExchange (18)
-                        +- RowToColumnar (17)
-                           +- * HashAggregate (16)
-                              +- * Project (15)
-                                 +- * BroadcastHashJoin Inner BuildRight (14)
-                                    :- * ColumnarToRow (12)
-                                    :  +- CometScan parquet spark_catalog.default.catalog_sales (11)
-                                    +- ReusedExchange (13)
+* HashAggregate (23)
++- Exchange (22)
+   +- * HashAggregate (21)
+      +- * Project (20)
+         +- * SortMergeJoin FullOuter (19)
+            :- * Sort (9)
+            :  +- * HashAggregate (8)
+            :     +- Exchange (7)
+            :        +- * HashAggregate (6)
+            :           +- * Project (5)
+            :              +- * BroadcastHashJoin Inner BuildRight (4)
+            :                 :- * ColumnarToRow (2)
+            :                 :  +- CometScan parquet spark_catalog.default.store_sales (1)
+            :                 +- ReusedExchange (3)
+            +- * Sort (18)
+               +- * HashAggregate (17)
+                  +- Exchange (16)
+                     +- * HashAggregate (15)
+                        +- * Project (14)
+                           +- * BroadcastHashJoin Inner BuildRight (13)
+                              :- * ColumnarToRow (11)
+                              :  +- CometScan parquet spark_catalog.default.catalog_sales (10)
+                              +- ReusedExchange (12)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -37,7 +34,7 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int>
 (2) ColumnarToRow [codegen id : 2]
 Input [3]: [ss_item_sk#1, ss_customer_sk#2, ss_sold_date_sk#3]
 
-(3) ReusedExchange [Reuses operator id: 31]
+(3) ReusedExchange [Reuses operator id: 28]
 Output [1]: [d_date_sk#5]
 
 (4) BroadcastHashJoin [codegen id : 2]
@@ -57,21 +54,20 @@ Functions: []
 Aggregate Attributes: []
 Results [2]: [ss_customer_sk#2, ss_item_sk#1]
 
-(7) RowToColumnar
+(7) Exchange
 Input [2]: [ss_customer_sk#2, ss_item_sk#1]
+Arguments: hashpartitioning(ss_customer_sk#2, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(8) CometColumnarExchange
-Input [2]: [ss_customer_sk#2, ss_item_sk#1]
-Arguments: hashpartitioning(ss_customer_sk#2, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
-
-(9) CometHashAggregate
+(8) HashAggregate [codegen id : 3]
 Input [2]: [ss_customer_sk#2, ss_item_sk#1]
 Keys [2]: [ss_customer_sk#2, ss_item_sk#1]
 Functions: []
+Aggregate Attributes: []
+Results [2]: [ss_customer_sk#2 AS customer_sk#6, ss_item_sk#1 AS item_sk#7]
 
-(10) CometSort
+(9) Sort [codegen id : 3]
 Input [2]: [customer_sk#6, item_sk#7]
-Arguments: [customer_sk#6, item_sk#7], [customer_sk#6 ASC NULLS FIRST, item_sk#7 ASC NULLS FIRST]
+Arguments: [customer_sk#6 ASC NULLS FIRST, item_sk#7 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [3]: [cs_bill_customer_sk#8, cs_item_sk#9, cs_sold_date_sk#10]
@@ -80,103 +76,104 @@ Location: InMemoryFileIndex []
 PartitionFilters: [isnotnull(cs_sold_date_sk#10), dynamicpruningexpression(cs_sold_date_sk#10 IN dynamicpruning#11)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_item_sk:int>
 
-(12) ColumnarToRow [codegen id : 4]
+(11) ColumnarToRow [codegen id : 5]
 Input [3]: [cs_bill_customer_sk#8, cs_item_sk#9, cs_sold_date_sk#10]
 
-(13) ReusedExchange [Reuses operator id: 31]
+(12) ReusedExchange [Reuses operator id: 28]
 Output [1]: [d_date_sk#12]
 
-(14) BroadcastHashJoin [codegen id : 4]
+(13) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [cs_sold_date_sk#10]
 Right keys [1]: [d_date_sk#12]
 Join type: Inner
 Join condition: None
 
-(15) Project [codegen id : 4]
+(14) Project [codegen id : 5]
 Output [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Input [4]: [cs_bill_customer_sk#8, cs_item_sk#9, cs_sold_date_sk#10, d_date_sk#12]
 
-(16) HashAggregate [codegen id : 4]
+(15) HashAggregate [codegen id : 5]
 Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Keys [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Functions: []
 Aggregate Attributes: []
 Results [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 
-(17) RowToColumnar
-Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
-
-(18) CometColumnarExchange
+(16) Exchange
 Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
-Arguments: hashpartitioning(cs_bill_customer_sk#8, cs_item_sk#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(cs_bill_customer_sk#8, cs_item_sk#9, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(19) CometHashAggregate
+(17) HashAggregate [codegen id : 6]
 Input [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Keys [2]: [cs_bill_customer_sk#8, cs_item_sk#9]
 Functions: []
+Aggregate Attributes: []
+Results [2]: [cs_bill_customer_sk#8 AS customer_sk#13, cs_item_sk#9 AS item_sk#14]
 
-(20) CometSort
+(18) Sort [codegen id : 6]
 Input [2]: [customer_sk#13, item_sk#14]
-Arguments: [customer_sk#13, item_sk#14], [customer_sk#13 ASC NULLS FIRST, item_sk#14 ASC NULLS FIRST]
+Arguments: [customer_sk#13 ASC NULLS FIRST, item_sk#14 ASC NULLS FIRST], false, 0
 
-(21) CometSortMergeJoin
-Left output [2]: [customer_sk#6, item_sk#7]
-Right output [2]: [customer_sk#13, item_sk#14]
-Arguments: [customer_sk#6, item_sk#7], [customer_sk#13, item_sk#14], FullOuter
+(19) SortMergeJoin [codegen id : 7]
+Left keys [2]: [customer_sk#6, item_sk#7]
+Right keys [2]: [customer_sk#13, item_sk#14]
+Join type: FullOuter
+Join condition: None
 
-(22) CometProject
+(20) Project [codegen id : 7]
+Output [2]: [customer_sk#6, customer_sk#13]
 Input [4]: [customer_sk#6, item_sk#7, customer_sk#13, item_sk#14]
-Arguments: [customer_sk#6, customer_sk#13], [customer_sk#6, customer_sk#13]
 
-(23) CometHashAggregate
+(21) HashAggregate [codegen id : 7]
 Input [2]: [customer_sk#6, customer_sk#13]
 Keys: []
 Functions [3]: [partial_sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END), partial_sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END), partial_sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)]
+Aggregate Attributes [3]: [sum#15, sum#16, sum#17]
+Results [3]: [sum#18, sum#19, sum#20]
 
-(24) CometColumnarExchange
-Input [3]: [sum#15, sum#16, sum#17]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+(22) Exchange
+Input [3]: [sum#18, sum#19, sum#20]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=3]
 
-(25) CometHashAggregate
-Input [3]: [sum#15, sum#16, sum#17]
+(23) HashAggregate [codegen id : 8]
+Input [3]: [sum#18, sum#19, sum#20]
 Keys: []
 Functions [3]: [sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END), sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END), sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)]
-
-(26) ColumnarToRow [codegen id : 5]
-Input [3]: [store_only#18, catalog_only#19, store_and_catalog#20]
+Aggregate Attributes [3]: [sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END)#21, sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#22, sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#23]
+Results [3]: [sum(CASE WHEN (isnotnull(customer_sk#6) AND isnull(customer_sk#13)) THEN 1 ELSE 0 END)#21 AS store_only#24, sum(CASE WHEN (isnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#22 AS catalog_only#25, sum(CASE WHEN (isnotnull(customer_sk#6) AND isnotnull(customer_sk#13)) THEN 1 ELSE 0 END)#23 AS store_and_catalog#26]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (31)
-+- * ColumnarToRow (30)
-   +- CometProject (29)
-      +- CometFilter (28)
-         +- CometScan parquet spark_catalog.default.date_dim (27)
+BroadcastExchange (28)
++- * ColumnarToRow (27)
+   +- CometProject (26)
+      +- CometFilter (25)
+         +- CometScan parquet spark_catalog.default.date_dim (24)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#21]
+Output [2]: [d_date_sk#5, d_month_seq#27]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(28) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#21]
-Condition : (((isnotnull(d_month_seq#21) AND (d_month_seq#21 >= 1200)) AND (d_month_seq#21 <= 1211)) AND isnotnull(d_date_sk#5))
+(25) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#27]
+Condition : (((isnotnull(d_month_seq#27) AND (d_month_seq#27 >= 1200)) AND (d_month_seq#27 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(29) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#21]
+(26) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#27]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(30) ColumnarToRow [codegen id : 1]
+(27) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(31) BroadcastExchange
+(28) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-Subquery:2 Hosting operator id = 11 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 10 Hosting Expression = cs_sold_date_sk#10 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt
index f4381c85e2..be9c20a560 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q97/simplified.txt
@@ -1,43 +1,47 @@
-WholeStageCodegen (5)
-  ColumnarToRow
+WholeStageCodegen (8)
+  HashAggregate [sum,sum,sum] [sum(CASE WHEN (isnotnull(customer_sk) AND isnull(customer_sk)) THEN 1 ELSE 0 END),sum(CASE WHEN (isnull(customer_sk) AND isnotnull(customer_sk)) THEN 1 ELSE 0 END),sum(CASE WHEN (isnotnull(customer_sk) AND isnotnull(customer_sk)) THEN 1 ELSE 0 END),store_only,catalog_only,store_and_catalog,sum,sum,sum]
     InputAdapter
-      CometHashAggregate [sum,sum,sum]
-        CometColumnarExchange #1
-          CometHashAggregate [customer_sk,customer_sk]
-            CometProject [customer_sk,customer_sk]
-              CometSortMergeJoin [customer_sk,item_sk,customer_sk,item_sk]
-                CometSort [customer_sk,item_sk]
-                  CometHashAggregate [ss_customer_sk,ss_item_sk]
-                    CometColumnarExchange [ss_customer_sk,ss_item_sk] #2
-                      RowToColumnar
-                        WholeStageCodegen (2)
-                          HashAggregate [ss_customer_sk,ss_item_sk]
-                            Project [ss_item_sk,ss_customer_sk]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
-                                      SubqueryBroadcast [d_date_sk] #1
-                                        BroadcastExchange #3
-                                          WholeStageCodegen (1)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [d_date_sk]
-                                                  CometFilter [d_month_seq,d_date_sk]
-                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #3
-                CometSort [customer_sk,item_sk]
-                  CometHashAggregate [cs_bill_customer_sk,cs_item_sk]
-                    CometColumnarExchange [cs_bill_customer_sk,cs_item_sk] #4
-                      RowToColumnar
-                        WholeStageCodegen (4)
-                          HashAggregate [cs_bill_customer_sk,cs_item_sk]
-                            Project [cs_bill_customer_sk,cs_item_sk]
-                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
-                                      ReusedSubquery [d_date_sk] #1
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #3
+      Exchange #1
+        WholeStageCodegen (7)
+          HashAggregate [customer_sk,customer_sk] [sum,sum,sum,sum,sum,sum]
+            Project [customer_sk,customer_sk]
+              SortMergeJoin [customer_sk,item_sk,customer_sk,item_sk]
+                InputAdapter
+                  WholeStageCodegen (3)
+                    Sort [customer_sk,item_sk]
+                      HashAggregate [ss_customer_sk,ss_item_sk] [customer_sk,item_sk]
+                        InputAdapter
+                          Exchange [ss_customer_sk,ss_item_sk] #2
+                            WholeStageCodegen (2)
+                              HashAggregate [ss_customer_sk,ss_item_sk]
+                                Project [ss_item_sk,ss_customer_sk]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #3
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_month_seq,d_date_sk]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #3
+                InputAdapter
+                  WholeStageCodegen (6)
+                    Sort [customer_sk,item_sk]
+                      HashAggregate [cs_bill_customer_sk,cs_item_sk] [customer_sk,item_sk]
+                        InputAdapter
+                          Exchange [cs_bill_customer_sk,cs_item_sk] #4
+                            WholeStageCodegen (5)
+                              HashAggregate [cs_bill_customer_sk,cs_item_sk]
+                                Project [cs_bill_customer_sk,cs_item_sk]
+                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_sold_date_sk]
+                                          ReusedSubquery [d_date_sk] #1
+                                    InputAdapter
+                                      ReusedExchange [d_date_sk] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
index 457e702c53..b69f690810 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/explain.txt
@@ -1,30 +1,26 @@
 == Physical Plan ==
-* ColumnarToRow (26)
-+- CometProject (25)
-   +- CometSort (24)
-      +- CometColumnarExchange (23)
-         +- RowToColumnar (22)
-            +- * Project (21)
-               +- Window (20)
-                  +- * ColumnarToRow (19)
-                     +- CometSort (18)
-                        +- CometColumnarExchange (17)
-                           +- CometHashAggregate (16)
-                              +- CometColumnarExchange (15)
-                                 +- RowToColumnar (14)
-                                    +- * HashAggregate (13)
-                                       +- * Project (12)
-                                          +- * BroadcastHashJoin Inner BuildRight (11)
-                                             :- * Project (9)
-                                             :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                             :     :- * ColumnarToRow (3)
-                                             :     :  +- CometFilter (2)
-                                             :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                                             :     +- BroadcastExchange (7)
-                                             :        +- * ColumnarToRow (6)
-                                             :           +- CometFilter (5)
-                                             :              +- CometScan parquet spark_catalog.default.item (4)
-                                             +- ReusedExchange (10)
+* Project (22)
++- * Sort (21)
+   +- Exchange (20)
+      +- * Project (19)
+         +- Window (18)
+            +- * Sort (17)
+               +- Exchange (16)
+                  +- * HashAggregate (15)
+                     +- Exchange (14)
+                        +- * HashAggregate (13)
+                           +- * Project (12)
+                              +- * BroadcastHashJoin Inner BuildRight (11)
+                                 :- * Project (9)
+                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+                                 :     :- * ColumnarToRow (3)
+                                 :     :  +- CometFilter (2)
+                                 :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                                 :     +- BroadcastExchange (7)
+                                 :        +- * ColumnarToRow (6)
+                                 :           +- CometFilter (5)
+                                 :              +- CometScan parquet spark_catalog.default.item (4)
+                                 +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -70,7 +66,7 @@ Join condition: None
 Output [7]: [ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 31]
+(10) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -90,84 +86,74 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) RowToColumnar
+(14) Exchange
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#14]
+Results [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS _w0#16, i_item_id#6]
 
-(17) CometColumnarExchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+(16) Exchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(18) CometSort
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6], [i_class#9 ASC NULLS FIRST]
+(17) Sort [codegen id : 5]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: [i_class#9 ASC NULLS FIRST], false, 0
 
-(19) ColumnarToRow [codegen id : 4]
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
+(18) Window
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6]
+Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
 
-(20) Window
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6]
-Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
+(19) Project [codegen id : 6]
+Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18, i_item_id#6]
+Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, i_item_id#6, _we0#17]
 
-(21) Project [codegen id : 5]
-Output [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17, i_item_id#6]
-Input [8]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, i_item_id#6, _we0#16]
+(20) Exchange
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
+Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(22) RowToColumnar
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
+(21) Sort [codegen id : 7]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
+Arguments: [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], true, 0
 
-(23) CometColumnarExchange
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
-Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(24) CometSort
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
-Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6], [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST]
-
-(25) CometProject
-Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17, i_item_id#6]
-Arguments: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17], [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
-
-(26) ColumnarToRow [codegen id : 6]
-Input [6]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(22) Project [codegen id : 7]
+Output [6]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+Input [7]: [i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18, i_item_id#6]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (31)
-+- * ColumnarToRow (30)
-   +- CometProject (29)
-      +- CometFilter (28)
-         +- CometScan parquet spark_catalog.default.date_dim (27)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#18]
+Output [2]: [d_date_sk#11, d_date#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(28) CometFilter
-Input [2]: [d_date_sk#11, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(24) CometFilter
+Input [2]: [d_date_sk#11, d_date#19]
+Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(29) CometProject
-Input [2]: [d_date_sk#11, d_date#18]
+(25) CometProject
+Input [2]: [d_date_sk#11, d_date#19]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(30) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(31) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
index 2e9931a8ea..9eabb9977c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q98/simplified.txt
@@ -1,46 +1,44 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometProject [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio]
-        CometSort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
-          CometColumnarExchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
-                  InputAdapter
-                    Window [_w0,i_class]
-                      WholeStageCodegen (4)
-                        ColumnarToRow
-                          InputAdapter
-                            CometSort [i_class]
-                              CometColumnarExchange [i_class] #2
-                                CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
-                                  CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
-                                    RowToColumnar
-                                      WholeStageCodegen (3)
-                                        HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
-                                          Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                                BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [ss_item_sk]
-                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                          SubqueryBroadcast [d_date_sk] #1
-                                                            BroadcastExchange #4
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [d_date_sk]
-                                                                      CometFilter [d_date,d_date_sk]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                  InputAdapter
-                                                    BroadcastExchange #5
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [i_category,i_item_sk]
-                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+WholeStageCodegen (7)
+  Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,revenueratio]
+    Sort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
+      InputAdapter
+        Exchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
+          WholeStageCodegen (6)
+            Project [i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0,i_item_id]
+              InputAdapter
+                Window [_w0,i_class]
+                  WholeStageCodegen (5)
+                    Sort [i_class]
+                      InputAdapter
+                        Exchange [i_class] #2
+                          WholeStageCodegen (4)
+                            HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ss_ext_sales_price)),itemrevenue,_w0,sum]
+                              InputAdapter
+                                Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
+                                  WholeStageCodegen (3)
+                                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
+                                      Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                          Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                            BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometFilter [ss_item_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #4
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_date_sk]
+                                                                  CometFilter [d_date,d_date_sk]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                               InputAdapter
-                                                ReusedExchange [d_date_sk] #4
+                                                BroadcastExchange #5
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometFilter [i_category,i_item_sk]
+                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                          InputAdapter
+                                            ReusedExchange [d_date_sk] #4
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt
index c8d7d7eaf3..8420e644cc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/explain.txt
@@ -1,38 +1,36 @@
 == Physical Plan ==
-* ColumnarToRow (34)
-+- CometTakeOrderedAndProject (33)
-   +- CometHashAggregate (32)
-      +- CometColumnarExchange (31)
-         +- RowToColumnar (30)
-            +- * HashAggregate (29)
-               +- * Project (28)
-                  +- * BroadcastHashJoin Inner BuildRight (27)
-                     :- * Project (21)
-                     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                     :     :- * Project (15)
-                     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :     :- * Project (9)
-                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                     :     :     :     :- * ColumnarToRow (3)
-                     :     :     :     :  +- CometFilter (2)
-                     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                     :     :     :     +- BroadcastExchange (7)
-                     :     :     :        +- * ColumnarToRow (6)
-                     :     :     :           +- CometFilter (5)
-                     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
-                     :     :     +- BroadcastExchange (13)
-                     :     :        +- * ColumnarToRow (12)
-                     :     :           +- CometFilter (11)
-                     :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
-                     :     +- BroadcastExchange (19)
-                     :        +- * ColumnarToRow (18)
-                     :           +- CometFilter (17)
-                     :              +- CometScan parquet spark_catalog.default.call_center (16)
-                     +- BroadcastExchange (26)
-                        +- * ColumnarToRow (25)
-                           +- CometProject (24)
-                              +- CometFilter (23)
-                                 +- CometScan parquet spark_catalog.default.date_dim (22)
+TakeOrderedAndProject (32)
++- * HashAggregate (31)
+   +- Exchange (30)
+      +- * HashAggregate (29)
+         +- * Project (28)
+            +- * BroadcastHashJoin Inner BuildRight (27)
+               :- * Project (21)
+               :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :     :- * Project (15)
+               :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :     :- * Project (9)
+               :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :     :     :     :- * ColumnarToRow (3)
+               :     :     :     :  +- CometFilter (2)
+               :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :     :     :     +- BroadcastExchange (7)
+               :     :     :        +- * ColumnarToRow (6)
+               :     :     :           +- CometFilter (5)
+               :     :     :              +- CometScan parquet spark_catalog.default.warehouse (4)
+               :     :     +- BroadcastExchange (13)
+               :     :        +- * ColumnarToRow (12)
+               :     :           +- CometFilter (11)
+               :     :              +- CometScan parquet spark_catalog.default.ship_mode (10)
+               :     +- BroadcastExchange (19)
+               :        +- * ColumnarToRow (18)
+               :           +- CometFilter (17)
+               :              +- CometScan parquet spark_catalog.default.call_center (16)
+               +- BroadcastExchange (26)
+                  +- * ColumnarToRow (25)
+                     +- CometProject (24)
+                        +- CometFilter (23)
+                           +- CometScan parquet spark_catalog.default.date_dim (22)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -172,22 +170,18 @@ Functions [5]: [partial_sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <
 Aggregate Attributes [5]: [sum#15, sum#16, sum#17, sum#18, sum#19]
 Results [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 
-(30) RowToColumnar
+(30) Exchange
 Input [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
+Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, cc_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(31) CometColumnarExchange
-Input [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
-Arguments: hashpartitioning(_groupingexpression#14, sm_type#9, cc_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(32) CometHashAggregate
+(31) HashAggregate [codegen id : 6]
 Input [8]: [_groupingexpression#14, sm_type#9, cc_name#11, sum#20, sum#21, sum#22, sum#23, sum#24]
 Keys [3]: [_groupingexpression#14, sm_type#9, cc_name#11]
 Functions [5]: [sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END), sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 30) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END), sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 60) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END), sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 90) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END), sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)]
+Aggregate Attributes [5]: [sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 30) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 60) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 90) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28, sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29]
+Results [8]: [_groupingexpression#14 AS substr(w_warehouse_name, 1, 20)#30, sm_type#9, cc_name#11, sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 30) THEN 1 ELSE 0 END)#25 AS 30 days #31, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 30) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 60)) THEN 1 ELSE 0 END)#26 AS 31 - 60 days #32, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 60) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 90)) THEN 1 ELSE 0 END)#27 AS 61 - 90 days #33, sum(CASE WHEN (((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 90) AND ((cs_ship_date_sk#1 - cs_sold_date_sk#5) <= 120)) THEN 1 ELSE 0 END)#28 AS 91 - 120 days #34, sum(CASE WHEN ((cs_ship_date_sk#1 - cs_sold_date_sk#5) > 120) THEN 1 ELSE 0 END)#29 AS >120 days #35]
 
-(33) CometTakeOrderedAndProject
-Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, cc_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST,sm_type#9 ASC NULLS FIRST,cc_name#11 ASC NULLS FIRST], output=[substr(w_warehouse_name, 1, 20)#25,sm_type#9,cc_name#11,30 days #26,31 - 60 days #27,61 - 90 days #28,91 - 120 days #29,>120 days #30]), 100, [substr(w_warehouse_name, 1, 20)#25 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, cc_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#25, sm_type#9, cc_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
-
-(34) ColumnarToRow [codegen id : 6]
-Input [8]: [substr(w_warehouse_name, 1, 20)#25, sm_type#9, cc_name#11, 30 days #26, 31 - 60 days #27, 61 - 90 days #28, 91 - 120 days #29, >120 days #30]
+(32) TakeOrderedAndProject
+Input [8]: [substr(w_warehouse_name, 1, 20)#30, sm_type#9, cc_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
+Arguments: 100, [substr(w_warehouse_name, 1, 20)#30 ASC NULLS FIRST, sm_type#9 ASC NULLS FIRST, cc_name#11 ASC NULLS FIRST], [substr(w_warehouse_name, 1, 20)#30, sm_type#9, cc_name#11, 30 days #31, 31 - 60 days #32, 61 - 90 days #33, 91 - 120 days #34, >120 days #35]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt
index e24461c48c..c5f25f0795 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q99/simplified.txt
@@ -1,50 +1,48 @@
-WholeStageCodegen (6)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,cc_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
-        CometHashAggregate [_groupingexpression,sm_type,cc_name,sum,sum,sum,sum,sum]
-          CometColumnarExchange [_groupingexpression,sm_type,cc_name] #1
-            RowToColumnar
-              WholeStageCodegen (5)
-                HashAggregate [_groupingexpression,sm_type,cc_name,cs_ship_date_sk,cs_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
-                  Project [cs_ship_date_sk,cs_sold_date_sk,sm_type,cc_name,w_warehouse_name]
-                    BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
-                      Project [cs_ship_date_sk,cs_sold_date_sk,w_warehouse_name,sm_type,cc_name]
-                        BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
-                          Project [cs_ship_date_sk,cs_call_center_sk,cs_sold_date_sk,w_warehouse_name,sm_type]
-                            BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
-                              Project [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_sold_date_sk,w_warehouse_name]
-                                BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [cs_warehouse_sk,cs_ship_mode_sk,cs_call_center_sk,cs_ship_date_sk]
-                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_sold_date_sk]
-                                  InputAdapter
-                                    BroadcastExchange #2
-                                      WholeStageCodegen (1)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [w_warehouse_sk]
-                                              CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+TakeOrderedAndProject [substr(w_warehouse_name, 1, 20),sm_type,cc_name,30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ]
+  WholeStageCodegen (6)
+    HashAggregate [_groupingexpression,sm_type,cc_name,sum,sum,sum,sum,sum] [sum(CASE WHEN ((cs_ship_date_sk - cs_sold_date_sk) <= 30) THEN 1 ELSE 0 END),sum(CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 30) AND ((cs_ship_date_sk - cs_sold_date_sk) <= 60)) THEN 1 ELSE 0 END),sum(CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 60) AND ((cs_ship_date_sk - cs_sold_date_sk) <= 90)) THEN 1 ELSE 0 END),sum(CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 90) AND ((cs_ship_date_sk - cs_sold_date_sk) <= 120)) THEN 1 ELSE 0 END),sum(CASE WHEN ((cs_ship_date_sk - cs_sold_date_sk) > 120) THEN 1 ELSE 0 END),substr(w_warehouse_name, 1, 20),30 days ,31 - 60 days ,61 - 90 days ,91 - 120 days ,>120 days ,sum,sum,sum,sum,sum]
+      InputAdapter
+        Exchange [_groupingexpression,sm_type,cc_name] #1
+          WholeStageCodegen (5)
+            HashAggregate [_groupingexpression,sm_type,cc_name,cs_ship_date_sk,cs_sold_date_sk] [sum,sum,sum,sum,sum,sum,sum,sum,sum,sum]
+              Project [cs_ship_date_sk,cs_sold_date_sk,sm_type,cc_name,w_warehouse_name]
+                BroadcastHashJoin [cs_ship_date_sk,d_date_sk]
+                  Project [cs_ship_date_sk,cs_sold_date_sk,w_warehouse_name,sm_type,cc_name]
+                    BroadcastHashJoin [cs_call_center_sk,cc_call_center_sk]
+                      Project [cs_ship_date_sk,cs_call_center_sk,cs_sold_date_sk,w_warehouse_name,sm_type]
+                        BroadcastHashJoin [cs_ship_mode_sk,sm_ship_mode_sk]
+                          Project [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_sold_date_sk,w_warehouse_name]
+                            BroadcastHashJoin [cs_warehouse_sk,w_warehouse_sk]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [cs_warehouse_sk,cs_ship_mode_sk,cs_call_center_sk,cs_ship_date_sk]
+                                    CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_call_center_sk,cs_ship_mode_sk,cs_warehouse_sk,cs_sold_date_sk]
                               InputAdapter
-                                BroadcastExchange #3
-                                  WholeStageCodegen (2)
+                                BroadcastExchange #2
+                                  WholeStageCodegen (1)
                                     ColumnarToRow
                                       InputAdapter
-                                        CometFilter [sm_ship_mode_sk]
-                                          CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
+                                        CometFilter [w_warehouse_sk]
+                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                           InputAdapter
-                            BroadcastExchange #4
-                              WholeStageCodegen (3)
+                            BroadcastExchange #3
+                              WholeStageCodegen (2)
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [cc_call_center_sk]
-                                      CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
+                                    CometFilter [sm_ship_mode_sk]
+                                      CometScan parquet spark_catalog.default.ship_mode [sm_ship_mode_sk,sm_type]
                       InputAdapter
-                        BroadcastExchange #5
-                          WholeStageCodegen (4)
+                        BroadcastExchange #4
+                          WholeStageCodegen (3)
                             ColumnarToRow
                               InputAdapter
-                                CometProject [d_date_sk]
-                                  CometFilter [d_month_seq,d_date_sk]
-                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                CometFilter [cc_call_center_sk]
+                                  CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
+                  InputAdapter
+                    BroadcastExchange #5
+                      WholeStageCodegen (4)
+                        ColumnarToRow
+                          InputAdapter
+                            CometProject [d_date_sk]
+                              CometFilter [d_month_seq,d_date_sk]
+                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt
index b413027c7e..ea5dac96e7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/explain.txt
@@ -1,47 +1,45 @@
 == Physical Plan ==
-* ColumnarToRow (43)
-+- CometTakeOrderedAndProject (42)
-   +- CometHashAggregate (41)
-      +- CometColumnarExchange (40)
-         +- RowToColumnar (39)
-            +- * HashAggregate (38)
-               +- * Project (37)
-                  +- * BroadcastHashJoin Inner BuildRight (36)
-                     :- * Project (31)
-                     :  +- * BroadcastHashJoin Inner BuildRight (30)
-                     :     :- * Project (24)
-                     :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
-                     :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
-                     :     :     :  :- * ColumnarToRow (3)
-                     :     :     :  :  +- CometFilter (2)
-                     :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
-                     :     :     :  +- BroadcastExchange (9)
-                     :     :     :     +- * Project (8)
-                     :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
-                     :     :     :           :- * ColumnarToRow (5)
-                     :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-                     :     :     :           +- ReusedExchange (6)
-                     :     :     +- BroadcastExchange (22)
-                     :     :        +- Union (21)
-                     :     :           :- * Project (15)
-                     :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :           :     :- * ColumnarToRow (12)
-                     :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
-                     :     :           :     +- ReusedExchange (13)
-                     :     :           +- * Project (20)
-                     :     :              +- * BroadcastHashJoin Inner BuildRight (19)
-                     :     :                 :- * ColumnarToRow (17)
-                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
-                     :     :                 +- ReusedExchange (18)
-                     :     +- BroadcastExchange (29)
-                     :        +- * ColumnarToRow (28)
-                     :           +- CometProject (27)
-                     :              +- CometFilter (26)
-                     :                 +- CometScan parquet spark_catalog.default.customer_address (25)
-                     +- BroadcastExchange (35)
-                        +- * ColumnarToRow (34)
-                           +- CometFilter (33)
-                              +- CometScan parquet spark_catalog.default.customer_demographics (32)
+TakeOrderedAndProject (41)
++- * HashAggregate (40)
+   +- Exchange (39)
+      +- * HashAggregate (38)
+         +- * Project (37)
+            +- * BroadcastHashJoin Inner BuildRight (36)
+               :- * Project (31)
+               :  +- * BroadcastHashJoin Inner BuildRight (30)
+               :     :- * Project (24)
+               :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
+               :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
+               :     :     :  :- * ColumnarToRow (3)
+               :     :     :  :  +- CometFilter (2)
+               :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
+               :     :     :  +- BroadcastExchange (9)
+               :     :     :     +- * Project (8)
+               :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :     :           :- * ColumnarToRow (5)
+               :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+               :     :     :           +- ReusedExchange (6)
+               :     :     +- BroadcastExchange (22)
+               :     :        +- Union (21)
+               :     :           :- * Project (15)
+               :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :           :     :- * ColumnarToRow (12)
+               :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
+               :     :           :     +- ReusedExchange (13)
+               :     :           +- * Project (20)
+               :     :              +- * BroadcastHashJoin Inner BuildRight (19)
+               :     :                 :- * ColumnarToRow (17)
+               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
+               :     :                 +- ReusedExchange (18)
+               :     +- BroadcastExchange (29)
+               :        +- * ColumnarToRow (28)
+               :           +- CometProject (27)
+               :              +- CometFilter (26)
+               :                 +- CometScan parquet spark_catalog.default.customer_address (25)
+               +- BroadcastExchange (35)
+                  +- * ColumnarToRow (34)
+                     +- CometFilter (33)
+                        +- CometScan parquet spark_catalog.default.customer_demographics (32)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -68,7 +66,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#4, ss_sold_date_sk#5]
 
-(6) ReusedExchange [Reuses operator id: 48]
+(6) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#7]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -101,7 +99,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#8, ws_sold_date_sk#9]
 
-(13) ReusedExchange [Reuses operator id: 48]
+(13) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#11]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -124,7 +122,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (17) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#13, cs_sold_date_sk#14]
 
-(18) ReusedExchange [Reuses operator id: 48]
+(18) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#16]
 
 (19) BroadcastHashJoin [codegen id : 6]
@@ -220,54 +218,50 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#29]
 Results [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 
-(39) RowToColumnar
+(39) Exchange
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
+Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(40) CometColumnarExchange
-Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
-Arguments: hashpartitioning(cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(41) CometHashAggregate
+(40) HashAggregate [codegen id : 10]
 Input [9]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28, count#30]
 Keys [8]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cd_purchase_estimate#24, cd_credit_rating#25, cd_dep_count#26, cd_dep_employed_count#27, cd_dep_college_count#28]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#31]
+Results [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, count(1)#31 AS cnt1#32, cd_purchase_estimate#24, count(1)#31 AS cnt2#33, cd_credit_rating#25, count(1)#31 AS cnt3#34, cd_dep_count#26, count(1)#31 AS cnt4#35, cd_dep_employed_count#27, count(1)#31 AS cnt5#36, cd_dep_college_count#28, count(1)#31 AS cnt6#37]
 
-(42) CometTakeOrderedAndProject
-Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_education_status#23 ASC NULLS FIRST,cd_purchase_estimate#24 ASC NULLS FIRST,cd_credit_rating#25 ASC NULLS FIRST,cd_dep_count#26 ASC NULLS FIRST,cd_dep_employed_count#27 ASC NULLS FIRST,cd_dep_college_count#28 ASC NULLS FIRST], output=[cd_gender#21,cd_marital_status#22,cd_education_status#23,cnt1#31,cd_purchase_estimate#24,cnt2#32,cd_credit_rating#25,cnt3#33,cd_dep_count#26,cnt4#34,cd_dep_employed_count#27,cnt5#35,cd_dep_college_count#28,cnt6#36]), 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
-
-(43) ColumnarToRow [codegen id : 10]
-Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#31, cd_purchase_estimate#24, cnt2#32, cd_credit_rating#25, cnt3#33, cd_dep_count#26, cnt4#34, cd_dep_employed_count#27, cnt5#35, cd_dep_college_count#28, cnt6#36]
+(41) TakeOrderedAndProject
+Input [14]: [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
+Arguments: 100, [cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_education_status#23 ASC NULLS FIRST, cd_purchase_estimate#24 ASC NULLS FIRST, cd_credit_rating#25 ASC NULLS FIRST, cd_dep_count#26 ASC NULLS FIRST, cd_dep_employed_count#27 ASC NULLS FIRST, cd_dep_college_count#28 ASC NULLS FIRST], [cd_gender#21, cd_marital_status#22, cd_education_status#23, cnt1#32, cd_purchase_estimate#24, cnt2#33, cd_credit_rating#25, cnt3#34, cd_dep_count#26, cnt4#35, cd_dep_employed_count#27, cnt5#36, cd_dep_college_count#28, cnt6#37]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (46)
++- * ColumnarToRow (45)
+   +- CometProject (44)
+      +- CometFilter (43)
+         +- CometScan parquet spark_catalog.default.date_dim (42)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#37, d_moy#38]
+Output [3]: [d_date_sk#7, d_year#38, d_moy#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2002), GreaterThanOrEqual(d_moy,4), LessThanOrEqual(d_moy,7), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(45) CometFilter
-Input [3]: [d_date_sk#7, d_year#37, d_moy#38]
-Condition : (((((isnotnull(d_year#37) AND isnotnull(d_moy#38)) AND (d_year#37 = 2002)) AND (d_moy#38 >= 4)) AND (d_moy#38 <= 7)) AND isnotnull(d_date_sk#7))
+(43) CometFilter
+Input [3]: [d_date_sk#7, d_year#38, d_moy#39]
+Condition : (((((isnotnull(d_year#38) AND isnotnull(d_moy#39)) AND (d_year#38 = 2002)) AND (d_moy#39 >= 4)) AND (d_moy#39 <= 7)) AND isnotnull(d_date_sk#7))
 
-(46) CometProject
-Input [3]: [d_date_sk#7, d_year#37, d_moy#38]
+(44) CometProject
+Input [3]: [d_date_sk#7, d_year#38, d_moy#39]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(47) ColumnarToRow [codegen id : 1]
+(45) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(48) BroadcastExchange
+(46) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt
index 440bda63b9..3eb2210a6e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q10a/simplified.txt
@@ -1,74 +1,72 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
-        CometHashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count]
-          CometColumnarExchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-            RowToColumnar
-              WholeStageCodegen (9)
-                HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
-                  Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                      Project [c_current_cdemo_sk]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [c_current_cdemo_sk,c_current_addr_sk]
-                            BroadcastHashJoin [c_customer_sk,customer_sk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (2)
-                                      Project [ss_customer_sk]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_moy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,cnt2,cnt3,cnt4,cnt5,cnt6]
+  WholeStageCodegen (10)
+    HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count] [count(1),cnt1,cnt2,cnt3,cnt4,cnt5,cnt6,count]
+      InputAdapter
+        Exchange [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+          WholeStageCodegen (9)
+            HashAggregate [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,count]
+              Project [cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                  Project [c_current_cdemo_sk]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [c_current_cdemo_sk,c_current_addr_sk]
+                        BroadcastHashJoin [c_customer_sk,customer_sk]
+                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                            ColumnarToRow
                               InputAdapter
-                                BroadcastExchange #4
-                                  Union
-                                    WholeStageCodegen (4)
-                                      Project [ws_bill_customer_sk]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
-                                    WholeStageCodegen (6)
-                                      Project [cs_ship_customer_sk]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                            InputAdapter
+                              BroadcastExchange #2
+                                WholeStageCodegen (2)
+                                  Project [ss_customer_sk]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_moy,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                           InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (7)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ca_address_sk]
-                                      CometFilter [ca_county,ca_address_sk]
-                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
+                            BroadcastExchange #4
+                              Union
+                                WholeStageCodegen (4)
+                                  Project [ws_bill_customer_sk]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                WholeStageCodegen (6)
+                                  Project [cs_ship_customer_sk]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (8)
+                        BroadcastExchange #5
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cd_demo_sk]
-                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometProject [ca_address_sk]
+                                  CometFilter [ca_county,ca_address_sk]
+                                    CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county]
+                  InputAdapter
+                    BroadcastExchange #6
+                      WholeStageCodegen (8)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cd_demo_sk]
+                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt
index 0052afc39e..befc87707c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/explain.txt
@@ -1,83 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (79)
-+- * Project (78)
-   +- * BroadcastHashJoin Inner BuildRight (77)
-      :- * Project (58)
-      :  +- * BroadcastHashJoin Inner BuildRight (57)
-      :     :- * BroadcastHashJoin Inner BuildRight (37)
-      :     :  :- * ColumnarToRow (18)
-      :     :  :  +- CometFilter (17)
-      :     :  :     +- CometHashAggregate (16)
-      :     :  :        +- CometColumnarExchange (15)
-      :     :  :           +- RowToColumnar (14)
-      :     :  :              +- * HashAggregate (13)
-      :     :  :                 +- * Project (12)
-      :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :  :                       :- * Project (9)
-      :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :  :                       :     :- * ColumnarToRow (3)
-      :     :  :                       :     :  +- CometFilter (2)
-      :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :  :                       :     +- BroadcastExchange (7)
-      :     :  :                       :        +- * ColumnarToRow (6)
-      :     :  :                       :           +- CometFilter (5)
-      :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :  :                       +- ReusedExchange (10)
-      :     :  +- BroadcastExchange (36)
-      :     :     +- * ColumnarToRow (35)
-      :     :        +- CometHashAggregate (34)
-      :     :           +- CometColumnarExchange (33)
-      :     :              +- RowToColumnar (32)
-      :     :                 +- * HashAggregate (31)
-      :     :                    +- * Project (30)
-      :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :                          :- * Project (27)
-      :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :                          :     :- * ColumnarToRow (21)
-      :     :                          :     :  +- CometFilter (20)
-      :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
-      :     :                          :     +- BroadcastExchange (25)
-      :     :                          :        +- * ColumnarToRow (24)
-      :     :                          :           +- CometFilter (23)
-      :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
-      :     :                          +- ReusedExchange (28)
-      :     +- BroadcastExchange (56)
-      :        +- * ColumnarToRow (55)
-      :           +- CometFilter (54)
-      :              +- CometHashAggregate (53)
-      :                 +- CometColumnarExchange (52)
-      :                    +- RowToColumnar (51)
-      :                       +- * HashAggregate (50)
-      :                          +- * Project (49)
-      :                             +- * BroadcastHashJoin Inner BuildRight (48)
-      :                                :- * Project (46)
-      :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
-      :                                :     :- * ColumnarToRow (40)
-      :                                :     :  +- CometFilter (39)
-      :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
-      :                                :     +- BroadcastExchange (44)
-      :                                :        +- * ColumnarToRow (43)
-      :                                :           +- CometFilter (42)
-      :                                :              +- CometScan parquet spark_catalog.default.web_sales (41)
-      :                                +- ReusedExchange (47)
-      +- BroadcastExchange (76)
-         +- * ColumnarToRow (75)
-            +- CometHashAggregate (74)
-               +- CometColumnarExchange (73)
-                  +- RowToColumnar (72)
-                     +- * HashAggregate (71)
-                        +- * Project (70)
-                           +- * BroadcastHashJoin Inner BuildRight (69)
-                              :- * Project (67)
-                              :  +- * BroadcastHashJoin Inner BuildRight (66)
-                              :     :- * ColumnarToRow (61)
-                              :     :  +- CometFilter (60)
-                              :     :     +- CometScan parquet spark_catalog.default.customer (59)
-                              :     +- BroadcastExchange (65)
-                              :        +- * ColumnarToRow (64)
-                              :           +- CometFilter (63)
-                              :              +- CometScan parquet spark_catalog.default.web_sales (62)
-                              +- ReusedExchange (68)
+TakeOrderedAndProject (71)
++- * Project (70)
+   +- * BroadcastHashJoin Inner BuildRight (69)
+      :- * Project (52)
+      :  +- * BroadcastHashJoin Inner BuildRight (51)
+      :     :- * BroadcastHashJoin Inner BuildRight (33)
+      :     :  :- * Filter (16)
+      :     :  :  +- * HashAggregate (15)
+      :     :  :     +- Exchange (14)
+      :     :  :        +- * HashAggregate (13)
+      :     :  :           +- * Project (12)
+      :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :  :                 :- * Project (9)
+      :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :  :                 :     :- * ColumnarToRow (3)
+      :     :  :                 :     :  +- CometFilter (2)
+      :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :  :                 :     +- BroadcastExchange (7)
+      :     :  :                 :        +- * ColumnarToRow (6)
+      :     :  :                 :           +- CometFilter (5)
+      :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :  :                 +- ReusedExchange (10)
+      :     :  +- BroadcastExchange (32)
+      :     :     +- * HashAggregate (31)
+      :     :        +- Exchange (30)
+      :     :           +- * HashAggregate (29)
+      :     :              +- * Project (28)
+      :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
+      :     :                    :- * Project (25)
+      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :                    :     :- * ColumnarToRow (19)
+      :     :                    :     :  +- CometFilter (18)
+      :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
+      :     :                    :     +- BroadcastExchange (23)
+      :     :                    :        +- * ColumnarToRow (22)
+      :     :                    :           +- CometFilter (21)
+      :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
+      :     :                    +- ReusedExchange (26)
+      :     +- BroadcastExchange (50)
+      :        +- * Filter (49)
+      :           +- * HashAggregate (48)
+      :              +- Exchange (47)
+      :                 +- * HashAggregate (46)
+      :                    +- * Project (45)
+      :                       +- * BroadcastHashJoin Inner BuildRight (44)
+      :                          :- * Project (42)
+      :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
+      :                          :     :- * ColumnarToRow (36)
+      :                          :     :  +- CometFilter (35)
+      :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
+      :                          :     +- BroadcastExchange (40)
+      :                          :        +- * ColumnarToRow (39)
+      :                          :           +- CometFilter (38)
+      :                          :              +- CometScan parquet spark_catalog.default.web_sales (37)
+      :                          +- ReusedExchange (43)
+      +- BroadcastExchange (68)
+         +- * HashAggregate (67)
+            +- Exchange (66)
+               +- * HashAggregate (65)
+                  +- * Project (64)
+                     +- * BroadcastHashJoin Inner BuildRight (63)
+                        :- * Project (61)
+                        :  +- * BroadcastHashJoin Inner BuildRight (60)
+                        :     :- * ColumnarToRow (55)
+                        :     :  +- CometFilter (54)
+                        :     :     +- CometScan parquet spark_catalog.default.customer (53)
+                        :     +- BroadcastExchange (59)
+                        :        +- * ColumnarToRow (58)
+                        :           +- CometFilter (57)
+                        :              +- CometScan parquet spark_catalog.default.web_sales (56)
+                        +- ReusedExchange (62)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -123,7 +115,7 @@ Join condition: None
 Output [10]: [c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 Input [12]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, ss_customer_sk#9, ss_ext_discount_amt#10, ss_ext_list_price#11, ss_sold_date_sk#12]
 
-(10) ReusedExchange [Reuses operator id: 83]
+(10) ReusedExchange [Reuses operator id: 75]
 Output [2]: [d_date_sk#14, d_year#15]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -143,312 +135,296 @@ Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discoun
 Aggregate Attributes [1]: [sum#16]
 Results [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 
-(14) RowToColumnar
+(14) Exchange
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 16]
 Input [9]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8, sum#17]
 Keys [8]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#15, c_preferred_cust_flag#5, c_birth_country#6, c_login#7, c_email_address#8]
 Functions [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18]
+Results [2]: [c_customer_id#2 AS customer_id#19, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#11 - ss_ext_discount_amt#10)))#18,18,2) AS year_total#20]
 
-(17) CometFilter
-Input [2]: [customer_id#18, year_total#19]
-Condition : (isnotnull(year_total#19) AND (year_total#19 > 0.00))
-
-(18) ColumnarToRow [codegen id : 16]
-Input [2]: [customer_id#18, year_total#19]
+(16) Filter [codegen id : 16]
+Input [2]: [customer_id#19, year_total#20]
+Condition : (isnotnull(year_total#20) AND (year_total#20 > 0.00))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+Output [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(20) CometFilter
-Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
-Condition : (isnotnull(c_customer_sk#20) AND isnotnull(c_customer_id#21))
+(18) CometFilter
+Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Condition : (isnotnull(c_customer_sk#21) AND isnotnull(c_customer_id#22))
 
-(21) ColumnarToRow [codegen id : 6]
-Input [8]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
+(19) ColumnarToRow [codegen id : 6]
+Input [8]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+Output [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#31), dynamicpruningexpression(ss_sold_date_sk#31 IN dynamicpruning#32)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#32), dynamicpruningexpression(ss_sold_date_sk#32 IN dynamicpruning#33)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_ext_discount_amt:decimal(7,2),ss_ext_list_price:decimal(7,2)>
 
-(23) CometFilter
-Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
-Condition : isnotnull(ss_customer_sk#28)
+(21) CometFilter
+Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+Condition : isnotnull(ss_customer_sk#29)
 
-(24) ColumnarToRow [codegen id : 4]
-Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+(22) ColumnarToRow [codegen id : 4]
+Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 
-(25) BroadcastExchange
-Input [4]: [ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+(23) BroadcastExchange
+Input [4]: [ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(26) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#20]
-Right keys [1]: [ss_customer_sk#28]
+(24) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#21]
+Right keys [1]: [ss_customer_sk#29]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
-Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
-Input [12]: [c_customer_sk#20, c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_customer_sk#28, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31]
+(25) Project [codegen id : 6]
+Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
+Input [12]: [c_customer_sk#21, c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_customer_sk#29, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32]
 
-(28) ReusedExchange [Reuses operator id: 87]
-Output [2]: [d_date_sk#33, d_year#34]
+(26) ReusedExchange [Reuses operator id: 79]
+Output [2]: [d_date_sk#34, d_year#35]
 
-(29) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#31]
-Right keys [1]: [d_date_sk#33]
+(27) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#32]
+Right keys [1]: [d_date_sk#34]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
-Input [12]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, ss_sold_date_sk#31, d_date_sk#33, d_year#34]
-
-(31) HashAggregate [codegen id : 6]
-Input [10]: [c_customer_id#21, c_first_name#22, c_last_name#23, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, ss_ext_discount_amt#29, ss_ext_list_price#30, d_year#34]
-Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
-Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
-Aggregate Attributes [1]: [sum#35]
-Results [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-
-(32) RowToColumnar
-Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-
-(33) CometColumnarExchange
-Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-Arguments: hashpartitioning(c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [9]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27, sum#36]
-Keys [8]: [c_customer_id#21, c_first_name#22, c_last_name#23, d_year#34, c_preferred_cust_flag#24, c_birth_country#25, c_login#26, c_email_address#27]
-Functions [1]: [sum(UnscaledValue((ss_ext_list_price#30 - ss_ext_discount_amt#29)))]
-
-(35) ColumnarToRow [codegen id : 7]
-Input [5]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41]
-
-(36) BroadcastExchange
-Input [5]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41]
+(28) Project [codegen id : 6]
+Output [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
+Input [12]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, ss_sold_date_sk#32, d_date_sk#34, d_year#35]
+
+(29) HashAggregate [codegen id : 6]
+Input [10]: [c_customer_id#22, c_first_name#23, c_last_name#24, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, ss_ext_discount_amt#30, ss_ext_list_price#31, d_year#35]
+Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Functions [1]: [partial_sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
+Aggregate Attributes [1]: [sum#36]
+Results [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
+
+(30) Exchange
+Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
+Arguments: hashpartitioning(c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 7]
+Input [9]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28, sum#37]
+Keys [8]: [c_customer_id#22, c_first_name#23, c_last_name#24, d_year#35, c_preferred_cust_flag#25, c_birth_country#26, c_login#27, c_email_address#28]
+Functions [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18]
+Results [5]: [c_customer_id#22 AS customer_id#38, c_first_name#23 AS customer_first_name#39, c_last_name#24 AS customer_last_name#40, c_email_address#28 AS customer_email_address#41, MakeDecimal(sum(UnscaledValue((ss_ext_list_price#31 - ss_ext_discount_amt#30)))#18,18,2) AS year_total#42]
+
+(32) BroadcastExchange
+Input [5]: [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(37) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#18]
-Right keys [1]: [customer_id#37]
+(33) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#19]
+Right keys [1]: [customer_id#38]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49]
+Output [8]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(39) CometFilter
-Input [8]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49]
-Condition : (isnotnull(c_customer_sk#42) AND isnotnull(c_customer_id#43))
+(35) CometFilter
+Input [8]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50]
+Condition : (isnotnull(c_customer_sk#43) AND isnotnull(c_customer_id#44))
 
-(40) ColumnarToRow [codegen id : 10]
-Input [8]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49]
+(36) ColumnarToRow [codegen id : 10]
+Input [8]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
+Output [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#54), dynamicpruningexpression(ws_sold_date_sk#54 IN dynamicpruning#55)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(42) CometFilter
-Input [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
-Condition : isnotnull(ws_bill_customer_sk#50)
+(38) CometFilter
+Input [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
+Condition : isnotnull(ws_bill_customer_sk#51)
 
-(43) ColumnarToRow [codegen id : 8]
-Input [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
+(39) ColumnarToRow [codegen id : 8]
+Input [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
 
-(44) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
+(40) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(45) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#42]
-Right keys [1]: [ws_bill_customer_sk#50]
+(41) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#43]
+Right keys [1]: [ws_bill_customer_sk#51]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 10]
-Output [10]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
-Input [12]: [c_customer_sk#42, c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_bill_customer_sk#50, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53]
+(42) Project [codegen id : 10]
+Output [10]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
+Input [12]: [c_customer_sk#43, c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_bill_customer_sk#51, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54]
 
-(47) ReusedExchange [Reuses operator id: 83]
-Output [2]: [d_date_sk#55, d_year#56]
+(43) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#56, d_year#57]
 
-(48) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#53]
-Right keys [1]: [d_date_sk#55]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#54]
+Right keys [1]: [d_date_sk#56]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 10]
-Output [10]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, d_year#56]
-Input [12]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56]
-
-(50) HashAggregate [codegen id : 10]
-Input [10]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, ws_ext_discount_amt#51, ws_ext_list_price#52, d_year#56]
-Keys [8]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#52 - ws_ext_discount_amt#51)))]
-Aggregate Attributes [1]: [sum#57]
-Results [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
-
-(51) RowToColumnar
-Input [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
-
-(52) CometColumnarExchange
-Input [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
-Arguments: hashpartitioning(c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(53) CometHashAggregate
-Input [9]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56, sum#58]
-Keys [8]: [c_customer_id#43, c_first_name#44, c_last_name#45, c_preferred_cust_flag#46, c_birth_country#47, c_login#48, c_email_address#49, d_year#56]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#52 - ws_ext_discount_amt#51)))]
-
-(54) CometFilter
-Input [2]: [customer_id#59, year_total#60]
-Condition : (isnotnull(year_total#60) AND (year_total#60 > 0.00))
-
-(55) ColumnarToRow [codegen id : 11]
-Input [2]: [customer_id#59, year_total#60]
-
-(56) BroadcastExchange
-Input [2]: [customer_id#59, year_total#60]
+(45) Project [codegen id : 10]
+Output [10]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, d_year#57]
+Input [12]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, ws_sold_date_sk#54, d_date_sk#56, d_year#57]
+
+(46) HashAggregate [codegen id : 10]
+Input [10]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, ws_ext_discount_amt#52, ws_ext_list_price#53, d_year#57]
+Keys [8]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))]
+Aggregate Attributes [1]: [sum#58]
+Results [9]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, sum#59]
+
+(47) Exchange
+Input [9]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, sum#59]
+Arguments: hashpartitioning(c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(48) HashAggregate [codegen id : 11]
+Input [9]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57, sum#59]
+Keys [8]: [c_customer_id#44, c_first_name#45, c_last_name#46, c_preferred_cust_flag#47, c_birth_country#48, c_login#49, c_email_address#50, d_year#57]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))#60]
+Results [2]: [c_customer_id#44 AS customer_id#61, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#53 - ws_ext_discount_amt#52)))#60,18,2) AS year_total#62]
+
+(49) Filter [codegen id : 11]
+Input [2]: [customer_id#61, year_total#62]
+Condition : (isnotnull(year_total#62) AND (year_total#62 > 0.00))
+
+(50) BroadcastExchange
+Input [2]: [customer_id#61, year_total#62]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(57) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#18]
-Right keys [1]: [customer_id#59]
+(51) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#19]
+Right keys [1]: [customer_id#61]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 16]
-Output [8]: [customer_id#18, year_total#19, customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41, year_total#60]
-Input [9]: [customer_id#18, year_total#19, customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41, customer_id#59, year_total#60]
+(52) Project [codegen id : 16]
+Output [8]: [customer_id#19, year_total#20, customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42, year_total#62]
+Input [9]: [customer_id#19, year_total#20, customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42, customer_id#61, year_total#62]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
+Output [8]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string,c_birth_country:string,c_login:string,c_email_address:string>
 
-(60) CometFilter
-Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
-Condition : (isnotnull(c_customer_sk#61) AND isnotnull(c_customer_id#62))
+(54) CometFilter
+Input [8]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70]
+Condition : (isnotnull(c_customer_sk#63) AND isnotnull(c_customer_id#64))
 
-(61) ColumnarToRow [codegen id : 14]
-Input [8]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68]
+(55) ColumnarToRow [codegen id : 14]
+Input [8]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+Output [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#72), dynamicpruningexpression(ws_sold_date_sk#72 IN dynamicpruning#73)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#74), dynamicpruningexpression(ws_sold_date_sk#74 IN dynamicpruning#75)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_ext_discount_amt:decimal(7,2),ws_ext_list_price:decimal(7,2)>
 
-(63) CometFilter
-Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
-Condition : isnotnull(ws_bill_customer_sk#69)
+(57) CometFilter
+Input [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
+Condition : isnotnull(ws_bill_customer_sk#71)
 
-(64) ColumnarToRow [codegen id : 12]
-Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+(58) ColumnarToRow [codegen id : 12]
+Input [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
 
-(65) BroadcastExchange
-Input [4]: [ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+(59) BroadcastExchange
+Input [4]: [ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(66) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#61]
-Right keys [1]: [ws_bill_customer_sk#69]
+(60) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#63]
+Right keys [1]: [ws_bill_customer_sk#71]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 14]
-Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
-Input [12]: [c_customer_sk#61, c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_bill_customer_sk#69, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72]
+(61) Project [codegen id : 14]
+Output [10]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
+Input [12]: [c_customer_sk#63, c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_bill_customer_sk#71, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74]
 
-(68) ReusedExchange [Reuses operator id: 87]
-Output [2]: [d_date_sk#74, d_year#75]
+(62) ReusedExchange [Reuses operator id: 79]
+Output [2]: [d_date_sk#76, d_year#77]
 
-(69) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#72]
-Right keys [1]: [d_date_sk#74]
+(63) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#74]
+Right keys [1]: [d_date_sk#76]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 14]
-Output [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
-Input [12]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, ws_sold_date_sk#72, d_date_sk#74, d_year#75]
-
-(71) HashAggregate [codegen id : 14]
-Input [10]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, ws_ext_discount_amt#70, ws_ext_list_price#71, d_year#75]
-Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
-Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
-Aggregate Attributes [1]: [sum#76]
-Results [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-
-(72) RowToColumnar
-Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-
-(73) CometColumnarExchange
-Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-Arguments: hashpartitioning(c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(74) CometHashAggregate
-Input [9]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75, sum#77]
-Keys [8]: [c_customer_id#62, c_first_name#63, c_last_name#64, c_preferred_cust_flag#65, c_birth_country#66, c_login#67, c_email_address#68, d_year#75]
-Functions [1]: [sum(UnscaledValue((ws_ext_list_price#71 - ws_ext_discount_amt#70)))]
-
-(75) ColumnarToRow [codegen id : 15]
-Input [2]: [customer_id#78, year_total#79]
-
-(76) BroadcastExchange
-Input [2]: [customer_id#78, year_total#79]
+(64) Project [codegen id : 14]
+Output [10]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, d_year#77]
+Input [12]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, ws_sold_date_sk#74, d_date_sk#76, d_year#77]
+
+(65) HashAggregate [codegen id : 14]
+Input [10]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, ws_ext_discount_amt#72, ws_ext_list_price#73, d_year#77]
+Keys [8]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77]
+Functions [1]: [partial_sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))]
+Aggregate Attributes [1]: [sum#78]
+Results [9]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, sum#79]
+
+(66) Exchange
+Input [9]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, sum#79]
+Arguments: hashpartitioning(c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(67) HashAggregate [codegen id : 15]
+Input [9]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77, sum#79]
+Keys [8]: [c_customer_id#64, c_first_name#65, c_last_name#66, c_preferred_cust_flag#67, c_birth_country#68, c_login#69, c_email_address#70, d_year#77]
+Functions [1]: [sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))]
+Aggregate Attributes [1]: [sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))#60]
+Results [2]: [c_customer_id#64 AS customer_id#80, MakeDecimal(sum(UnscaledValue((ws_ext_list_price#73 - ws_ext_discount_amt#72)))#60,18,2) AS year_total#81]
+
+(68) BroadcastExchange
+Input [2]: [customer_id#80, year_total#81]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(77) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#18]
-Right keys [1]: [customer_id#78]
+(69) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#19]
+Right keys [1]: [customer_id#80]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#60 > 0.00) THEN (year_total#79 / year_total#60) ELSE 0E-20 END > CASE WHEN (year_total#19 > 0.00) THEN (year_total#41 / year_total#19) ELSE 0E-20 END)
+Join condition: (CASE WHEN (year_total#62 > 0.00) THEN (year_total#81 / year_total#62) ELSE 0E-20 END > CASE WHEN (year_total#20 > 0.00) THEN (year_total#42 / year_total#20) ELSE 0E-20 END)
 
-(78) Project [codegen id : 16]
-Output [4]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40]
-Input [10]: [customer_id#18, year_total#19, customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40, year_total#41, year_total#60, customer_id#78, year_total#79]
+(70) Project [codegen id : 16]
+Output [4]: [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41]
+Input [10]: [customer_id#19, year_total#20, customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41, year_total#42, year_total#62, customer_id#80, year_total#81]
 
-(79) TakeOrderedAndProject
-Input [4]: [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40]
-Arguments: 100, [customer_id#37 ASC NULLS FIRST, customer_first_name#38 ASC NULLS FIRST, customer_last_name#39 ASC NULLS FIRST, customer_email_address#40 ASC NULLS FIRST], [customer_id#37, customer_first_name#38, customer_last_name#39, customer_email_address#40]
+(71) TakeOrderedAndProject
+Input [4]: [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41]
+Arguments: 100, [customer_id#38 ASC NULLS FIRST, customer_first_name#39 ASC NULLS FIRST, customer_last_name#40 ASC NULLS FIRST, customer_email_address#41 ASC NULLS FIRST], [customer_id#38, customer_first_name#39, customer_last_name#40, customer_email_address#41]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (83)
-+- * ColumnarToRow (82)
-   +- CometFilter (81)
-      +- CometScan parquet spark_catalog.default.date_dim (80)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometFilter (73)
+      +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -458,44 +434,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(81) CometFilter
+(73) CometFilter
 Input [2]: [d_date_sk#14, d_year#15]
 Condition : ((isnotnull(d_year#15) AND (d_year#15 = 2001)) AND isnotnull(d_date_sk#14))
 
-(82) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#14, d_year#15]
 
-(83) BroadcastExchange
+(75) BroadcastExchange
 Input [2]: [d_date_sk#14, d_year#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#31 IN dynamicpruning#32
-BroadcastExchange (87)
-+- * ColumnarToRow (86)
-   +- CometFilter (85)
-      +- CometScan parquet spark_catalog.default.date_dim (84)
+Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#32 IN dynamicpruning#33
+BroadcastExchange (79)
++- * ColumnarToRow (78)
+   +- CometFilter (77)
+      +- CometScan parquet spark_catalog.default.date_dim (76)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#33, d_year#34]
+Output [2]: [d_date_sk#34, d_year#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(85) CometFilter
-Input [2]: [d_date_sk#33, d_year#34]
-Condition : ((isnotnull(d_year#34) AND (d_year#34 = 2002)) AND isnotnull(d_date_sk#33))
+(77) CometFilter
+Input [2]: [d_date_sk#34, d_year#35]
+Condition : ((isnotnull(d_year#35) AND (d_year#35 = 2002)) AND isnotnull(d_date_sk#34))
 
-(86) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#33, d_year#34]
+(78) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#34, d_year#35]
 
-(87) BroadcastExchange
-Input [2]: [d_date_sk#33, d_year#34]
+(79) BroadcastExchange
+Input [2]: [d_date_sk#34, d_year#35]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#13
+Subquery:3 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#54 IN dynamicpruning#13
 
-Subquery:4 Hosting operator id = 62 Hosting Expression = ws_sold_date_sk#72 IN dynamicpruning#32
+Subquery:4 Hosting operator id = 56 Hosting Expression = ws_sold_date_sk#74 IN dynamicpruning#33
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt
index 6e42d76f1c..0a30aba051 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q11/simplified.txt
@@ -5,13 +5,43 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
         Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,customer_email_address,year_total,year_total]
           BroadcastHashJoin [customer_id,customer_id]
             BroadcastHashJoin [customer_id,customer_id]
-              ColumnarToRow
-                InputAdapter
-                  CometFilter [year_total]
-                    CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
-                      CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
-                        RowToColumnar
-                          WholeStageCodegen (3)
+              Filter [year_total]
+                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,year_total,sum]
+                  InputAdapter
+                    Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #1
+                      WholeStageCodegen (3)
+                        HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
+                          Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [c_customer_sk,c_customer_id]
+                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ss_customer_sk]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                              InputAdapter
+                                ReusedExchange [d_date_sk,d_year] #3
+              InputAdapter
+                BroadcastExchange #4
+                  WholeStageCodegen (7)
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum] [sum(UnscaledValue((ss_ext_list_price - ss_ext_discount_amt))),customer_id,customer_first_name,customer_last_name,customer_email_address,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
+                          WholeStageCodegen (6)
                             HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
                               Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
                                 BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -22,109 +52,71 @@ TakeOrderedAndProject [customer_id,customer_first_name,customer_last_name,custom
                                           CometFilter [c_customer_sk,c_customer_id]
                                             CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                       InputAdapter
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
+                                        BroadcastExchange #6
+                                          WholeStageCodegen (4)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometFilter [ss_customer_sk]
                                                   CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
+                                                    SubqueryBroadcast [d_date_sk] #2
+                                                      BroadcastExchange #7
                                                         WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
                                                               CometFilter [d_year,d_date_sk]
                                                                 CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
-              InputAdapter
-                BroadcastExchange #4
-                  WholeStageCodegen (7)
-                    ColumnarToRow
-                      InputAdapter
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address] #5
-                            RowToColumnar
-                              WholeStageCodegen (6)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_list_price,ss_ext_discount_amt] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,d_year]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (4)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ss_customer_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_ext_discount_amt,ss_ext_list_price,ss_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #2
-                                                          BroadcastExchange #7
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #7
+                                    ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [year_total]
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
-                            RowToColumnar
-                              WholeStageCodegen (10)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                          InputAdapter
-                                            BroadcastExchange #10
-                                              WholeStageCodegen (8)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
+                  Filter [year_total]
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #9
+                          WholeStageCodegen (10)
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                              Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk,c_customer_id]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (8)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              ColumnarToRow
+              HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum] [sum(UnscaledValue((ws_ext_list_price - ws_ext_discount_amt))),customer_id,year_total,sum]
                 InputAdapter
-                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,sum]
-                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
-                      RowToColumnar
-                        WholeStageCodegen (14)
-                          HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
-                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_customer_id]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
-                                    InputAdapter
-                                      BroadcastExchange #13
-                                        WholeStageCodegen (12)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #2
+                  Exchange [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year] #12
+                    WholeStageCodegen (14)
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,d_year,ws_ext_list_price,ws_ext_discount_amt] [sum,sum]
+                        Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,d_year]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_customer_sk,c_customer_id]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_country,c_login,c_email_address]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #7
+                                  BroadcastExchange #13
+                                    WholeStageCodegen (12)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_customer_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_ext_discount_amt,ws_ext_list_price,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #2
+                            InputAdapter
+                              ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt
index c60f2045af..f3c5c46098 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/explain.txt
@@ -1,26 +1,24 @@
 == Physical Plan ==
-TakeOrderedAndProject (22)
-+- * Project (21)
-   +- Window (20)
-      +- * ColumnarToRow (19)
-         +- CometSort (18)
-            +- CometColumnarExchange (17)
-               +- CometHashAggregate (16)
-                  +- CometColumnarExchange (15)
-                     +- RowToColumnar (14)
-                        +- * HashAggregate (13)
-                           +- * Project (12)
-                              +- * BroadcastHashJoin Inner BuildRight (11)
-                                 :- * Project (9)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                 :     :- * ColumnarToRow (3)
-                                 :     :  +- CometFilter (2)
-                                 :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                                 :     +- BroadcastExchange (7)
-                                 :        +- * ColumnarToRow (6)
-                                 :           +- CometFilter (5)
-                                 :              +- CometScan parquet spark_catalog.default.item (4)
-                                 +- ReusedExchange (10)
+TakeOrderedAndProject (20)
++- * Project (19)
+   +- Window (18)
+      +- * Sort (17)
+         +- Exchange (16)
+            +- * HashAggregate (15)
+               +- Exchange (14)
+                  +- * HashAggregate (13)
+                     +- * Project (12)
+                        +- * BroadcastHashJoin Inner BuildRight (11)
+                           :- * Project (9)
+                           :  +- * BroadcastHashJoin Inner BuildRight (8)
+                           :     :- * ColumnarToRow (3)
+                           :     :  +- CometFilter (2)
+                           :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                           :     +- BroadcastExchange (7)
+                           :        +- * ColumnarToRow (6)
+                           :           +- CometFilter (5)
+                           :              +- CometScan parquet spark_catalog.default.item (4)
+                           +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -66,7 +64,7 @@ Join condition: None
 Output [7]: [ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ws_item_sk#1, ws_ext_sales_price#2, ws_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 27]
+(10) ReusedExchange [Reuses operator id: 25]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -86,70 +84,66 @@ Functions [1]: [partial_sum(UnscaledValue(ws_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) RowToColumnar
+(14) Exchange
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ws_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_ext_sales_price#2))#14]
+Results [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#2))#14,17,2) AS _w0#16]
 
-(17) CometColumnarExchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(18) CometSort
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15], [i_class#9 ASC NULLS FIRST]
+(16) Exchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) ColumnarToRow [codegen id : 4]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+(17) Sort [codegen id : 5]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: [i_class#9 ASC NULLS FIRST], false, 0
 
-(20) Window
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
+(18) Window
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
 
-(21) Project [codegen id : 5]
-Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17]
-Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, _we0#16]
+(19) Project [codegen id : 6]
+Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18]
+Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, _we0#17]
 
-(22) TakeOrderedAndProject
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(20) TakeOrderedAndProject
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (25)
++- * ColumnarToRow (24)
+   +- CometProject (23)
+      +- CometFilter (22)
+         +- CometScan parquet spark_catalog.default.date_dim (21)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#18]
+Output [2]: [d_date_sk#11, d_date#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(24) CometFilter
-Input [2]: [d_date_sk#11, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(22) CometFilter
+Input [2]: [d_date_sk#11, d_date#19]
+Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(25) CometProject
-Input [2]: [d_date_sk#11, d_date#18]
+(23) CometProject
+Input [2]: [d_date_sk#11, d_date#19]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(26) ColumnarToRow [codegen id : 1]
+(24) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(27) BroadcastExchange
+(25) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt
index 03091f0fbb..1bc2538b48 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q12/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (5)
+  WholeStageCodegen (6)
     Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (4)
-            ColumnarToRow
+          WholeStageCodegen (5)
+            Sort [i_class]
               InputAdapter
-                CometSort [i_class]
-                  CometColumnarExchange [i_class] #1
-                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
-                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
-                        RowToColumnar
+                Exchange [i_class] #1
+                  WholeStageCodegen (4)
+                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ws_ext_sales_price)),itemrevenue,_w0,sum]
+                      InputAdapter
+                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ws_ext_sales_price] [sum,sum]
                               Project [ws_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt
index 377f8ee690..6fdb365c5b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/explain.txt
@@ -1,94 +1,88 @@
 == Physical Plan ==
-TakeOrderedAndProject (90)
-+- * BroadcastHashJoin Inner BuildRight (89)
-   :- * ColumnarToRow (70)
-   :  +- CometFilter (69)
-   :     +- CometHashAggregate (68)
-   :        +- CometColumnarExchange (67)
-   :           +- RowToColumnar (66)
-   :              +- * HashAggregate (65)
-   :                 +- * Project (64)
-   :                    +- * BroadcastHashJoin Inner BuildRight (63)
-   :                       :- * Project (61)
-   :                       :  +- * BroadcastHashJoin Inner BuildRight (60)
-   :                       :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
-   :                       :     :  :- * ColumnarToRow (3)
-   :                       :     :  :  +- CometFilter (2)
-   :                       :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-   :                       :     :  +- BroadcastExchange (52)
-   :                       :     :     +- * Project (51)
-   :                       :     :        +- * BroadcastHashJoin Inner BuildRight (50)
-   :                       :     :           :- * ColumnarToRow (6)
-   :                       :     :           :  +- CometFilter (5)
-   :                       :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-   :                       :     :           +- BroadcastExchange (49)
-   :                       :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
-   :                       :     :                 :- * ColumnarToRow (37)
-   :                       :     :                 :  +- CometHashAggregate (36)
-   :                       :     :                 :     +- CometColumnarExchange (35)
-   :                       :     :                 :        +- RowToColumnar (34)
-   :                       :     :                 :           +- * HashAggregate (33)
-   :                       :     :                 :              +- * Project (32)
-   :                       :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
-   :                       :     :                 :                    :- * Project (29)
-   :                       :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
-   :                       :     :                 :                    :     :- * ColumnarToRow (9)
-   :                       :     :                 :                    :     :  +- CometFilter (8)
-   :                       :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-   :                       :     :                 :                    :     +- BroadcastExchange (27)
-   :                       :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-   :                       :     :                 :                    :           :- * ColumnarToRow (12)
-   :                       :     :                 :                    :           :  +- CometFilter (11)
-   :                       :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
-   :                       :     :                 :                    :           +- BroadcastExchange (25)
-   :                       :     :                 :                    :              +- * Project (24)
-   :                       :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
-   :                       :     :                 :                    :                    :- * Project (21)
-   :                       :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-   :                       :     :                 :                    :                    :     :- * ColumnarToRow (15)
-   :                       :     :                 :                    :                    :     :  +- CometFilter (14)
-   :                       :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-   :                       :     :                 :                    :                    :     +- BroadcastExchange (19)
-   :                       :     :                 :                    :                    :        +- * ColumnarToRow (18)
-   :                       :     :                 :                    :                    :           +- CometFilter (17)
-   :                       :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
-   :                       :     :                 :                    :                    +- ReusedExchange (22)
-   :                       :     :                 :                    +- ReusedExchange (30)
-   :                       :     :                 +- BroadcastExchange (47)
-   :                       :     :                    +- * Project (46)
-   :                       :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
-   :                       :     :                          :- * Project (43)
-   :                       :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
-   :                       :     :                          :     :- * ColumnarToRow (40)
-   :                       :     :                          :     :  +- CometFilter (39)
-   :                       :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
-   :                       :     :                          :     +- ReusedExchange (41)
-   :                       :     :                          +- ReusedExchange (44)
-   :                       :     +- BroadcastExchange (59)
-   :                       :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
-   :                       :           :- * ColumnarToRow (56)
-   :                       :           :  +- CometFilter (55)
-   :                       :           :     +- CometScan parquet spark_catalog.default.item (54)
-   :                       :           +- ReusedExchange (57)
-   :                       +- ReusedExchange (62)
-   +- BroadcastExchange (88)
-      +- * ColumnarToRow (87)
-         +- CometFilter (86)
-            +- CometHashAggregate (85)
-               +- CometColumnarExchange (84)
-                  +- RowToColumnar (83)
-                     +- * HashAggregate (82)
-                        +- * Project (81)
-                           +- * BroadcastHashJoin Inner BuildRight (80)
-                              :- * Project (78)
-                              :  +- * BroadcastHashJoin Inner BuildRight (77)
-                              :     :- * BroadcastHashJoin LeftSemi BuildRight (75)
-                              :     :  :- * ColumnarToRow (73)
-                              :     :  :  +- CometFilter (72)
-                              :     :  :     +- CometScan parquet spark_catalog.default.store_sales (71)
-                              :     :  +- ReusedExchange (74)
-                              :     +- ReusedExchange (76)
-                              +- ReusedExchange (79)
+TakeOrderedAndProject (84)
++- * BroadcastHashJoin Inner BuildRight (83)
+   :- * Filter (66)
+   :  +- * HashAggregate (65)
+   :     +- Exchange (64)
+   :        +- * HashAggregate (63)
+   :           +- * Project (62)
+   :              +- * BroadcastHashJoin Inner BuildRight (61)
+   :                 :- * Project (59)
+   :                 :  +- * BroadcastHashJoin Inner BuildRight (58)
+   :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
+   :                 :     :  :- * ColumnarToRow (3)
+   :                 :     :  :  +- CometFilter (2)
+   :                 :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :                 :     :  +- BroadcastExchange (50)
+   :                 :     :     +- * Project (49)
+   :                 :     :        +- * BroadcastHashJoin Inner BuildRight (48)
+   :                 :     :           :- * ColumnarToRow (6)
+   :                 :     :           :  +- CometFilter (5)
+   :                 :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+   :                 :     :           +- BroadcastExchange (47)
+   :                 :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
+   :                 :     :                 :- * HashAggregate (35)
+   :                 :     :                 :  +- Exchange (34)
+   :                 :     :                 :     +- * HashAggregate (33)
+   :                 :     :                 :        +- * Project (32)
+   :                 :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
+   :                 :     :                 :              :- * Project (29)
+   :                 :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
+   :                 :     :                 :              :     :- * ColumnarToRow (9)
+   :                 :     :                 :              :     :  +- CometFilter (8)
+   :                 :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+   :                 :     :                 :              :     +- BroadcastExchange (27)
+   :                 :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+   :                 :     :                 :              :           :- * ColumnarToRow (12)
+   :                 :     :                 :              :           :  +- CometFilter (11)
+   :                 :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
+   :                 :     :                 :              :           +- BroadcastExchange (25)
+   :                 :     :                 :              :              +- * Project (24)
+   :                 :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
+   :                 :     :                 :              :                    :- * Project (21)
+   :                 :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+   :                 :     :                 :              :                    :     :- * ColumnarToRow (15)
+   :                 :     :                 :              :                    :     :  +- CometFilter (14)
+   :                 :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+   :                 :     :                 :              :                    :     +- BroadcastExchange (19)
+   :                 :     :                 :              :                    :        +- * ColumnarToRow (18)
+   :                 :     :                 :              :                    :           +- CometFilter (17)
+   :                 :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
+   :                 :     :                 :              :                    +- ReusedExchange (22)
+   :                 :     :                 :              +- ReusedExchange (30)
+   :                 :     :                 +- BroadcastExchange (45)
+   :                 :     :                    +- * Project (44)
+   :                 :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
+   :                 :     :                          :- * Project (41)
+   :                 :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
+   :                 :     :                          :     :- * ColumnarToRow (38)
+   :                 :     :                          :     :  +- CometFilter (37)
+   :                 :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
+   :                 :     :                          :     +- ReusedExchange (39)
+   :                 :     :                          +- ReusedExchange (42)
+   :                 :     +- BroadcastExchange (57)
+   :                 :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
+   :                 :           :- * ColumnarToRow (54)
+   :                 :           :  +- CometFilter (53)
+   :                 :           :     +- CometScan parquet spark_catalog.default.item (52)
+   :                 :           +- ReusedExchange (55)
+   :                 +- ReusedExchange (60)
+   +- BroadcastExchange (82)
+      +- * Filter (81)
+         +- * HashAggregate (80)
+            +- Exchange (79)
+               +- * HashAggregate (78)
+                  +- * Project (77)
+                     +- * BroadcastHashJoin Inner BuildRight (76)
+                        :- * Project (74)
+                        :  +- * BroadcastHashJoin Inner BuildRight (73)
+                        :     :- * BroadcastHashJoin LeftSemi BuildRight (71)
+                        :     :  :- * ColumnarToRow (69)
+                        :     :  :  +- CometFilter (68)
+                        :     :  :     +- CometScan parquet spark_catalog.default.store_sales (67)
+                        :     :  +- ReusedExchange (70)
+                        :     +- ReusedExchange (72)
+                        +- ReusedExchange (75)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -192,7 +186,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 125]
+(22) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -229,7 +223,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 125]
+(30) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -249,20 +243,16 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) RowToColumnar
+(34) Exchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) CometColumnarExchange
-Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(36) CometHashAggregate
+(35) HashAggregate [codegen id : 10]
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-
-(37) ColumnarToRow [codegen id : 10]
-Input [3]: [brand_id#26, class_id#27, category_id#28]
+Aggregate Attributes: []
+Results [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -272,68 +262,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(39) CometFilter
+(37) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(40) ColumnarToRow [codegen id : 9]
+(38) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(41) ReusedExchange [Reuses operator id: 19]
+(39) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) BroadcastHashJoin [codegen id : 9]
+(40) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 9]
+(41) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(44) ReusedExchange [Reuses operator id: 125]
+(42) ReusedExchange [Reuses operator id: 117]
 Output [1]: [d_date_sk#36]
 
-(45) BroadcastHashJoin [codegen id : 9]
+(43) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 9]
+(44) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(48) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(50) BroadcastHashJoin [codegen id : 11]
+(48) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 11]
+(49) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(53) BroadcastHashJoin [codegen id : 25]
+(51) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -346,434 +336,420 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk), IsNotNull(i_brand_id), IsNotNull(i_class_id), IsNotNull(i_category_id)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(55) CometFilter
+(53) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : (((isnotnull(i_item_sk#38) AND isnotnull(i_brand_id#39)) AND isnotnull(i_class_id#40)) AND isnotnull(i_category_id#41))
 
-(56) ColumnarToRow [codegen id : 23]
+(54) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(57) ReusedExchange [Reuses operator id: 52]
+(55) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(58) BroadcastHashJoin [codegen id : 23]
+(56) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(59) BroadcastExchange
+(57) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 25]
+(58) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 25]
+(59) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(62) ReusedExchange [Reuses operator id: 116]
+(60) ReusedExchange [Reuses operator id: 108]
 Output [1]: [d_date_sk#42]
 
-(63) BroadcastHashJoin [codegen id : 25]
+(61) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 25]
+(62) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(65) HashAggregate [codegen id : 25]
+(63) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(66) RowToColumnar
-Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-
-(67) CometColumnarExchange
+(64) Exchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(68) CometHashAggregate
+(65) HashAggregate [codegen id : 52]
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
+Results [6]: [store AS channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#52, count(1)#50 AS number_sales#53]
 
-(69) CometFilter
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
-Condition : (isnotnull(sales#50) AND (cast(sales#50 as decimal(32,6)) > cast(Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
-
-(70) ColumnarToRow [codegen id : 52]
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
+(66) Filter [codegen id : 52]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
+Condition : (isnotnull(sales#52) AND (cast(sales#52 as decimal(32,6)) > cast(Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
+Output [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#57), dynamicpruningexpression(ss_sold_date_sk#57 IN dynamicpruning#58)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#59), dynamicpruningexpression(ss_sold_date_sk#59 IN dynamicpruning#60)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(72) CometFilter
-Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
-Condition : isnotnull(ss_item_sk#54)
+(68) CometFilter
+Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
+Condition : isnotnull(ss_item_sk#56)
 
-(73) ColumnarToRow [codegen id : 50]
-Input [4]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57]
+(69) ColumnarToRow [codegen id : 50]
+Input [4]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59]
 
-(74) ReusedExchange [Reuses operator id: 52]
+(70) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(75) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#54]
+(71) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#56]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(76) ReusedExchange [Reuses operator id: 59]
-Output [4]: [i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
+(72) ReusedExchange [Reuses operator id: 57]
+Output [4]: [i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
 
-(77) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_item_sk#54]
-Right keys [1]: [i_item_sk#59]
+(73) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_item_sk#56]
+Right keys [1]: [i_item_sk#61]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 50]
-Output [6]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62]
-Input [8]: [ss_item_sk#54, ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
+(74) Project [codegen id : 50]
+Output [6]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64]
+Input [8]: [ss_item_sk#56, ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
 
-(79) ReusedExchange [Reuses operator id: 130]
-Output [1]: [d_date_sk#63]
+(75) ReusedExchange [Reuses operator id: 122]
+Output [1]: [d_date_sk#65]
 
-(80) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [ss_sold_date_sk#57]
-Right keys [1]: [d_date_sk#63]
+(76) BroadcastHashJoin [codegen id : 50]
+Left keys [1]: [ss_sold_date_sk#59]
+Right keys [1]: [d_date_sk#65]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 50]
-Output [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
-Input [7]: [ss_quantity#55, ss_list_price#56, ss_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62, d_date_sk#63]
-
-(82) HashAggregate [codegen id : 50]
-Input [5]: [ss_quantity#55, ss_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
-Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
-Functions [2]: [partial_sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), partial_count(1)]
-Aggregate Attributes [3]: [sum#64, isEmpty#65, count#66]
-Results [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-
-(83) RowToColumnar
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-
-(84) CometColumnarExchange
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-Arguments: hashpartitioning(i_brand_id#60, i_class_id#61, i_category_id#62, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(85) CometHashAggregate
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
-Functions [2]: [sum((cast(ss_quantity#55 as decimal(10,0)) * ss_list_price#56)), count(1)]
-
-(86) CometFilter
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-Condition : (isnotnull(sales#71) AND (cast(sales#71 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
-
-(87) ColumnarToRow [codegen id : 51]
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-
-(88) BroadcastExchange
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+(77) Project [codegen id : 50]
+Output [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
+Input [7]: [ss_quantity#57, ss_list_price#58, ss_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64, d_date_sk#65]
+
+(78) HashAggregate [codegen id : 50]
+Input [5]: [ss_quantity#57, ss_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
+Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Functions [2]: [partial_sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), partial_count(1)]
+Aggregate Attributes [3]: [sum#66, isEmpty#67, count#68]
+Results [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+
+(79) Exchange
+Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+Arguments: hashpartitioning(i_brand_id#62, i_class_id#63, i_category_id#64, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(80) HashAggregate [codegen id : 51]
+Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Functions [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72, count(1)#73]
+Results [6]: [store AS channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sum((cast(ss_quantity#57 as decimal(10,0)) * ss_list_price#58))#72 AS sales#75, count(1)#73 AS number_sales#76]
+
+(81) Filter [codegen id : 51]
+Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+Condition : (isnotnull(sales#75) AND (cast(sales#75 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+
+(82) BroadcastExchange
+Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
 Arguments: HashedRelationBroadcastMode(List(input[1, int, true], input[2, int, true], input[3, int, true]),false), [plan_id=11]
 
-(89) BroadcastHashJoin [codegen id : 52]
+(83) BroadcastHashJoin [codegen id : 52]
 Left keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
-Right keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
+Right keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
 Join type: Inner
 Join condition: None
 
-(90) TakeOrderedAndProject
-Input [12]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51, channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
+(84) TakeOrderedAndProject
+Input [12]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+Arguments: 100, [i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53, channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#52, [id=#53]
-* ColumnarToRow (111)
-+- CometHashAggregate (110)
-   +- CometColumnarExchange (109)
-      +- RowToColumnar (108)
-         +- * HashAggregate (107)
-            +- Union (106)
-               :- * Project (95)
-               :  +- * BroadcastHashJoin Inner BuildRight (94)
-               :     :- * ColumnarToRow (92)
-               :     :  +- CometScan parquet spark_catalog.default.store_sales (91)
-               :     +- ReusedExchange (93)
-               :- * Project (100)
-               :  +- * BroadcastHashJoin Inner BuildRight (99)
-               :     :- * ColumnarToRow (97)
-               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (96)
-               :     +- ReusedExchange (98)
-               +- * Project (105)
-                  +- * BroadcastHashJoin Inner BuildRight (104)
-                     :- * ColumnarToRow (102)
-                     :  +- CometScan parquet spark_catalog.default.web_sales (101)
-                     +- ReusedExchange (103)
+Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#54, [id=#55]
+* HashAggregate (103)
++- Exchange (102)
+   +- * HashAggregate (101)
+      +- Union (100)
+         :- * Project (89)
+         :  +- * BroadcastHashJoin Inner BuildRight (88)
+         :     :- * ColumnarToRow (86)
+         :     :  +- CometScan parquet spark_catalog.default.store_sales (85)
+         :     +- ReusedExchange (87)
+         :- * Project (94)
+         :  +- * BroadcastHashJoin Inner BuildRight (93)
+         :     :- * ColumnarToRow (91)
+         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (90)
+         :     +- ReusedExchange (92)
+         +- * Project (99)
+            +- * BroadcastHashJoin Inner BuildRight (98)
+               :- * ColumnarToRow (96)
+               :  +- CometScan parquet spark_catalog.default.web_sales (95)
+               +- ReusedExchange (97)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
+Output [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#75), dynamicpruningexpression(ss_sold_date_sk#75 IN dynamicpruning#76)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#79), dynamicpruningexpression(ss_sold_date_sk#79 IN dynamicpruning#80)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(92) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75]
+(86) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79]
 
-(93) ReusedExchange [Reuses operator id: 125]
-Output [1]: [d_date_sk#77]
+(87) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#81]
 
-(94) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#75]
-Right keys [1]: [d_date_sk#77]
+(88) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#79]
+Right keys [1]: [d_date_sk#81]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 2]
-Output [2]: [ss_quantity#73 AS quantity#78, ss_list_price#74 AS list_price#79]
-Input [4]: [ss_quantity#73, ss_list_price#74, ss_sold_date_sk#75, d_date_sk#77]
+(89) Project [codegen id : 2]
+Output [2]: [ss_quantity#77 AS quantity#82, ss_list_price#78 AS list_price#83]
+Input [4]: [ss_quantity#77, ss_list_price#78, ss_sold_date_sk#79, d_date_sk#81]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
+Output [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#82), dynamicpruningexpression(cs_sold_date_sk#82 IN dynamicpruning#83)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#86), dynamicpruningexpression(cs_sold_date_sk#86 IN dynamicpruning#87)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(97) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82]
+(91) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86]
 
-(98) ReusedExchange [Reuses operator id: 125]
-Output [1]: [d_date_sk#84]
+(92) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#88]
 
-(99) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#82]
-Right keys [1]: [d_date_sk#84]
+(93) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#86]
+Right keys [1]: [d_date_sk#88]
 Join type: Inner
 Join condition: None
 
-(100) Project [codegen id : 4]
-Output [2]: [cs_quantity#80 AS quantity#85, cs_list_price#81 AS list_price#86]
-Input [4]: [cs_quantity#80, cs_list_price#81, cs_sold_date_sk#82, d_date_sk#84]
+(94) Project [codegen id : 4]
+Output [2]: [cs_quantity#84 AS quantity#89, cs_list_price#85 AS list_price#90]
+Input [4]: [cs_quantity#84, cs_list_price#85, cs_sold_date_sk#86, d_date_sk#88]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
+Output [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#89), dynamicpruningexpression(ws_sold_date_sk#89 IN dynamicpruning#90)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#93), dynamicpruningexpression(ws_sold_date_sk#93 IN dynamicpruning#94)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(102) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89]
+(96) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93]
 
-(103) ReusedExchange [Reuses operator id: 125]
-Output [1]: [d_date_sk#91]
+(97) ReusedExchange [Reuses operator id: 117]
+Output [1]: [d_date_sk#95]
 
-(104) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#89]
-Right keys [1]: [d_date_sk#91]
+(98) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#93]
+Right keys [1]: [d_date_sk#95]
 Join type: Inner
 Join condition: None
 
-(105) Project [codegen id : 6]
-Output [2]: [ws_quantity#87 AS quantity#92, ws_list_price#88 AS list_price#93]
-Input [4]: [ws_quantity#87, ws_list_price#88, ws_sold_date_sk#89, d_date_sk#91]
+(99) Project [codegen id : 6]
+Output [2]: [ws_quantity#91 AS quantity#96, ws_list_price#92 AS list_price#97]
+Input [4]: [ws_quantity#91, ws_list_price#92, ws_sold_date_sk#93, d_date_sk#95]
 
-(106) Union
+(100) Union
 
-(107) HashAggregate [codegen id : 7]
-Input [2]: [quantity#78, list_price#79]
+(101) HashAggregate [codegen id : 7]
+Input [2]: [quantity#82, list_price#83]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
-Aggregate Attributes [2]: [sum#94, count#95]
-Results [2]: [sum#96, count#97]
+Functions [1]: [partial_avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
+Aggregate Attributes [2]: [sum#98, count#99]
+Results [2]: [sum#100, count#101]
 
-(108) RowToColumnar
-Input [2]: [sum#96, count#97]
+(102) Exchange
+Input [2]: [sum#100, count#101]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
 
-(109) CometColumnarExchange
-Input [2]: [sum#96, count#97]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
-
-(110) CometHashAggregate
-Input [2]: [sum#96, count#97]
+(103) HashAggregate [codegen id : 8]
+Input [2]: [sum#100, count#101]
 Keys: []
-Functions [1]: [avg((cast(quantity#78 as decimal(10,0)) * list_price#79))]
-
-(111) ColumnarToRow [codegen id : 8]
-Input [1]: [average_sales#98]
+Functions [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))]
+Aggregate Attributes [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102]
+Results [1]: [avg((cast(quantity#82 as decimal(10,0)) * list_price#83))#102 AS average_sales#103]
 
-Subquery:2 Hosting operator id = 91 Hosting Expression = ss_sold_date_sk#75 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 85 Hosting Expression = ss_sold_date_sk#79 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 96 Hosting Expression = cs_sold_date_sk#82 IN dynamicpruning#12
+Subquery:3 Hosting operator id = 90 Hosting Expression = cs_sold_date_sk#86 IN dynamicpruning#12
 
-Subquery:4 Hosting operator id = 101 Hosting Expression = ws_sold_date_sk#89 IN dynamicpruning#12
+Subquery:4 Hosting operator id = 95 Hosting Expression = ws_sold_date_sk#93 IN dynamicpruning#12
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (116)
-+- * ColumnarToRow (115)
-   +- CometProject (114)
-      +- CometFilter (113)
-         +- CometScan parquet spark_catalog.default.date_dim (112)
+BroadcastExchange (108)
++- * ColumnarToRow (107)
+   +- CometProject (106)
+      +- CometFilter (105)
+         +- CometScan parquet spark_catalog.default.date_dim (104)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#42, d_week_seq#99]
+Output [2]: [d_date_sk#42, d_week_seq#104]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(113) CometFilter
-Input [2]: [d_date_sk#42, d_week_seq#99]
-Condition : ((isnotnull(d_week_seq#99) AND (d_week_seq#99 = Subquery scalar-subquery#100, [id=#101])) AND isnotnull(d_date_sk#42))
+(105) CometFilter
+Input [2]: [d_date_sk#42, d_week_seq#104]
+Condition : ((isnotnull(d_week_seq#104) AND (d_week_seq#104 = Subquery scalar-subquery#105, [id=#106])) AND isnotnull(d_date_sk#42))
 
-(114) CometProject
-Input [2]: [d_date_sk#42, d_week_seq#99]
+(106) CometProject
+Input [2]: [d_date_sk#42, d_week_seq#104]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(115) ColumnarToRow [codegen id : 1]
+(107) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(116) BroadcastExchange
+(108) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:6 Hosting operator id = 113 Hosting Expression = Subquery scalar-subquery#100, [id=#101]
-* ColumnarToRow (120)
-+- CometProject (119)
-   +- CometFilter (118)
-      +- CometScan parquet spark_catalog.default.date_dim (117)
+Subquery:6 Hosting operator id = 105 Hosting Expression = Subquery scalar-subquery#105, [id=#106]
+* ColumnarToRow (112)
++- CometProject (111)
+   +- CometFilter (110)
+      +- CometScan parquet spark_catalog.default.date_dim (109)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
+Output [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,1999), EqualTo(d_moy,12), EqualTo(d_dom,16)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(118) CometFilter
-Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
-Condition : (((((isnotnull(d_year#103) AND isnotnull(d_moy#104)) AND isnotnull(d_dom#105)) AND (d_year#103 = 1999)) AND (d_moy#104 = 12)) AND (d_dom#105 = 16))
+(110) CometFilter
+Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
+Condition : (((((isnotnull(d_year#108) AND isnotnull(d_moy#109)) AND isnotnull(d_dom#110)) AND (d_year#108 = 1999)) AND (d_moy#109 = 12)) AND (d_dom#110 = 16))
 
-(119) CometProject
-Input [4]: [d_week_seq#102, d_year#103, d_moy#104, d_dom#105]
-Arguments: [d_week_seq#102], [d_week_seq#102]
+(111) CometProject
+Input [4]: [d_week_seq#107, d_year#108, d_moy#109, d_dom#110]
+Arguments: [d_week_seq#107], [d_week_seq#107]
 
-(120) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#102]
+(112) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#107]
 
 Subquery:7 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (125)
-+- * ColumnarToRow (124)
-   +- CometProject (123)
-      +- CometFilter (122)
-         +- CometScan parquet spark_catalog.default.date_dim (121)
+BroadcastExchange (117)
++- * ColumnarToRow (116)
+   +- CometProject (115)
+      +- CometFilter (114)
+         +- CometScan parquet spark_catalog.default.date_dim (113)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#106]
+Output [2]: [d_date_sk#25, d_year#111]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1998), LessThanOrEqual(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(122) CometFilter
-Input [2]: [d_date_sk#25, d_year#106]
-Condition : (((isnotnull(d_year#106) AND (d_year#106 >= 1998)) AND (d_year#106 <= 2000)) AND isnotnull(d_date_sk#25))
+(114) CometFilter
+Input [2]: [d_date_sk#25, d_year#111]
+Condition : (((isnotnull(d_year#111) AND (d_year#111 >= 1998)) AND (d_year#111 <= 2000)) AND isnotnull(d_date_sk#25))
 
-(123) CometProject
-Input [2]: [d_date_sk#25, d_year#106]
+(115) CometProject
+Input [2]: [d_date_sk#25, d_year#111]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(124) ColumnarToRow [codegen id : 1]
+(116) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(125) BroadcastExchange
+(117) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
 Subquery:8 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:9 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:10 Hosting operator id = 86 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
+Subquery:10 Hosting operator id = 81 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
 
-Subquery:11 Hosting operator id = 71 Hosting Expression = ss_sold_date_sk#57 IN dynamicpruning#58
-BroadcastExchange (130)
-+- * ColumnarToRow (129)
-   +- CometProject (128)
-      +- CometFilter (127)
-         +- CometScan parquet spark_catalog.default.date_dim (126)
+Subquery:11 Hosting operator id = 67 Hosting Expression = ss_sold_date_sk#59 IN dynamicpruning#60
+BroadcastExchange (122)
++- * ColumnarToRow (121)
+   +- CometProject (120)
+      +- CometFilter (119)
+         +- CometScan parquet spark_catalog.default.date_dim (118)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#63, d_week_seq#107]
+Output [2]: [d_date_sk#65, d_week_seq#112]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_week_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_week_seq:int>
 
-(127) CometFilter
-Input [2]: [d_date_sk#63, d_week_seq#107]
-Condition : ((isnotnull(d_week_seq#107) AND (d_week_seq#107 = Subquery scalar-subquery#108, [id=#109])) AND isnotnull(d_date_sk#63))
+(119) CometFilter
+Input [2]: [d_date_sk#65, d_week_seq#112]
+Condition : ((isnotnull(d_week_seq#112) AND (d_week_seq#112 = Subquery scalar-subquery#113, [id=#114])) AND isnotnull(d_date_sk#65))
 
-(128) CometProject
-Input [2]: [d_date_sk#63, d_week_seq#107]
-Arguments: [d_date_sk#63], [d_date_sk#63]
+(120) CometProject
+Input [2]: [d_date_sk#65, d_week_seq#112]
+Arguments: [d_date_sk#65], [d_date_sk#65]
 
-(129) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#63]
+(121) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#65]
 
-(130) BroadcastExchange
-Input [1]: [d_date_sk#63]
+(122) BroadcastExchange
+Input [1]: [d_date_sk#65]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
-Subquery:12 Hosting operator id = 127 Hosting Expression = Subquery scalar-subquery#108, [id=#109]
-* ColumnarToRow (134)
-+- CometProject (133)
-   +- CometFilter (132)
-      +- CometScan parquet spark_catalog.default.date_dim (131)
+Subquery:12 Hosting operator id = 119 Hosting Expression = Subquery scalar-subquery#113, [id=#114]
+* ColumnarToRow (126)
++- CometProject (125)
+   +- CometFilter (124)
+      +- CometScan parquet spark_catalog.default.date_dim (123)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
+Output [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), IsNotNull(d_dom), EqualTo(d_year,1998), EqualTo(d_moy,12), EqualTo(d_dom,16)]
 ReadSchema: struct<d_week_seq:int,d_year:int,d_moy:int,d_dom:int>
 
-(132) CometFilter
-Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
-Condition : (((((isnotnull(d_year#111) AND isnotnull(d_moy#112)) AND isnotnull(d_dom#113)) AND (d_year#111 = 1998)) AND (d_moy#112 = 12)) AND (d_dom#113 = 16))
+(124) CometFilter
+Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
+Condition : (((((isnotnull(d_year#116) AND isnotnull(d_moy#117)) AND isnotnull(d_dom#118)) AND (d_year#116 = 1998)) AND (d_moy#117 = 12)) AND (d_dom#118 = 16))
 
-(133) CometProject
-Input [4]: [d_week_seq#110, d_year#111, d_moy#112, d_dom#113]
-Arguments: [d_week_seq#110], [d_week_seq#110]
+(125) CometProject
+Input [4]: [d_week_seq#115, d_year#116, d_moy#117, d_dom#118]
+Arguments: [d_week_seq#115], [d_week_seq#115]
 
-(134) ColumnarToRow [codegen id : 1]
-Input [1]: [d_week_seq#110]
+(126) ColumnarToRow [codegen id : 1]
+Input [1]: [d_week_seq#115]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt
index 13ac319fbd..09d8d9dde3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14/simplified.txt
@@ -1,210 +1,202 @@
 TakeOrderedAndProject [i_brand_id,i_class_id,i_category_id,channel,sales,number_sales,channel,i_brand_id,i_class_id,i_category_id,sales,number_sales]
   WholeStageCodegen (52)
     BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-      ColumnarToRow
-        InputAdapter
-          CometFilter [sales]
-            Subquery #4
-              WholeStageCodegen (8)
-                ColumnarToRow
-                  InputAdapter
-                    CometHashAggregate [sum,count]
-                      CometColumnarExchange #12
-                        RowToColumnar
-                          WholeStageCodegen (7)
-                            HashAggregate [quantity,list_price] [sum,count,sum,count]
-                              InputAdapter
-                                Union
-                                  WholeStageCodegen (2)
-                                    Project [ss_quantity,ss_list_price]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #6
-                                  WholeStageCodegen (4)
-                                    Project [cs_quantity,cs_list_price]
-                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #6
-                                  WholeStageCodegen (6)
-                                    Project [ws_quantity,ws_list_price]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                              ReusedSubquery [d_date_sk] #3
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #6
-            CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-              CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #1
-                RowToColumnar
-                  WholeStageCodegen (25)
-                    HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                      Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                          Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                              BroadcastHashJoin [ss_item_sk,ss_item_sk]
+      Filter [sales]
+        Subquery #4
+          WholeStageCodegen (8)
+            HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
+              InputAdapter
+                Exchange #12
+                  WholeStageCodegen (7)
+                    HashAggregate [quantity,list_price] [sum,count,sum,count]
+                      InputAdapter
+                        Union
+                          WholeStageCodegen (2)
+                            Project [ss_quantity,ss_list_price]
+                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                 ColumnarToRow
                                   InputAdapter
-                                    CometFilter [ss_item_sk]
-                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_week_seq,d_date_sk]
-                                                      Subquery #2
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_week_seq]
-                                                                CometFilter [d_year,d_moy,d_dom]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                    CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #3
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #6
+                          WholeStageCodegen (4)
+                            Project [cs_quantity,cs_list_price]
+                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #3
+                                InputAdapter
+                                  ReusedExchange [d_date_sk] #6
+                          WholeStageCodegen (6)
+                            Project [ws_quantity,ws_list_price]
+                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                      ReusedSubquery [d_date_sk] #3
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (11)
-                                      Project [i_item_sk]
-                                        BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                  ReusedExchange [d_date_sk] #6
+        HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+          InputAdapter
+            Exchange [i_brand_id,i_class_id,i_category_id] #1
+              WholeStageCodegen (25)
+                HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                  Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                      Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                        BroadcastHashJoin [ss_item_sk,i_item_sk]
+                          BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [ss_item_sk]
+                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [i_brand_id,i_class_id,i_category_id]
-                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                          InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (10)
-                                                BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometHashAggregate [brand_id,class_id,category_id]
-                                                        CometColumnarExchange [brand_id,class_id,category_id] #5
-                                                          RowToColumnar
-                                                            WholeStageCodegen (6)
-                                                              HashAggregate [brand_id,class_id,category_id]
-                                                                Project [i_brand_id,i_class_id,i_category_id]
-                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                    Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_week_seq,d_date_sk]
+                                                  Subquery #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_week_seq]
+                                                            CometFilter [d_year,d_moy,d_dom]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                            InputAdapter
+                              BroadcastExchange #3
+                                WholeStageCodegen (11)
+                                  Project [i_item_sk]
+                                    BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [i_brand_id,i_class_id,i_category_id]
+                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                      InputAdapter
+                                        BroadcastExchange #4
+                                          WholeStageCodegen (10)
+                                            BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
+                                              HashAggregate [brand_id,class_id,category_id]
+                                                InputAdapter
+                                                  Exchange [brand_id,class_id,category_id] #5
+                                                    WholeStageCodegen (6)
+                                                      HashAggregate [brand_id,class_id,category_id]
+                                                        Project [i_brand_id,i_class_id,i_category_id]
+                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                            Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [ss_item_sk]
+                                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                        SubqueryBroadcast [d_date_sk] #3
+                                                                          BroadcastExchange #6
+                                                                            WholeStageCodegen (1)
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometProject [d_date_sk]
+                                                                                    CometFilter [d_year,d_date_sk]
+                                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                InputAdapter
+                                                                  BroadcastExchange #7
+                                                                    WholeStageCodegen (4)
+                                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
                                                                         ColumnarToRow
                                                                           InputAdapter
-                                                                            CometFilter [ss_item_sk]
-                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                                SubqueryBroadcast [d_date_sk] #3
-                                                                                  BroadcastExchange #6
-                                                                                    WholeStageCodegen (1)
+                                                                            CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                        InputAdapter
+                                                                          BroadcastExchange #8
+                                                                            WholeStageCodegen (3)
+                                                                              Project [i_brand_id,i_class_id,i_category_id]
+                                                                                BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                                  Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
                                                                                       ColumnarToRow
                                                                                         InputAdapter
-                                                                                          CometProject [d_date_sk]
-                                                                                            CometFilter [d_year,d_date_sk]
-                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                        InputAdapter
-                                                                          BroadcastExchange #7
-                                                                            WholeStageCodegen (4)
-                                                                              BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
-                                                                                ColumnarToRow
-                                                                                  InputAdapter
-                                                                                    CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                InputAdapter
-                                                                                  BroadcastExchange #8
-                                                                                    WholeStageCodegen (3)
-                                                                                      Project [i_brand_id,i_class_id,i_category_id]
-                                                                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                                          Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                            BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                                                              ColumnarToRow
-                                                                                                InputAdapter
-                                                                                                  CometFilter [cs_item_sk]
-                                                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
-                                                                                                      ReusedSubquery [d_date_sk] #3
+                                                                                          CometFilter [cs_item_sk]
+                                                                                            CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                                                                              ReusedSubquery [d_date_sk] #3
+                                                                                      InputAdapter
+                                                                                        BroadcastExchange #9
+                                                                                          WholeStageCodegen (1)
+                                                                                            ColumnarToRow
                                                                                               InputAdapter
-                                                                                                BroadcastExchange #9
-                                                                                                  WholeStageCodegen (1)
-                                                                                                    ColumnarToRow
-                                                                                                      InputAdapter
-                                                                                                        CometFilter [i_item_sk]
-                                                                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                          InputAdapter
-                                                                                            ReusedExchange [d_date_sk] #6
-                                                                    InputAdapter
-                                                                      ReusedExchange [d_date_sk] #6
-                                                  InputAdapter
-                                                    BroadcastExchange #10
-                                                      WholeStageCodegen (9)
-                                                        Project [i_brand_id,i_class_id,i_category_id]
-                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                            Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                              BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometFilter [ws_item_sk]
-                                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                        ReusedSubquery [d_date_sk] #3
-                                                                InputAdapter
-                                                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
+                                                                                                CometFilter [i_item_sk]
+                                                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                  InputAdapter
+                                                                                    ReusedExchange [d_date_sk] #6
                                                             InputAdapter
                                                               ReusedExchange [d_date_sk] #6
-                              InputAdapter
-                                BroadcastExchange #11
-                                  WholeStageCodegen (23)
-                                    BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                      InputAdapter
-                                        ReusedExchange [ss_item_sk] #3
+                                              InputAdapter
+                                                BroadcastExchange #10
+                                                  WholeStageCodegen (9)
+                                                    Project [i_brand_id,i_class_id,i_category_id]
+                                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                        Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [ws_item_sk]
+                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                    ReusedSubquery [d_date_sk] #3
+                                                            InputAdapter
+                                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #9
+                                                        InputAdapter
+                                                          ReusedExchange [d_date_sk] #6
                           InputAdapter
-                            ReusedExchange [d_date_sk] #2
+                            BroadcastExchange #11
+                              WholeStageCodegen (23)
+                                BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                  InputAdapter
+                                    ReusedExchange [ss_item_sk] #3
+                      InputAdapter
+                        ReusedExchange [d_date_sk] #2
       InputAdapter
         BroadcastExchange #13
           WholeStageCodegen (51)
-            ColumnarToRow
-              InputAdapter
-                CometFilter [sales]
-                  ReusedSubquery [average_sales] #4
-                  CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                    CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #14
-                      RowToColumnar
-                        WholeStageCodegen (50)
-                          HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                            Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                  BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                    BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #5
-                                                BroadcastExchange #15
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_week_seq,d_date_sk]
-                                                            Subquery #6
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [d_week_seq]
-                                                                      CometFilter [d_year,d_moy,d_dom]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
-                                      InputAdapter
-                                        ReusedExchange [ss_item_sk] #3
+            Filter [sales]
+              ReusedSubquery [average_sales] #4
+              HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+                InputAdapter
+                  Exchange [i_brand_id,i_class_id,i_category_id] #14
+                    WholeStageCodegen (50)
+                      HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                        Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                              BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                  ColumnarToRow
                                     InputAdapter
-                                      ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
+                                      CometFilter [ss_item_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #5
+                                            BroadcastExchange #15
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_week_seq,d_date_sk]
+                                                        Subquery #6
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometProject [d_week_seq]
+                                                                  CometFilter [d_year,d_moy,d_dom]
+                                                                    CometScan parquet spark_catalog.default.date_dim [d_week_seq,d_year,d_moy,d_dom]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                  InputAdapter
+                                    ReusedExchange [ss_item_sk] #3
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #15
+                                  ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #15
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt
index 0085b3b4c6..a8db177f87 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/explain.txt
@@ -1,135 +1,129 @@
 == Physical Plan ==
-* ColumnarToRow (131)
-+- CometTakeOrderedAndProject (130)
-   +- CometHashAggregate (129)
-      +- CometColumnarExchange (128)
-         +- CometHashAggregate (127)
-            +- CometUnion (126)
-               :- CometHashAggregate (105)
-               :  +- CometColumnarExchange (104)
-               :     +- CometHashAggregate (103)
-               :        +- CometUnion (102)
-               :           :- CometFilter (69)
-               :           :  +- CometHashAggregate (68)
-               :           :     +- CometColumnarExchange (67)
-               :           :        +- RowToColumnar (66)
-               :           :           +- * HashAggregate (65)
-               :           :              +- * Project (64)
-               :           :                 +- * BroadcastHashJoin Inner BuildRight (63)
-               :           :                    :- * Project (61)
-               :           :                    :  +- * BroadcastHashJoin Inner BuildRight (60)
-               :           :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (53)
-               :           :                    :     :  :- * ColumnarToRow (3)
-               :           :                    :     :  :  +- CometFilter (2)
-               :           :                    :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :           :                    :     :  +- BroadcastExchange (52)
-               :           :                    :     :     +- * Project (51)
-               :           :                    :     :        +- * BroadcastHashJoin Inner BuildRight (50)
-               :           :                    :     :           :- * ColumnarToRow (6)
-               :           :                    :     :           :  +- CometFilter (5)
-               :           :                    :     :           :     +- CometScan parquet spark_catalog.default.item (4)
-               :           :                    :     :           +- BroadcastExchange (49)
-               :           :                    :     :              +- * BroadcastHashJoin LeftSemi BuildRight (48)
-               :           :                    :     :                 :- * ColumnarToRow (37)
-               :           :                    :     :                 :  +- CometHashAggregate (36)
-               :           :                    :     :                 :     +- CometColumnarExchange (35)
-               :           :                    :     :                 :        +- RowToColumnar (34)
-               :           :                    :     :                 :           +- * HashAggregate (33)
-               :           :                    :     :                 :              +- * Project (32)
-               :           :                    :     :                 :                 +- * BroadcastHashJoin Inner BuildRight (31)
-               :           :                    :     :                 :                    :- * Project (29)
-               :           :                    :     :                 :                    :  +- * BroadcastHashJoin Inner BuildRight (28)
-               :           :                    :     :                 :                    :     :- * ColumnarToRow (9)
-               :           :                    :     :                 :                    :     :  +- CometFilter (8)
-               :           :                    :     :                 :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
-               :           :                    :     :                 :                    :     +- BroadcastExchange (27)
-               :           :                    :     :                 :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
-               :           :                    :     :                 :                    :           :- * ColumnarToRow (12)
-               :           :                    :     :                 :                    :           :  +- CometFilter (11)
-               :           :                    :     :                 :                    :           :     +- CometScan parquet spark_catalog.default.item (10)
-               :           :                    :     :                 :                    :           +- BroadcastExchange (25)
-               :           :                    :     :                 :                    :              +- * Project (24)
-               :           :                    :     :                 :                    :                 +- * BroadcastHashJoin Inner BuildRight (23)
-               :           :                    :     :                 :                    :                    :- * Project (21)
-               :           :                    :     :                 :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :           :                    :     :                 :                    :                    :     :- * ColumnarToRow (15)
-               :           :                    :     :                 :                    :                    :     :  +- CometFilter (14)
-               :           :                    :     :                 :                    :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
-               :           :                    :     :                 :                    :                    :     +- BroadcastExchange (19)
-               :           :                    :     :                 :                    :                    :        +- * ColumnarToRow (18)
-               :           :                    :     :                 :                    :                    :           +- CometFilter (17)
-               :           :                    :     :                 :                    :                    :              +- CometScan parquet spark_catalog.default.item (16)
-               :           :                    :     :                 :                    :                    +- ReusedExchange (22)
-               :           :                    :     :                 :                    +- ReusedExchange (30)
-               :           :                    :     :                 +- BroadcastExchange (47)
-               :           :                    :     :                    +- * Project (46)
-               :           :                    :     :                       +- * BroadcastHashJoin Inner BuildRight (45)
-               :           :                    :     :                          :- * Project (43)
-               :           :                    :     :                          :  +- * BroadcastHashJoin Inner BuildRight (42)
-               :           :                    :     :                          :     :- * ColumnarToRow (40)
-               :           :                    :     :                          :     :  +- CometFilter (39)
-               :           :                    :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (38)
-               :           :                    :     :                          :     +- ReusedExchange (41)
-               :           :                    :     :                          +- ReusedExchange (44)
-               :           :                    :     +- BroadcastExchange (59)
-               :           :                    :        +- * BroadcastHashJoin LeftSemi BuildRight (58)
-               :           :                    :           :- * ColumnarToRow (56)
-               :           :                    :           :  +- CometFilter (55)
-               :           :                    :           :     +- CometScan parquet spark_catalog.default.item (54)
-               :           :                    :           +- ReusedExchange (57)
-               :           :                    +- ReusedExchange (62)
-               :           :- CometFilter (85)
-               :           :  +- CometHashAggregate (84)
-               :           :     +- CometColumnarExchange (83)
-               :           :        +- RowToColumnar (82)
-               :           :           +- * HashAggregate (81)
-               :           :              +- * Project (80)
-               :           :                 +- * BroadcastHashJoin Inner BuildRight (79)
-               :           :                    :- * Project (77)
-               :           :                    :  +- * BroadcastHashJoin Inner BuildRight (76)
-               :           :                    :     :- * BroadcastHashJoin LeftSemi BuildRight (74)
-               :           :                    :     :  :- * ColumnarToRow (72)
-               :           :                    :     :  :  +- CometFilter (71)
-               :           :                    :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (70)
-               :           :                    :     :  +- ReusedExchange (73)
-               :           :                    :     +- ReusedExchange (75)
-               :           :                    +- ReusedExchange (78)
-               :           +- CometFilter (101)
-               :              +- CometHashAggregate (100)
-               :                 +- CometColumnarExchange (99)
-               :                    +- RowToColumnar (98)
-               :                       +- * HashAggregate (97)
-               :                          +- * Project (96)
-               :                             +- * BroadcastHashJoin Inner BuildRight (95)
-               :                                :- * Project (93)
-               :                                :  +- * BroadcastHashJoin Inner BuildRight (92)
-               :                                :     :- * BroadcastHashJoin LeftSemi BuildRight (90)
-               :                                :     :  :- * ColumnarToRow (88)
-               :                                :     :  :  +- CometFilter (87)
-               :                                :     :  :     +- CometScan parquet spark_catalog.default.web_sales (86)
-               :                                :     :  +- ReusedExchange (89)
-               :                                :     +- ReusedExchange (91)
-               :                                +- ReusedExchange (94)
-               :- CometHashAggregate (110)
-               :  +- CometColumnarExchange (109)
-               :     +- CometHashAggregate (108)
-               :        +- CometHashAggregate (107)
-               :           +- ReusedExchange (106)
-               :- CometHashAggregate (115)
-               :  +- CometColumnarExchange (114)
-               :     +- CometHashAggregate (113)
-               :        +- CometHashAggregate (112)
-               :           +- ReusedExchange (111)
-               :- CometHashAggregate (120)
-               :  +- CometColumnarExchange (119)
-               :     +- CometHashAggregate (118)
-               :        +- CometHashAggregate (117)
-               :           +- ReusedExchange (116)
-               +- CometHashAggregate (125)
-                  +- CometColumnarExchange (124)
-                     +- CometHashAggregate (123)
-                        +- CometHashAggregate (122)
-                           +- ReusedExchange (121)
+TakeOrderedAndProject (125)
++- * HashAggregate (124)
+   +- Exchange (123)
+      +- * HashAggregate (122)
+         +- Union (121)
+            :- * HashAggregate (100)
+            :  +- Exchange (99)
+            :     +- * HashAggregate (98)
+            :        +- Union (97)
+            :           :- * Filter (66)
+            :           :  +- * HashAggregate (65)
+            :           :     +- Exchange (64)
+            :           :        +- * HashAggregate (63)
+            :           :           +- * Project (62)
+            :           :              +- * BroadcastHashJoin Inner BuildRight (61)
+            :           :                 :- * Project (59)
+            :           :                 :  +- * BroadcastHashJoin Inner BuildRight (58)
+            :           :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (51)
+            :           :                 :     :  :- * ColumnarToRow (3)
+            :           :                 :     :  :  +- CometFilter (2)
+            :           :                 :     :  :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :           :                 :     :  +- BroadcastExchange (50)
+            :           :                 :     :     +- * Project (49)
+            :           :                 :     :        +- * BroadcastHashJoin Inner BuildRight (48)
+            :           :                 :     :           :- * ColumnarToRow (6)
+            :           :                 :     :           :  +- CometFilter (5)
+            :           :                 :     :           :     +- CometScan parquet spark_catalog.default.item (4)
+            :           :                 :     :           +- BroadcastExchange (47)
+            :           :                 :     :              +- * BroadcastHashJoin LeftSemi BuildRight (46)
+            :           :                 :     :                 :- * HashAggregate (35)
+            :           :                 :     :                 :  +- Exchange (34)
+            :           :                 :     :                 :     +- * HashAggregate (33)
+            :           :                 :     :                 :        +- * Project (32)
+            :           :                 :     :                 :           +- * BroadcastHashJoin Inner BuildRight (31)
+            :           :                 :     :                 :              :- * Project (29)
+            :           :                 :     :                 :              :  +- * BroadcastHashJoin Inner BuildRight (28)
+            :           :                 :     :                 :              :     :- * ColumnarToRow (9)
+            :           :                 :     :                 :              :     :  +- CometFilter (8)
+            :           :                 :     :                 :              :     :     +- CometScan parquet spark_catalog.default.store_sales (7)
+            :           :                 :     :                 :              :     +- BroadcastExchange (27)
+            :           :                 :     :                 :              :        +- * BroadcastHashJoin LeftSemi BuildRight (26)
+            :           :                 :     :                 :              :           :- * ColumnarToRow (12)
+            :           :                 :     :                 :              :           :  +- CometFilter (11)
+            :           :                 :     :                 :              :           :     +- CometScan parquet spark_catalog.default.item (10)
+            :           :                 :     :                 :              :           +- BroadcastExchange (25)
+            :           :                 :     :                 :              :              +- * Project (24)
+            :           :                 :     :                 :              :                 +- * BroadcastHashJoin Inner BuildRight (23)
+            :           :                 :     :                 :              :                    :- * Project (21)
+            :           :                 :     :                 :              :                    :  +- * BroadcastHashJoin Inner BuildRight (20)
+            :           :                 :     :                 :              :                    :     :- * ColumnarToRow (15)
+            :           :                 :     :                 :              :                    :     :  +- CometFilter (14)
+            :           :                 :     :                 :              :                    :     :     +- CometScan parquet spark_catalog.default.catalog_sales (13)
+            :           :                 :     :                 :              :                    :     +- BroadcastExchange (19)
+            :           :                 :     :                 :              :                    :        +- * ColumnarToRow (18)
+            :           :                 :     :                 :              :                    :           +- CometFilter (17)
+            :           :                 :     :                 :              :                    :              +- CometScan parquet spark_catalog.default.item (16)
+            :           :                 :     :                 :              :                    +- ReusedExchange (22)
+            :           :                 :     :                 :              +- ReusedExchange (30)
+            :           :                 :     :                 +- BroadcastExchange (45)
+            :           :                 :     :                    +- * Project (44)
+            :           :                 :     :                       +- * BroadcastHashJoin Inner BuildRight (43)
+            :           :                 :     :                          :- * Project (41)
+            :           :                 :     :                          :  +- * BroadcastHashJoin Inner BuildRight (40)
+            :           :                 :     :                          :     :- * ColumnarToRow (38)
+            :           :                 :     :                          :     :  +- CometFilter (37)
+            :           :                 :     :                          :     :     +- CometScan parquet spark_catalog.default.web_sales (36)
+            :           :                 :     :                          :     +- ReusedExchange (39)
+            :           :                 :     :                          +- ReusedExchange (42)
+            :           :                 :     +- BroadcastExchange (57)
+            :           :                 :        +- * BroadcastHashJoin LeftSemi BuildRight (56)
+            :           :                 :           :- * ColumnarToRow (54)
+            :           :                 :           :  +- CometFilter (53)
+            :           :                 :           :     +- CometScan parquet spark_catalog.default.item (52)
+            :           :                 :           +- ReusedExchange (55)
+            :           :                 +- ReusedExchange (60)
+            :           :- * Filter (81)
+            :           :  +- * HashAggregate (80)
+            :           :     +- Exchange (79)
+            :           :        +- * HashAggregate (78)
+            :           :           +- * Project (77)
+            :           :              +- * BroadcastHashJoin Inner BuildRight (76)
+            :           :                 :- * Project (74)
+            :           :                 :  +- * BroadcastHashJoin Inner BuildRight (73)
+            :           :                 :     :- * BroadcastHashJoin LeftSemi BuildRight (71)
+            :           :                 :     :  :- * ColumnarToRow (69)
+            :           :                 :     :  :  +- CometFilter (68)
+            :           :                 :     :  :     +- CometScan parquet spark_catalog.default.catalog_sales (67)
+            :           :                 :     :  +- ReusedExchange (70)
+            :           :                 :     +- ReusedExchange (72)
+            :           :                 +- ReusedExchange (75)
+            :           +- * Filter (96)
+            :              +- * HashAggregate (95)
+            :                 +- Exchange (94)
+            :                    +- * HashAggregate (93)
+            :                       +- * Project (92)
+            :                          +- * BroadcastHashJoin Inner BuildRight (91)
+            :                             :- * Project (89)
+            :                             :  +- * BroadcastHashJoin Inner BuildRight (88)
+            :                             :     :- * BroadcastHashJoin LeftSemi BuildRight (86)
+            :                             :     :  :- * ColumnarToRow (84)
+            :                             :     :  :  +- CometFilter (83)
+            :                             :     :  :     +- CometScan parquet spark_catalog.default.web_sales (82)
+            :                             :     :  +- ReusedExchange (85)
+            :                             :     +- ReusedExchange (87)
+            :                             +- ReusedExchange (90)
+            :- * HashAggregate (105)
+            :  +- Exchange (104)
+            :     +- * HashAggregate (103)
+            :        +- * HashAggregate (102)
+            :           +- ReusedExchange (101)
+            :- * HashAggregate (110)
+            :  +- Exchange (109)
+            :     +- * HashAggregate (108)
+            :        +- * HashAggregate (107)
+            :           +- ReusedExchange (106)
+            :- * HashAggregate (115)
+            :  +- Exchange (114)
+            :     +- * HashAggregate (113)
+            :        +- * HashAggregate (112)
+            :           +- ReusedExchange (111)
+            +- * HashAggregate (120)
+               +- Exchange (119)
+                  +- * HashAggregate (118)
+                     +- * HashAggregate (117)
+                        +- ReusedExchange (116)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -233,7 +227,7 @@ Join condition: None
 Output [4]: [cs_sold_date_sk#18, i_brand_id#21, i_class_id#22, i_category_id#23]
 Input [6]: [cs_item_sk#17, cs_sold_date_sk#18, i_item_sk#20, i_brand_id#21, i_class_id#22, i_category_id#23]
 
-(22) ReusedExchange [Reuses operator id: 167]
+(22) ReusedExchange [Reuses operator id: 159]
 Output [1]: [d_date_sk#24]
 
 (23) BroadcastHashJoin [codegen id : 3]
@@ -270,7 +264,7 @@ Join condition: None
 Output [4]: [ss_sold_date_sk#11, i_brand_id#14, i_class_id#15, i_category_id#16]
 Input [6]: [ss_item_sk#10, ss_sold_date_sk#11, i_item_sk#13, i_brand_id#14, i_class_id#15, i_category_id#16]
 
-(30) ReusedExchange [Reuses operator id: 167]
+(30) ReusedExchange [Reuses operator id: 159]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 6]
@@ -290,20 +284,16 @@ Functions: []
 Aggregate Attributes: []
 Results [3]: [brand_id#26, class_id#27, category_id#28]
 
-(34) RowToColumnar
+(34) Exchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
+Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) CometColumnarExchange
-Input [3]: [brand_id#26, class_id#27, category_id#28]
-Arguments: hashpartitioning(brand_id#26, class_id#27, category_id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(36) CometHashAggregate
+(35) HashAggregate [codegen id : 10]
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Keys [3]: [brand_id#26, class_id#27, category_id#28]
 Functions: []
-
-(37) ColumnarToRow [codegen id : 10]
-Input [3]: [brand_id#26, class_id#27, category_id#28]
+Aggregate Attributes: []
+Results [3]: [brand_id#26, class_id#27, category_id#28]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [2]: [ws_item_sk#29, ws_sold_date_sk#30]
@@ -313,68 +303,68 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int>
 
-(39) CometFilter
+(37) CometFilter
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 Condition : isnotnull(ws_item_sk#29)
 
-(40) ColumnarToRow [codegen id : 9]
+(38) ColumnarToRow [codegen id : 9]
 Input [2]: [ws_item_sk#29, ws_sold_date_sk#30]
 
-(41) ReusedExchange [Reuses operator id: 19]
+(39) ReusedExchange [Reuses operator id: 19]
 Output [4]: [i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(42) BroadcastHashJoin [codegen id : 9]
+(40) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_item_sk#29]
 Right keys [1]: [i_item_sk#32]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 9]
+(41) Project [codegen id : 9]
 Output [4]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [6]: [ws_item_sk#29, ws_sold_date_sk#30, i_item_sk#32, i_brand_id#33, i_class_id#34, i_category_id#35]
 
-(44) ReusedExchange [Reuses operator id: 167]
+(42) ReusedExchange [Reuses operator id: 159]
 Output [1]: [d_date_sk#36]
 
-(45) BroadcastHashJoin [codegen id : 9]
+(43) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ws_sold_date_sk#30]
 Right keys [1]: [d_date_sk#36]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 9]
+(44) Project [codegen id : 9]
 Output [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Input [5]: [ws_sold_date_sk#30, i_brand_id#33, i_class_id#34, i_category_id#35, d_date_sk#36]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [3]: [i_brand_id#33, i_class_id#34, i_category_id#35]
 Arguments: HashedRelationBroadcastMode(List(coalesce(input[0, int, true], 0), isnull(input[0, int, true]), coalesce(input[1, int, true], 0), isnull(input[1, int, true]), coalesce(input[2, int, true], 0), isnull(input[2, int, true])),false), [plan_id=5]
 
-(48) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 10]
 Left keys [6]: [coalesce(brand_id#26, 0), isnull(brand_id#26), coalesce(class_id#27, 0), isnull(class_id#27), coalesce(category_id#28, 0), isnull(category_id#28)]
 Right keys [6]: [coalesce(i_brand_id#33, 0), isnull(i_brand_id#33), coalesce(i_class_id#34, 0), isnull(i_class_id#34), coalesce(i_category_id#35, 0), isnull(i_category_id#35)]
 Join type: LeftSemi
 Join condition: None
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [3]: [brand_id#26, class_id#27, category_id#28]
 Arguments: HashedRelationBroadcastMode(List(input[0, int, true], input[1, int, true], input[2, int, true]),false), [plan_id=6]
 
-(50) BroadcastHashJoin [codegen id : 11]
+(48) BroadcastHashJoin [codegen id : 11]
 Left keys [3]: [i_brand_id#7, i_class_id#8, i_category_id#9]
 Right keys [3]: [brand_id#26, class_id#27, category_id#28]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 11]
+(49) Project [codegen id : 11]
 Output [1]: [i_item_sk#6 AS ss_item_sk#37]
 Input [7]: [i_item_sk#6, i_brand_id#7, i_class_id#8, i_category_id#9, brand_id#26, class_id#27, category_id#28]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [ss_item_sk#37]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-(53) BroadcastHashJoin [codegen id : 25]
+(51) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
@@ -387,576 +377,588 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_brand_id:int,i_class_id:int,i_category_id:int>
 
-(55) CometFilter
+(53) CometFilter
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Condition : isnotnull(i_item_sk#38)
 
-(56) ColumnarToRow [codegen id : 23]
+(54) ColumnarToRow [codegen id : 23]
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(57) ReusedExchange [Reuses operator id: 52]
+(55) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(58) BroadcastHashJoin [codegen id : 23]
+(56) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [i_item_sk#38]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(59) BroadcastExchange
+(57) BroadcastExchange
 Input [4]: [i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(60) BroadcastHashJoin [codegen id : 25]
+(58) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#38]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 25]
+(59) Project [codegen id : 25]
 Output [6]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [8]: [ss_item_sk#1, ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_item_sk#38, i_brand_id#39, i_class_id#40, i_category_id#41]
 
-(62) ReusedExchange [Reuses operator id: 162]
+(60) ReusedExchange [Reuses operator id: 154]
 Output [1]: [d_date_sk#42]
 
-(63) BroadcastHashJoin [codegen id : 25]
+(61) BroadcastHashJoin [codegen id : 25]
 Left keys [1]: [ss_sold_date_sk#4]
 Right keys [1]: [d_date_sk#42]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 25]
+(62) Project [codegen id : 25]
 Output [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Input [7]: [ss_quantity#2, ss_list_price#3, ss_sold_date_sk#4, i_brand_id#39, i_class_id#40, i_category_id#41, d_date_sk#42]
 
-(65) HashAggregate [codegen id : 25]
+(63) HashAggregate [codegen id : 25]
 Input [5]: [ss_quantity#2, ss_list_price#3, i_brand_id#39, i_class_id#40, i_category_id#41]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [partial_sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), partial_count(1)]
 Aggregate Attributes [3]: [sum#43, isEmpty#44, count#45]
 Results [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 
-(66) RowToColumnar
-Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-
-(67) CometColumnarExchange
+(64) Exchange
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
-Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+Arguments: hashpartitioning(i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(68) CometHashAggregate
+(65) HashAggregate [codegen id : 26]
 Input [6]: [i_brand_id#39, i_class_id#40, i_category_id#41, sum#46, isEmpty#47, count#48]
 Keys [3]: [i_brand_id#39, i_class_id#40, i_category_id#41]
 Functions [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49, count(1)#50]
+Results [6]: [store AS channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum((cast(ss_quantity#2 as decimal(10,0)) * ss_list_price#3))#49 AS sales#52, count(1)#50 AS number_sales#53]
 
-(69) CometFilter
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
-Condition : (isnotnull(sales#50) AND (cast(sales#50 as decimal(32,6)) > cast(Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+(66) Filter [codegen id : 26]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
+Condition : (isnotnull(sales#52) AND (cast(sales#52 as decimal(32,6)) > cast(Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57]
+Output [4]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#57), dynamicpruningexpression(cs_sold_date_sk#57 IN dynamicpruning#58)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#59), dynamicpruningexpression(cs_sold_date_sk#59 IN dynamicpruning#60)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(71) CometFilter
-Input [4]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57]
-Condition : isnotnull(cs_item_sk#54)
+(68) CometFilter
+Input [4]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59]
+Condition : isnotnull(cs_item_sk#56)
 
-(72) ColumnarToRow [codegen id : 50]
-Input [4]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57]
+(69) ColumnarToRow [codegen id : 51]
+Input [4]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59]
 
-(73) ReusedExchange [Reuses operator id: 52]
+(70) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(74) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [cs_item_sk#54]
+(71) BroadcastHashJoin [codegen id : 51]
+Left keys [1]: [cs_item_sk#56]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(75) ReusedExchange [Reuses operator id: 59]
-Output [4]: [i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
+(72) ReusedExchange [Reuses operator id: 57]
+Output [4]: [i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
 
-(76) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [cs_item_sk#54]
-Right keys [1]: [i_item_sk#59]
+(73) BroadcastHashJoin [codegen id : 51]
+Left keys [1]: [cs_item_sk#56]
+Right keys [1]: [i_item_sk#61]
 Join type: Inner
 Join condition: None
 
-(77) Project [codegen id : 50]
-Output [6]: [cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62]
-Input [8]: [cs_item_sk#54, cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57, i_item_sk#59, i_brand_id#60, i_class_id#61, i_category_id#62]
+(74) Project [codegen id : 51]
+Output [6]: [cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64]
+Input [8]: [cs_item_sk#56, cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59, i_item_sk#61, i_brand_id#62, i_class_id#63, i_category_id#64]
 
-(78) ReusedExchange [Reuses operator id: 162]
-Output [1]: [d_date_sk#63]
+(75) ReusedExchange [Reuses operator id: 154]
+Output [1]: [d_date_sk#65]
 
-(79) BroadcastHashJoin [codegen id : 50]
-Left keys [1]: [cs_sold_date_sk#57]
-Right keys [1]: [d_date_sk#63]
+(76) BroadcastHashJoin [codegen id : 51]
+Left keys [1]: [cs_sold_date_sk#59]
+Right keys [1]: [d_date_sk#65]
 Join type: Inner
 Join condition: None
 
-(80) Project [codegen id : 50]
-Output [5]: [cs_quantity#55, cs_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
-Input [7]: [cs_quantity#55, cs_list_price#56, cs_sold_date_sk#57, i_brand_id#60, i_class_id#61, i_category_id#62, d_date_sk#63]
-
-(81) HashAggregate [codegen id : 50]
-Input [5]: [cs_quantity#55, cs_list_price#56, i_brand_id#60, i_class_id#61, i_category_id#62]
-Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
-Functions [2]: [partial_sum((cast(cs_quantity#55 as decimal(10,0)) * cs_list_price#56)), partial_count(1)]
-Aggregate Attributes [3]: [sum#64, isEmpty#65, count#66]
-Results [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+(77) Project [codegen id : 51]
+Output [5]: [cs_quantity#57, cs_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
+Input [7]: [cs_quantity#57, cs_list_price#58, cs_sold_date_sk#59, i_brand_id#62, i_class_id#63, i_category_id#64, d_date_sk#65]
 
-(82) RowToColumnar
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
+(78) HashAggregate [codegen id : 51]
+Input [5]: [cs_quantity#57, cs_list_price#58, i_brand_id#62, i_class_id#63, i_category_id#64]
+Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Functions [2]: [partial_sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58)), partial_count(1)]
+Aggregate Attributes [3]: [sum#66, isEmpty#67, count#68]
+Results [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
 
-(83) CometColumnarExchange
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-Arguments: hashpartitioning(i_brand_id#60, i_class_id#61, i_category_id#62, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(79) Exchange
+Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+Arguments: hashpartitioning(i_brand_id#62, i_class_id#63, i_category_id#64, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(84) CometHashAggregate
-Input [6]: [i_brand_id#60, i_class_id#61, i_category_id#62, sum#67, isEmpty#68, count#69]
-Keys [3]: [i_brand_id#60, i_class_id#61, i_category_id#62]
-Functions [2]: [sum((cast(cs_quantity#55 as decimal(10,0)) * cs_list_price#56)), count(1)]
+(80) HashAggregate [codegen id : 52]
+Input [6]: [i_brand_id#62, i_class_id#63, i_category_id#64, sum#69, isEmpty#70, count#71]
+Keys [3]: [i_brand_id#62, i_class_id#63, i_category_id#64]
+Functions [2]: [sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58)), count(1)]
+Aggregate Attributes [2]: [sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58))#72, count(1)#73]
+Results [6]: [catalog AS channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sum((cast(cs_quantity#57 as decimal(10,0)) * cs_list_price#58))#72 AS sales#75, count(1)#73 AS number_sales#76]
 
-(85) CometFilter
-Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-Condition : (isnotnull(sales#71) AND (cast(sales#71 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
+(81) Filter [codegen id : 52]
+Input [6]: [channel#74, i_brand_id#62, i_class_id#63, i_category_id#64, sales#75, number_sales#76]
+Condition : (isnotnull(sales#75) AND (cast(sales#75 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76]
+Output [4]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#76), dynamicpruningexpression(ws_sold_date_sk#76 IN dynamicpruning#77)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#80), dynamicpruningexpression(ws_sold_date_sk#80 IN dynamicpruning#81)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(87) CometFilter
-Input [4]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76]
-Condition : isnotnull(ws_item_sk#73)
+(83) CometFilter
+Input [4]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80]
+Condition : isnotnull(ws_item_sk#77)
 
-(88) ColumnarToRow [codegen id : 75]
-Input [4]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76]
+(84) ColumnarToRow [codegen id : 77]
+Input [4]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80]
 
-(89) ReusedExchange [Reuses operator id: 52]
+(85) ReusedExchange [Reuses operator id: 50]
 Output [1]: [ss_item_sk#37]
 
-(90) BroadcastHashJoin [codegen id : 75]
-Left keys [1]: [ws_item_sk#73]
+(86) BroadcastHashJoin [codegen id : 77]
+Left keys [1]: [ws_item_sk#77]
 Right keys [1]: [ss_item_sk#37]
 Join type: LeftSemi
 Join condition: None
 
-(91) ReusedExchange [Reuses operator id: 59]
-Output [4]: [i_item_sk#78, i_brand_id#79, i_class_id#80, i_category_id#81]
+(87) ReusedExchange [Reuses operator id: 57]
+Output [4]: [i_item_sk#82, i_brand_id#83, i_class_id#84, i_category_id#85]
 
-(92) BroadcastHashJoin [codegen id : 75]
-Left keys [1]: [ws_item_sk#73]
-Right keys [1]: [i_item_sk#78]
+(88) BroadcastHashJoin [codegen id : 77]
+Left keys [1]: [ws_item_sk#77]
+Right keys [1]: [i_item_sk#82]
 Join type: Inner
 Join condition: None
 
-(93) Project [codegen id : 75]
-Output [6]: [ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76, i_brand_id#79, i_class_id#80, i_category_id#81]
-Input [8]: [ws_item_sk#73, ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76, i_item_sk#78, i_brand_id#79, i_class_id#80, i_category_id#81]
+(89) Project [codegen id : 77]
+Output [6]: [ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80, i_brand_id#83, i_class_id#84, i_category_id#85]
+Input [8]: [ws_item_sk#77, ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80, i_item_sk#82, i_brand_id#83, i_class_id#84, i_category_id#85]
 
-(94) ReusedExchange [Reuses operator id: 162]
-Output [1]: [d_date_sk#82]
+(90) ReusedExchange [Reuses operator id: 154]
+Output [1]: [d_date_sk#86]
 
-(95) BroadcastHashJoin [codegen id : 75]
-Left keys [1]: [ws_sold_date_sk#76]
-Right keys [1]: [d_date_sk#82]
+(91) BroadcastHashJoin [codegen id : 77]
+Left keys [1]: [ws_sold_date_sk#80]
+Right keys [1]: [d_date_sk#86]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 75]
-Output [5]: [ws_quantity#74, ws_list_price#75, i_brand_id#79, i_class_id#80, i_category_id#81]
-Input [7]: [ws_quantity#74, ws_list_price#75, ws_sold_date_sk#76, i_brand_id#79, i_class_id#80, i_category_id#81, d_date_sk#82]
-
-(97) HashAggregate [codegen id : 75]
-Input [5]: [ws_quantity#74, ws_list_price#75, i_brand_id#79, i_class_id#80, i_category_id#81]
-Keys [3]: [i_brand_id#79, i_class_id#80, i_category_id#81]
-Functions [2]: [partial_sum((cast(ws_quantity#74 as decimal(10,0)) * ws_list_price#75)), partial_count(1)]
-Aggregate Attributes [3]: [sum#83, isEmpty#84, count#85]
-Results [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
-
-(98) RowToColumnar
-Input [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
-
-(99) CometColumnarExchange
-Input [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
-Arguments: hashpartitioning(i_brand_id#79, i_class_id#80, i_category_id#81, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
-
-(100) CometHashAggregate
-Input [6]: [i_brand_id#79, i_class_id#80, i_category_id#81, sum#86, isEmpty#87, count#88]
-Keys [3]: [i_brand_id#79, i_class_id#80, i_category_id#81]
-Functions [2]: [sum((cast(ws_quantity#74 as decimal(10,0)) * ws_list_price#75)), count(1)]
-
-(101) CometFilter
-Input [6]: [channel#89, i_brand_id#79, i_class_id#80, i_category_id#81, sales#90, number_sales#91]
-Condition : (isnotnull(sales#90) AND (cast(sales#90 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#52, [id=#53] as decimal(32,6))))
-
-(102) CometUnion
-Child 0 Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
-Child 1 Input [6]: [channel#70, i_brand_id#60, i_class_id#61, i_category_id#62, sales#71, number_sales#72]
-Child 2 Input [6]: [channel#89, i_brand_id#79, i_class_id#80, i_category_id#81, sales#90, number_sales#91]
-
-(103) CometHashAggregate
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sales#50, number_sales#51]
-Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [partial_sum(sales#50), partial_sum(number_sales#51)]
-
-(104) CometColumnarExchange
-Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-Arguments: hashpartitioning(channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
-
-(105) CometHashAggregate
-Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#50), sum(number_sales#51)]
-
-(106) ReusedExchange [Reuses operator id: 104]
-Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-
-(107) CometHashAggregate
-Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#50), sum(number_sales#51)]
-
-(108) CometHashAggregate
-Input [5]: [channel#49, i_brand_id#39, i_class_id#40, sum_sales#95, number_sales#96]
-Keys [3]: [channel#49, i_brand_id#39, i_class_id#40]
-Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
-
-(109) CometColumnarExchange
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, sum#97, isEmpty#98, sum#99]
-Arguments: hashpartitioning(channel#49, i_brand_id#39, i_class_id#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
-
-(110) CometHashAggregate
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, sum#97, isEmpty#98, sum#99]
-Keys [3]: [channel#49, i_brand_id#39, i_class_id#40]
-Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
-
-(111) ReusedExchange [Reuses operator id: 104]
-Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-
-(112) CometHashAggregate
-Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#50), sum(number_sales#51)]
-
-(113) CometHashAggregate
-Input [4]: [channel#49, i_brand_id#39, sum_sales#95, number_sales#96]
-Keys [2]: [channel#49, i_brand_id#39]
-Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
-
-(114) CometColumnarExchange
-Input [5]: [channel#49, i_brand_id#39, sum#100, isEmpty#101, sum#102]
-Arguments: hashpartitioning(channel#49, i_brand_id#39, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
-
-(115) CometHashAggregate
-Input [5]: [channel#49, i_brand_id#39, sum#100, isEmpty#101, sum#102]
-Keys [2]: [channel#49, i_brand_id#39]
-Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
-
-(116) ReusedExchange [Reuses operator id: 104]
-Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-
-(117) CometHashAggregate
-Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#50), sum(number_sales#51)]
-
-(118) CometHashAggregate
-Input [3]: [channel#49, sum_sales#95, number_sales#96]
-Keys [1]: [channel#49]
-Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
-
-(119) CometColumnarExchange
-Input [4]: [channel#49, sum#103, isEmpty#104, sum#105]
-Arguments: hashpartitioning(channel#49, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
-
-(120) CometHashAggregate
-Input [4]: [channel#49, sum#103, isEmpty#104, sum#105]
-Keys [1]: [channel#49]
-Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
-
-(121) ReusedExchange [Reuses operator id: 104]
-Output [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-
-(122) CometHashAggregate
-Input [7]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum#92, isEmpty#93, sum#94]
-Keys [4]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41]
-Functions [2]: [sum(sales#50), sum(number_sales#51)]
-
-(123) CometHashAggregate
-Input [2]: [sum_sales#95, number_sales#96]
+(92) Project [codegen id : 77]
+Output [5]: [ws_quantity#78, ws_list_price#79, i_brand_id#83, i_class_id#84, i_category_id#85]
+Input [7]: [ws_quantity#78, ws_list_price#79, ws_sold_date_sk#80, i_brand_id#83, i_class_id#84, i_category_id#85, d_date_sk#86]
+
+(93) HashAggregate [codegen id : 77]
+Input [5]: [ws_quantity#78, ws_list_price#79, i_brand_id#83, i_class_id#84, i_category_id#85]
+Keys [3]: [i_brand_id#83, i_class_id#84, i_category_id#85]
+Functions [2]: [partial_sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79)), partial_count(1)]
+Aggregate Attributes [3]: [sum#87, isEmpty#88, count#89]
+Results [6]: [i_brand_id#83, i_class_id#84, i_category_id#85, sum#90, isEmpty#91, count#92]
+
+(94) Exchange
+Input [6]: [i_brand_id#83, i_class_id#84, i_category_id#85, sum#90, isEmpty#91, count#92]
+Arguments: hashpartitioning(i_brand_id#83, i_class_id#84, i_category_id#85, 5), ENSURE_REQUIREMENTS, [plan_id=11]
+
+(95) HashAggregate [codegen id : 78]
+Input [6]: [i_brand_id#83, i_class_id#84, i_category_id#85, sum#90, isEmpty#91, count#92]
+Keys [3]: [i_brand_id#83, i_class_id#84, i_category_id#85]
+Functions [2]: [sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79)), count(1)]
+Aggregate Attributes [2]: [sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79))#93, count(1)#94]
+Results [6]: [web AS channel#95, i_brand_id#83, i_class_id#84, i_category_id#85, sum((cast(ws_quantity#78 as decimal(10,0)) * ws_list_price#79))#93 AS sales#96, count(1)#94 AS number_sales#97]
+
+(96) Filter [codegen id : 78]
+Input [6]: [channel#95, i_brand_id#83, i_class_id#84, i_category_id#85, sales#96, number_sales#97]
+Condition : (isnotnull(sales#96) AND (cast(sales#96 as decimal(32,6)) > cast(ReusedSubquery Subquery scalar-subquery#54, [id=#55] as decimal(32,6))))
+
+(97) Union
+
+(98) HashAggregate [codegen id : 79]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sales#52, number_sales#53]
+Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [partial_sum(sales#52), partial_sum(number_sales#53)]
+Aggregate Attributes [3]: [sum#98, isEmpty#99, sum#100]
+Results [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+
+(99) Exchange
+Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+Arguments: hashpartitioning(channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+
+(100) HashAggregate [codegen id : 80]
+Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#52), sum(number_sales#53)]
+Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
+Results [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
+
+(101) ReusedExchange [Reuses operator id: 99]
+Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+
+(102) HashAggregate [codegen id : 160]
+Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#52), sum(number_sales#53)]
+Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
+Results [5]: [channel#51, i_brand_id#39, i_class_id#40, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
+
+(103) HashAggregate [codegen id : 160]
+Input [5]: [channel#51, i_brand_id#39, i_class_id#40, sum_sales#106, number_sales#107]
+Keys [3]: [channel#51, i_brand_id#39, i_class_id#40]
+Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
+Aggregate Attributes [3]: [sum#108, isEmpty#109, sum#110]
+Results [6]: [channel#51, i_brand_id#39, i_class_id#40, sum#111, isEmpty#112, sum#113]
+
+(104) Exchange
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, sum#111, isEmpty#112, sum#113]
+Arguments: hashpartitioning(channel#51, i_brand_id#39, i_class_id#40, 5), ENSURE_REQUIREMENTS, [plan_id=13]
+
+(105) HashAggregate [codegen id : 161]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, sum#111, isEmpty#112, sum#113]
+Keys [3]: [channel#51, i_brand_id#39, i_class_id#40]
+Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
+Aggregate Attributes [2]: [sum(sum_sales#106)#114, sum(number_sales#107)#115]
+Results [6]: [channel#51, i_brand_id#39, i_class_id#40, null AS i_category_id#116, sum(sum_sales#106)#114 AS sum(sum_sales)#117, sum(number_sales#107)#115 AS sum(number_sales)#118]
+
+(106) ReusedExchange [Reuses operator id: 99]
+Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+
+(107) HashAggregate [codegen id : 241]
+Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#52), sum(number_sales#53)]
+Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
+Results [4]: [channel#51, i_brand_id#39, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
+
+(108) HashAggregate [codegen id : 241]
+Input [4]: [channel#51, i_brand_id#39, sum_sales#106, number_sales#107]
+Keys [2]: [channel#51, i_brand_id#39]
+Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
+Aggregate Attributes [3]: [sum#119, isEmpty#120, sum#121]
+Results [5]: [channel#51, i_brand_id#39, sum#122, isEmpty#123, sum#124]
+
+(109) Exchange
+Input [5]: [channel#51, i_brand_id#39, sum#122, isEmpty#123, sum#124]
+Arguments: hashpartitioning(channel#51, i_brand_id#39, 5), ENSURE_REQUIREMENTS, [plan_id=14]
+
+(110) HashAggregate [codegen id : 242]
+Input [5]: [channel#51, i_brand_id#39, sum#122, isEmpty#123, sum#124]
+Keys [2]: [channel#51, i_brand_id#39]
+Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
+Aggregate Attributes [2]: [sum(sum_sales#106)#125, sum(number_sales#107)#126]
+Results [6]: [channel#51, i_brand_id#39, null AS i_class_id#127, null AS i_category_id#128, sum(sum_sales#106)#125 AS sum(sum_sales)#129, sum(number_sales#107)#126 AS sum(number_sales)#130]
+
+(111) ReusedExchange [Reuses operator id: 99]
+Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+
+(112) HashAggregate [codegen id : 322]
+Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#52), sum(number_sales#53)]
+Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
+Results [3]: [channel#51, sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
+
+(113) HashAggregate [codegen id : 322]
+Input [3]: [channel#51, sum_sales#106, number_sales#107]
+Keys [1]: [channel#51]
+Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
+Aggregate Attributes [3]: [sum#131, isEmpty#132, sum#133]
+Results [4]: [channel#51, sum#134, isEmpty#135, sum#136]
+
+(114) Exchange
+Input [4]: [channel#51, sum#134, isEmpty#135, sum#136]
+Arguments: hashpartitioning(channel#51, 5), ENSURE_REQUIREMENTS, [plan_id=15]
+
+(115) HashAggregate [codegen id : 323]
+Input [4]: [channel#51, sum#134, isEmpty#135, sum#136]
+Keys [1]: [channel#51]
+Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
+Aggregate Attributes [2]: [sum(sum_sales#106)#137, sum(number_sales#107)#138]
+Results [6]: [channel#51, null AS i_brand_id#139, null AS i_class_id#140, null AS i_category_id#141, sum(sum_sales#106)#137 AS sum(sum_sales)#142, sum(number_sales#107)#138 AS sum(number_sales)#143]
+
+(116) ReusedExchange [Reuses operator id: 99]
+Output [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+
+(117) HashAggregate [codegen id : 403]
+Input [7]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum#101, isEmpty#102, sum#103]
+Keys [4]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41]
+Functions [2]: [sum(sales#52), sum(number_sales#53)]
+Aggregate Attributes [2]: [sum(sales#52)#104, sum(number_sales#53)#105]
+Results [2]: [sum(sales#52)#104 AS sum_sales#106, sum(number_sales#53)#105 AS number_sales#107]
+
+(118) HashAggregate [codegen id : 403]
+Input [2]: [sum_sales#106, number_sales#107]
 Keys: []
-Functions [2]: [partial_sum(sum_sales#95), partial_sum(number_sales#96)]
+Functions [2]: [partial_sum(sum_sales#106), partial_sum(number_sales#107)]
+Aggregate Attributes [3]: [sum#144, isEmpty#145, sum#146]
+Results [3]: [sum#147, isEmpty#148, sum#149]
 
-(124) CometColumnarExchange
-Input [3]: [sum#106, isEmpty#107, sum#108]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
+(119) Exchange
+Input [3]: [sum#147, isEmpty#148, sum#149]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=16]
 
-(125) CometHashAggregate
-Input [3]: [sum#106, isEmpty#107, sum#108]
+(120) HashAggregate [codegen id : 404]
+Input [3]: [sum#147, isEmpty#148, sum#149]
 Keys: []
-Functions [2]: [sum(sum_sales#95), sum(number_sales#96)]
-
-(126) CometUnion
-Child 0 Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
-Child 1 Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#109, sum(sum_sales)#110, sum(number_sales)#111]
-Child 2 Input [6]: [channel#49, i_brand_id#39, i_class_id#112, i_category_id#113, sum(sum_sales)#114, sum(number_sales)#115]
-Child 3 Input [6]: [channel#49, i_brand_id#116, i_class_id#117, i_category_id#118, sum(sum_sales)#119, sum(number_sales)#120]
-Child 4 Input [6]: [channel#121, i_brand_id#122, i_class_id#123, i_category_id#124, sum(sum_sales)#125, sum(number_sales)#126]
-
-(127) CometHashAggregate
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
-Keys [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
-Functions: []
+Functions [2]: [sum(sum_sales#106), sum(number_sales#107)]
+Aggregate Attributes [2]: [sum(sum_sales#106)#150, sum(number_sales#107)#151]
+Results [6]: [null AS channel#152, null AS i_brand_id#153, null AS i_class_id#154, null AS i_category_id#155, sum(sum_sales#106)#150 AS sum(sum_sales)#156, sum(number_sales#107)#151 AS sum(number_sales)#157]
 
-(128) CometColumnarExchange
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
-Arguments: hashpartitioning(channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
+(121) Union
 
-(129) CometHashAggregate
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
-Keys [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+(122) HashAggregate [codegen id : 405]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+Keys [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
 Functions: []
+Aggregate Attributes: []
+Results [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
 
-(130) CometTakeOrderedAndProject
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#49 ASC NULLS FIRST,i_brand_id#39 ASC NULLS FIRST,i_class_id#40 ASC NULLS FIRST,i_category_id#41 ASC NULLS FIRST], output=[channel#49,i_brand_id#39,i_class_id#40,i_category_id#41,sum_sales#95,number_sales#96]), 100, [channel#49 ASC NULLS FIRST, i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+(123) Exchange
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+Arguments: hashpartitioning(channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107, 5), ENSURE_REQUIREMENTS, [plan_id=17]
 
-(131) ColumnarToRow [codegen id : 376]
-Input [6]: [channel#49, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#95, number_sales#96]
+(124) HashAggregate [codegen id : 406]
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+Keys [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+Functions: []
+Aggregate Attributes: []
+Results [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+
+(125) TakeOrderedAndProject
+Input [6]: [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
+Arguments: 100, [channel#51 ASC NULLS FIRST, i_brand_id#39 ASC NULLS FIRST, i_class_id#40 ASC NULLS FIRST, i_category_id#41 ASC NULLS FIRST], [channel#51, i_brand_id#39, i_class_id#40, i_category_id#41, sum_sales#106, number_sales#107]
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 69 Hosting Expression = Subquery scalar-subquery#52, [id=#53]
-* ColumnarToRow (152)
-+- CometHashAggregate (151)
-   +- CometColumnarExchange (150)
-      +- RowToColumnar (149)
-         +- * HashAggregate (148)
-            +- Union (147)
-               :- * Project (136)
-               :  +- * BroadcastHashJoin Inner BuildRight (135)
-               :     :- * ColumnarToRow (133)
-               :     :  +- CometScan parquet spark_catalog.default.store_sales (132)
-               :     +- ReusedExchange (134)
-               :- * Project (141)
-               :  +- * BroadcastHashJoin Inner BuildRight (140)
-               :     :- * ColumnarToRow (138)
-               :     :  +- CometScan parquet spark_catalog.default.catalog_sales (137)
-               :     +- ReusedExchange (139)
-               +- * Project (146)
-                  +- * BroadcastHashJoin Inner BuildRight (145)
-                     :- * ColumnarToRow (143)
-                     :  +- CometScan parquet spark_catalog.default.web_sales (142)
-                     +- ReusedExchange (144)
+Subquery:1 Hosting operator id = 66 Hosting Expression = Subquery scalar-subquery#54, [id=#55]
+* HashAggregate (144)
++- Exchange (143)
+   +- * HashAggregate (142)
+      +- Union (141)
+         :- * Project (130)
+         :  +- * BroadcastHashJoin Inner BuildRight (129)
+         :     :- * ColumnarToRow (127)
+         :     :  +- CometScan parquet spark_catalog.default.store_sales (126)
+         :     +- ReusedExchange (128)
+         :- * Project (135)
+         :  +- * BroadcastHashJoin Inner BuildRight (134)
+         :     :- * ColumnarToRow (132)
+         :     :  +- CometScan parquet spark_catalog.default.catalog_sales (131)
+         :     +- ReusedExchange (133)
+         +- * Project (140)
+            +- * BroadcastHashJoin Inner BuildRight (139)
+               :- * ColumnarToRow (137)
+               :  +- CometScan parquet spark_catalog.default.web_sales (136)
+               +- ReusedExchange (138)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_quantity#127, ss_list_price#128, ss_sold_date_sk#129]
+Output [3]: [ss_quantity#158, ss_list_price#159, ss_sold_date_sk#160]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#129), dynamicpruningexpression(ss_sold_date_sk#129 IN dynamicpruning#130)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#160), dynamicpruningexpression(ss_sold_date_sk#160 IN dynamicpruning#161)]
 ReadSchema: struct<ss_quantity:int,ss_list_price:decimal(7,2)>
 
-(133) ColumnarToRow [codegen id : 2]
-Input [3]: [ss_quantity#127, ss_list_price#128, ss_sold_date_sk#129]
+(127) ColumnarToRow [codegen id : 2]
+Input [3]: [ss_quantity#158, ss_list_price#159, ss_sold_date_sk#160]
 
-(134) ReusedExchange [Reuses operator id: 167]
-Output [1]: [d_date_sk#131]
+(128) ReusedExchange [Reuses operator id: 159]
+Output [1]: [d_date_sk#162]
 
-(135) BroadcastHashJoin [codegen id : 2]
-Left keys [1]: [ss_sold_date_sk#129]
-Right keys [1]: [d_date_sk#131]
+(129) BroadcastHashJoin [codegen id : 2]
+Left keys [1]: [ss_sold_date_sk#160]
+Right keys [1]: [d_date_sk#162]
 Join type: Inner
 Join condition: None
 
-(136) Project [codegen id : 2]
-Output [2]: [ss_quantity#127 AS quantity#132, ss_list_price#128 AS list_price#133]
-Input [4]: [ss_quantity#127, ss_list_price#128, ss_sold_date_sk#129, d_date_sk#131]
+(130) Project [codegen id : 2]
+Output [2]: [ss_quantity#158 AS quantity#163, ss_list_price#159 AS list_price#164]
+Input [4]: [ss_quantity#158, ss_list_price#159, ss_sold_date_sk#160, d_date_sk#162]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [3]: [cs_quantity#134, cs_list_price#135, cs_sold_date_sk#136]
+Output [3]: [cs_quantity#165, cs_list_price#166, cs_sold_date_sk#167]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#136), dynamicpruningexpression(cs_sold_date_sk#136 IN dynamicpruning#137)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#167), dynamicpruningexpression(cs_sold_date_sk#167 IN dynamicpruning#168)]
 ReadSchema: struct<cs_quantity:int,cs_list_price:decimal(7,2)>
 
-(138) ColumnarToRow [codegen id : 4]
-Input [3]: [cs_quantity#134, cs_list_price#135, cs_sold_date_sk#136]
+(132) ColumnarToRow [codegen id : 4]
+Input [3]: [cs_quantity#165, cs_list_price#166, cs_sold_date_sk#167]
 
-(139) ReusedExchange [Reuses operator id: 157]
-Output [1]: [d_date_sk#138]
+(133) ReusedExchange [Reuses operator id: 149]
+Output [1]: [d_date_sk#169]
 
-(140) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [cs_sold_date_sk#136]
-Right keys [1]: [d_date_sk#138]
+(134) BroadcastHashJoin [codegen id : 4]
+Left keys [1]: [cs_sold_date_sk#167]
+Right keys [1]: [d_date_sk#169]
 Join type: Inner
 Join condition: None
 
-(141) Project [codegen id : 4]
-Output [2]: [cs_quantity#134 AS quantity#139, cs_list_price#135 AS list_price#140]
-Input [4]: [cs_quantity#134, cs_list_price#135, cs_sold_date_sk#136, d_date_sk#138]
+(135) Project [codegen id : 4]
+Output [2]: [cs_quantity#165 AS quantity#170, cs_list_price#166 AS list_price#171]
+Input [4]: [cs_quantity#165, cs_list_price#166, cs_sold_date_sk#167, d_date_sk#169]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_quantity#141, ws_list_price#142, ws_sold_date_sk#143]
+Output [3]: [ws_quantity#172, ws_list_price#173, ws_sold_date_sk#174]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#143), dynamicpruningexpression(ws_sold_date_sk#143 IN dynamicpruning#144)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#174), dynamicpruningexpression(ws_sold_date_sk#174 IN dynamicpruning#175)]
 ReadSchema: struct<ws_quantity:int,ws_list_price:decimal(7,2)>
 
-(143) ColumnarToRow [codegen id : 6]
-Input [3]: [ws_quantity#141, ws_list_price#142, ws_sold_date_sk#143]
+(137) ColumnarToRow [codegen id : 6]
+Input [3]: [ws_quantity#172, ws_list_price#173, ws_sold_date_sk#174]
 
-(144) ReusedExchange [Reuses operator id: 157]
-Output [1]: [d_date_sk#145]
+(138) ReusedExchange [Reuses operator id: 149]
+Output [1]: [d_date_sk#176]
 
-(145) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ws_sold_date_sk#143]
-Right keys [1]: [d_date_sk#145]
+(139) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ws_sold_date_sk#174]
+Right keys [1]: [d_date_sk#176]
 Join type: Inner
 Join condition: None
 
-(146) Project [codegen id : 6]
-Output [2]: [ws_quantity#141 AS quantity#146, ws_list_price#142 AS list_price#147]
-Input [4]: [ws_quantity#141, ws_list_price#142, ws_sold_date_sk#143, d_date_sk#145]
+(140) Project [codegen id : 6]
+Output [2]: [ws_quantity#172 AS quantity#177, ws_list_price#173 AS list_price#178]
+Input [4]: [ws_quantity#172, ws_list_price#173, ws_sold_date_sk#174, d_date_sk#176]
 
-(147) Union
+(141) Union
 
-(148) HashAggregate [codegen id : 7]
-Input [2]: [quantity#132, list_price#133]
+(142) HashAggregate [codegen id : 7]
+Input [2]: [quantity#163, list_price#164]
 Keys: []
-Functions [1]: [partial_avg((cast(quantity#132 as decimal(10,0)) * list_price#133))]
-Aggregate Attributes [2]: [sum#148, count#149]
-Results [2]: [sum#150, count#151]
+Functions [1]: [partial_avg((cast(quantity#163 as decimal(10,0)) * list_price#164))]
+Aggregate Attributes [2]: [sum#179, count#180]
+Results [2]: [sum#181, count#182]
 
-(149) RowToColumnar
-Input [2]: [sum#150, count#151]
+(143) Exchange
+Input [2]: [sum#181, count#182]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=18]
 
-(150) CometColumnarExchange
-Input [2]: [sum#150, count#151]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
-
-(151) CometHashAggregate
-Input [2]: [sum#150, count#151]
+(144) HashAggregate [codegen id : 8]
+Input [2]: [sum#181, count#182]
 Keys: []
-Functions [1]: [avg((cast(quantity#132 as decimal(10,0)) * list_price#133))]
-
-(152) ColumnarToRow [codegen id : 8]
-Input [1]: [average_sales#152]
+Functions [1]: [avg((cast(quantity#163 as decimal(10,0)) * list_price#164))]
+Aggregate Attributes [1]: [avg((cast(quantity#163 as decimal(10,0)) * list_price#164))#183]
+Results [1]: [avg((cast(quantity#163 as decimal(10,0)) * list_price#164))#183 AS average_sales#184]
 
-Subquery:2 Hosting operator id = 132 Hosting Expression = ss_sold_date_sk#129 IN dynamicpruning#12
+Subquery:2 Hosting operator id = 126 Hosting Expression = ss_sold_date_sk#160 IN dynamicpruning#12
 
-Subquery:3 Hosting operator id = 137 Hosting Expression = cs_sold_date_sk#136 IN dynamicpruning#137
-BroadcastExchange (157)
-+- * ColumnarToRow (156)
-   +- CometProject (155)
-      +- CometFilter (154)
-         +- CometScan parquet spark_catalog.default.date_dim (153)
+Subquery:3 Hosting operator id = 131 Hosting Expression = cs_sold_date_sk#167 IN dynamicpruning#168
+BroadcastExchange (149)
++- * ColumnarToRow (148)
+   +- CometProject (147)
+      +- CometFilter (146)
+         +- CometScan parquet spark_catalog.default.date_dim (145)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#138, d_year#153]
+Output [2]: [d_date_sk#169, d_year#185]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1998), LessThanOrEqual(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(154) CometFilter
-Input [2]: [d_date_sk#138, d_year#153]
-Condition : (((isnotnull(d_year#153) AND (d_year#153 >= 1998)) AND (d_year#153 <= 2000)) AND isnotnull(d_date_sk#138))
+(146) CometFilter
+Input [2]: [d_date_sk#169, d_year#185]
+Condition : (((isnotnull(d_year#185) AND (d_year#185 >= 1998)) AND (d_year#185 <= 2000)) AND isnotnull(d_date_sk#169))
 
-(155) CometProject
-Input [2]: [d_date_sk#138, d_year#153]
-Arguments: [d_date_sk#138], [d_date_sk#138]
+(147) CometProject
+Input [2]: [d_date_sk#169, d_year#185]
+Arguments: [d_date_sk#169], [d_date_sk#169]
 
-(156) ColumnarToRow [codegen id : 1]
-Input [1]: [d_date_sk#138]
+(148) ColumnarToRow [codegen id : 1]
+Input [1]: [d_date_sk#169]
 
-(157) BroadcastExchange
-Input [1]: [d_date_sk#138]
+(149) BroadcastExchange
+Input [1]: [d_date_sk#169]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=19]
 
-Subquery:4 Hosting operator id = 142 Hosting Expression = ws_sold_date_sk#143 IN dynamicpruning#137
+Subquery:4 Hosting operator id = 136 Hosting Expression = ws_sold_date_sk#174 IN dynamicpruning#168
 
 Subquery:5 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (162)
-+- * ColumnarToRow (161)
-   +- CometProject (160)
-      +- CometFilter (159)
-         +- CometScan parquet spark_catalog.default.date_dim (158)
+BroadcastExchange (154)
++- * ColumnarToRow (153)
+   +- CometProject (152)
+      +- CometFilter (151)
+         +- CometScan parquet spark_catalog.default.date_dim (150)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#42, d_year#154, d_moy#155]
+Output [3]: [d_date_sk#42, d_year#186, d_moy#187]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,11), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(159) CometFilter
-Input [3]: [d_date_sk#42, d_year#154, d_moy#155]
-Condition : ((((isnotnull(d_year#154) AND isnotnull(d_moy#155)) AND (d_year#154 = 2000)) AND (d_moy#155 = 11)) AND isnotnull(d_date_sk#42))
+(151) CometFilter
+Input [3]: [d_date_sk#42, d_year#186, d_moy#187]
+Condition : ((((isnotnull(d_year#186) AND isnotnull(d_moy#187)) AND (d_year#186 = 2000)) AND (d_moy#187 = 11)) AND isnotnull(d_date_sk#42))
 
-(160) CometProject
-Input [3]: [d_date_sk#42, d_year#154, d_moy#155]
+(152) CometProject
+Input [3]: [d_date_sk#42, d_year#186, d_moy#187]
 Arguments: [d_date_sk#42], [d_date_sk#42]
 
-(161) ColumnarToRow [codegen id : 1]
+(153) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#42]
 
-(162) BroadcastExchange
+(154) BroadcastExchange
 Input [1]: [d_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=20]
 
 Subquery:6 Hosting operator id = 7 Hosting Expression = ss_sold_date_sk#11 IN dynamicpruning#12
-BroadcastExchange (167)
-+- * ColumnarToRow (166)
-   +- CometProject (165)
-      +- CometFilter (164)
-         +- CometScan parquet spark_catalog.default.date_dim (163)
+BroadcastExchange (159)
++- * ColumnarToRow (158)
+   +- CometProject (157)
+      +- CometFilter (156)
+         +- CometScan parquet spark_catalog.default.date_dim (155)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#156]
+Output [2]: [d_date_sk#25, d_year#188]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), GreaterThanOrEqual(d_year,1999), LessThanOrEqual(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(164) CometFilter
-Input [2]: [d_date_sk#25, d_year#156]
-Condition : (((isnotnull(d_year#156) AND (d_year#156 >= 1999)) AND (d_year#156 <= 2001)) AND isnotnull(d_date_sk#25))
+(156) CometFilter
+Input [2]: [d_date_sk#25, d_year#188]
+Condition : (((isnotnull(d_year#188) AND (d_year#188 >= 1999)) AND (d_year#188 <= 2001)) AND isnotnull(d_date_sk#25))
 
-(165) CometProject
-Input [2]: [d_date_sk#25, d_year#156]
+(157) CometProject
+Input [2]: [d_date_sk#25, d_year#188]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(166) ColumnarToRow [codegen id : 1]
+(158) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(167) BroadcastExchange
+(159) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=21]
 
 Subquery:7 Hosting operator id = 13 Hosting Expression = cs_sold_date_sk#18 IN dynamicpruning#12
 
-Subquery:8 Hosting operator id = 38 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
+Subquery:8 Hosting operator id = 36 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#12
 
-Subquery:9 Hosting operator id = 85 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
+Subquery:9 Hosting operator id = 81 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
 
-Subquery:10 Hosting operator id = 70 Hosting Expression = cs_sold_date_sk#57 IN dynamicpruning#5
+Subquery:10 Hosting operator id = 67 Hosting Expression = cs_sold_date_sk#59 IN dynamicpruning#5
 
-Subquery:11 Hosting operator id = 101 Hosting Expression = ReusedSubquery Subquery scalar-subquery#52, [id=#53]
+Subquery:11 Hosting operator id = 96 Hosting Expression = ReusedSubquery Subquery scalar-subquery#54, [id=#55]
 
-Subquery:12 Hosting operator id = 86 Hosting Expression = ws_sold_date_sk#76 IN dynamicpruning#5
+Subquery:12 Hosting operator id = 82 Hosting Expression = ws_sold_date_sk#80 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt
index becceb8614..a203f9620b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q14a/simplified.txt
@@ -1,241 +1,261 @@
-WholeStageCodegen (376)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
-        CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
-          CometColumnarExchange [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales] #1
-            CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
-              CometUnion
-                CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
-                  CometColumnarExchange [channel,i_brand_id,i_class_id,i_category_id] #2
-                    CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sales,number_sales]
-                      CometUnion
-                        CometFilter [sales]
-                          Subquery #3
-                            WholeStageCodegen (8)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometHashAggregate [sum,count]
-                                    CometColumnarExchange #14
-                                      RowToColumnar
-                                        WholeStageCodegen (7)
-                                          HashAggregate [quantity,list_price] [sum,count,sum,count]
+TakeOrderedAndProject [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
+  WholeStageCodegen (406)
+    HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
+      InputAdapter
+        Exchange [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales] #1
+          WholeStageCodegen (405)
+            HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum_sales,number_sales]
+              InputAdapter
+                Union
+                  WholeStageCodegen (80)
+                    HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
+                      InputAdapter
+                        Exchange [channel,i_brand_id,i_class_id,i_category_id] #2
+                          WholeStageCodegen (79)
+                            HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (26)
+                                    Filter [sales]
+                                      Subquery #3
+                                        WholeStageCodegen (8)
+                                          HashAggregate [sum,count] [avg((cast(quantity as decimal(10,0)) * list_price)),average_sales,sum,count]
                                             InputAdapter
-                                              Union
-                                                WholeStageCodegen (2)
-                                                  Project [ss_quantity,ss_list_price]
-                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #2
-                                                      InputAdapter
-                                                        ReusedExchange [d_date_sk] #8
-                                                WholeStageCodegen (4)
-                                                  Project [cs_quantity,cs_list_price]
-                                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                            SubqueryBroadcast [d_date_sk] #4
-                                                              BroadcastExchange #15
-                                                                WholeStageCodegen (1)
-                                                                  ColumnarToRow
-                                                                    InputAdapter
-                                                                      CometProject [d_date_sk]
-                                                                        CometFilter [d_year,d_date_sk]
-                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                      InputAdapter
-                                                        ReusedExchange [d_date_sk] #15
-                                                WholeStageCodegen (6)
-                                                  Project [ws_quantity,ws_list_price]
-                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                            ReusedSubquery [d_date_sk] #4
-                                                      InputAdapter
-                                                        ReusedExchange [d_date_sk] #15
-                          CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                            CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #3
-                              RowToColumnar
-                                WholeStageCodegen (25)
-                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                    Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                        Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                            BroadcastHashJoin [ss_item_sk,ss_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_item_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #4
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
+                                              Exchange #14
+                                                WholeStageCodegen (7)
+                                                  HashAggregate [quantity,list_price] [sum,count,sum,count]
+                                                    InputAdapter
+                                                      Union
+                                                        WholeStageCodegen (2)
+                                                          Project [ss_quantity,ss_list_price]
+                                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometScan parquet spark_catalog.default.store_sales [ss_quantity,ss_list_price,ss_sold_date_sk]
+                                                                    ReusedSubquery [d_date_sk] #2
+                                                              InputAdapter
+                                                                ReusedExchange [d_date_sk] #8
+                                                        WholeStageCodegen (4)
+                                                          Project [cs_quantity,cs_list_price]
+                                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                                    SubqueryBroadcast [d_date_sk] #4
+                                                                      BroadcastExchange #15
+                                                                        WholeStageCodegen (1)
+                                                                          ColumnarToRow
+                                                                            InputAdapter
+                                                                              CometProject [d_date_sk]
+                                                                                CometFilter [d_year,d_date_sk]
+                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                               InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_year,d_moy,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                              InputAdapter
-                                                BroadcastExchange #5
-                                                  WholeStageCodegen (11)
-                                                    Project [i_item_sk]
-                                                      BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
-                                                        ColumnarToRow
+                                                                ReusedExchange [d_date_sk] #15
+                                                        WholeStageCodegen (6)
+                                                          Project [ws_quantity,ws_list_price]
+                                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                              ColumnarToRow
+                                                                InputAdapter
+                                                                  CometScan parquet spark_catalog.default.web_sales [ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                                    ReusedSubquery [d_date_sk] #4
+                                                              InputAdapter
+                                                                ReusedExchange [d_date_sk] #15
+                                      HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ss_quantity as decimal(10,0)) * ss_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
+                                        InputAdapter
+                                          Exchange [i_brand_id,i_class_id,i_category_id] #3
+                                            WholeStageCodegen (25)
+                                              HashAggregate [i_brand_id,i_class_id,i_category_id,ss_quantity,ss_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                                Project [ss_quantity,ss_list_price,i_brand_id,i_class_id,i_category_id]
+                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                    Project [ss_quantity,ss_list_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                        BroadcastHashJoin [ss_item_sk,ss_item_sk]
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [ss_item_sk]
+                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_quantity,ss_list_price,ss_sold_date_sk]
+                                                                  SubqueryBroadcast [d_date_sk] #1
+                                                                    BroadcastExchange #4
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometProject [d_date_sk]
+                                                                              CometFilter [d_year,d_moy,d_date_sk]
+                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
                                                           InputAdapter
-                                                            CometFilter [i_brand_id,i_class_id,i_category_id]
-                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                        InputAdapter
-                                                          BroadcastExchange #6
-                                                            WholeStageCodegen (10)
-                                                              BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometHashAggregate [brand_id,class_id,category_id]
-                                                                      CometColumnarExchange [brand_id,class_id,category_id] #7
-                                                                        RowToColumnar
-                                                                          WholeStageCodegen (6)
+                                                            BroadcastExchange #5
+                                                              WholeStageCodegen (11)
+                                                                Project [i_item_sk]
+                                                                  BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,brand_id,class_id,category_id]
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometFilter [i_brand_id,i_class_id,i_category_id]
+                                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                    InputAdapter
+                                                                      BroadcastExchange #6
+                                                                        WholeStageCodegen (10)
+                                                                          BroadcastHashJoin [brand_id,class_id,category_id,i_brand_id,i_class_id,i_category_id]
                                                                             HashAggregate [brand_id,class_id,category_id]
-                                                                              Project [i_brand_id,i_class_id,i_category_id]
-                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                  Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                    BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                                                      ColumnarToRow
-                                                                                        InputAdapter
-                                                                                          CometFilter [ss_item_sk]
-                                                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
-                                                                                              SubqueryBroadcast [d_date_sk] #2
-                                                                                                BroadcastExchange #8
-                                                                                                  WholeStageCodegen (1)
-                                                                                                    ColumnarToRow
-                                                                                                      InputAdapter
-                                                                                                        CometProject [d_date_sk]
-                                                                                                          CometFilter [d_year,d_date_sk]
-                                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                      InputAdapter
-                                                                                        BroadcastExchange #9
-                                                                                          WholeStageCodegen (4)
-                                                                                            BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
+                                                                              InputAdapter
+                                                                                Exchange [brand_id,class_id,category_id] #7
+                                                                                  WholeStageCodegen (6)
+                                                                                    HashAggregate [brand_id,class_id,category_id]
+                                                                                      Project [i_brand_id,i_class_id,i_category_id]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          Project [ss_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                            BroadcastHashJoin [ss_item_sk,i_item_sk]
                                                                                               ColumnarToRow
                                                                                                 InputAdapter
-                                                                                                  CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                              InputAdapter
-                                                                                                BroadcastExchange #10
-                                                                                                  WholeStageCodegen (3)
-                                                                                                    Project [i_brand_id,i_class_id,i_category_id]
-                                                                                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                                                        Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                                                          BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                                                  CometFilter [ss_item_sk]
+                                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sold_date_sk]
+                                                                                                      SubqueryBroadcast [d_date_sk] #2
+                                                                                                        BroadcastExchange #8
+                                                                                                          WholeStageCodegen (1)
                                                                                                             ColumnarToRow
                                                                                                               InputAdapter
-                                                                                                                CometFilter [cs_item_sk]
-                                                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
-                                                                                                                    ReusedSubquery [d_date_sk] #2
-                                                                                                            InputAdapter
-                                                                                                              BroadcastExchange #11
-                                                                                                                WholeStageCodegen (1)
-                                                                                                                  ColumnarToRow
-                                                                                                                    InputAdapter
-                                                                                                                      CometFilter [i_item_sk]
-                                                                                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                                CometProject [d_date_sk]
+                                                                                                                  CometFilter [d_year,d_date_sk]
+                                                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                              InputAdapter
+                                                                                                BroadcastExchange #9
+                                                                                                  WholeStageCodegen (4)
+                                                                                                    BroadcastHashJoin [i_brand_id,i_class_id,i_category_id,i_brand_id,i_class_id,i_category_id]
+                                                                                                      ColumnarToRow
                                                                                                         InputAdapter
-                                                                                                          ReusedExchange [d_date_sk] #8
-                                                                                  InputAdapter
-                                                                                    ReusedExchange [d_date_sk] #8
+                                                                                                          CometFilter [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                      InputAdapter
+                                                                                                        BroadcastExchange #10
+                                                                                                          WholeStageCodegen (3)
+                                                                                                            Project [i_brand_id,i_class_id,i_category_id]
+                                                                                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                                                                Project [cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                                                                    ColumnarToRow
+                                                                                                                      InputAdapter
+                                                                                                                        CometFilter [cs_item_sk]
+                                                                                                                          CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_sold_date_sk]
+                                                                                                                            ReusedSubquery [d_date_sk] #2
+                                                                                                                    InputAdapter
+                                                                                                                      BroadcastExchange #11
+                                                                                                                        WholeStageCodegen (1)
+                                                                                                                          ColumnarToRow
+                                                                                                                            InputAdapter
+                                                                                                                              CometFilter [i_item_sk]
+                                                                                                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                                                InputAdapter
+                                                                                                                  ReusedExchange [d_date_sk] #8
+                                                                                          InputAdapter
+                                                                                            ReusedExchange [d_date_sk] #8
+                                                                            InputAdapter
+                                                                              BroadcastExchange #12
+                                                                                WholeStageCodegen (9)
+                                                                                  Project [i_brand_id,i_class_id,i_category_id]
+                                                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                                      Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                                                        BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometFilter [ws_item_sk]
+                                                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
+                                                                                                  ReusedSubquery [d_date_sk] #2
+                                                                                          InputAdapter
+                                                                                            ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
+                                                                                      InputAdapter
+                                                                                        ReusedExchange [d_date_sk] #8
+                                                        InputAdapter
+                                                          BroadcastExchange #13
+                                                            WholeStageCodegen (23)
+                                                              BroadcastHashJoin [i_item_sk,ss_item_sk]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometFilter [i_item_sk]
+                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
                                                                 InputAdapter
-                                                                  BroadcastExchange #12
-                                                                    WholeStageCodegen (9)
-                                                                      Project [i_brand_id,i_class_id,i_category_id]
-                                                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                          Project [ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                                                            BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                                                              ColumnarToRow
-                                                                                InputAdapter
-                                                                                  CometFilter [ws_item_sk]
-                                                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sold_date_sk]
-                                                                                      ReusedSubquery [d_date_sk] #2
-                                                                              InputAdapter
-                                                                                ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #11
-                                                                          InputAdapter
-                                                                            ReusedExchange [d_date_sk] #8
-                                            InputAdapter
-                                              BroadcastExchange #13
-                                                WholeStageCodegen (23)
-                                                  BroadcastHashJoin [i_item_sk,ss_item_sk]
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometFilter [i_item_sk]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id]
+                                                                  ReusedExchange [ss_item_sk] #5
                                                     InputAdapter
-                                                      ReusedExchange [ss_item_sk] #5
-                                        InputAdapter
-                                          ReusedExchange [d_date_sk] #4
-                        CometFilter [sales]
-                          ReusedSubquery [average_sales] #3
-                          CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                            CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #16
-                              RowToColumnar
-                                WholeStageCodegen (50)
-                                  HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                    Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                        Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                          BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                            BroadcastHashJoin [cs_item_sk,ss_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [cs_item_sk]
-                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [ss_item_sk] #5
-                                            InputAdapter
-                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
+                                                      ReusedExchange [d_date_sk] #4
+                                  WholeStageCodegen (52)
+                                    Filter [sales]
+                                      ReusedSubquery [average_sales] #3
+                                      HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(cs_quantity as decimal(10,0)) * cs_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
                                         InputAdapter
-                                          ReusedExchange [d_date_sk] #4
-                        CometFilter [sales]
-                          ReusedSubquery [average_sales] #3
-                          CometHashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count]
-                            CometColumnarExchange [i_brand_id,i_class_id,i_category_id] #17
-                              RowToColumnar
-                                WholeStageCodegen (75)
-                                  HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
-                                    Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
-                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                        Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
-                                          BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                            BroadcastHashJoin [ws_item_sk,ss_item_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ws_item_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
-                                                      ReusedSubquery [d_date_sk] #1
-                                              InputAdapter
-                                                ReusedExchange [ss_item_sk] #5
-                                            InputAdapter
-                                              ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
+                                          Exchange [i_brand_id,i_class_id,i_category_id] #16
+                                            WholeStageCodegen (51)
+                                              HashAggregate [i_brand_id,i_class_id,i_category_id,cs_quantity,cs_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                                Project [cs_quantity,cs_list_price,i_brand_id,i_class_id,i_category_id]
+                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                    Project [cs_quantity,cs_list_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                        BroadcastHashJoin [cs_item_sk,ss_item_sk]
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [cs_item_sk]
+                                                                CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_quantity,cs_list_price,cs_sold_date_sk]
+                                                                  ReusedSubquery [d_date_sk] #1
+                                                          InputAdapter
+                                                            ReusedExchange [ss_item_sk] #5
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk] #4
+                                  WholeStageCodegen (78)
+                                    Filter [sales]
+                                      ReusedSubquery [average_sales] #3
+                                      HashAggregate [i_brand_id,i_class_id,i_category_id,sum,isEmpty,count] [sum((cast(ws_quantity as decimal(10,0)) * ws_list_price)),count(1),channel,sales,number_sales,sum,isEmpty,count]
                                         InputAdapter
-                                          ReusedExchange [d_date_sk] #4
-                CometHashAggregate [channel,i_brand_id,i_class_id,sum,isEmpty,sum]
-                  CometColumnarExchange [channel,i_brand_id,i_class_id] #18
-                    CometHashAggregate [channel,i_brand_id,i_class_id,sum_sales,number_sales]
-                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
-                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
-                CometHashAggregate [channel,i_brand_id,sum,isEmpty,sum]
-                  CometColumnarExchange [channel,i_brand_id] #19
-                    CometHashAggregate [channel,i_brand_id,sum_sales,number_sales]
-                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
-                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
-                CometHashAggregate [channel,sum,isEmpty,sum]
-                  CometColumnarExchange [channel] #20
-                    CometHashAggregate [channel,sum_sales,number_sales]
-                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
-                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
-                CometHashAggregate [sum,isEmpty,sum]
-                  CometColumnarExchange #21
-                    CometHashAggregate [sum_sales,number_sales]
-                      CometHashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum]
-                        ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                                          Exchange [i_brand_id,i_class_id,i_category_id] #17
+                                            WholeStageCodegen (77)
+                                              HashAggregate [i_brand_id,i_class_id,i_category_id,ws_quantity,ws_list_price] [sum,isEmpty,count,sum,isEmpty,count]
+                                                Project [ws_quantity,ws_list_price,i_brand_id,i_class_id,i_category_id]
+                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                    Project [ws_quantity,ws_list_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id]
+                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                        BroadcastHashJoin [ws_item_sk,ss_item_sk]
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [ws_item_sk]
+                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_quantity,ws_list_price,ws_sold_date_sk]
+                                                                  ReusedSubquery [d_date_sk] #1
+                                                          InputAdapter
+                                                            ReusedExchange [ss_item_sk] #5
+                                                        InputAdapter
+                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id] #13
+                                                    InputAdapter
+                                                      ReusedExchange [d_date_sk] #4
+                  WholeStageCodegen (161)
+                    HashAggregate [channel,i_brand_id,i_class_id,sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
+                      InputAdapter
+                        Exchange [channel,i_brand_id,i_class_id] #18
+                          WholeStageCodegen (160)
+                            HashAggregate [channel,i_brand_id,i_class_id,sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
+                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
+                                InputAdapter
+                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                  WholeStageCodegen (242)
+                    HashAggregate [channel,i_brand_id,sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),i_class_id,i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
+                      InputAdapter
+                        Exchange [channel,i_brand_id] #19
+                          WholeStageCodegen (241)
+                            HashAggregate [channel,i_brand_id,sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
+                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
+                                InputAdapter
+                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                  WholeStageCodegen (323)
+                    HashAggregate [channel,sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),i_brand_id,i_class_id,i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
+                      InputAdapter
+                        Exchange [channel] #20
+                          WholeStageCodegen (322)
+                            HashAggregate [channel,sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
+                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
+                                InputAdapter
+                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
+                  WholeStageCodegen (404)
+                    HashAggregate [sum,isEmpty,sum] [sum(sum_sales),sum(number_salesL),channel,i_brand_id,i_class_id,i_category_id,sum(sum_sales),sum(number_sales),sum,isEmpty,sum]
+                      InputAdapter
+                        Exchange #21
+                          WholeStageCodegen (403)
+                            HashAggregate [sum_sales,number_sales] [sum,isEmpty,sum,sum,isEmpty,sum]
+                              HashAggregate [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] [sum(sales),sum(number_salesL),sum_sales,number_sales,sum,isEmpty,sum]
+                                InputAdapter
+                                  ReusedExchange [channel,i_brand_id,i_class_id,i_category_id,sum,isEmpty,sum] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt
index 7130612b73..4d23b269c1 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/explain.txt
@@ -1,163 +1,157 @@
 == Physical Plan ==
-* ColumnarToRow (159)
-+- CometTakeOrderedAndProject (158)
-   +- CometUnion (157)
-      :- CometHashAggregate (42)
-      :  +- CometColumnarExchange (41)
-      :     +- RowToColumnar (40)
-      :        +- * HashAggregate (39)
-      :           +- * Project (38)
-      :              +- * BroadcastHashJoin Inner BuildRight (37)
-      :                 :- * Project (32)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (31)
-      :                 :     :- * Project (29)
-      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (28)
-      :                 :     :     :- * Project (23)
-      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
-      :                 :     :     :     :- * Project (17)
-      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
-      :                 :     :     :     :     :- * Project (10)
-      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-      :                 :     :     :     :     :     :- * ColumnarToRow (3)
-      :                 :     :     :     :     :     :  +- CometFilter (2)
-      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-      :                 :     :     :     :     :     +- BroadcastExchange (8)
-      :                 :     :     :     :     :        +- * ColumnarToRow (7)
-      :                 :     :     :     :     :           +- CometProject (6)
-      :                 :     :     :     :     :              +- CometFilter (5)
-      :                 :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-      :                 :     :     :     :     +- BroadcastExchange (15)
-      :                 :     :     :     :        +- * ColumnarToRow (14)
-      :                 :     :     :     :           +- CometProject (13)
-      :                 :     :     :     :              +- CometFilter (12)
-      :                 :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
-      :                 :     :     :     +- BroadcastExchange (21)
-      :                 :     :     :        +- * ColumnarToRow (20)
-      :                 :     :     :           +- CometFilter (19)
-      :                 :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
-      :                 :     :     +- BroadcastExchange (27)
-      :                 :     :        +- * ColumnarToRow (26)
-      :                 :     :           +- CometFilter (25)
-      :                 :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
-      :                 :     +- ReusedExchange (30)
-      :                 +- BroadcastExchange (36)
-      :                    +- * ColumnarToRow (35)
-      :                       +- CometFilter (34)
-      :                          +- CometScan parquet spark_catalog.default.item (33)
-      :- CometHashAggregate (70)
-      :  +- CometColumnarExchange (69)
-      :     +- RowToColumnar (68)
-      :        +- * HashAggregate (67)
-      :           +- * Project (66)
-      :              +- * BroadcastHashJoin Inner BuildRight (65)
-      :                 :- * Project (63)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (62)
-      :                 :     :- * Project (60)
-      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (59)
-      :                 :     :     :- * Project (54)
-      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
-      :                 :     :     :     :- * Project (51)
-      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (50)
-      :                 :     :     :     :     :- * Project (48)
-      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (47)
-      :                 :     :     :     :     :     :- * ColumnarToRow (45)
-      :                 :     :     :     :     :     :  +- CometFilter (44)
-      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (43)
-      :                 :     :     :     :     :     +- ReusedExchange (46)
-      :                 :     :     :     :     +- ReusedExchange (49)
-      :                 :     :     :     +- ReusedExchange (52)
-      :                 :     :     +- BroadcastExchange (58)
-      :                 :     :        +- * ColumnarToRow (57)
-      :                 :     :           +- CometFilter (56)
-      :                 :     :              +- CometScan parquet spark_catalog.default.customer_address (55)
-      :                 :     +- ReusedExchange (61)
-      :                 +- ReusedExchange (64)
-      :- CometHashAggregate (99)
-      :  +- CometColumnarExchange (98)
-      :     +- RowToColumnar (97)
-      :        +- * HashAggregate (96)
-      :           +- * Project (95)
-      :              +- * BroadcastHashJoin Inner BuildRight (94)
-      :                 :- * Project (92)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (91)
-      :                 :     :- * Project (89)
-      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (88)
-      :                 :     :     :- * Project (82)
-      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (81)
-      :                 :     :     :     :- * Project (79)
-      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (78)
-      :                 :     :     :     :     :- * Project (76)
-      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (75)
-      :                 :     :     :     :     :     :- * ColumnarToRow (73)
-      :                 :     :     :     :     :     :  +- CometFilter (72)
-      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (71)
-      :                 :     :     :     :     :     +- ReusedExchange (74)
-      :                 :     :     :     :     +- ReusedExchange (77)
-      :                 :     :     :     +- ReusedExchange (80)
-      :                 :     :     +- BroadcastExchange (87)
-      :                 :     :        +- * ColumnarToRow (86)
-      :                 :     :           +- CometProject (85)
-      :                 :     :              +- CometFilter (84)
-      :                 :     :                 +- CometScan parquet spark_catalog.default.customer_address (83)
-      :                 :     +- ReusedExchange (90)
-      :                 +- ReusedExchange (93)
-      :- CometHashAggregate (128)
-      :  +- CometColumnarExchange (127)
-      :     +- RowToColumnar (126)
-      :        +- * HashAggregate (125)
-      :           +- * Project (124)
-      :              +- * BroadcastHashJoin Inner BuildRight (123)
-      :                 :- * Project (121)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (120)
-      :                 :     :- * Project (118)
-      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (117)
-      :                 :     :     :- * Project (111)
-      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (110)
-      :                 :     :     :     :- * Project (108)
-      :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (107)
-      :                 :     :     :     :     :- * Project (105)
-      :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (104)
-      :                 :     :     :     :     :     :- * ColumnarToRow (102)
-      :                 :     :     :     :     :     :  +- CometFilter (101)
-      :                 :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (100)
-      :                 :     :     :     :     :     +- ReusedExchange (103)
-      :                 :     :     :     :     +- ReusedExchange (106)
-      :                 :     :     :     +- ReusedExchange (109)
-      :                 :     :     +- BroadcastExchange (116)
-      :                 :     :        +- * ColumnarToRow (115)
-      :                 :     :           +- CometProject (114)
-      :                 :     :              +- CometFilter (113)
-      :                 :     :                 +- CometScan parquet spark_catalog.default.customer_address (112)
-      :                 :     +- ReusedExchange (119)
-      :                 +- ReusedExchange (122)
-      +- CometHashAggregate (156)
-         +- CometColumnarExchange (155)
-            +- RowToColumnar (154)
-               +- * HashAggregate (153)
-                  +- * Project (152)
-                     +- * BroadcastHashJoin Inner BuildRight (151)
-                        :- * Project (146)
-                        :  +- * BroadcastHashJoin Inner BuildRight (145)
-                        :     :- * Project (143)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (142)
-                        :     :     :- * Project (140)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (139)
-                        :     :     :     :- * Project (137)
-                        :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (136)
-                        :     :     :     :     :- * Project (134)
-                        :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (133)
-                        :     :     :     :     :     :- * ColumnarToRow (131)
-                        :     :     :     :     :     :  +- CometFilter (130)
-                        :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (129)
-                        :     :     :     :     :     +- ReusedExchange (132)
-                        :     :     :     :     +- ReusedExchange (135)
-                        :     :     :     +- ReusedExchange (138)
-                        :     :     +- ReusedExchange (141)
-                        :     +- ReusedExchange (144)
-                        +- BroadcastExchange (150)
-                           +- * ColumnarToRow (149)
-                              +- CometFilter (148)
-                                 +- CometScan parquet spark_catalog.default.item (147)
+TakeOrderedAndProject (153)
++- Union (152)
+   :- * HashAggregate (41)
+   :  +- Exchange (40)
+   :     +- * HashAggregate (39)
+   :        +- * Project (38)
+   :           +- * BroadcastHashJoin Inner BuildRight (37)
+   :              :- * Project (32)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (31)
+   :              :     :- * Project (29)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (28)
+   :              :     :     :- * Project (23)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (22)
+   :              :     :     :     :- * Project (17)
+   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (16)
+   :              :     :     :     :     :- * Project (10)
+   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+   :              :     :     :     :     :     :- * ColumnarToRow (3)
+   :              :     :     :     :     :     :  +- CometFilter (2)
+   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+   :              :     :     :     :     :     +- BroadcastExchange (8)
+   :              :     :     :     :     :        +- * ColumnarToRow (7)
+   :              :     :     :     :     :           +- CometProject (6)
+   :              :     :     :     :     :              +- CometFilter (5)
+   :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+   :              :     :     :     :     +- BroadcastExchange (15)
+   :              :     :     :     :        +- * ColumnarToRow (14)
+   :              :     :     :     :           +- CometProject (13)
+   :              :     :     :     :              +- CometFilter (12)
+   :              :     :     :     :                 +- CometScan parquet spark_catalog.default.customer (11)
+   :              :     :     :     +- BroadcastExchange (21)
+   :              :     :     :        +- * ColumnarToRow (20)
+   :              :     :     :           +- CometFilter (19)
+   :              :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (18)
+   :              :     :     +- BroadcastExchange (27)
+   :              :     :        +- * ColumnarToRow (26)
+   :              :     :           +- CometFilter (25)
+   :              :     :              +- CometScan parquet spark_catalog.default.customer_address (24)
+   :              :     +- ReusedExchange (30)
+   :              +- BroadcastExchange (36)
+   :                 +- * ColumnarToRow (35)
+   :                    +- CometFilter (34)
+   :                       +- CometScan parquet spark_catalog.default.item (33)
+   :- * HashAggregate (68)
+   :  +- Exchange (67)
+   :     +- * HashAggregate (66)
+   :        +- * Project (65)
+   :           +- * BroadcastHashJoin Inner BuildRight (64)
+   :              :- * Project (62)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (61)
+   :              :     :- * Project (59)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (58)
+   :              :     :     :- * Project (53)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (52)
+   :              :     :     :     :- * Project (50)
+   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (49)
+   :              :     :     :     :     :- * Project (47)
+   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (46)
+   :              :     :     :     :     :     :- * ColumnarToRow (44)
+   :              :     :     :     :     :     :  +- CometFilter (43)
+   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (42)
+   :              :     :     :     :     :     +- ReusedExchange (45)
+   :              :     :     :     :     +- ReusedExchange (48)
+   :              :     :     :     +- ReusedExchange (51)
+   :              :     :     +- BroadcastExchange (57)
+   :              :     :        +- * ColumnarToRow (56)
+   :              :     :           +- CometFilter (55)
+   :              :     :              +- CometScan parquet spark_catalog.default.customer_address (54)
+   :              :     +- ReusedExchange (60)
+   :              +- ReusedExchange (63)
+   :- * HashAggregate (96)
+   :  +- Exchange (95)
+   :     +- * HashAggregate (94)
+   :        +- * Project (93)
+   :           +- * BroadcastHashJoin Inner BuildRight (92)
+   :              :- * Project (90)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (89)
+   :              :     :- * Project (87)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (86)
+   :              :     :     :- * Project (80)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (79)
+   :              :     :     :     :- * Project (77)
+   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (76)
+   :              :     :     :     :     :- * Project (74)
+   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (73)
+   :              :     :     :     :     :     :- * ColumnarToRow (71)
+   :              :     :     :     :     :     :  +- CometFilter (70)
+   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (69)
+   :              :     :     :     :     :     +- ReusedExchange (72)
+   :              :     :     :     :     +- ReusedExchange (75)
+   :              :     :     :     +- ReusedExchange (78)
+   :              :     :     +- BroadcastExchange (85)
+   :              :     :        +- * ColumnarToRow (84)
+   :              :     :           +- CometProject (83)
+   :              :     :              +- CometFilter (82)
+   :              :     :                 +- CometScan parquet spark_catalog.default.customer_address (81)
+   :              :     +- ReusedExchange (88)
+   :              +- ReusedExchange (91)
+   :- * HashAggregate (124)
+   :  +- Exchange (123)
+   :     +- * HashAggregate (122)
+   :        +- * Project (121)
+   :           +- * BroadcastHashJoin Inner BuildRight (120)
+   :              :- * Project (118)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (117)
+   :              :     :- * Project (115)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (114)
+   :              :     :     :- * Project (108)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (107)
+   :              :     :     :     :- * Project (105)
+   :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (104)
+   :              :     :     :     :     :- * Project (102)
+   :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (101)
+   :              :     :     :     :     :     :- * ColumnarToRow (99)
+   :              :     :     :     :     :     :  +- CometFilter (98)
+   :              :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (97)
+   :              :     :     :     :     :     +- ReusedExchange (100)
+   :              :     :     :     :     +- ReusedExchange (103)
+   :              :     :     :     +- ReusedExchange (106)
+   :              :     :     +- BroadcastExchange (113)
+   :              :     :        +- * ColumnarToRow (112)
+   :              :     :           +- CometProject (111)
+   :              :     :              +- CometFilter (110)
+   :              :     :                 +- CometScan parquet spark_catalog.default.customer_address (109)
+   :              :     +- ReusedExchange (116)
+   :              +- ReusedExchange (119)
+   +- * HashAggregate (151)
+      +- Exchange (150)
+         +- * HashAggregate (149)
+            +- * Project (148)
+               +- * BroadcastHashJoin Inner BuildRight (147)
+                  :- * Project (142)
+                  :  +- * BroadcastHashJoin Inner BuildRight (141)
+                  :     :- * Project (139)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (138)
+                  :     :     :- * Project (136)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (135)
+                  :     :     :     :- * Project (133)
+                  :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (132)
+                  :     :     :     :     :- * Project (130)
+                  :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (129)
+                  :     :     :     :     :     :- * ColumnarToRow (127)
+                  :     :     :     :     :     :  +- CometFilter (126)
+                  :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (125)
+                  :     :     :     :     :     +- ReusedExchange (128)
+                  :     :     :     :     +- ReusedExchange (131)
+                  :     :     :     +- ReusedExchange (134)
+                  :     :     +- ReusedExchange (137)
+                  :     +- ReusedExchange (140)
+                  +- BroadcastExchange (146)
+                     +- * ColumnarToRow (145)
+                        +- CometFilter (144)
+                           +- CometScan parquet spark_catalog.default.item (143)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -295,7 +289,7 @@ Join condition: None
 Output [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_county#22, ca_state#23, ca_country#24]
 Input [14]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_county#22, ca_state#23, ca_country#24]
 
-(30) ReusedExchange [Reuses operator id: 164]
+(30) ReusedExchange [Reuses operator id: 158]
 Output [1]: [d_date_sk#25]
 
 (31) BroadcastHashJoin [codegen id : 7]
@@ -343,69 +337,68 @@ Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30)
 Aggregate Attributes [14]: [sum#35, count#36, sum#37, count#38, sum#39, count#40, sum#41, count#42, sum#43, count#44, sum#45, count#46, sum#47, count#48]
 Results [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
 
-(40) RowToColumnar
+(40) Exchange
 Input [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
+Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, ca_county#22, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) CometColumnarExchange
-Input [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
-Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, ca_county#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 8]
 Input [18]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56, sum#57, count#58, sum#59, count#60, sum#61, count#62]
 Keys [4]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
+Aggregate Attributes [7]: [avg(agg1#28)#63, avg(agg2#29)#64, avg(agg3#30)#65, avg(agg4#31)#66, avg(agg5#32)#67, avg(agg6#33)#68, avg(agg7#34)#69]
+Results [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, avg(agg1#28)#63 AS agg1#70, avg(agg2#29)#64 AS agg2#71, avg(agg3#30)#65 AS agg3#72, avg(agg4#31)#66 AS agg4#73, avg(agg5#32)#67 AS agg5#74, avg(agg6#33)#68 AS agg6#75, avg(agg7#34)#69 AS agg7#76]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#63)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#77)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(44) CometFilter
+(43) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(45) ColumnarToRow [codegen id : 14]
+(44) ColumnarToRow [codegen id : 15]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(46) ReusedExchange [Reuses operator id: 8]
+(45) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(47) BroadcastHashJoin [codegen id : 14]
+(46) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 14]
+(47) Project [codegen id : 15]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(49) ReusedExchange [Reuses operator id: 15]
+(48) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(50) BroadcastHashJoin [codegen id : 14]
+(49) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 14]
+(50) Project [codegen id : 15]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(52) ReusedExchange [Reuses operator id: 21]
+(51) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(53) BroadcastHashJoin [codegen id : 14]
+(52) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(54) Project [codegen id : 14]
+(53) Project [codegen id : 15]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
@@ -416,123 +409,122 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [In(ca_state, [AL,MS,NC,ND,OK,TN,WI]), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string,ca_country:string>
 
-(56) CometFilter
+(55) CometFilter
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Condition : (ca_state#23 IN (ND,WI,AL,NC,OK,MS,TN) AND isnotnull(ca_address_sk#21))
 
-(57) ColumnarToRow [codegen id : 11]
+(56) ColumnarToRow [codegen id : 12]
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 
-(58) BroadcastExchange
+(57) BroadcastExchange
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(59) BroadcastHashJoin [codegen id : 14]
+(58) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(60) Project [codegen id : 14]
+(59) Project [codegen id : 15]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24]
 Input [13]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_state#23, ca_country#24]
 
-(61) ReusedExchange [Reuses operator id: 164]
+(60) ReusedExchange [Reuses operator id: 158]
 Output [1]: [d_date_sk#25]
 
-(62) BroadcastHashJoin [codegen id : 14]
+(61) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 14]
+(62) Project [codegen id : 15]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24, d_date_sk#25]
 
-(64) ReusedExchange [Reuses operator id: 36]
+(63) ReusedExchange [Reuses operator id: 36]
 Output [2]: [i_item_sk#26, i_item_id#27]
 
-(65) BroadcastHashJoin [codegen id : 14]
+(64) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(66) Project [codegen id : 14]
+(65) Project [codegen id : 15]
 Output [10]: [i_item_id#27, ca_country#24, ca_state#23, cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_state#23, ca_country#24, i_item_sk#26, i_item_id#27]
 
-(67) HashAggregate [codegen id : 14]
+(66) HashAggregate [codegen id : 15]
 Input [10]: [i_item_id#27, ca_country#24, ca_state#23, agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys [3]: [i_item_id#27, ca_country#24, ca_state#23]
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#64, count#65, sum#66, count#67, sum#68, count#69, sum#70, count#71, sum#72, count#73, sum#74, count#75, sum#76, count#77]
-Results [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
-
-(68) RowToColumnar
-Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+Aggregate Attributes [14]: [sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+Results [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#92, count#93, sum#94, count#95, sum#96, count#97, sum#98, count#99, sum#100, count#101, sum#102, count#103, sum#104, count#105]
 
-(69) CometColumnarExchange
-Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
-Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(67) Exchange
+Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#92, count#93, sum#94, count#95, sum#96, count#97, sum#98, count#99, sum#100, count#101, sum#102, count#103, sum#104, count#105]
+Arguments: hashpartitioning(i_item_id#27, ca_country#24, ca_state#23, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(70) CometHashAggregate
-Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#78, count#79, sum#80, count#81, sum#82, count#83, sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+(68) HashAggregate [codegen id : 16]
+Input [17]: [i_item_id#27, ca_country#24, ca_state#23, sum#92, count#93, sum#94, count#95, sum#96, count#97, sum#98, count#99, sum#100, count#101, sum#102, count#103, sum#104, count#105]
 Keys [3]: [i_item_id#27, ca_country#24, ca_state#23]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
+Aggregate Attributes [7]: [avg(agg1#28)#106, avg(agg2#29)#107, avg(agg3#30)#108, avg(agg4#31)#109, avg(agg5#32)#110, avg(agg6#33)#111, avg(agg7#34)#112]
+Results [11]: [i_item_id#27, ca_country#24, ca_state#23, null AS county#113, avg(agg1#28)#106 AS agg1#114, avg(agg2#29)#107 AS agg2#115, avg(agg3#30)#108 AS agg3#116, avg(agg4#31)#109 AS agg4#117, avg(agg5#32)#110 AS agg5#118, avg(agg6#33)#111 AS agg6#119, avg(agg7#34)#112 AS agg7#120]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#92)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#121)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(72) CometFilter
+(70) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(73) ColumnarToRow [codegen id : 21]
+(71) ColumnarToRow [codegen id : 23]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(74) ReusedExchange [Reuses operator id: 8]
+(72) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(75) BroadcastHashJoin [codegen id : 21]
+(73) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(76) Project [codegen id : 21]
+(74) Project [codegen id : 23]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(77) ReusedExchange [Reuses operator id: 15]
+(75) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(78) BroadcastHashJoin [codegen id : 21]
+(76) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 21]
+(77) Project [codegen id : 23]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(80) ReusedExchange [Reuses operator id: 21]
+(78) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(81) BroadcastHashJoin [codegen id : 21]
+(79) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 21]
+(80) Project [codegen id : 23]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
@@ -543,127 +535,126 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [In(ca_state, [AL,MS,NC,ND,OK,TN,WI]), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string,ca_country:string>
 
-(84) CometFilter
+(82) CometFilter
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Condition : (ca_state#23 IN (ND,WI,AL,NC,OK,MS,TN) AND isnotnull(ca_address_sk#21))
 
-(85) CometProject
+(83) CometProject
 Input [3]: [ca_address_sk#21, ca_state#23, ca_country#24]
 Arguments: [ca_address_sk#21, ca_country#24], [ca_address_sk#21, ca_country#24]
 
-(86) ColumnarToRow [codegen id : 18]
+(84) ColumnarToRow [codegen id : 20]
 Input [2]: [ca_address_sk#21, ca_country#24]
 
-(87) BroadcastExchange
+(85) BroadcastExchange
 Input [2]: [ca_address_sk#21, ca_country#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-(88) BroadcastHashJoin [codegen id : 21]
+(86) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(89) Project [codegen id : 21]
+(87) Project [codegen id : 23]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_country#24]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21, ca_country#24]
 
-(90) ReusedExchange [Reuses operator id: 164]
+(88) ReusedExchange [Reuses operator id: 158]
 Output [1]: [d_date_sk#25]
 
-(91) BroadcastHashJoin [codegen id : 21]
+(89) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(92) Project [codegen id : 21]
+(90) Project [codegen id : 23]
 Output [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_country#24]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, ca_country#24, d_date_sk#25]
 
-(93) ReusedExchange [Reuses operator id: 36]
+(91) ReusedExchange [Reuses operator id: 36]
 Output [2]: [i_item_sk#26, i_item_id#27]
 
-(94) BroadcastHashJoin [codegen id : 21]
+(92) BroadcastHashJoin [codegen id : 23]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(95) Project [codegen id : 21]
+(93) Project [codegen id : 23]
 Output [9]: [i_item_id#27, ca_country#24, cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, ca_country#24, i_item_sk#26, i_item_id#27]
 
-(96) HashAggregate [codegen id : 21]
+(94) HashAggregate [codegen id : 23]
 Input [9]: [i_item_id#27, ca_country#24, agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys [2]: [i_item_id#27, ca_country#24]
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#93, count#94, sum#95, count#96, sum#97, count#98, sum#99, count#100, sum#101, count#102, sum#103, count#104, sum#105, count#106]
-Results [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
-
-(97) RowToColumnar
-Input [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
+Aggregate Attributes [14]: [sum#122, count#123, sum#124, count#125, sum#126, count#127, sum#128, count#129, sum#130, count#131, sum#132, count#133, sum#134, count#135]
+Results [16]: [i_item_id#27, ca_country#24, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
 
-(98) CometColumnarExchange
-Input [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
-Arguments: hashpartitioning(i_item_id#27, ca_country#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(95) Exchange
+Input [16]: [i_item_id#27, ca_country#24, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+Arguments: hashpartitioning(i_item_id#27, ca_country#24, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(99) CometHashAggregate
-Input [16]: [i_item_id#27, ca_country#24, sum#107, count#108, sum#109, count#110, sum#111, count#112, sum#113, count#114, sum#115, count#116, sum#117, count#118, sum#119, count#120]
+(96) HashAggregate [codegen id : 24]
+Input [16]: [i_item_id#27, ca_country#24, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
 Keys [2]: [i_item_id#27, ca_country#24]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
+Aggregate Attributes [7]: [avg(agg1#28)#150, avg(agg2#29)#151, avg(agg3#30)#152, avg(agg4#31)#153, avg(agg5#32)#154, avg(agg6#33)#155, avg(agg7#34)#156]
+Results [11]: [i_item_id#27, ca_country#24, null AS ca_state#157, null AS county#158, avg(agg1#28)#150 AS agg1#159, avg(agg2#29)#151 AS agg2#160, avg(agg3#30)#152 AS agg3#161, avg(agg4#31)#153 AS agg4#162, avg(agg5#32)#154 AS agg5#163, avg(agg6#33)#155 AS agg6#164, avg(agg7#34)#156 AS agg7#165]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#121)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#166)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(101) CometFilter
+(98) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(102) ColumnarToRow [codegen id : 28]
+(99) ColumnarToRow [codegen id : 31]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(103) ReusedExchange [Reuses operator id: 8]
+(100) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(104) BroadcastHashJoin [codegen id : 28]
+(101) BroadcastHashJoin [codegen id : 31]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(105) Project [codegen id : 28]
+(102) Project [codegen id : 31]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(106) ReusedExchange [Reuses operator id: 15]
+(103) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(107) BroadcastHashJoin [codegen id : 28]
+(104) BroadcastHashJoin [codegen id : 31]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(108) Project [codegen id : 28]
+(105) Project [codegen id : 31]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(109) ReusedExchange [Reuses operator id: 21]
+(106) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(110) BroadcastHashJoin [codegen id : 28]
+(107) BroadcastHashJoin [codegen id : 31]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(111) Project [codegen id : 28]
+(108) Project [codegen id : 31]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
@@ -674,153 +665,152 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [In(ca_state, [AL,MS,NC,ND,OK,TN,WI]), IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_state:string>
 
-(113) CometFilter
+(110) CometFilter
 Input [2]: [ca_address_sk#21, ca_state#23]
 Condition : (ca_state#23 IN (ND,WI,AL,NC,OK,MS,TN) AND isnotnull(ca_address_sk#21))
 
-(114) CometProject
+(111) CometProject
 Input [2]: [ca_address_sk#21, ca_state#23]
 Arguments: [ca_address_sk#21], [ca_address_sk#21]
 
-(115) ColumnarToRow [codegen id : 25]
+(112) ColumnarToRow [codegen id : 28]
 Input [1]: [ca_address_sk#21]
 
-(116) BroadcastExchange
+(113) BroadcastExchange
 Input [1]: [ca_address_sk#21]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(117) BroadcastHashJoin [codegen id : 28]
+(114) BroadcastHashJoin [codegen id : 31]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(118) Project [codegen id : 28]
+(115) Project [codegen id : 31]
 Output [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21]
 
-(119) ReusedExchange [Reuses operator id: 164]
+(116) ReusedExchange [Reuses operator id: 158]
 Output [1]: [d_date_sk#25]
 
-(120) BroadcastHashJoin [codegen id : 28]
+(117) BroadcastHashJoin [codegen id : 31]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(121) Project [codegen id : 28]
+(118) Project [codegen id : 31]
 Output [8]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19]
 Input [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, d_date_sk#25]
 
-(122) ReusedExchange [Reuses operator id: 36]
+(119) ReusedExchange [Reuses operator id: 36]
 Output [2]: [i_item_sk#26, i_item_id#27]
 
-(123) BroadcastHashJoin [codegen id : 28]
+(120) BroadcastHashJoin [codegen id : 31]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(124) Project [codegen id : 28]
+(121) Project [codegen id : 31]
 Output [8]: [i_item_id#27, cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, i_item_sk#26, i_item_id#27]
 
-(125) HashAggregate [codegen id : 28]
+(122) HashAggregate [codegen id : 31]
 Input [8]: [i_item_id#27, agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys [1]: [i_item_id#27]
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#122, count#123, sum#124, count#125, sum#126, count#127, sum#128, count#129, sum#130, count#131, sum#132, count#133, sum#134, count#135]
-Results [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
-
-(126) RowToColumnar
-Input [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+Aggregate Attributes [14]: [sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178, sum#179, count#180]
+Results [15]: [i_item_id#27, sum#181, count#182, sum#183, count#184, sum#185, count#186, sum#187, count#188, sum#189, count#190, sum#191, count#192, sum#193, count#194]
 
-(127) CometColumnarExchange
-Input [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
-Arguments: hashpartitioning(i_item_id#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(123) Exchange
+Input [15]: [i_item_id#27, sum#181, count#182, sum#183, count#184, sum#185, count#186, sum#187, count#188, sum#189, count#190, sum#191, count#192, sum#193, count#194]
+Arguments: hashpartitioning(i_item_id#27, 5), ENSURE_REQUIREMENTS, [plan_id=12]
 
-(128) CometHashAggregate
-Input [15]: [i_item_id#27, sum#136, count#137, sum#138, count#139, sum#140, count#141, sum#142, count#143, sum#144, count#145, sum#146, count#147, sum#148, count#149]
+(124) HashAggregate [codegen id : 32]
+Input [15]: [i_item_id#27, sum#181, count#182, sum#183, count#184, sum#185, count#186, sum#187, count#188, sum#189, count#190, sum#191, count#192, sum#193, count#194]
 Keys [1]: [i_item_id#27]
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
+Aggregate Attributes [7]: [avg(agg1#28)#195, avg(agg2#29)#196, avg(agg3#30)#197, avg(agg4#31)#198, avg(agg5#32)#199, avg(agg6#33)#200, avg(agg7#34)#201]
+Results [11]: [i_item_id#27, null AS ca_country#202, null AS ca_state#203, null AS county#204, avg(agg1#28)#195 AS agg1#205, avg(agg2#29)#196 AS agg2#206, avg(agg3#30)#197 AS agg3#207, avg(agg4#31)#198 AS agg4#208, avg(agg5#32)#199 AS agg5#209, avg(agg6#33)#200 AS agg6#210, avg(agg7#34)#201 AS agg7#211]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#150)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#9), dynamicpruningexpression(cs_sold_date_sk#9 IN dynamicpruning#212)]
 PushedFilters: [IsNotNull(cs_bill_cdemo_sk), IsNotNull(cs_bill_customer_sk), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_bill_cdemo_sk:int,cs_item_sk:int,cs_quantity:int,cs_list_price:decimal(7,2),cs_sales_price:decimal(7,2),cs_coupon_amt:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(130) CometFilter
+(126) CometFilter
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 Condition : ((isnotnull(cs_bill_cdemo_sk#2) AND isnotnull(cs_bill_customer_sk#1)) AND isnotnull(cs_item_sk#3))
 
-(131) ColumnarToRow [codegen id : 35]
+(127) ColumnarToRow [codegen id : 39]
 Input [9]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9]
 
-(132) ReusedExchange [Reuses operator id: 8]
+(128) ReusedExchange [Reuses operator id: 8]
 Output [2]: [cd_demo_sk#11, cd_dep_count#14]
 
-(133) BroadcastHashJoin [codegen id : 35]
+(129) BroadcastHashJoin [codegen id : 39]
 Left keys [1]: [cs_bill_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#11]
 Join type: Inner
 Join condition: None
 
-(134) Project [codegen id : 35]
+(130) Project [codegen id : 39]
 Output [9]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14]
 Input [11]: [cs_bill_customer_sk#1, cs_bill_cdemo_sk#2, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_demo_sk#11, cd_dep_count#14]
 
-(135) ReusedExchange [Reuses operator id: 15]
+(131) ReusedExchange [Reuses operator id: 15]
 Output [4]: [c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(136) BroadcastHashJoin [codegen id : 35]
+(132) BroadcastHashJoin [codegen id : 39]
 Left keys [1]: [cs_bill_customer_sk#1]
 Right keys [1]: [c_customer_sk#15]
 Join type: Inner
 Join condition: None
 
-(137) Project [codegen id : 35]
+(133) Project [codegen id : 39]
 Output [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 Input [13]: [cs_bill_customer_sk#1, cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_customer_sk#15, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19]
 
-(138) ReusedExchange [Reuses operator id: 21]
+(134) ReusedExchange [Reuses operator id: 21]
 Output [1]: [cd_demo_sk#20]
 
-(139) BroadcastHashJoin [codegen id : 35]
+(135) BroadcastHashJoin [codegen id : 39]
 Left keys [1]: [c_current_cdemo_sk#16]
 Right keys [1]: [cd_demo_sk#20]
 Join type: Inner
 Join condition: None
 
-(140) Project [codegen id : 35]
+(136) Project [codegen id : 39]
 Output [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19]
 Input [12]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_cdemo_sk#16, c_current_addr_sk#17, c_birth_year#19, cd_demo_sk#20]
 
-(141) ReusedExchange [Reuses operator id: 116]
+(137) ReusedExchange [Reuses operator id: 113]
 Output [1]: [ca_address_sk#21]
 
-(142) BroadcastHashJoin [codegen id : 35]
+(138) BroadcastHashJoin [codegen id : 39]
 Left keys [1]: [c_current_addr_sk#17]
 Right keys [1]: [ca_address_sk#21]
 Join type: Inner
 Join condition: None
 
-(143) Project [codegen id : 35]
+(139) Project [codegen id : 39]
 Output [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19]
 Input [11]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_current_addr_sk#17, c_birth_year#19, ca_address_sk#21]
 
-(144) ReusedExchange [Reuses operator id: 164]
+(140) ReusedExchange [Reuses operator id: 158]
 Output [1]: [d_date_sk#25]
 
-(145) BroadcastHashJoin [codegen id : 35]
+(141) BroadcastHashJoin [codegen id : 39]
 Left keys [1]: [cs_sold_date_sk#9]
 Right keys [1]: [d_date_sk#25]
 Join type: Inner
 Join condition: None
 
-(146) Project [codegen id : 35]
+(142) Project [codegen id : 39]
 Output [8]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19]
 Input [10]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cs_sold_date_sk#9, cd_dep_count#14, c_birth_year#19, d_date_sk#25]
 
@@ -831,98 +821,89 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int>
 
-(148) CometFilter
+(144) CometFilter
 Input [1]: [i_item_sk#26]
 Condition : isnotnull(i_item_sk#26)
 
-(149) ColumnarToRow [codegen id : 34]
+(145) ColumnarToRow [codegen id : 38]
 Input [1]: [i_item_sk#26]
 
-(150) BroadcastExchange
+(146) BroadcastExchange
 Input [1]: [i_item_sk#26]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(151) BroadcastHashJoin [codegen id : 35]
+(147) BroadcastHashJoin [codegen id : 39]
 Left keys [1]: [cs_item_sk#3]
 Right keys [1]: [i_item_sk#26]
 Join type: Inner
 Join condition: None
 
-(152) Project [codegen id : 35]
+(148) Project [codegen id : 39]
 Output [7]: [cast(cs_quantity#4 as decimal(12,2)) AS agg1#28, cast(cs_list_price#5 as decimal(12,2)) AS agg2#29, cast(cs_coupon_amt#7 as decimal(12,2)) AS agg3#30, cast(cs_sales_price#6 as decimal(12,2)) AS agg4#31, cast(cs_net_profit#8 as decimal(12,2)) AS agg5#32, cast(c_birth_year#19 as decimal(12,2)) AS agg6#33, cast(cd_dep_count#14 as decimal(12,2)) AS agg7#34]
 Input [9]: [cs_item_sk#3, cs_quantity#4, cs_list_price#5, cs_sales_price#6, cs_coupon_amt#7, cs_net_profit#8, cd_dep_count#14, c_birth_year#19, i_item_sk#26]
 
-(153) HashAggregate [codegen id : 35]
+(149) HashAggregate [codegen id : 39]
 Input [7]: [agg1#28, agg2#29, agg3#30, agg4#31, agg5#32, agg6#33, agg7#34]
 Keys: []
 Functions [7]: [partial_avg(agg1#28), partial_avg(agg2#29), partial_avg(agg3#30), partial_avg(agg4#31), partial_avg(agg5#32), partial_avg(agg6#33), partial_avg(agg7#34)]
-Aggregate Attributes [14]: [sum#151, count#152, sum#153, count#154, sum#155, count#156, sum#157, count#158, sum#159, count#160, sum#161, count#162, sum#163, count#164]
-Results [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
+Aggregate Attributes [14]: [sum#213, count#214, sum#215, count#216, sum#217, count#218, sum#219, count#220, sum#221, count#222, sum#223, count#224, sum#225, count#226]
+Results [14]: [sum#227, count#228, sum#229, count#230, sum#231, count#232, sum#233, count#234, sum#235, count#236, sum#237, count#238, sum#239, count#240]
 
-(154) RowToColumnar
-Input [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
+(150) Exchange
+Input [14]: [sum#227, count#228, sum#229, count#230, sum#231, count#232, sum#233, count#234, sum#235, count#236, sum#237, count#238, sum#239, count#240]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=14]
 
-(155) CometColumnarExchange
-Input [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
-
-(156) CometHashAggregate
-Input [14]: [sum#165, count#166, sum#167, count#168, sum#169, count#170, sum#171, count#172, sum#173, count#174, sum#175, count#176, sum#177, count#178]
+(151) HashAggregate [codegen id : 40]
+Input [14]: [sum#227, count#228, sum#229, count#230, sum#231, count#232, sum#233, count#234, sum#235, count#236, sum#237, count#238, sum#239, count#240]
 Keys: []
 Functions [7]: [avg(agg1#28), avg(agg2#29), avg(agg3#30), avg(agg4#31), avg(agg5#32), avg(agg6#33), avg(agg7#34)]
+Aggregate Attributes [7]: [avg(agg1#28)#241, avg(agg2#29)#242, avg(agg3#30)#243, avg(agg4#31)#244, avg(agg5#32)#245, avg(agg6#33)#246, avg(agg7#34)#247]
+Results [11]: [null AS i_item_id#248, null AS ca_country#249, null AS ca_state#250, null AS county#251, avg(agg1#28)#241 AS agg1#252, avg(agg2#29)#242 AS agg2#253, avg(agg3#30)#243 AS agg3#254, avg(agg4#31)#244 AS agg4#255, avg(agg5#32)#245 AS agg5#256, avg(agg6#33)#246 AS agg6#257, avg(agg7#34)#247 AS agg7#258]
 
-(157) CometUnion
-Child 0 Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
-Child 1 Input [11]: [i_item_id#27, ca_country#24, ca_state#23, county#186, agg1#187, agg2#188, agg3#189, agg4#190, agg5#191, agg6#192, agg7#193]
-Child 2 Input [11]: [i_item_id#27, ca_country#24, ca_state#194, county#195, agg1#196, agg2#197, agg3#198, agg4#199, agg5#200, agg6#201, agg7#202]
-Child 3 Input [11]: [i_item_id#27, ca_country#203, ca_state#204, county#205, agg1#206, agg2#207, agg3#208, agg4#209, agg5#210, agg6#211, agg7#212]
-Child 4 Input [11]: [i_item_id#213, ca_country#214, ca_state#215, county#216, agg1#217, agg2#218, agg3#219, agg4#220, agg5#221, agg6#222, agg7#223]
-
-(158) CometTakeOrderedAndProject
-Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_country#24 ASC NULLS FIRST,ca_state#23 ASC NULLS FIRST,ca_county#22 ASC NULLS FIRST,i_item_id#27 ASC NULLS FIRST], output=[i_item_id#27,ca_country#24,ca_state#23,ca_county#22,agg1#179,agg2#180,agg3#181,agg4#182,agg5#183,agg6#184,agg7#185]), 100, [ca_country#24 ASC NULLS FIRST, ca_state#23 ASC NULLS FIRST, ca_county#22 ASC NULLS FIRST, i_item_id#27 ASC NULLS FIRST], [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
+(152) Union
 
-(159) ColumnarToRow [codegen id : 36]
-Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#179, agg2#180, agg3#181, agg4#182, agg5#183, agg6#184, agg7#185]
+(153) TakeOrderedAndProject
+Input [11]: [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#70, agg2#71, agg3#72, agg4#73, agg5#74, agg6#75, agg7#76]
+Arguments: 100, [ca_country#24 ASC NULLS FIRST, ca_state#23 ASC NULLS FIRST, ca_county#22 ASC NULLS FIRST, i_item_id#27 ASC NULLS FIRST], [i_item_id#27, ca_country#24, ca_state#23, ca_county#22, agg1#70, agg2#71, agg3#72, agg4#73, agg5#74, agg6#75, agg7#76]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
-BroadcastExchange (164)
-+- * ColumnarToRow (163)
-   +- CometProject (162)
-      +- CometFilter (161)
-         +- CometScan parquet spark_catalog.default.date_dim (160)
+BroadcastExchange (158)
++- * ColumnarToRow (157)
+   +- CometProject (156)
+      +- CometFilter (155)
+         +- CometScan parquet spark_catalog.default.date_dim (154)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#25, d_year#224]
+Output [2]: [d_date_sk#25, d_year#259]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(161) CometFilter
-Input [2]: [d_date_sk#25, d_year#224]
-Condition : ((isnotnull(d_year#224) AND (d_year#224 = 2001)) AND isnotnull(d_date_sk#25))
+(155) CometFilter
+Input [2]: [d_date_sk#25, d_year#259]
+Condition : ((isnotnull(d_year#259) AND (d_year#259 = 2001)) AND isnotnull(d_date_sk#25))
 
-(162) CometProject
-Input [2]: [d_date_sk#25, d_year#224]
+(156) CometProject
+Input [2]: [d_date_sk#25, d_year#259]
 Arguments: [d_date_sk#25], [d_date_sk#25]
 
-(163) ColumnarToRow [codegen id : 1]
+(157) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#25]
 
-(164) BroadcastExchange
+(158) BroadcastExchange
 Input [1]: [d_date_sk#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=15]
 
-Subquery:2 Hosting operator id = 43 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:2 Hosting operator id = 42 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
-Subquery:3 Hosting operator id = 71 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:3 Hosting operator id = 69 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
-Subquery:4 Hosting operator id = 100 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:4 Hosting operator id = 97 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
-Subquery:5 Hosting operator id = 129 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
+Subquery:5 Hosting operator id = 125 Hosting Expression = cs_sold_date_sk#9 IN dynamicpruning#10
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt
index e0eebcd657..f02809572c 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q18a/simplified.txt
@@ -1,231 +1,233 @@
-WholeStageCodegen (36)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
-        CometUnion
-          CometHashAggregate [i_item_id,ca_country,ca_state,ca_county,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange [i_item_id,ca_country,ca_state,ca_county] #1
-              RowToColumnar
-                WholeStageCodegen (7)
-                  HashAggregate [i_item_id,ca_country,ca_state,ca_county,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [i_item_id,ca_country,ca_state,ca_county,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #2
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                            InputAdapter
-                                              BroadcastExchange #3
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [cd_demo_sk,cd_dep_count]
-                                                        CometFilter [cd_gender,cd_education_status,cd_demo_sk]
-                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
+TakeOrderedAndProject [ca_country,ca_state,ca_county,i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7]
+  Union
+    WholeStageCodegen (8)
+      HashAggregate [i_item_id,ca_country,ca_state,ca_county,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange [i_item_id,ca_country,ca_state,ca_county] #1
+            WholeStageCodegen (7)
+              HashAggregate [i_item_id,ca_country,ca_state,ca_county,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [i_item_id,ca_country,ca_state,ca_county,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_county,ca_state,ca_country]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #2
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                         InputAdapter
-                                          BroadcastExchange #4
-                                            WholeStageCodegen (2)
+                                          BroadcastExchange #3
+                                            WholeStageCodegen (1)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                                    CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
+                                                  CometProject [cd_demo_sk,cd_dep_count]
+                                                    CometFilter [cd_gender,cd_education_status,cd_demo_sk]
+                                                      CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_education_status,cd_dep_count]
                                     InputAdapter
-                                      BroadcastExchange #5
-                                        WholeStageCodegen (3)
+                                      BroadcastExchange #4
+                                        WholeStageCodegen (2)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [cd_demo_sk]
-                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
+                                              CometProject [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                                CometFilter [c_birth_month,c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_month,c_birth_year]
                                 InputAdapter
-                                  BroadcastExchange #6
-                                    WholeStageCodegen (4)
+                                  BroadcastExchange #5
+                                    WholeStageCodegen (3)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [ca_state,ca_address_sk]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
+                                          CometFilter [cd_demo_sk]
+                                            CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #6
+                                WholeStageCodegen (4)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ca_state,ca_address_sk]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_county,ca_state,ca_country]
                         InputAdapter
-                          BroadcastExchange #7
-                            WholeStageCodegen (6)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-          CometHashAggregate [i_item_id,ca_country,ca_state,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange [i_item_id,ca_country,ca_state] #8
-              RowToColumnar
-                WholeStageCodegen (14)
-                  HashAggregate [i_item_id,ca_country,ca_state,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [i_item_id,ca_country,ca_state,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_state,ca_country]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_state,ca_country]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                          ReusedExchange [d_date_sk] #2
+                    InputAdapter
+                      BroadcastExchange #7
+                        WholeStageCodegen (6)
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+    WholeStageCodegen (16)
+      HashAggregate [i_item_id,ca_country,ca_state,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange [i_item_id,ca_country,ca_state] #8
+            WholeStageCodegen (15)
+              HashAggregate [i_item_id,ca_country,ca_state,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [i_item_id,ca_country,ca_state,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_state,ca_country]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_state,ca_country]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                         InputAdapter
-                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                     InputAdapter
-                                      ReusedExchange [cd_demo_sk] #5
+                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                 InputAdapter
-                                  BroadcastExchange #9
-                                    WholeStageCodegen (11)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ca_state,ca_address_sk]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                                  ReusedExchange [cd_demo_sk] #5
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #9
+                                WholeStageCodegen (12)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [ca_state,ca_address_sk]
+                                        CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                         InputAdapter
-                          ReusedExchange [i_item_sk,i_item_id] #7
-          CometHashAggregate [i_item_id,ca_country,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange [i_item_id,ca_country] #10
-              RowToColumnar
-                WholeStageCodegen (21)
-                  HashAggregate [i_item_id,ca_country,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [i_item_id,ca_country,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_country]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_country]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                          ReusedExchange [d_date_sk] #2
+                    InputAdapter
+                      ReusedExchange [i_item_sk,i_item_id] #7
+    WholeStageCodegen (24)
+      HashAggregate [i_item_id,ca_country,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),ca_state,county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange [i_item_id,ca_country] #10
+            WholeStageCodegen (23)
+              HashAggregate [i_item_id,ca_country,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [i_item_id,ca_country,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year,ca_country]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year,ca_country]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                         InputAdapter
-                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                     InputAdapter
-                                      ReusedExchange [cd_demo_sk] #5
+                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                 InputAdapter
-                                  BroadcastExchange #11
-                                    WholeStageCodegen (18)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [ca_address_sk,ca_country]
-                                            CometFilter [ca_state,ca_address_sk]
-                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
+                                  ReusedExchange [cd_demo_sk] #5
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #11
+                                WholeStageCodegen (20)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [ca_address_sk,ca_country]
+                                        CometFilter [ca_state,ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_country]
                         InputAdapter
-                          ReusedExchange [i_item_sk,i_item_id] #7
-          CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange [i_item_id] #12
-              RowToColumnar
-                WholeStageCodegen (28)
-                  HashAggregate [i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                          ReusedExchange [d_date_sk] #2
+                    InputAdapter
+                      ReusedExchange [i_item_sk,i_item_id] #7
+    WholeStageCodegen (32)
+      HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),ca_country,ca_state,county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange [i_item_id] #12
+            WholeStageCodegen (31)
+              HashAggregate [i_item_id,agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [i_item_id,cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                         InputAdapter
-                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                     InputAdapter
-                                      ReusedExchange [cd_demo_sk] #5
+                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                 InputAdapter
-                                  BroadcastExchange #13
-                                    WholeStageCodegen (25)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometProject [ca_address_sk]
-                                            CometFilter [ca_state,ca_address_sk]
-                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                                  ReusedExchange [cd_demo_sk] #5
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              BroadcastExchange #13
+                                WholeStageCodegen (28)
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometProject [ca_address_sk]
+                                        CometFilter [ca_state,ca_address_sk]
+                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                         InputAdapter
-                          ReusedExchange [i_item_sk,i_item_id] #7
-          CometHashAggregate [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange #14
-              RowToColumnar
-                WholeStageCodegen (35)
-                  HashAggregate [agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
-                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
-                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
-                              BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
-                                  BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
-                                      BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
-                                        Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
-                                          BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
-                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [cd_demo_sk,cd_dep_count] #3
+                          ReusedExchange [d_date_sk] #2
+                    InputAdapter
+                      ReusedExchange [i_item_sk,i_item_id] #7
+    WholeStageCodegen (40)
+      HashAggregate [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(agg2),avg(agg3),avg(agg4),avg(agg5),avg(agg6),avg(agg7),i_item_id,ca_country,ca_state,county,agg1,agg2,agg3,agg4,agg5,agg6,agg7,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange #14
+            WholeStageCodegen (39)
+              HashAggregate [agg1,agg2,agg3,agg4,agg5,agg6,agg7] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [cs_quantity,cs_list_price,cs_coupon_amt,cs_sales_price,cs_net_profit,c_birth_year,cd_dep_count]
+                  BroadcastHashJoin [cs_item_sk,i_item_sk]
+                    Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cd_dep_count,c_birth_year]
+                      BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                        Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_birth_year]
+                          BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                            Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_addr_sk,c_birth_year]
+                              BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                                Project [cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count,c_current_cdemo_sk,c_current_addr_sk,c_birth_year]
+                                  BroadcastHashJoin [cs_bill_customer_sk,c_customer_sk]
+                                    Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk,cd_dep_count]
+                                      BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [cs_bill_cdemo_sk,cs_bill_customer_sk,cs_item_sk]
+                                              CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_bill_cdemo_sk,cs_item_sk,cs_quantity,cs_list_price,cs_sales_price,cs_coupon_amt,cs_net_profit,cs_sold_date_sk]
+                                                ReusedSubquery [d_date_sk] #1
                                         InputAdapter
-                                          ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
+                                          ReusedExchange [cd_demo_sk,cd_dep_count] #3
                                     InputAdapter
-                                      ReusedExchange [cd_demo_sk] #5
+                                      ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk,c_birth_year] #4
                                 InputAdapter
-                                  ReusedExchange [ca_address_sk] #13
+                                  ReusedExchange [cd_demo_sk] #5
                             InputAdapter
-                              ReusedExchange [d_date_sk] #2
+                              ReusedExchange [ca_address_sk] #13
                         InputAdapter
-                          BroadcastExchange #15
-                            WholeStageCodegen (34)
-                              ColumnarToRow
-                                InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk]
+                          ReusedExchange [d_date_sk] #2
+                    InputAdapter
+                      BroadcastExchange #15
+                        WholeStageCodegen (38)
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt
index f62cbd1f86..ad52796edc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/explain.txt
@@ -1,26 +1,24 @@
 == Physical Plan ==
-TakeOrderedAndProject (22)
-+- * Project (21)
-   +- Window (20)
-      +- * ColumnarToRow (19)
-         +- CometSort (18)
-            +- CometColumnarExchange (17)
-               +- CometHashAggregate (16)
-                  +- CometColumnarExchange (15)
-                     +- RowToColumnar (14)
-                        +- * HashAggregate (13)
-                           +- * Project (12)
-                              +- * BroadcastHashJoin Inner BuildRight (11)
-                                 :- * Project (9)
-                                 :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                 :     :- * ColumnarToRow (3)
-                                 :     :  +- CometFilter (2)
-                                 :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                                 :     +- BroadcastExchange (7)
-                                 :        +- * ColumnarToRow (6)
-                                 :           +- CometFilter (5)
-                                 :              +- CometScan parquet spark_catalog.default.item (4)
-                                 +- ReusedExchange (10)
+TakeOrderedAndProject (20)
++- * Project (19)
+   +- Window (18)
+      +- * Sort (17)
+         +- Exchange (16)
+            +- * HashAggregate (15)
+               +- Exchange (14)
+                  +- * HashAggregate (13)
+                     +- * Project (12)
+                        +- * BroadcastHashJoin Inner BuildRight (11)
+                           :- * Project (9)
+                           :  +- * BroadcastHashJoin Inner BuildRight (8)
+                           :     :- * ColumnarToRow (3)
+                           :     :  +- CometFilter (2)
+                           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+                           :     +- BroadcastExchange (7)
+                           :        +- * ColumnarToRow (6)
+                           :           +- CometFilter (5)
+                           :              +- CometScan parquet spark_catalog.default.item (4)
+                           +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -66,7 +64,7 @@ Join condition: None
 Output [7]: [cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [cs_item_sk#1, cs_ext_sales_price#2, cs_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 27]
+(10) ReusedExchange [Reuses operator id: 25]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -86,70 +84,66 @@ Functions [1]: [partial_sum(UnscaledValue(cs_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) RowToColumnar
+(14) Exchange
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(cs_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_ext_sales_price#2))#14]
+Results [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#2))#14,17,2) AS _w0#16]
 
-(17) CometColumnarExchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(18) CometSort
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15], [i_class#9 ASC NULLS FIRST]
+(16) Exchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) ColumnarToRow [codegen id : 4]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
+(17) Sort [codegen id : 5]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: [i_class#9 ASC NULLS FIRST], false, 0
 
-(20) Window
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
+(18) Window
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
 
-(21) Project [codegen id : 5]
-Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17]
-Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, _we0#16]
+(19) Project [codegen id : 6]
+Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18]
+Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, _we0#17]
 
-(22) TakeOrderedAndProject
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
-Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(20) TakeOrderedAndProject
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+Arguments: 100, [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (27)
-+- * ColumnarToRow (26)
-   +- CometProject (25)
-      +- CometFilter (24)
-         +- CometScan parquet spark_catalog.default.date_dim (23)
+BroadcastExchange (25)
++- * ColumnarToRow (24)
+   +- CometProject (23)
+      +- CometFilter (22)
+         +- CometScan parquet spark_catalog.default.date_dim (21)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#18]
+Output [2]: [d_date_sk#11, d_date#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(24) CometFilter
-Input [2]: [d_date_sk#11, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(22) CometFilter
+Input [2]: [d_date_sk#11, d_date#19]
+Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(25) CometProject
-Input [2]: [d_date_sk#11, d_date#18]
+(23) CometProject
+Input [2]: [d_date_sk#11, d_date#19]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(26) ColumnarToRow [codegen id : 1]
+(24) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(27) BroadcastExchange
+(25) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt
index 4cf648ccf6..2a2a392cd0 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q20/simplified.txt
@@ -1,16 +1,16 @@
 TakeOrderedAndProject [i_category,i_class,i_item_id,i_item_desc,revenueratio,i_current_price,itemrevenue]
-  WholeStageCodegen (5)
+  WholeStageCodegen (6)
     Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
       InputAdapter
         Window [_w0,i_class]
-          WholeStageCodegen (4)
-            ColumnarToRow
+          WholeStageCodegen (5)
+            Sort [i_class]
               InputAdapter
-                CometSort [i_class]
-                  CometColumnarExchange [i_class] #1
-                    CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
-                      CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
-                        RowToColumnar
+                Exchange [i_class] #1
+                  WholeStageCodegen (4)
+                    HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(cs_ext_sales_price)),itemrevenue,_w0,sum]
+                      InputAdapter
+                        Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #2
                           WholeStageCodegen (3)
                             HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,cs_ext_sales_price] [sum,sum]
                               Project [cs_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt
index 9328d2b49d..bdfd6eee0d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/explain.txt
@@ -1,28 +1,26 @@
 == Physical Plan ==
-* ColumnarToRow (24)
-+- CometTakeOrderedAndProject (23)
-   +- CometHashAggregate (22)
-      +- CometColumnarExchange (21)
-         +- RowToColumnar (20)
-            +- * HashAggregate (19)
-               +- * Expand (18)
-                  +- * Project (17)
-                     +- * BroadcastNestedLoopJoin Inner BuildRight (16)
-                        :- * Project (12)
-                        :  +- * BroadcastHashJoin Inner BuildRight (11)
-                        :     :- * Project (6)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                        :     :     :- * ColumnarToRow (3)
-                        :     :     :  +- CometFilter (2)
-                        :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-                        :     :     +- ReusedExchange (4)
-                        :     +- BroadcastExchange (10)
-                        :        +- * ColumnarToRow (9)
-                        :           +- CometFilter (8)
-                        :              +- CometScan parquet spark_catalog.default.item (7)
-                        +- BroadcastExchange (15)
-                           +- * ColumnarToRow (14)
-                              +- CometScan parquet spark_catalog.default.warehouse (13)
+TakeOrderedAndProject (22)
++- * HashAggregate (21)
+   +- Exchange (20)
+      +- * HashAggregate (19)
+         +- * Expand (18)
+            +- * Project (17)
+               +- * BroadcastNestedLoopJoin Inner BuildRight (16)
+                  :- * Project (12)
+                  :  +- * BroadcastHashJoin Inner BuildRight (11)
+                  :     :- * Project (6)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                  :     :     :- * ColumnarToRow (3)
+                  :     :     :  +- CometFilter (2)
+                  :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+                  :     :     +- ReusedExchange (4)
+                  :     +- BroadcastExchange (10)
+                  :        +- * ColumnarToRow (9)
+                  :           +- CometFilter (8)
+                  :              +- CometScan parquet spark_catalog.default.item (7)
+                  +- BroadcastExchange (15)
+                     +- * ColumnarToRow (14)
+                        +- CometScan parquet spark_catalog.default.warehouse (13)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -40,7 +38,7 @@ Condition : isnotnull(inv_item_sk#1)
 (3) ColumnarToRow [codegen id : 4]
 Input [3]: [inv_item_sk#1, inv_quantity_on_hand#2, inv_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 29]
+(4) ReusedExchange [Reuses operator id: 27]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -113,54 +111,50 @@ Functions [1]: [partial_avg(inv_quantity_on_hand#2)]
 Aggregate Attributes [2]: [sum#16, count#17]
 Results [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
 
-(20) RowToColumnar
+(20) Exchange
 Input [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
+Arguments: hashpartitioning(i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
-Arguments: hashpartitioning(i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [7]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15, sum#18, count#19]
 Keys [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, spark_grouping_id#15]
 Functions [1]: [avg(inv_quantity_on_hand#2)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#2)#20]
+Results [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, avg(inv_quantity_on_hand#2)#20 AS qoh#21]
 
-(23) CometTakeOrderedAndProject
-Input [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#20]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[qoh#20 ASC NULLS FIRST,i_product_name#11 ASC NULLS FIRST,i_brand#12 ASC NULLS FIRST,i_class#13 ASC NULLS FIRST,i_category#14 ASC NULLS FIRST], output=[i_product_name#11,i_brand#12,i_class#13,i_category#14,qoh#20]), 100, [qoh#20 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#12 ASC NULLS FIRST, i_class#13 ASC NULLS FIRST, i_category#14 ASC NULLS FIRST], [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#20]
-
-(24) ColumnarToRow [codegen id : 5]
-Input [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#20]
+(22) TakeOrderedAndProject
+Input [5]: [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#21]
+Arguments: 100, [qoh#21 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#12 ASC NULLS FIRST, i_class#13 ASC NULLS FIRST, i_category#14 ASC NULLS FIRST], [i_product_name#11, i_brand#12, i_class#13, i_category#14, qoh#21]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (29)
-+- * ColumnarToRow (28)
-   +- CometProject (27)
-      +- CometFilter (26)
-         +- CometScan parquet spark_catalog.default.date_dim (25)
+BroadcastExchange (27)
++- * ColumnarToRow (26)
+   +- CometProject (25)
+      +- CometFilter (24)
+         +- CometScan parquet spark_catalog.default.date_dim (23)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#21]
+Output [2]: [d_date_sk#5, d_month_seq#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1200), LessThanOrEqual(d_month_seq,1211), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(26) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#21]
-Condition : (((isnotnull(d_month_seq#21) AND (d_month_seq#21 >= 1200)) AND (d_month_seq#21 <= 1211)) AND isnotnull(d_date_sk#5))
+(24) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#22]
+Condition : (((isnotnull(d_month_seq#22) AND (d_month_seq#22 >= 1200)) AND (d_month_seq#22 <= 1211)) AND isnotnull(d_date_sk#5))
 
-(27) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#21]
+(25) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#22]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(28) ColumnarToRow [codegen id : 1]
+(26) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(29) BroadcastExchange
+(27) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt
index 797b870040..63a428d4e4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22/simplified.txt
@@ -1,43 +1,41 @@
-WholeStageCodegen (5)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
-        CometHashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count]
-          CometColumnarExchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
-            RowToColumnar
-              WholeStageCodegen (4)
-                HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
-                  Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                    Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
-                      BroadcastNestedLoopJoin
-                        Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                          BroadcastHashJoin [inv_item_sk,i_item_sk]
-                            Project [inv_item_sk,inv_quantity_on_hand]
-                              BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [inv_item_sk]
-                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
-                                        SubqueryBroadcast [d_date_sk] #1
-                                          BroadcastExchange #2
-                                            WholeStageCodegen (1)
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometProject [d_date_sk]
-                                                    CometFilter [d_month_seq,d_date_sk]
-                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+TakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
+  WholeStageCodegen (5)
+    HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+      InputAdapter
+        Exchange [i_product_name,i_brand,i_class,i_category,spark_grouping_id] #1
+          WholeStageCodegen (4)
+            HashAggregate [i_product_name,i_brand,i_class,i_category,spark_grouping_id,inv_quantity_on_hand] [sum,count,sum,count]
+              Expand [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                Project [inv_quantity_on_hand,i_product_name,i_brand,i_class,i_category]
+                  BroadcastNestedLoopJoin
+                    Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                      BroadcastHashJoin [inv_item_sk,i_item_sk]
+                        Project [inv_item_sk,inv_quantity_on_hand]
+                          BroadcastHashJoin [inv_date_sk,d_date_sk]
+                            ColumnarToRow
+                              InputAdapter
+                                CometFilter [inv_item_sk]
+                                  CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_quantity_on_hand,inv_date_sk]
+                                    SubqueryBroadcast [d_date_sk] #1
+                                      BroadcastExchange #2
+                                        WholeStageCodegen (1)
+                                          ColumnarToRow
+                                            InputAdapter
+                                              CometProject [d_date_sk]
+                                                CometFilter [d_month_seq,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
                             InputAdapter
-                              BroadcastExchange #3
-                                WholeStageCodegen (2)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          BroadcastExchange #4
-                            WholeStageCodegen (3)
+                          BroadcastExchange #3
+                            WholeStageCodegen (2)
                               ColumnarToRow
                                 InputAdapter
-                                  CometScan parquet spark_catalog.default.warehouse
+                                  CometFilter [i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
+                    InputAdapter
+                      BroadcastExchange #4
+                        WholeStageCodegen (3)
+                          ColumnarToRow
+                            InputAdapter
+                              CometScan parquet spark_catalog.default.warehouse
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt
index 3911ebef4c..e0a290cea7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-* ColumnarToRow (47)
-+- CometTakeOrderedAndProject (46)
-   +- CometUnion (45)
-      :- CometHashAggregate (24)
-      :  +- CometHashAggregate (23)
-      :     +- CometHashAggregate (22)
-      :        +- CometColumnarExchange (21)
-      :           +- RowToColumnar (20)
-      :              +- * HashAggregate (19)
-      :                 +- * Project (18)
-      :                    +- * BroadcastHashJoin Inner BuildRight (17)
-      :                       :- * Project (12)
-      :                       :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :                       :     :- * Project (6)
-      :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-      :                       :     :     :- * ColumnarToRow (3)
-      :                       :     :     :  +- CometFilter (2)
-      :                       :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
-      :                       :     :     +- ReusedExchange (4)
-      :                       :     +- BroadcastExchange (10)
-      :                       :        +- * ColumnarToRow (9)
-      :                       :           +- CometFilter (8)
-      :                       :              +- CometScan parquet spark_catalog.default.item (7)
-      :                       +- BroadcastExchange (16)
-      :                          +- * ColumnarToRow (15)
-      :                             +- CometFilter (14)
-      :                                +- CometScan parquet spark_catalog.default.warehouse (13)
-      :- CometHashAggregate (29)
-      :  +- CometColumnarExchange (28)
-      :     +- CometHashAggregate (27)
-      :        +- CometHashAggregate (26)
-      :           +- ReusedExchange (25)
-      :- CometHashAggregate (34)
-      :  +- CometColumnarExchange (33)
-      :     +- CometHashAggregate (32)
-      :        +- CometHashAggregate (31)
-      :           +- ReusedExchange (30)
-      :- CometHashAggregate (39)
-      :  +- CometColumnarExchange (38)
-      :     +- CometHashAggregate (37)
-      :        +- CometHashAggregate (36)
-      :           +- ReusedExchange (35)
-      +- CometHashAggregate (44)
-         +- CometColumnarExchange (43)
-            +- CometHashAggregate (42)
-               +- CometHashAggregate (41)
-                  +- ReusedExchange (40)
+TakeOrderedAndProject (45)
++- Union (44)
+   :- * HashAggregate (23)
+   :  +- * HashAggregate (22)
+   :     +- * HashAggregate (21)
+   :        +- Exchange (20)
+   :           +- * HashAggregate (19)
+   :              +- * Project (18)
+   :                 +- * BroadcastHashJoin Inner BuildRight (17)
+   :                    :- * Project (12)
+   :                    :  +- * BroadcastHashJoin Inner BuildRight (11)
+   :                    :     :- * Project (6)
+   :                    :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+   :                    :     :     :- * ColumnarToRow (3)
+   :                    :     :     :  +- CometFilter (2)
+   :                    :     :     :     +- CometScan parquet spark_catalog.default.inventory (1)
+   :                    :     :     +- ReusedExchange (4)
+   :                    :     +- BroadcastExchange (10)
+   :                    :        +- * ColumnarToRow (9)
+   :                    :           +- CometFilter (8)
+   :                    :              +- CometScan parquet spark_catalog.default.item (7)
+   :                    +- BroadcastExchange (16)
+   :                       +- * ColumnarToRow (15)
+   :                          +- CometFilter (14)
+   :                             +- CometScan parquet spark_catalog.default.warehouse (13)
+   :- * HashAggregate (28)
+   :  +- Exchange (27)
+   :     +- * HashAggregate (26)
+   :        +- * HashAggregate (25)
+   :           +- ReusedExchange (24)
+   :- * HashAggregate (33)
+   :  +- Exchange (32)
+   :     +- * HashAggregate (31)
+   :        +- * HashAggregate (30)
+   :           +- ReusedExchange (29)
+   :- * HashAggregate (38)
+   :  +- Exchange (37)
+   :     +- * HashAggregate (36)
+   :        +- * HashAggregate (35)
+   :           +- ReusedExchange (34)
+   +- * HashAggregate (43)
+      +- Exchange (42)
+         +- * HashAggregate (41)
+            +- * HashAggregate (40)
+               +- ReusedExchange (39)
 
 
 (unknown) Scan parquet spark_catalog.default.inventory
@@ -63,7 +61,7 @@ Condition : (isnotnull(inv_item_sk#1) AND isnotnull(inv_warehouse_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [4]: [inv_item_sk#1, inv_warehouse_sk#2, inv_quantity_on_hand#3, inv_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 52]
+(4) ReusedExchange [Reuses operator id: 50]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -139,159 +137,178 @@ Functions [1]: [partial_avg(inv_quantity_on_hand#3)]
 Aggregate Attributes [2]: [sum#13, count#14]
 Results [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(20) RowToColumnar
+(20) Exchange
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
+Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, i_category#10, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
-Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, i_category#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
+Results [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(23) CometHashAggregate
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#17]
+(22) HashAggregate [codegen id : 5]
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#18]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
-Functions [1]: [partial_avg(qoh#17)]
+Functions [1]: [partial_avg(qoh#18)]
+Aggregate Attributes [2]: [sum#19, count#20]
+Results [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#21, count#22]
 
-(24) CometHashAggregate
-Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#18, count#19]
+(23) HashAggregate [codegen id : 5]
+Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#21, count#22]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
-Functions [1]: [avg(qoh#17)]
+Functions [1]: [avg(qoh#18)]
+Aggregate Attributes [1]: [avg(qoh#18)#23]
+Results [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, avg(qoh#18)#23 AS qoh#24]
 
-(25) ReusedExchange [Reuses operator id: 21]
+(24) ReusedExchange [Reuses operator id: 20]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(26) CometHashAggregate
+(25) HashAggregate [codegen id : 10]
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
+Results [4]: [i_product_name#11, i_brand#8, i_class#9, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(27) CometHashAggregate
-Input [4]: [i_product_name#11, i_brand#8, i_class#9, qoh#17]
+(26) HashAggregate [codegen id : 10]
+Input [4]: [i_product_name#11, i_brand#8, i_class#9, qoh#18]
 Keys [3]: [i_product_name#11, i_brand#8, i_class#9]
-Functions [1]: [partial_avg(qoh#17)]
+Functions [1]: [partial_avg(qoh#18)]
+Aggregate Attributes [2]: [sum#25, count#26]
+Results [5]: [i_product_name#11, i_brand#8, i_class#9, sum#27, count#28]
 
-(28) CometColumnarExchange
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#20, count#21]
-Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(27) Exchange
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#27, count#28]
+Arguments: hashpartitioning(i_product_name#11, i_brand#8, i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(29) CometHashAggregate
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#20, count#21]
+(28) HashAggregate [codegen id : 11]
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, sum#27, count#28]
 Keys [3]: [i_product_name#11, i_brand#8, i_class#9]
-Functions [1]: [avg(qoh#17)]
+Functions [1]: [avg(qoh#18)]
+Aggregate Attributes [1]: [avg(qoh#18)#29]
+Results [5]: [i_product_name#11, i_brand#8, i_class#9, null AS i_category#30, avg(qoh#18)#29 AS qoh#31]
 
-(30) ReusedExchange [Reuses operator id: 21]
+(29) ReusedExchange [Reuses operator id: 20]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(31) CometHashAggregate
+(30) HashAggregate [codegen id : 16]
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
+Results [3]: [i_product_name#11, i_brand#8, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(32) CometHashAggregate
-Input [3]: [i_product_name#11, i_brand#8, qoh#17]
+(31) HashAggregate [codegen id : 16]
+Input [3]: [i_product_name#11, i_brand#8, qoh#18]
 Keys [2]: [i_product_name#11, i_brand#8]
-Functions [1]: [partial_avg(qoh#17)]
+Functions [1]: [partial_avg(qoh#18)]
+Aggregate Attributes [2]: [sum#32, count#33]
+Results [4]: [i_product_name#11, i_brand#8, sum#34, count#35]
 
-(33) CometColumnarExchange
-Input [4]: [i_product_name#11, i_brand#8, sum#22, count#23]
-Arguments: hashpartitioning(i_product_name#11, i_brand#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(32) Exchange
+Input [4]: [i_product_name#11, i_brand#8, sum#34, count#35]
+Arguments: hashpartitioning(i_product_name#11, i_brand#8, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(34) CometHashAggregate
-Input [4]: [i_product_name#11, i_brand#8, sum#22, count#23]
+(33) HashAggregate [codegen id : 17]
+Input [4]: [i_product_name#11, i_brand#8, sum#34, count#35]
 Keys [2]: [i_product_name#11, i_brand#8]
-Functions [1]: [avg(qoh#17)]
+Functions [1]: [avg(qoh#18)]
+Aggregate Attributes [1]: [avg(qoh#18)#36]
+Results [5]: [i_product_name#11, i_brand#8, null AS i_class#37, null AS i_category#38, avg(qoh#18)#36 AS qoh#39]
 
-(35) ReusedExchange [Reuses operator id: 21]
+(34) ReusedExchange [Reuses operator id: 20]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(36) CometHashAggregate
+(35) HashAggregate [codegen id : 22]
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
+Results [2]: [i_product_name#11, avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(37) CometHashAggregate
-Input [2]: [i_product_name#11, qoh#17]
+(36) HashAggregate [codegen id : 22]
+Input [2]: [i_product_name#11, qoh#18]
 Keys [1]: [i_product_name#11]
-Functions [1]: [partial_avg(qoh#17)]
+Functions [1]: [partial_avg(qoh#18)]
+Aggregate Attributes [2]: [sum#40, count#41]
+Results [3]: [i_product_name#11, sum#42, count#43]
 
-(38) CometColumnarExchange
-Input [3]: [i_product_name#11, sum#24, count#25]
-Arguments: hashpartitioning(i_product_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(37) Exchange
+Input [3]: [i_product_name#11, sum#42, count#43]
+Arguments: hashpartitioning(i_product_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(39) CometHashAggregate
-Input [3]: [i_product_name#11, sum#24, count#25]
+(38) HashAggregate [codegen id : 23]
+Input [3]: [i_product_name#11, sum#42, count#43]
 Keys [1]: [i_product_name#11]
-Functions [1]: [avg(qoh#17)]
+Functions [1]: [avg(qoh#18)]
+Aggregate Attributes [1]: [avg(qoh#18)#44]
+Results [5]: [i_product_name#11, null AS i_brand#45, null AS i_class#46, null AS i_category#47, avg(qoh#18)#44 AS qoh#48]
 
-(40) ReusedExchange [Reuses operator id: 21]
+(39) ReusedExchange [Reuses operator id: 20]
 Output [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 
-(41) CometHashAggregate
+(40) HashAggregate [codegen id : 28]
 Input [6]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, sum#15, count#16]
 Keys [4]: [i_product_name#11, i_brand#8, i_class#9, i_category#10]
 Functions [1]: [avg(inv_quantity_on_hand#3)]
+Aggregate Attributes [1]: [avg(inv_quantity_on_hand#3)#17]
+Results [1]: [avg(inv_quantity_on_hand#3)#17 AS qoh#18]
 
-(42) CometHashAggregate
-Input [1]: [qoh#17]
+(41) HashAggregate [codegen id : 28]
+Input [1]: [qoh#18]
 Keys: []
-Functions [1]: [partial_avg(qoh#17)]
+Functions [1]: [partial_avg(qoh#18)]
+Aggregate Attributes [2]: [sum#49, count#50]
+Results [2]: [sum#51, count#52]
 
-(43) CometColumnarExchange
-Input [2]: [sum#26, count#27]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(42) Exchange
+Input [2]: [sum#51, count#52]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(44) CometHashAggregate
-Input [2]: [sum#26, count#27]
+(43) HashAggregate [codegen id : 29]
+Input [2]: [sum#51, count#52]
 Keys: []
-Functions [1]: [avg(qoh#17)]
-
-(45) CometUnion
-Child 0 Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
-Child 1 Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#29, qoh#30]
-Child 2 Input [5]: [i_product_name#11, i_brand#8, i_class#31, i_category#32, qoh#33]
-Child 3 Input [5]: [i_product_name#11, i_brand#34, i_class#35, i_category#36, qoh#37]
-Child 4 Input [5]: [i_product_name#38, i_brand#39, i_class#40, i_category#41, qoh#42]
+Functions [1]: [avg(qoh#18)]
+Aggregate Attributes [1]: [avg(qoh#18)#53]
+Results [5]: [null AS i_product_name#54, null AS i_brand#55, null AS i_class#56, null AS i_category#57, avg(qoh#18)#53 AS qoh#58]
 
-(46) CometTakeOrderedAndProject
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[qoh#28 ASC NULLS FIRST,i_product_name#11 ASC NULLS FIRST,i_brand#8 ASC NULLS FIRST,i_class#9 ASC NULLS FIRST,i_category#10 ASC NULLS FIRST], output=[i_product_name#11,i_brand#8,i_class#9,i_category#10,qoh#28]), 100, [qoh#28 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#8 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_category#10 ASC NULLS FIRST], [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
+(44) Union
 
-(47) ColumnarToRow [codegen id : 21]
-Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#28]
+(45) TakeOrderedAndProject
+Input [5]: [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#24]
+Arguments: 100, [qoh#24 ASC NULLS FIRST, i_product_name#11 ASC NULLS FIRST, i_brand#8 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_category#10 ASC NULLS FIRST], [i_product_name#11, i_brand#8, i_class#9, i_category#10, qoh#24]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = inv_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (52)
-+- * ColumnarToRow (51)
-   +- CometProject (50)
-      +- CometFilter (49)
-         +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (50)
++- * ColumnarToRow (49)
+   +- CometProject (48)
+      +- CometFilter (47)
+         +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_month_seq#43]
+Output [2]: [d_date_sk#6, d_month_seq#59]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(49) CometFilter
-Input [2]: [d_date_sk#6, d_month_seq#43]
-Condition : (((isnotnull(d_month_seq#43) AND (d_month_seq#43 >= 1212)) AND (d_month_seq#43 <= 1223)) AND isnotnull(d_date_sk#6))
+(47) CometFilter
+Input [2]: [d_date_sk#6, d_month_seq#59]
+Condition : (((isnotnull(d_month_seq#59) AND (d_month_seq#59 >= 1212)) AND (d_month_seq#59 <= 1223)) AND isnotnull(d_date_sk#6))
 
-(50) CometProject
-Input [2]: [d_date_sk#6, d_month_seq#43]
+(48) CometProject
+Input [2]: [d_date_sk#6, d_month_seq#59]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(51) ColumnarToRow [codegen id : 1]
+(49) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(52) BroadcastExchange
+(50) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt
index 442e169eb9..a8d71b06ac 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q22a/simplified.txt
@@ -1,66 +1,80 @@
-WholeStageCodegen (21)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
-        CometUnion
-          CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
-            CometHashAggregate [i_product_name,i_brand,i_class,i_category,qoh]
-              CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
-                CometColumnarExchange [i_product_name,i_brand,i_class,i_category] #1
-                  RowToColumnar
-                    WholeStageCodegen (4)
-                      HashAggregate [i_product_name,i_brand,i_class,i_category,inv_quantity_on_hand] [sum,count,sum,count]
-                        Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                          BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                            Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
-                              BroadcastHashJoin [inv_item_sk,i_item_sk]
-                                Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
-                                  BroadcastHashJoin [inv_date_sk,d_date_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [inv_item_sk,inv_warehouse_sk]
-                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_month_seq,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                    InputAdapter
-                                      ReusedExchange [d_date_sk] #2
+TakeOrderedAndProject [qoh,i_product_name,i_brand,i_class,i_category]
+  Union
+    WholeStageCodegen (5)
+      HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(qoh),qoh,sum,count]
+        HashAggregate [i_product_name,i_brand,i_class,i_category,qoh] [sum,count,sum,count]
+          HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+            InputAdapter
+              Exchange [i_product_name,i_brand,i_class,i_category] #1
+                WholeStageCodegen (4)
+                  HashAggregate [i_product_name,i_brand,i_class,i_category,inv_quantity_on_hand] [sum,count,sum,count]
+                    Project [inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                      BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                        Project [inv_warehouse_sk,inv_quantity_on_hand,i_brand,i_class,i_category,i_product_name]
+                          BroadcastHashJoin [inv_item_sk,i_item_sk]
+                            Project [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand]
+                              BroadcastHashJoin [inv_date_sk,d_date_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [inv_item_sk,inv_warehouse_sk]
+                                      CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_month_seq,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (2)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [i_item_sk]
-                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
+                                  ReusedExchange [d_date_sk] #2
                             InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (3)
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [w_warehouse_sk]
-                                        CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
-          CometHashAggregate [i_product_name,i_brand,i_class,sum,count]
-            CometColumnarExchange [i_product_name,i_brand,i_class] #5
-              CometHashAggregate [i_product_name,i_brand,i_class,qoh]
-                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
-                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
-          CometHashAggregate [i_product_name,i_brand,sum,count]
-            CometColumnarExchange [i_product_name,i_brand] #6
-              CometHashAggregate [i_product_name,i_brand,qoh]
-                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
-                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
-          CometHashAggregate [i_product_name,sum,count]
-            CometColumnarExchange [i_product_name] #7
-              CometHashAggregate [i_product_name,qoh]
-                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
-                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
-          CometHashAggregate [sum,count]
-            CometColumnarExchange #8
-              CometHashAggregate [qoh]
-                CometHashAggregate [i_product_name,i_brand,i_class,i_category,sum,count]
-                  ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+                                      CometFilter [i_item_sk]
+                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
+                        InputAdapter
+                          BroadcastExchange #4
+                            WholeStageCodegen (3)
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [w_warehouse_sk]
+                                    CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk]
+    WholeStageCodegen (11)
+      HashAggregate [i_product_name,i_brand,i_class,sum,count] [avg(qoh),i_category,qoh,sum,count]
+        InputAdapter
+          Exchange [i_product_name,i_brand,i_class] #5
+            WholeStageCodegen (10)
+              HashAggregate [i_product_name,i_brand,i_class,qoh] [sum,count,sum,count]
+                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+                  InputAdapter
+                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+    WholeStageCodegen (17)
+      HashAggregate [i_product_name,i_brand,sum,count] [avg(qoh),i_class,i_category,qoh,sum,count]
+        InputAdapter
+          Exchange [i_product_name,i_brand] #6
+            WholeStageCodegen (16)
+              HashAggregate [i_product_name,i_brand,qoh] [sum,count,sum,count]
+                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+                  InputAdapter
+                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+    WholeStageCodegen (23)
+      HashAggregate [i_product_name,sum,count] [avg(qoh),i_brand,i_class,i_category,qoh,sum,count]
+        InputAdapter
+          Exchange [i_product_name] #7
+            WholeStageCodegen (22)
+              HashAggregate [i_product_name,qoh] [sum,count,sum,count]
+                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+                  InputAdapter
+                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
+    WholeStageCodegen (29)
+      HashAggregate [sum,count] [avg(qoh),i_product_name,i_brand,i_class,i_category,qoh,sum,count]
+        InputAdapter
+          Exchange #8
+            WholeStageCodegen (28)
+              HashAggregate [qoh] [sum,count,sum,count]
+                HashAggregate [i_product_name,i_brand,i_class,i_category,sum,count] [avg(inv_quantity_on_hand),qoh,sum,count]
+                  InputAdapter
+                    ReusedExchange [i_product_name,i_brand,i_class,i_category,sum,count] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt
index c19e023683..9bbf5e9847 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/explain.txt
@@ -1,53 +1,51 @@
 == Physical Plan ==
-* ColumnarToRow (49)
-+- CometSort (48)
-   +- CometColumnarExchange (47)
-      +- CometFilter (46)
-         +- CometHashAggregate (45)
-            +- CometColumnarExchange (44)
-               +- CometHashAggregate (43)
-                  +- CometHashAggregate (42)
-                     +- CometColumnarExchange (41)
-                        +- RowToColumnar (40)
-                           +- * HashAggregate (39)
-                              +- * Project (38)
-                                 +- * BroadcastHashJoin Inner BuildRight (37)
-                                    :- * Project (32)
-                                    :  +- * BroadcastHashJoin Inner BuildRight (31)
-                                    :     :- * Project (26)
-                                    :     :  +- * BroadcastHashJoin Inner BuildRight (25)
-                                    :     :     :- * Project (20)
-                                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
-                                    :     :     :     :- * ColumnarToRow (13)
-                                    :     :     :     :  +- CometProject (12)
-                                    :     :     :     :     +- CometSortMergeJoin (11)
-                                    :     :     :     :        :- CometSort (5)
-                                    :     :     :     :        :  +- CometColumnarExchange (4)
-                                    :     :     :     :        :     +- CometProject (3)
-                                    :     :     :     :        :        +- CometFilter (2)
-                                    :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
-                                    :     :     :     :        +- CometSort (10)
-                                    :     :     :     :           +- CometColumnarExchange (9)
-                                    :     :     :     :              +- CometProject (8)
-                                    :     :     :     :                 +- CometFilter (7)
-                                    :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
-                                    :     :     :     +- BroadcastExchange (18)
-                                    :     :     :        +- * ColumnarToRow (17)
-                                    :     :     :           +- CometProject (16)
-                                    :     :     :              +- CometFilter (15)
-                                    :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
-                                    :     :     +- BroadcastExchange (24)
-                                    :     :        +- * ColumnarToRow (23)
-                                    :     :           +- CometFilter (22)
-                                    :     :              +- CometScan parquet spark_catalog.default.item (21)
-                                    :     +- BroadcastExchange (30)
-                                    :        +- * ColumnarToRow (29)
-                                    :           +- CometFilter (28)
-                                    :              +- CometScan parquet spark_catalog.default.customer (27)
-                                    +- BroadcastExchange (36)
-                                       +- * ColumnarToRow (35)
-                                          +- CometFilter (34)
-                                             +- CometScan parquet spark_catalog.default.customer_address (33)
+* Sort (47)
++- Exchange (46)
+   +- * Filter (45)
+      +- * HashAggregate (44)
+         +- Exchange (43)
+            +- * HashAggregate (42)
+               +- * HashAggregate (41)
+                  +- Exchange (40)
+                     +- * HashAggregate (39)
+                        +- * Project (38)
+                           +- * BroadcastHashJoin Inner BuildRight (37)
+                              :- * Project (32)
+                              :  +- * BroadcastHashJoin Inner BuildRight (31)
+                              :     :- * Project (26)
+                              :     :  +- * BroadcastHashJoin Inner BuildRight (25)
+                              :     :     :- * Project (20)
+                              :     :     :  +- * BroadcastHashJoin Inner BuildRight (19)
+                              :     :     :     :- * ColumnarToRow (13)
+                              :     :     :     :  +- CometProject (12)
+                              :     :     :     :     +- CometSortMergeJoin (11)
+                              :     :     :     :        :- CometSort (5)
+                              :     :     :     :        :  +- CometExchange (4)
+                              :     :     :     :        :     +- CometProject (3)
+                              :     :     :     :        :        +- CometFilter (2)
+                              :     :     :     :        :           +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     :     :     :        +- CometSort (10)
+                              :     :     :     :           +- CometExchange (9)
+                              :     :     :     :              +- CometProject (8)
+                              :     :     :     :                 +- CometFilter (7)
+                              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (6)
+                              :     :     :     +- BroadcastExchange (18)
+                              :     :     :        +- * ColumnarToRow (17)
+                              :     :     :           +- CometProject (16)
+                              :     :     :              +- CometFilter (15)
+                              :     :     :                 +- CometScan parquet spark_catalog.default.store (14)
+                              :     :     +- BroadcastExchange (24)
+                              :     :        +- * ColumnarToRow (23)
+                              :     :           +- CometFilter (22)
+                              :     :              +- CometScan parquet spark_catalog.default.item (21)
+                              :     +- BroadcastExchange (30)
+                              :        +- * ColumnarToRow (29)
+                              :           +- CometFilter (28)
+                              :              +- CometScan parquet spark_catalog.default.customer (27)
+                              +- BroadcastExchange (36)
+                                 +- * ColumnarToRow (35)
+                                    +- CometFilter (34)
+                                       +- CometScan parquet spark_catalog.default.customer_address (33)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -65,9 +63,9 @@ Condition : (((isnotnull(ss_ticket_number#4) AND isnotnull(ss_item_sk#1)) AND is
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, ss_sold_date_sk#6]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(4) CometColumnarExchange
+(4) CometExchange
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (5) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
@@ -88,9 +86,9 @@ Condition : (isnotnull(sr_ticket_number#8) AND isnotnull(sr_item_sk#7))
 Input [3]: [sr_item_sk#7, sr_ticket_number#8, sr_returned_date_sk#9]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_item_sk#7, sr_ticket_number#8]
 
-(9) CometColumnarExchange
+(9) CometExchange
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
-Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#8, sr_item_sk#7, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (10) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
@@ -231,118 +229,116 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
 Aggregate Attributes [1]: [sum#30]
 Results [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
 
-(40) RowToColumnar
+(40) Exchange
 Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(41) CometColumnarExchange
-Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 6]
 Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#31]
 Keys [10]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#32]
+Results [4]: [c_last_name#24, c_first_name#23, s_store_name#11, MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#32,17,2) AS netpaid#33]
 
-(43) CometHashAggregate
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, netpaid#32]
+(42) HashAggregate [codegen id : 6]
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, netpaid#33]
 Keys [3]: [c_last_name#24, c_first_name#23, s_store_name#11]
-Functions [1]: [partial_sum(netpaid#32)]
+Functions [1]: [partial_sum(netpaid#33)]
+Aggregate Attributes [2]: [sum#34, isEmpty#35]
+Results [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#36, isEmpty#37]
 
-(44) CometColumnarExchange
-Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#33, isEmpty#34]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(43) Exchange
+Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#36, isEmpty#37]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(45) CometHashAggregate
-Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#33, isEmpty#34]
+(44) HashAggregate [codegen id : 7]
+Input [5]: [c_last_name#24, c_first_name#23, s_store_name#11, sum#36, isEmpty#37]
 Keys [3]: [c_last_name#24, c_first_name#23, s_store_name#11]
-Functions [1]: [sum(netpaid#32)]
+Functions [1]: [sum(netpaid#33)]
+Aggregate Attributes [1]: [sum(netpaid#33)#38]
+Results [4]: [c_last_name#24, c_first_name#23, s_store_name#11, sum(netpaid#33)#38 AS paid#39]
 
-(46) CometFilter
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
-Condition : (isnotnull(paid#35) AND (cast(paid#35 as decimal(33,8)) > cast(Subquery scalar-subquery#36, [id=#37] as decimal(33,8))))
+(45) Filter [codegen id : 7]
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#39]
+Condition : (isnotnull(paid#39) AND (cast(paid#39 as decimal(33,8)) > cast(Subquery scalar-subquery#40, [id=#41] as decimal(33,8))))
 
-(47) CometColumnarExchange
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
-Arguments: rangepartitioning(c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(46) Exchange
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#39]
+Arguments: rangepartitioning(c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(48) CometSort
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
-Arguments: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35], [c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST]
-
-(49) ColumnarToRow [codegen id : 6]
-Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#35]
+(47) Sort [codegen id : 8]
+Input [4]: [c_last_name#24, c_first_name#23, s_store_name#11, paid#39]
+Arguments: [c_last_name#24 ASC NULLS FIRST, c_first_name#23 ASC NULLS FIRST, s_store_name#11 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
-Subquery:1 Hosting operator id = 46 Hosting Expression = Subquery scalar-subquery#36, [id=#37]
-* ColumnarToRow (79)
-+- CometHashAggregate (78)
-   +- CometColumnarExchange (77)
-      +- CometHashAggregate (76)
-         +- CometHashAggregate (75)
-            +- CometColumnarExchange (74)
-               +- RowToColumnar (73)
-                  +- * HashAggregate (72)
-                     +- * Project (71)
-                        +- * BroadcastHashJoin Inner BuildRight (70)
-                           :- * Project (68)
-                           :  +- * BroadcastHashJoin Inner BuildRight (67)
-                           :     :- * Project (65)
-                           :     :  +- * BroadcastHashJoin Inner BuildRight (64)
-                           :     :     :- * Project (59)
-                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (58)
-                           :     :     :     :- * ColumnarToRow (56)
-                           :     :     :     :  +- CometProject (55)
-                           :     :     :     :     +- CometSortMergeJoin (54)
-                           :     :     :     :        :- CometSort (51)
-                           :     :     :     :        :  +- ReusedExchange (50)
-                           :     :     :     :        +- CometSort (53)
-                           :     :     :     :           +- ReusedExchange (52)
-                           :     :     :     +- ReusedExchange (57)
-                           :     :     +- BroadcastExchange (63)
-                           :     :        +- * ColumnarToRow (62)
-                           :     :           +- CometFilter (61)
-                           :     :              +- CometScan parquet spark_catalog.default.item (60)
-                           :     +- ReusedExchange (66)
-                           +- ReusedExchange (69)
-
-
-(50) ReusedExchange [Reuses operator id: 4]
+Subquery:1 Hosting operator id = 45 Hosting Expression = Subquery scalar-subquery#40, [id=#41]
+* HashAggregate (75)
++- Exchange (74)
+   +- * HashAggregate (73)
+      +- * HashAggregate (72)
+         +- Exchange (71)
+            +- * HashAggregate (70)
+               +- * Project (69)
+                  +- * BroadcastHashJoin Inner BuildRight (68)
+                     :- * Project (66)
+                     :  +- * BroadcastHashJoin Inner BuildRight (65)
+                     :     :- * Project (63)
+                     :     :  +- * BroadcastHashJoin Inner BuildRight (62)
+                     :     :     :- * Project (57)
+                     :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+                     :     :     :     :- * ColumnarToRow (54)
+                     :     :     :     :  +- CometProject (53)
+                     :     :     :     :     +- CometSortMergeJoin (52)
+                     :     :     :     :        :- CometSort (49)
+                     :     :     :     :        :  +- ReusedExchange (48)
+                     :     :     :     :        +- CometSort (51)
+                     :     :     :     :           +- ReusedExchange (50)
+                     :     :     :     +- ReusedExchange (55)
+                     :     :     +- BroadcastExchange (61)
+                     :     :        +- * ColumnarToRow (60)
+                     :     :           +- CometFilter (59)
+                     :     :              +- CometScan parquet spark_catalog.default.item (58)
+                     :     +- ReusedExchange (64)
+                     +- ReusedExchange (67)
+
+
+(48) ReusedExchange [Reuses operator id: 4]
 Output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 
-(51) CometSort
+(49) CometSort
 Input [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5], [ss_ticket_number#4 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST]
 
-(52) ReusedExchange [Reuses operator id: 9]
+(50) ReusedExchange [Reuses operator id: 9]
 Output [2]: [sr_item_sk#7, sr_ticket_number#8]
 
-(53) CometSort
+(51) CometSort
 Input [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [sr_item_sk#7, sr_ticket_number#8], [sr_ticket_number#8 ASC NULLS FIRST, sr_item_sk#7 ASC NULLS FIRST]
 
-(54) CometSortMergeJoin
+(52) CometSortMergeJoin
 Left output [5]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5]
 Right output [2]: [sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_ticket_number#4, ss_item_sk#1], [sr_ticket_number#8, sr_item_sk#7], Inner
 
-(55) CometProject
+(53) CometProject
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_net_paid#5, sr_item_sk#7, sr_ticket_number#8]
 Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5], [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(56) ColumnarToRow [codegen id : 5]
+(54) ColumnarToRow [codegen id : 5]
 Input [4]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5]
 
-(57) ReusedExchange [Reuses operator id: 18]
+(55) ReusedExchange [Reuses operator id: 18]
 Output [4]: [s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
-(58) BroadcastHashJoin [codegen id : 5]
+(56) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#10]
 Join type: Inner
 Join condition: None
 
-(59) Project [codegen id : 5]
+(57) Project [codegen id : 5]
 Output [6]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14]
 Input [8]: [ss_item_sk#1, ss_customer_sk#2, ss_store_sk#3, ss_net_paid#5, s_store_sk#10, s_store_name#11, s_state#13, s_zip#14]
 
@@ -353,87 +349,87 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_size:string,i_color:string,i_units:string,i_manager_id:int>
 
-(61) CometFilter
+(59) CometFilter
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Condition : isnotnull(i_item_sk#15)
 
-(62) ColumnarToRow [codegen id : 2]
+(60) ColumnarToRow [codegen id : 2]
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(63) BroadcastExchange
+(61) BroadcastExchange
 Input [6]: [i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-(64) BroadcastHashJoin [codegen id : 5]
+(62) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#15]
 Join type: Inner
 Join condition: None
 
-(65) Project [codegen id : 5]
+(63) Project [codegen id : 5]
 Output [10]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_item_sk#15, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20]
 
-(66) ReusedExchange [Reuses operator id: 30]
+(64) ReusedExchange [Reuses operator id: 30]
 Output [5]: [c_customer_sk#21, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25]
 
-(67) BroadcastHashJoin [codegen id : 5]
+(65) BroadcastHashJoin [codegen id : 5]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#21]
 Join type: Inner
 Join condition: None
 
-(68) Project [codegen id : 5]
+(66) Project [codegen id : 5]
 Output [13]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25]
 Input [15]: [ss_customer_sk#2, ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_customer_sk#21, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25]
 
-(69) ReusedExchange [Reuses operator id: 36]
+(67) ReusedExchange [Reuses operator id: 36]
 Output [4]: [ca_address_sk#26, ca_state#27, ca_zip#28, ca_country#29]
 
-(70) BroadcastHashJoin [codegen id : 5]
+(68) BroadcastHashJoin [codegen id : 5]
 Left keys [3]: [c_current_addr_sk#22, c_birth_country#25, s_zip#14]
 Right keys [3]: [ca_address_sk#26, upper(ca_country#29), ca_zip#28]
 Join type: Inner
 Join condition: None
 
-(71) Project [codegen id : 5]
+(69) Project [codegen id : 5]
 Output [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#23, c_last_name#24, ca_state#27]
 Input [17]: [ss_net_paid#5, s_store_name#11, s_state#13, s_zip#14, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_current_addr_sk#22, c_first_name#23, c_last_name#24, c_birth_country#25, ca_address_sk#26, ca_state#27, ca_zip#28, ca_country#29]
 
-(72) HashAggregate [codegen id : 5]
+(70) HashAggregate [codegen id : 5]
 Input [11]: [ss_net_paid#5, s_store_name#11, s_state#13, i_current_price#16, i_size#17, i_color#18, i_units#19, i_manager_id#20, c_first_name#23, c_last_name#24, ca_state#27]
 Keys [10]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#5))]
-Aggregate Attributes [1]: [sum#38]
-Results [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
-
-(73) RowToColumnar
-Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
+Aggregate Attributes [1]: [sum#42]
+Results [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#43]
 
-(74) CometColumnarExchange
-Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
-Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(71) Exchange
+Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#43]
+Arguments: hashpartitioning(c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(75) CometHashAggregate
-Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#39]
+(72) HashAggregate [codegen id : 6]
+Input [11]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17, sum#43]
 Keys [10]: [c_last_name#24, c_first_name#23, s_store_name#11, ca_state#27, s_state#13, i_color#18, i_current_price#16, i_manager_id#20, i_units#19, i_size#17]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#5))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#5))#32]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_paid#5))#32,17,2) AS netpaid#33]
 
-(76) CometHashAggregate
-Input [1]: [netpaid#32]
+(73) HashAggregate [codegen id : 6]
+Input [1]: [netpaid#33]
 Keys: []
-Functions [1]: [partial_avg(netpaid#32)]
+Functions [1]: [partial_avg(netpaid#33)]
+Aggregate Attributes [2]: [sum#44, count#45]
+Results [2]: [sum#46, count#47]
 
-(77) CometColumnarExchange
-Input [2]: [sum#40, count#41]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(74) Exchange
+Input [2]: [sum#46, count#47]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=12]
 
-(78) CometHashAggregate
-Input [2]: [sum#40, count#41]
+(75) HashAggregate [codegen id : 7]
+Input [2]: [sum#46, count#47]
 Keys: []
-Functions [1]: [avg(netpaid#32)]
-
-(79) ColumnarToRow [codegen id : 6]
-Input [1]: [(0.05 * avg(netpaid))#42]
+Functions [1]: [avg(netpaid#33)]
+Aggregate Attributes [1]: [avg(netpaid#33)#48]
+Results [1]: [(0.05 * avg(netpaid#33)#48) AS (0.05 * avg(netpaid))#49]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt
index 05de849be4..b22891cebe 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/simplified.txt
@@ -1,19 +1,19 @@
-WholeStageCodegen (6)
-  ColumnarToRow
+WholeStageCodegen (8)
+  Sort [c_last_name,c_first_name,s_store_name]
     InputAdapter
-      CometSort [c_last_name,c_first_name,s_store_name]
-        CometColumnarExchange [c_last_name,c_first_name,s_store_name] #1
-          CometFilter [paid]
+      Exchange [c_last_name,c_first_name,s_store_name] #1
+        WholeStageCodegen (7)
+          Filter [paid]
             Subquery #1
-              WholeStageCodegen (6)
-                ColumnarToRow
+              WholeStageCodegen (7)
+                HashAggregate [sum,count] [avg(netpaid),(0.05 * avg(netpaid)),sum,count]
                   InputAdapter
-                    CometHashAggregate [sum,count]
-                      CometColumnarExchange #10
-                        CometHashAggregate [netpaid]
-                          CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
-                            CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #11
-                              RowToColumnar
+                    Exchange #10
+                      WholeStageCodegen (6)
+                        HashAggregate [netpaid] [sum,count,sum,count]
+                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
+                            InputAdapter
+                              Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #11
                                 WholeStageCodegen (5)
                                   HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
                                     Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
@@ -45,62 +45,64 @@ WholeStageCodegen (6)
                                               ReusedExchange [c_customer_sk,c_current_addr_sk,c_first_name,c_last_name,c_birth_country] #8
                                         InputAdapter
                                           ReusedExchange [ca_address_sk,ca_state,ca_zip,ca_country] #9
-            CometHashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty]
-              CometColumnarExchange [c_last_name,c_first_name,s_store_name] #2
-                CometHashAggregate [c_last_name,c_first_name,s_store_name,netpaid]
-                  CometHashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum]
-                    CometColumnarExchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #3
-                      RowToColumnar
-                        WholeStageCodegen (5)
-                          HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
-                            Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
-                              BroadcastHashJoin [c_current_addr_sk,c_birth_country,s_zip,ca_address_sk,ca_country,ca_zip]
-                                Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
-                                  BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                    Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
-                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                        Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
-                                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
-                                                  CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                    CometSort [ss_ticket_number,ss_item_sk]
-                                                      CometColumnarExchange [ss_ticket_number,ss_item_sk] #4
-                                                        CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
-                                                          CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
-                                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
-                                                    CometSort [sr_ticket_number,sr_item_sk]
-                                                      CometColumnarExchange [sr_ticket_number,sr_item_sk] #5
-                                                        CometProject [sr_item_sk,sr_ticket_number]
-                                                          CometFilter [sr_ticket_number,sr_item_sk]
-                                                            CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+            HashAggregate [c_last_name,c_first_name,s_store_name,sum,isEmpty] [sum(netpaid),paid,sum,isEmpty]
+              InputAdapter
+                Exchange [c_last_name,c_first_name,s_store_name] #2
+                  WholeStageCodegen (6)
+                    HashAggregate [c_last_name,c_first_name,s_store_name,netpaid] [sum,isEmpty,sum,isEmpty]
+                      HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,sum] [sum(UnscaledValue(ss_net_paid)),netpaid,sum]
+                        InputAdapter
+                          Exchange [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size] #3
+                            WholeStageCodegen (5)
+                              HashAggregate [c_last_name,c_first_name,s_store_name,ca_state,s_state,i_color,i_current_price,i_manager_id,i_units,i_size,ss_net_paid] [sum,sum]
+                                Project [ss_net_paid,s_store_name,s_state,i_current_price,i_size,i_color,i_units,i_manager_id,c_first_name,c_last_name,ca_state]
+                                  BroadcastHashJoin [c_current_addr_sk,c_birth_country,s_zip,ca_address_sk,ca_country,ca_zip]
+                                    Project [ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
+                                      BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                        Project [ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                            Project [ss_item_sk,ss_customer_sk,ss_net_paid,s_store_name,s_state,s_zip]
+                                              BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_net_paid]
+                                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                        CometSort [ss_ticket_number,ss_item_sk]
+                                                          CometExchange [ss_ticket_number,ss_item_sk] #4
+                                                            CometProject [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid]
+                                                              CometFilter [ss_ticket_number,ss_item_sk,ss_store_sk,ss_customer_sk]
+                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_store_sk,ss_ticket_number,ss_net_paid,ss_sold_date_sk]
+                                                        CometSort [sr_ticket_number,sr_item_sk]
+                                                          CometExchange [sr_ticket_number,sr_item_sk] #5
+                                                            CometProject [sr_item_sk,sr_ticket_number]
+                                                              CometFilter [sr_ticket_number,sr_item_sk]
+                                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
+                                                InputAdapter
+                                                  BroadcastExchange #6
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [s_store_sk,s_store_name,s_state,s_zip]
+                                                            CometFilter [s_market_id,s_store_sk,s_zip]
+                                                              CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_market_id,s_state,s_zip]
                                             InputAdapter
-                                              BroadcastExchange #6
-                                                WholeStageCodegen (1)
+                                              BroadcastExchange #7
+                                                WholeStageCodegen (2)
                                                   ColumnarToRow
                                                     InputAdapter
-                                                      CometProject [s_store_sk,s_store_name,s_state,s_zip]
-                                                        CometFilter [s_market_id,s_store_sk,s_zip]
-                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_market_id,s_state,s_zip]
+                                                      CometFilter [i_color,i_item_sk]
+                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
                                         InputAdapter
-                                          BroadcastExchange #7
-                                            WholeStageCodegen (2)
+                                          BroadcastExchange #8
+                                            WholeStageCodegen (3)
                                               ColumnarToRow
                                                 InputAdapter
-                                                  CometFilter [i_color,i_item_sk]
-                                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_size,i_color,i_units,i_manager_id]
+                                                  CometFilter [c_customer_sk,c_current_addr_sk,c_birth_country]
+                                                    CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
                                     InputAdapter
-                                      BroadcastExchange #8
-                                        WholeStageCodegen (3)
+                                      BroadcastExchange #9
+                                        WholeStageCodegen (4)
                                           ColumnarToRow
                                             InputAdapter
-                                              CometFilter [c_customer_sk,c_current_addr_sk,c_birth_country]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk,c_first_name,c_last_name,c_birth_country]
-                                InputAdapter
-                                  BroadcastExchange #9
-                                    WholeStageCodegen (4)
-                                      ColumnarToRow
-                                        InputAdapter
-                                          CometFilter [ca_address_sk,ca_country,ca_zip]
-                                            CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip,ca_country]
+                                              CometFilter [ca_address_sk,ca_country,ca_zip]
+                                                CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state,ca_zip,ca_country]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt
index d689cb65a9..54aadf2cf5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/explain.txt
@@ -1,81 +1,77 @@
 == Physical Plan ==
-* ColumnarToRow (77)
-+- CometTakeOrderedAndProject (76)
-   +- CometUnion (75)
-      :- CometHashAggregate (29)
-      :  +- CometColumnarExchange (28)
-      :     +- RowToColumnar (27)
-      :        +- * HashAggregate (26)
-      :           +- * Project (25)
-      :              +- * BroadcastHashJoin Inner BuildRight (24)
-      :                 :- * Project (19)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (18)
-      :                 :     :- * Project (13)
-      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (12)
-      :                 :     :     :- * Project (10)
-      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
-      :                 :     :     :     :- * ColumnarToRow (3)
-      :                 :     :     :     :  +- CometFilter (2)
-      :                 :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-      :                 :     :     :     +- BroadcastExchange (8)
-      :                 :     :     :        +- * ColumnarToRow (7)
-      :                 :     :     :           +- CometProject (6)
-      :                 :     :     :              +- CometFilter (5)
-      :                 :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
-      :                 :     :     +- ReusedExchange (11)
-      :                 :     +- BroadcastExchange (17)
-      :                 :        +- * ColumnarToRow (16)
-      :                 :           +- CometFilter (15)
-      :                 :              +- CometScan parquet spark_catalog.default.store (14)
-      :                 +- BroadcastExchange (23)
-      :                    +- * ColumnarToRow (22)
-      :                       +- CometFilter (21)
-      :                          +- CometScan parquet spark_catalog.default.item (20)
-      :- CometHashAggregate (52)
-      :  +- CometColumnarExchange (51)
-      :     +- RowToColumnar (50)
-      :        +- * HashAggregate (49)
-      :           +- * Project (48)
-      :              +- * BroadcastHashJoin Inner BuildRight (47)
-      :                 :- * Project (45)
-      :                 :  +- * BroadcastHashJoin Inner BuildRight (44)
-      :                 :     :- * Project (38)
-      :                 :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-      :                 :     :     :- * Project (35)
-      :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-      :                 :     :     :     :- * ColumnarToRow (32)
-      :                 :     :     :     :  +- CometFilter (31)
-      :                 :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (30)
-      :                 :     :     :     +- ReusedExchange (33)
-      :                 :     :     +- ReusedExchange (36)
-      :                 :     +- BroadcastExchange (43)
-      :                 :        +- * ColumnarToRow (42)
-      :                 :           +- CometProject (41)
-      :                 :              +- CometFilter (40)
-      :                 :                 +- CometScan parquet spark_catalog.default.store (39)
-      :                 +- ReusedExchange (46)
-      +- CometHashAggregate (74)
-         +- CometColumnarExchange (73)
-            +- RowToColumnar (72)
-               +- * HashAggregate (71)
-                  +- * Project (70)
-                     +- * BroadcastHashJoin Inner BuildRight (69)
-                        :- * Project (64)
-                        :  +- * BroadcastHashJoin Inner BuildRight (63)
-                        :     :- * Project (61)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (60)
-                        :     :     :- * Project (58)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
-                        :     :     :     :- * ColumnarToRow (55)
-                        :     :     :     :  +- CometFilter (54)
-                        :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (53)
-                        :     :     :     +- ReusedExchange (56)
-                        :     :     +- ReusedExchange (59)
-                        :     +- ReusedExchange (62)
-                        +- BroadcastExchange (68)
-                           +- * ColumnarToRow (67)
-                              +- CometFilter (66)
-                                 +- CometScan parquet spark_catalog.default.item (65)
+TakeOrderedAndProject (73)
++- Union (72)
+   :- * HashAggregate (28)
+   :  +- Exchange (27)
+   :     +- * HashAggregate (26)
+   :        +- * Project (25)
+   :           +- * BroadcastHashJoin Inner BuildRight (24)
+   :              :- * Project (19)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (18)
+   :              :     :- * Project (13)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (12)
+   :              :     :     :- * Project (10)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (9)
+   :              :     :     :     :- * ColumnarToRow (3)
+   :              :     :     :     :  +- CometFilter (2)
+   :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+   :              :     :     :     +- BroadcastExchange (8)
+   :              :     :     :        +- * ColumnarToRow (7)
+   :              :     :     :           +- CometProject (6)
+   :              :     :     :              +- CometFilter (5)
+   :              :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (4)
+   :              :     :     +- ReusedExchange (11)
+   :              :     +- BroadcastExchange (17)
+   :              :        +- * ColumnarToRow (16)
+   :              :           +- CometFilter (15)
+   :              :              +- CometScan parquet spark_catalog.default.store (14)
+   :              +- BroadcastExchange (23)
+   :                 +- * ColumnarToRow (22)
+   :                    +- CometFilter (21)
+   :                       +- CometScan parquet spark_catalog.default.item (20)
+   :- * HashAggregate (50)
+   :  +- Exchange (49)
+   :     +- * HashAggregate (48)
+   :        +- * Project (47)
+   :           +- * BroadcastHashJoin Inner BuildRight (46)
+   :              :- * Project (44)
+   :              :  +- * BroadcastHashJoin Inner BuildRight (43)
+   :              :     :- * Project (37)
+   :              :     :  +- * BroadcastHashJoin Inner BuildRight (36)
+   :              :     :     :- * Project (34)
+   :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (33)
+   :              :     :     :     :- * ColumnarToRow (31)
+   :              :     :     :     :  +- CometFilter (30)
+   :              :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (29)
+   :              :     :     :     +- ReusedExchange (32)
+   :              :     :     +- ReusedExchange (35)
+   :              :     +- BroadcastExchange (42)
+   :              :        +- * ColumnarToRow (41)
+   :              :           +- CometProject (40)
+   :              :              +- CometFilter (39)
+   :              :                 +- CometScan parquet spark_catalog.default.store (38)
+   :              +- ReusedExchange (45)
+   +- * HashAggregate (71)
+      +- Exchange (70)
+         +- * HashAggregate (69)
+            +- * Project (68)
+               +- * BroadcastHashJoin Inner BuildRight (67)
+                  :- * Project (62)
+                  :  +- * BroadcastHashJoin Inner BuildRight (61)
+                  :     :- * Project (59)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (58)
+                  :     :     :- * Project (56)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (55)
+                  :     :     :     :- * ColumnarToRow (53)
+                  :     :     :     :  +- CometFilter (52)
+                  :     :     :     :     +- CometScan parquet spark_catalog.default.store_sales (51)
+                  :     :     :     +- ReusedExchange (54)
+                  :     :     +- ReusedExchange (57)
+                  :     +- ReusedExchange (60)
+                  +- BroadcastExchange (66)
+                     +- * ColumnarToRow (65)
+                        +- CometFilter (64)
+                           +- CometScan parquet spark_catalog.default.item (63)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -125,7 +121,7 @@ Join condition: None
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(11) ReusedExchange [Reuses operator id: 82]
+(11) ReusedExchange [Reuses operator id: 78]
 Output [1]: [d_date_sk#14]
 
 (12) BroadcastHashJoin [codegen id : 5]
@@ -201,56 +197,55 @@ Functions [4]: [partial_avg(agg1#19), partial_avg(UnscaledValue(agg2#20)), parti
 Aggregate Attributes [8]: [sum#23, count#24, sum#25, count#26, sum#27, count#28, sum#29, count#30]
 Results [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
 
-(27) RowToColumnar
+(27) Exchange
 Input [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
+Arguments: hashpartitioning(i_item_id#18, s_state#16, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometColumnarExchange
-Input [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
-Arguments: hashpartitioning(i_item_id#18, s_state#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(29) CometHashAggregate
+(28) HashAggregate [codegen id : 6]
 Input [10]: [i_item_id#18, s_state#16, sum#31, count#32, sum#33, count#34, sum#35, count#36, sum#37, count#38]
 Keys [2]: [i_item_id#18, s_state#16]
 Functions [4]: [avg(agg1#19), avg(UnscaledValue(agg2#20)), avg(UnscaledValue(agg3#21)), avg(UnscaledValue(agg4#22))]
+Aggregate Attributes [4]: [avg(agg1#19)#39, avg(UnscaledValue(agg2#20))#40, avg(UnscaledValue(agg3#21))#41, avg(UnscaledValue(agg4#22))#42]
+Results [7]: [i_item_id#18, s_state#16, 0 AS g_state#43, avg(agg1#19)#39 AS agg1#44, cast((avg(UnscaledValue(agg2#20))#40 / 100.0) as decimal(11,6)) AS agg2#45, cast((avg(UnscaledValue(agg3#21))#41 / 100.0) as decimal(11,6)) AS agg3#46, cast((avg(UnscaledValue(agg4#22))#42 / 100.0) as decimal(11,6)) AS agg4#47]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#39)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#48)]
 PushedFilters: [IsNotNull(ss_cdemo_sk), IsNotNull(ss_store_sk), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_cdemo_sk:int,ss_store_sk:int,ss_quantity:int,ss_list_price:decimal(7,2),ss_sales_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(31) CometFilter
+(30) CometFilter
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Condition : ((isnotnull(ss_cdemo_sk#2) AND isnotnull(ss_store_sk#3)) AND isnotnull(ss_item_sk#1))
 
-(32) ColumnarToRow [codegen id : 10]
+(31) ColumnarToRow [codegen id : 11]
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 
-(33) ReusedExchange [Reuses operator id: 8]
+(32) ReusedExchange [Reuses operator id: 8]
 Output [1]: [cd_demo_sk#10]
 
-(34) BroadcastHashJoin [codegen id : 10]
+(33) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [ss_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#10]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
+(34) Project [codegen id : 11]
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(36) ReusedExchange [Reuses operator id: 82]
+(35) ReusedExchange [Reuses operator id: 78]
 Output [1]: [d_date_sk#14]
 
-(37) BroadcastHashJoin [codegen id : 10]
+(36) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [ss_sold_date_sk#8]
 Right keys [1]: [d_date_sk#14]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 10]
+(37) Project [codegen id : 11]
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, d_date_sk#14]
 
@@ -261,114 +256,113 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_state), EqualTo(s_state,TN), IsNotNull(s_store_sk)]
 ReadSchema: struct<s_store_sk:int,s_state:string>
 
-(40) CometFilter
+(39) CometFilter
 Input [2]: [s_store_sk#15, s_state#16]
 Condition : ((isnotnull(s_state#16) AND (s_state#16 = TN)) AND isnotnull(s_store_sk#15))
 
-(41) CometProject
+(40) CometProject
 Input [2]: [s_store_sk#15, s_state#16]
 Arguments: [s_store_sk#15], [s_store_sk#15]
 
-(42) ColumnarToRow [codegen id : 8]
+(41) ColumnarToRow [codegen id : 9]
 Input [1]: [s_store_sk#15]
 
-(43) BroadcastExchange
+(42) BroadcastExchange
 Input [1]: [s_store_sk#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
-(44) BroadcastHashJoin [codegen id : 10]
+(43) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#15]
 Join type: Inner
 Join condition: None
 
-(45) Project [codegen id : 10]
+(44) Project [codegen id : 11]
 Output [5]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, s_store_sk#15]
 
-(46) ReusedExchange [Reuses operator id: 23]
+(45) ReusedExchange [Reuses operator id: 23]
 Output [2]: [i_item_sk#17, i_item_id#18]
 
-(47) BroadcastHashJoin [codegen id : 10]
+(46) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#17]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 10]
+(47) Project [codegen id : 11]
 Output [5]: [i_item_id#18, ss_quantity#4 AS agg1#19, ss_list_price#5 AS agg2#20, ss_coupon_amt#7 AS agg3#21, ss_sales_price#6 AS agg4#22]
 Input [7]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, i_item_sk#17, i_item_id#18]
 
-(49) HashAggregate [codegen id : 10]
+(48) HashAggregate [codegen id : 11]
 Input [5]: [i_item_id#18, agg1#19, agg2#20, agg3#21, agg4#22]
 Keys [1]: [i_item_id#18]
 Functions [4]: [partial_avg(agg1#19), partial_avg(UnscaledValue(agg2#20)), partial_avg(UnscaledValue(agg3#21)), partial_avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [8]: [sum#40, count#41, sum#42, count#43, sum#44, count#45, sum#46, count#47]
-Results [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
-
-(50) RowToColumnar
-Input [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
+Aggregate Attributes [8]: [sum#49, count#50, sum#51, count#52, sum#53, count#54, sum#55, count#56]
+Results [9]: [i_item_id#18, sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
 
-(51) CometColumnarExchange
-Input [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
-Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(49) Exchange
+Input [9]: [i_item_id#18, sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
+Arguments: hashpartitioning(i_item_id#18, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(52) CometHashAggregate
-Input [9]: [i_item_id#18, sum#48, count#49, sum#50, count#51, sum#52, count#53, sum#54, count#55]
+(50) HashAggregate [codegen id : 12]
+Input [9]: [i_item_id#18, sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
 Keys [1]: [i_item_id#18]
 Functions [4]: [avg(agg1#19), avg(UnscaledValue(agg2#20)), avg(UnscaledValue(agg3#21)), avg(UnscaledValue(agg4#22))]
+Aggregate Attributes [4]: [avg(agg1#19)#65, avg(UnscaledValue(agg2#20))#66, avg(UnscaledValue(agg3#21))#67, avg(UnscaledValue(agg4#22))#68]
+Results [7]: [i_item_id#18, null AS s_state#69, 1 AS g_state#70, avg(agg1#19)#65 AS agg1#71, cast((avg(UnscaledValue(agg2#20))#66 / 100.0) as decimal(11,6)) AS agg2#72, cast((avg(UnscaledValue(agg3#21))#67 / 100.0) as decimal(11,6)) AS agg3#73, cast((avg(UnscaledValue(agg4#22))#68 / 100.0) as decimal(11,6)) AS agg4#74]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#56)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#8), dynamicpruningexpression(ss_sold_date_sk#8 IN dynamicpruning#75)]
 PushedFilters: [IsNotNull(ss_cdemo_sk), IsNotNull(ss_store_sk), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_cdemo_sk:int,ss_store_sk:int,ss_quantity:int,ss_list_price:decimal(7,2),ss_sales_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(54) CometFilter
+(52) CometFilter
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Condition : ((isnotnull(ss_cdemo_sk#2) AND isnotnull(ss_store_sk#3)) AND isnotnull(ss_item_sk#1))
 
-(55) ColumnarToRow [codegen id : 15]
+(53) ColumnarToRow [codegen id : 17]
 Input [8]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 
-(56) ReusedExchange [Reuses operator id: 8]
+(54) ReusedExchange [Reuses operator id: 8]
 Output [1]: [cd_demo_sk#10]
 
-(57) BroadcastHashJoin [codegen id : 15]
+(55) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ss_cdemo_sk#2]
 Right keys [1]: [cd_demo_sk#10]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 15]
+(56) Project [codegen id : 17]
 Output [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8]
 Input [9]: [ss_item_sk#1, ss_cdemo_sk#2, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, cd_demo_sk#10]
 
-(59) ReusedExchange [Reuses operator id: 82]
+(57) ReusedExchange [Reuses operator id: 78]
 Output [1]: [d_date_sk#14]
 
-(60) BroadcastHashJoin [codegen id : 15]
+(58) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ss_sold_date_sk#8]
 Right keys [1]: [d_date_sk#14]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 15]
+(59) Project [codegen id : 17]
 Output [6]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [8]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, ss_sold_date_sk#8, d_date_sk#14]
 
-(62) ReusedExchange [Reuses operator id: 43]
+(60) ReusedExchange [Reuses operator id: 42]
 Output [1]: [s_store_sk#15]
 
-(63) BroadcastHashJoin [codegen id : 15]
+(61) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ss_store_sk#3]
 Right keys [1]: [s_store_sk#15]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 15]
+(62) Project [codegen id : 17]
 Output [5]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7]
 Input [7]: [ss_item_sk#1, ss_store_sk#3, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, s_store_sk#15]
 
@@ -379,92 +373,85 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int>
 
-(66) CometFilter
+(64) CometFilter
 Input [1]: [i_item_sk#17]
 Condition : isnotnull(i_item_sk#17)
 
-(67) ColumnarToRow [codegen id : 14]
+(65) ColumnarToRow [codegen id : 16]
 Input [1]: [i_item_sk#17]
 
-(68) BroadcastExchange
+(66) BroadcastExchange
 Input [1]: [i_item_sk#17]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(69) BroadcastHashJoin [codegen id : 15]
+(67) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#17]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 15]
+(68) Project [codegen id : 17]
 Output [4]: [ss_quantity#4 AS agg1#19, ss_list_price#5 AS agg2#20, ss_coupon_amt#7 AS agg3#21, ss_sales_price#6 AS agg4#22]
 Input [6]: [ss_item_sk#1, ss_quantity#4, ss_list_price#5, ss_sales_price#6, ss_coupon_amt#7, i_item_sk#17]
 
-(71) HashAggregate [codegen id : 15]
+(69) HashAggregate [codegen id : 17]
 Input [4]: [agg1#19, agg2#20, agg3#21, agg4#22]
 Keys: []
 Functions [4]: [partial_avg(agg1#19), partial_avg(UnscaledValue(agg2#20)), partial_avg(UnscaledValue(agg3#21)), partial_avg(UnscaledValue(agg4#22))]
-Aggregate Attributes [8]: [sum#57, count#58, sum#59, count#60, sum#61, count#62, sum#63, count#64]
-Results [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
+Aggregate Attributes [8]: [sum#76, count#77, sum#78, count#79, sum#80, count#81, sum#82, count#83]
+Results [8]: [sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
 
-(72) RowToColumnar
-Input [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
+(70) Exchange
+Input [8]: [sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=8]
 
-(73) CometColumnarExchange
-Input [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
-
-(74) CometHashAggregate
-Input [8]: [sum#65, count#66, sum#67, count#68, sum#69, count#70, sum#71, count#72]
+(71) HashAggregate [codegen id : 18]
+Input [8]: [sum#84, count#85, sum#86, count#87, sum#88, count#89, sum#90, count#91]
 Keys: []
 Functions [4]: [avg(agg1#19), avg(UnscaledValue(agg2#20)), avg(UnscaledValue(agg3#21)), avg(UnscaledValue(agg4#22))]
+Aggregate Attributes [4]: [avg(agg1#19)#92, avg(UnscaledValue(agg2#20))#93, avg(UnscaledValue(agg3#21))#94, avg(UnscaledValue(agg4#22))#95]
+Results [7]: [null AS i_item_id#96, null AS s_state#97, 1 AS g_state#98, avg(agg1#19)#92 AS agg1#99, cast((avg(UnscaledValue(agg2#20))#93 / 100.0) as decimal(11,6)) AS agg2#100, cast((avg(UnscaledValue(agg3#21))#94 / 100.0) as decimal(11,6)) AS agg3#101, cast((avg(UnscaledValue(agg4#22))#95 / 100.0) as decimal(11,6)) AS agg4#102]
 
-(75) CometUnion
-Child 0 Input [7]: [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
-Child 1 Input [7]: [i_item_id#18, s_state#78, g_state#79, agg1#80, agg2#81, agg3#82, agg4#83]
-Child 2 Input [7]: [i_item_id#84, s_state#85, g_state#86, agg1#87, agg2#88, agg3#89, agg4#90]
-
-(76) CometTakeOrderedAndProject
-Input [7]: [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[i_item_id#18 ASC NULLS FIRST,s_state#16 ASC NULLS FIRST], output=[i_item_id#18,s_state#16,g_state#73,agg1#74,agg2#75,agg3#76,agg4#77]), 100, [i_item_id#18 ASC NULLS FIRST, s_state#16 ASC NULLS FIRST], [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
+(72) Union
 
-(77) ColumnarToRow [codegen id : 16]
-Input [7]: [i_item_id#18, s_state#16, g_state#73, agg1#74, agg2#75, agg3#76, agg4#77]
+(73) TakeOrderedAndProject
+Input [7]: [i_item_id#18, s_state#16, g_state#43, agg1#44, agg2#45, agg3#46, agg4#47]
+Arguments: 100, [i_item_id#18 ASC NULLS FIRST, s_state#16 ASC NULLS FIRST], [i_item_id#18, s_state#16, g_state#43, agg1#44, agg2#45, agg3#46, agg4#47]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (82)
-+- * ColumnarToRow (81)
-   +- CometProject (80)
-      +- CometFilter (79)
-         +- CometScan parquet spark_catalog.default.date_dim (78)
+BroadcastExchange (78)
++- * ColumnarToRow (77)
+   +- CometProject (76)
+      +- CometFilter (75)
+         +- CometScan parquet spark_catalog.default.date_dim (74)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_year#91]
+Output [2]: [d_date_sk#14, d_year#103]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1998), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(79) CometFilter
-Input [2]: [d_date_sk#14, d_year#91]
-Condition : ((isnotnull(d_year#91) AND (d_year#91 = 1998)) AND isnotnull(d_date_sk#14))
+(75) CometFilter
+Input [2]: [d_date_sk#14, d_year#103]
+Condition : ((isnotnull(d_year#103) AND (d_year#103 = 1998)) AND isnotnull(d_date_sk#14))
 
-(80) CometProject
-Input [2]: [d_date_sk#14, d_year#91]
+(76) CometProject
+Input [2]: [d_date_sk#14, d_year#103]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(81) ColumnarToRow [codegen id : 1]
+(77) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(82) BroadcastExchange
+(78) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=9]
 
-Subquery:2 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
+Subquery:2 Hosting operator id = 29 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
 
-Subquery:3 Hosting operator id = 53 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
+Subquery:3 Hosting operator id = 51 Hosting Expression = ss_sold_date_sk#8 IN dynamicpruning#9
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt
index fec1c27dd3..32f003798d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q27a/simplified.txt
@@ -1,117 +1,117 @@
-WholeStageCodegen (16)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
-        CometUnion
-          CometHashAggregate [i_item_id,s_state,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange [i_item_id,s_state] #1
-              RowToColumnar
-                WholeStageCodegen (5)
-                  HashAggregate [i_item_id,s_state,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [i_item_id,s_state,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
-                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                            SubqueryBroadcast [d_date_sk] #1
-                                              BroadcastExchange #2
-                                                WholeStageCodegen (1)
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometProject [d_date_sk]
-                                                        CometFilter [d_year,d_date_sk]
-                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                    InputAdapter
-                                      BroadcastExchange #3
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometProject [cd_demo_sk]
-                                                CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
-                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
+TakeOrderedAndProject [i_item_id,s_state,g_state,agg1,agg2,agg3,agg4]
+  Union
+    WholeStageCodegen (6)
+      HashAggregate [i_item_id,s_state,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(UnscaledValue(agg2)),avg(UnscaledValue(agg3)),avg(UnscaledValue(agg4)),g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange [i_item_id,s_state] #1
+            WholeStageCodegen (5)
+              HashAggregate [i_item_id,s_state,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [i_item_id,s_state,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,s_state]
+                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                        SubqueryBroadcast [d_date_sk] #1
+                                          BroadcastExchange #2
+                                            WholeStageCodegen (1)
+                                              ColumnarToRow
+                                                InputAdapter
+                                                  CometProject [d_date_sk]
+                                                    CometFilter [d_year,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  BroadcastExchange #3
+                                    WholeStageCodegen (1)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [cd_demo_sk]
+                                            CometFilter [cd_gender,cd_marital_status,cd_education_status,cd_demo_sk]
+                                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_education_status]
                             InputAdapter
-                              BroadcastExchange #4
-                                WholeStageCodegen (3)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometFilter [s_state,s_store_sk]
-                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          BroadcastExchange #5
-                            WholeStageCodegen (4)
+                          BroadcastExchange #4
+                            WholeStageCodegen (3)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
-          CometHashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange [i_item_id] #6
-              RowToColumnar
-                WholeStageCodegen (10)
-                  HashAggregate [i_item_id,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                    InputAdapter
-                                      ReusedExchange [cd_demo_sk] #3
-                                InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  CometFilter [s_state,s_store_sk]
+                                    CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                    InputAdapter
+                      BroadcastExchange #5
+                        WholeStageCodegen (4)
+                          ColumnarToRow
                             InputAdapter
-                              BroadcastExchange #7
-                                WholeStageCodegen (8)
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometProject [s_store_sk]
-                                        CometFilter [s_state,s_store_sk]
-                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                        InputAdapter
-                          ReusedExchange [i_item_sk,i_item_id] #5
-          CometHashAggregate [sum,count,sum,count,sum,count,sum,count]
-            CometColumnarExchange #8
-              RowToColumnar
-                WholeStageCodegen (15)
-                  HashAggregate [agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
-                    Project [ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                          BroadcastHashJoin [ss_store_sk,s_store_sk]
-                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                  BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
-                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
-                                            ReusedSubquery [d_date_sk] #1
-                                    InputAdapter
-                                      ReusedExchange [cd_demo_sk] #3
+                              CometFilter [i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id]
+    WholeStageCodegen (12)
+      HashAggregate [i_item_id,sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(UnscaledValue(agg2)),avg(UnscaledValue(agg3)),avg(UnscaledValue(agg4)),s_state,g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange [i_item_id] #6
+            WholeStageCodegen (11)
+              HashAggregate [i_item_id,agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [i_item_id,ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                        ReusedSubquery [d_date_sk] #1
                                 InputAdapter
-                                  ReusedExchange [d_date_sk] #2
+                                  ReusedExchange [cd_demo_sk] #3
                             InputAdapter
-                              ReusedExchange [s_store_sk] #7
+                              ReusedExchange [d_date_sk] #2
                         InputAdapter
-                          BroadcastExchange #9
-                            WholeStageCodegen (14)
+                          BroadcastExchange #7
+                            WholeStageCodegen (9)
                               ColumnarToRow
                                 InputAdapter
-                                  CometFilter [i_item_sk]
-                                    CometScan parquet spark_catalog.default.item [i_item_sk]
+                                  CometProject [s_store_sk]
+                                    CometFilter [s_state,s_store_sk]
+                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                    InputAdapter
+                      ReusedExchange [i_item_sk,i_item_id] #5
+    WholeStageCodegen (18)
+      HashAggregate [sum,count,sum,count,sum,count,sum,count] [avg(agg1),avg(UnscaledValue(agg2)),avg(UnscaledValue(agg3)),avg(UnscaledValue(agg4)),i_item_id,s_state,g_state,agg1,agg2,agg3,agg4,sum,count,sum,count,sum,count,sum,count]
+        InputAdapter
+          Exchange #8
+            WholeStageCodegen (17)
+              HashAggregate [agg1,agg2,agg3,agg4] [sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count,sum,count]
+                Project [ss_quantity,ss_list_price,ss_coupon_amt,ss_sales_price]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ss_item_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                      BroadcastHashJoin [ss_store_sk,s_store_sk]
+                        Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt]
+                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                            Project [ss_item_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                              BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ss_cdemo_sk,ss_store_sk,ss_item_sk]
+                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_cdemo_sk,ss_store_sk,ss_quantity,ss_list_price,ss_sales_price,ss_coupon_amt,ss_sold_date_sk]
+                                        ReusedSubquery [d_date_sk] #1
+                                InputAdapter
+                                  ReusedExchange [cd_demo_sk] #3
+                            InputAdapter
+                              ReusedExchange [d_date_sk] #2
+                        InputAdapter
+                          ReusedExchange [s_store_sk] #7
+                    InputAdapter
+                      BroadcastExchange #9
+                        WholeStageCodegen (16)
+                          ColumnarToRow
+                            InputAdapter
+                              CometFilter [i_item_sk]
+                                CometScan parquet spark_catalog.default.item [i_item_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt
index cd5187ddd2..a86edcfa3a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/explain.txt
@@ -1,40 +1,36 @@
 == Physical Plan ==
-* ColumnarToRow (36)
-+- CometSort (35)
-   +- CometColumnarExchange (34)
-      +- RowToColumnar (33)
-         +- * Project (32)
-            +- * BroadcastHashJoin Inner BuildRight (31)
-               :- * ColumnarToRow (26)
-               :  +- CometFilter (25)
-               :     +- CometHashAggregate (24)
-               :        +- CometColumnarExchange (23)
-               :           +- RowToColumnar (22)
-               :              +- * HashAggregate (21)
-               :                 +- * Project (20)
-               :                    +- * BroadcastHashJoin Inner BuildRight (19)
-               :                       :- * Project (13)
-               :                       :  +- * BroadcastHashJoin Inner BuildRight (12)
-               :                       :     :- * Project (6)
-               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :                       :     :     :- * ColumnarToRow (3)
-               :                       :     :     :  +- CometFilter (2)
-               :                       :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                       :     :     +- ReusedExchange (4)
-               :                       :     +- BroadcastExchange (11)
-               :                       :        +- * ColumnarToRow (10)
-               :                       :           +- CometProject (9)
-               :                       :              +- CometFilter (8)
-               :                       :                 +- CometScan parquet spark_catalog.default.store (7)
-               :                       +- BroadcastExchange (18)
-               :                          +- * ColumnarToRow (17)
-               :                             +- CometProject (16)
-               :                                +- CometFilter (15)
-               :                                   +- CometScan parquet spark_catalog.default.household_demographics (14)
-               +- BroadcastExchange (30)
-                  +- * ColumnarToRow (29)
-                     +- CometFilter (28)
-                        +- CometScan parquet spark_catalog.default.customer (27)
+* Sort (32)
++- Exchange (31)
+   +- * Project (30)
+      +- * BroadcastHashJoin Inner BuildRight (29)
+         :- * Filter (24)
+         :  +- * HashAggregate (23)
+         :     +- Exchange (22)
+         :        +- * HashAggregate (21)
+         :           +- * Project (20)
+         :              +- * BroadcastHashJoin Inner BuildRight (19)
+         :                 :- * Project (13)
+         :                 :  +- * BroadcastHashJoin Inner BuildRight (12)
+         :                 :     :- * Project (6)
+         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+         :                 :     :     :- * ColumnarToRow (3)
+         :                 :     :     :  +- CometFilter (2)
+         :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+         :                 :     :     +- ReusedExchange (4)
+         :                 :     +- BroadcastExchange (11)
+         :                 :        +- * ColumnarToRow (10)
+         :                 :           +- CometProject (9)
+         :                 :              +- CometFilter (8)
+         :                 :                 +- CometScan parquet spark_catalog.default.store (7)
+         :                 +- BroadcastExchange (18)
+         :                    +- * ColumnarToRow (17)
+         :                       +- CometProject (16)
+         :                          +- CometFilter (15)
+         :                             +- CometScan parquet spark_catalog.default.household_demographics (14)
+         +- BroadcastExchange (28)
+            +- * ColumnarToRow (27)
+               +- CometFilter (26)
+                  +- CometScan parquet spark_catalog.default.customer (25)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -52,7 +48,7 @@ Condition : ((isnotnull(ss_store_sk#3) AND isnotnull(ss_hdemo_sk#2)) AND isnotnu
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_customer_sk#1, ss_hdemo_sk#2, ss_store_sk#3, ss_ticket_number#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 41]
+(4) ReusedExchange [Reuses operator id: 37]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -136,96 +132,86 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#14]
 Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 
-(22) RowToColumnar
+(22) Exchange
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
+Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(23) CometColumnarExchange
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
-Arguments: hashpartitioning(ss_ticket_number#4, ss_customer_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(24) CometHashAggregate
+(23) HashAggregate [codegen id : 6]
 Input [3]: [ss_ticket_number#4, ss_customer_sk#1, count#15]
 Keys [2]: [ss_ticket_number#4, ss_customer_sk#1]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#16]
+Results [3]: [ss_ticket_number#4, ss_customer_sk#1, count(1)#16 AS cnt#17]
 
-(25) CometFilter
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
-Condition : ((cnt#16 >= 15) AND (cnt#16 <= 20))
-
-(26) ColumnarToRow [codegen id : 6]
-Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16]
+(24) Filter [codegen id : 6]
+Input [3]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17]
+Condition : ((cnt#17 >= 15) AND (cnt#17 <= 20))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+Output [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk)]
 ReadSchema: struct<c_customer_sk:int,c_salutation:string,c_first_name:string,c_last_name:string,c_preferred_cust_flag:string>
 
-(28) CometFilter
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
-Condition : isnotnull(c_customer_sk#17)
+(26) CometFilter
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
+Condition : isnotnull(c_customer_sk#18)
 
-(29) ColumnarToRow [codegen id : 5]
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+(27) ColumnarToRow [codegen id : 5]
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 
-(30) BroadcastExchange
-Input [5]: [c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
+(28) BroadcastExchange
+Input [5]: [c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(31) BroadcastHashJoin [codegen id : 6]
+(29) BroadcastHashJoin [codegen id : 6]
 Left keys [1]: [ss_customer_sk#1]
-Right keys [1]: [c_customer_sk#17]
+Right keys [1]: [c_customer_sk#18]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 6]
-Output [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#16, c_customer_sk#17, c_salutation#18, c_first_name#19, c_last_name#20, c_preferred_cust_flag#21]
-
-(33) RowToColumnar
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-
-(34) CometColumnarExchange
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Arguments: rangepartitioning(c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(30) Project [codegen id : 6]
+Output [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Input [8]: [ss_ticket_number#4, ss_customer_sk#1, cnt#17, c_customer_sk#18, c_salutation#19, c_first_name#20, c_last_name#21, c_preferred_cust_flag#22]
 
-(35) CometSort
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
-Arguments: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16], [c_last_name#20 ASC NULLS FIRST, c_first_name#19 ASC NULLS FIRST, c_salutation#18 ASC NULLS FIRST, c_preferred_cust_flag#21 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST]
+(31) Exchange
+Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Arguments: rangepartitioning(c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(36) ColumnarToRow [codegen id : 7]
-Input [6]: [c_last_name#20, c_first_name#19, c_salutation#18, c_preferred_cust_flag#21, ss_ticket_number#4, cnt#16]
+(32) Sort [codegen id : 7]
+Input [6]: [c_last_name#21, c_first_name#20, c_salutation#19, c_preferred_cust_flag#22, ss_ticket_number#4, cnt#17]
+Arguments: [c_last_name#21 ASC NULLS FIRST, c_first_name#20 ASC NULLS FIRST, c_salutation#19 ASC NULLS FIRST, c_preferred_cust_flag#22 DESC NULLS LAST, ss_ticket_number#4 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (41)
-+- * ColumnarToRow (40)
-   +- CometProject (39)
-      +- CometFilter (38)
-         +- CometScan parquet spark_catalog.default.date_dim (37)
+BroadcastExchange (37)
++- * ColumnarToRow (36)
+   +- CometProject (35)
+      +- CometFilter (34)
+         +- CometScan parquet spark_catalog.default.date_dim (33)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#22, d_dom#23]
+Output [3]: [d_date_sk#7, d_year#23, d_dom#24]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(And(GreaterThanOrEqual(d_dom,1),LessThanOrEqual(d_dom,3)),And(GreaterThanOrEqual(d_dom,25),LessThanOrEqual(d_dom,28))), In(d_year, [1999,2000,2001]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_dom:int>
 
-(38) CometFilter
-Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
-Condition : (((((d_dom#23 >= 1) AND (d_dom#23 <= 3)) OR ((d_dom#23 >= 25) AND (d_dom#23 <= 28))) AND d_year#22 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
+(34) CometFilter
+Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
+Condition : (((((d_dom#24 >= 1) AND (d_dom#24 <= 3)) OR ((d_dom#24 >= 25) AND (d_dom#24 <= 28))) AND d_year#23 IN (1999,2000,2001)) AND isnotnull(d_date_sk#7))
 
-(39) CometProject
-Input [3]: [d_date_sk#7, d_year#22, d_dom#23]
+(35) CometProject
+Input [3]: [d_date_sk#7, d_year#23, d_dom#24]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(40) ColumnarToRow [codegen id : 1]
+(36) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(41) BroadcastExchange
+(37) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt
index 9c94a51d26..b473e48921 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q34/simplified.txt
@@ -1,60 +1,56 @@
 WholeStageCodegen (7)
-  ColumnarToRow
+  Sort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number]
     InputAdapter
-      CometSort [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number]
-        CometColumnarExchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number] #1
-          RowToColumnar
-            WholeStageCodegen (6)
-              Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
-                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [cnt]
-                        CometHashAggregate [ss_ticket_number,ss_customer_sk,count]
-                          CometColumnarExchange [ss_ticket_number,ss_customer_sk] #2
-                            RowToColumnar
-                              WholeStageCodegen (4)
-                                HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
-                                  Project [ss_customer_sk,ss_ticket_number]
-                                    BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                      Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
-                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                          Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #3
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_dom,d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
+      Exchange [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number] #1
+        WholeStageCodegen (6)
+          Project [c_last_name,c_first_name,c_salutation,c_preferred_cust_flag,ss_ticket_number,cnt]
+            BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+              Filter [cnt]
+                HashAggregate [ss_ticket_number,ss_customer_sk,count] [count(1),cnt,count]
+                  InputAdapter
+                    Exchange [ss_ticket_number,ss_customer_sk] #2
+                      WholeStageCodegen (4)
+                        HashAggregate [ss_ticket_number,ss_customer_sk] [count,count]
+                          Project [ss_customer_sk,ss_ticket_number]
+                            BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                              Project [ss_customer_sk,ss_hdemo_sk,ss_ticket_number]
+                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                  Project [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ss_store_sk,ss_hdemo_sk,ss_customer_sk]
+                                            CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_hdemo_sk,ss_store_sk,ss_ticket_number,ss_sold_date_sk]
+                                              SubqueryBroadcast [d_date_sk] #1
+                                                BroadcastExchange #3
+                                                  WholeStageCodegen (1)
+                                                    ColumnarToRow
+                                                      InputAdapter
+                                                        CometProject [d_date_sk]
+                                                          CometFilter [d_dom,d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_dom]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                  InputAdapter
+                                    BroadcastExchange #4
+                                      WholeStageCodegen (2)
+                                        ColumnarToRow
                                           InputAdapter
-                                            BroadcastExchange #4
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometProject [s_store_sk]
-                                                      CometFilter [s_county,s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
+                                            CometProject [s_store_sk]
+                                              CometFilter [s_county,s_store_sk]
+                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county]
+                              InputAdapter
+                                BroadcastExchange #5
+                                  WholeStageCodegen (3)
+                                    ColumnarToRow
                                       InputAdapter
-                                        BroadcastExchange #5
-                                          WholeStageCodegen (3)
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometProject [hd_demo_sk]
-                                                  CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
-                                                    CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
-                  InputAdapter
-                    BroadcastExchange #6
-                      WholeStageCodegen (5)
-                        ColumnarToRow
-                          InputAdapter
-                            CometFilter [c_customer_sk]
-                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
+                                        CometProject [hd_demo_sk]
+                                          CometFilter [hd_vehicle_count,hd_buy_potential,hd_dep_count,hd_demo_sk]
+                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential,hd_dep_count,hd_vehicle_count]
+              InputAdapter
+                BroadcastExchange #6
+                  WholeStageCodegen (5)
+                    ColumnarToRow
+                      InputAdapter
+                        CometFilter [c_customer_sk]
+                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt
index 54878fd686..e723b6c0e6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/explain.txt
@@ -1,48 +1,46 @@
 == Physical Plan ==
-* ColumnarToRow (44)
-+- CometTakeOrderedAndProject (43)
-   +- CometHashAggregate (42)
-      +- CometColumnarExchange (41)
-         +- RowToColumnar (40)
-            +- * HashAggregate (39)
-               +- * Project (38)
-                  +- * BroadcastHashJoin Inner BuildRight (37)
-                     :- * Project (32)
-                     :  +- * BroadcastHashJoin Inner BuildRight (31)
-                     :     :- * Project (26)
-                     :     :  +- * Filter (25)
-                     :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
-                     :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
-                     :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
-                     :     :        :  :  :- * ColumnarToRow (3)
-                     :     :        :  :  :  +- CometFilter (2)
-                     :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
-                     :     :        :  :  +- BroadcastExchange (9)
-                     :     :        :  :     +- * Project (8)
-                     :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
-                     :     :        :  :           :- * ColumnarToRow (5)
-                     :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-                     :     :        :  :           +- ReusedExchange (6)
-                     :     :        :  +- BroadcastExchange (16)
-                     :     :        :     +- * Project (15)
-                     :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :        :           :- * ColumnarToRow (12)
-                     :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
-                     :     :        :           +- ReusedExchange (13)
-                     :     :        +- BroadcastExchange (23)
-                     :     :           +- * Project (22)
-                     :     :              +- * BroadcastHashJoin Inner BuildRight (21)
-                     :     :                 :- * ColumnarToRow (19)
-                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
-                     :     :                 +- ReusedExchange (20)
-                     :     +- BroadcastExchange (30)
-                     :        +- * ColumnarToRow (29)
-                     :           +- CometFilter (28)
-                     :              +- CometScan parquet spark_catalog.default.customer_address (27)
-                     +- BroadcastExchange (36)
-                        +- * ColumnarToRow (35)
-                           +- CometFilter (34)
-                              +- CometScan parquet spark_catalog.default.customer_demographics (33)
+TakeOrderedAndProject (42)
++- * HashAggregate (41)
+   +- Exchange (40)
+      +- * HashAggregate (39)
+         +- * Project (38)
+            +- * BroadcastHashJoin Inner BuildRight (37)
+               :- * Project (32)
+               :  +- * BroadcastHashJoin Inner BuildRight (31)
+               :     :- * Project (26)
+               :     :  +- * Filter (25)
+               :     :     +- * BroadcastHashJoin ExistenceJoin(exists#1) BuildRight (24)
+               :     :        :- * BroadcastHashJoin ExistenceJoin(exists#2) BuildRight (17)
+               :     :        :  :- * BroadcastHashJoin LeftSemi BuildRight (10)
+               :     :        :  :  :- * ColumnarToRow (3)
+               :     :        :  :  :  +- CometFilter (2)
+               :     :        :  :  :     +- CometScan parquet spark_catalog.default.customer (1)
+               :     :        :  :  +- BroadcastExchange (9)
+               :     :        :  :     +- * Project (8)
+               :     :        :  :        +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :        :  :           :- * ColumnarToRow (5)
+               :     :        :  :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+               :     :        :  :           +- ReusedExchange (6)
+               :     :        :  +- BroadcastExchange (16)
+               :     :        :     +- * Project (15)
+               :     :        :        +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :        :           :- * ColumnarToRow (12)
+               :     :        :           :  +- CometScan parquet spark_catalog.default.web_sales (11)
+               :     :        :           +- ReusedExchange (13)
+               :     :        +- BroadcastExchange (23)
+               :     :           +- * Project (22)
+               :     :              +- * BroadcastHashJoin Inner BuildRight (21)
+               :     :                 :- * ColumnarToRow (19)
+               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (18)
+               :     :                 +- ReusedExchange (20)
+               :     +- BroadcastExchange (30)
+               :        +- * ColumnarToRow (29)
+               :           +- CometFilter (28)
+               :              +- CometScan parquet spark_catalog.default.customer_address (27)
+               +- BroadcastExchange (36)
+                  +- * ColumnarToRow (35)
+                     +- CometFilter (34)
+                        +- CometScan parquet spark_catalog.default.customer_demographics (33)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -69,7 +67,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#6, ss_sold_date_sk#7]
 
-(6) ReusedExchange [Reuses operator id: 49]
+(6) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#9]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -102,7 +100,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#10, ws_sold_date_sk#11]
 
-(13) ReusedExchange [Reuses operator id: 49]
+(13) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#13]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -135,7 +133,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (19) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#14, cs_sold_date_sk#15]
 
-(20) ReusedExchange [Reuses operator id: 49]
+(20) ReusedExchange [Reuses operator id: 47]
 Output [1]: [d_date_sk#17]
 
 (21) BroadcastHashJoin [codegen id : 6]
@@ -229,54 +227,50 @@ Functions [10]: [partial_count(1), partial_avg(cd_dep_count#23), partial_max(cd_
 Aggregate Attributes [13]: [count#26, sum#27, count#28, max#29, sum#30, sum#31, count#32, max#33, sum#34, sum#35, count#36, max#37, sum#38]
 Results [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 
-(40) RowToColumnar
+(40) Exchange
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
+Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(41) CometColumnarExchange
-Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
-Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(42) CometHashAggregate
+(41) HashAggregate [codegen id : 10]
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 Keys [6]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25]
 Functions [10]: [count(1), avg(cd_dep_count#23), max(cd_dep_count#23), sum(cd_dep_count#23), avg(cd_dep_employed_count#24), max(cd_dep_employed_count#24), sum(cd_dep_employed_count#24), avg(cd_dep_college_count#25), max(cd_dep_college_count#25), sum(cd_dep_college_count#25)]
+Aggregate Attributes [10]: [count(1)#52, avg(cd_dep_count#23)#53, max(cd_dep_count#23)#54, sum(cd_dep_count#23)#55, avg(cd_dep_employed_count#24)#56, max(cd_dep_employed_count#24)#57, sum(cd_dep_employed_count#24)#58, avg(cd_dep_college_count#25)#59, max(cd_dep_college_count#25)#60, sum(cd_dep_college_count#25)#61]
+Results [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, count(1)#52 AS cnt1#62, avg(cd_dep_count#23)#53 AS avg(cd_dep_count)#63, max(cd_dep_count#23)#54 AS max(cd_dep_count)#64, sum(cd_dep_count#23)#55 AS sum(cd_dep_count)#65, cd_dep_employed_count#24, count(1)#52 AS cnt2#66, avg(cd_dep_employed_count#24)#56 AS avg(cd_dep_employed_count)#67, max(cd_dep_employed_count#24)#57 AS max(cd_dep_employed_count)#68, sum(cd_dep_employed_count#24)#58 AS sum(cd_dep_employed_count)#69, cd_dep_college_count#25, count(1)#52 AS cnt3#70, avg(cd_dep_college_count#25)#59 AS avg(cd_dep_college_count)#71, max(cd_dep_college_count#25)#60 AS max(cd_dep_college_count)#72, sum(cd_dep_college_count#25)#61 AS sum(cd_dep_college_count)#73]
 
-(43) CometTakeOrderedAndProject
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_state#19 ASC NULLS FIRST,cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_dep_count#23 ASC NULLS FIRST,cd_dep_employed_count#24 ASC NULLS FIRST,cd_dep_college_count#25 ASC NULLS FIRST], output=[ca_state#19,cd_gender#21,cd_marital_status#22,cd_dep_count#23,cnt1#52,avg(cd_dep_count)#53,max(cd_dep_count)#54,sum(cd_dep_count)#55,cd_dep_employed_count#24,cnt2#56,avg(cd_dep_employed_count)#57,max(cd_dep_employed_count)#58,sum(cd_dep_employed_count)#59,cd_dep_college_count#25,cnt3#60,avg(cd_dep_college_count)#61,max(cd_dep_college_count)#62,sum(cd_dep_college_count)#63]), 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
-
-(44) ColumnarToRow [codegen id : 10]
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
+(42) TakeOrderedAndProject
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
+Arguments: 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (49)
-+- * ColumnarToRow (48)
-   +- CometProject (47)
-      +- CometFilter (46)
-         +- CometScan parquet spark_catalog.default.date_dim (45)
+BroadcastExchange (47)
++- * ColumnarToRow (46)
+   +- CometProject (45)
+      +- CometFilter (44)
+         +- CometScan parquet spark_catalog.default.date_dim (43)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#9, d_year#64, d_qoy#65]
+Output [3]: [d_date_sk#9, d_year#74, d_qoy#75]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_qoy), EqualTo(d_year,2002), LessThan(d_qoy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(46) CometFilter
-Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
-Condition : ((((isnotnull(d_year#64) AND isnotnull(d_qoy#65)) AND (d_year#64 = 2002)) AND (d_qoy#65 < 4)) AND isnotnull(d_date_sk#9))
+(44) CometFilter
+Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
+Condition : ((((isnotnull(d_year#74) AND isnotnull(d_qoy#75)) AND (d_year#74 = 2002)) AND (d_qoy#75 < 4)) AND isnotnull(d_date_sk#9))
 
-(47) CometProject
-Input [3]: [d_date_sk#9, d_year#64, d_qoy#65]
+(45) CometProject
+Input [3]: [d_date_sk#9, d_year#74, d_qoy#75]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(48) ColumnarToRow [codegen id : 1]
+(46) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(49) BroadcastExchange
+(47) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt
index 549322409a..dc724ca919 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35/simplified.txt
@@ -1,76 +1,74 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
-        CometHashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-          CometColumnarExchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-            RowToColumnar
-              WholeStageCodegen (9)
-                HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-                  Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                      Project [c_current_cdemo_sk,ca_state]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [c_current_cdemo_sk,c_current_addr_sk]
-                            Filter [exists,exists]
-                              BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
-                                BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                  BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                    InputAdapter
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (2)
-                                          Project [ss_customer_sk]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
-                                                        WholeStageCodegen (1)
-                                                          ColumnarToRow
-                                                            InputAdapter
-                                                              CometProject [d_date_sk]
-                                                                CometFilter [d_year,d_qoy,d_date_sk]
-                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
+  WholeStageCodegen (10)
+    HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum] [count(1),avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+      InputAdapter
+        Exchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+          WholeStageCodegen (9)
+            HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+              Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                  Project [c_current_cdemo_sk,ca_state]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [c_current_cdemo_sk,c_current_addr_sk]
+                        Filter [exists,exists]
+                          BroadcastHashJoin [c_customer_sk,cs_ship_customer_sk]
+                            BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                ColumnarToRow
                                   InputAdapter
-                                    BroadcastExchange #4
-                                      WholeStageCodegen (4)
-                                        Project [ws_bill_customer_sk]
-                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                            ColumnarToRow
-                                              InputAdapter
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #1
-                                            InputAdapter
-                                              ReusedExchange [d_date_sk] #3
+                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
                                 InputAdapter
-                                  BroadcastExchange #5
-                                    WholeStageCodegen (6)
-                                      Project [cs_ship_customer_sk]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (2)
+                                      Project [ss_customer_sk]
+                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
                                           ColumnarToRow
                                             InputAdapter
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometProject [d_date_sk]
+                                                            CometFilter [d_year,d_qoy,d_date_sk]
+                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
                                           InputAdapter
                                             ReusedExchange [d_date_sk] #3
-                          InputAdapter
-                            BroadcastExchange #6
-                              WholeStageCodegen (7)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                              InputAdapter
+                                BroadcastExchange #4
+                                  WholeStageCodegen (4)
+                                    Project [ws_bill_customer_sk]
+                                      BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #1
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #3
+                            InputAdapter
+                              BroadcastExchange #5
+                                WholeStageCodegen (6)
+                                  Project [cs_ship_customer_sk]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        BroadcastExchange #7
-                          WholeStageCodegen (8)
+                        BroadcastExchange #6
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cd_demo_sk]
-                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [ca_address_sk]
+                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                  InputAdapter
+                    BroadcastExchange #7
+                      WholeStageCodegen (8)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cd_demo_sk]
+                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt
index d12bef6d51..29e62c0b79 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/explain.txt
@@ -1,46 +1,44 @@
 == Physical Plan ==
-* ColumnarToRow (42)
-+- CometTakeOrderedAndProject (41)
-   +- CometHashAggregate (40)
-      +- CometColumnarExchange (39)
-         +- RowToColumnar (38)
-            +- * HashAggregate (37)
-               +- * Project (36)
-                  +- * BroadcastHashJoin Inner BuildRight (35)
-                     :- * Project (30)
-                     :  +- * BroadcastHashJoin Inner BuildRight (29)
-                     :     :- * Project (24)
-                     :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
-                     :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
-                     :     :     :  :- * ColumnarToRow (3)
-                     :     :     :  :  +- CometFilter (2)
-                     :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
-                     :     :     :  +- BroadcastExchange (9)
-                     :     :     :     +- * Project (8)
-                     :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
-                     :     :     :           :- * ColumnarToRow (5)
-                     :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
-                     :     :     :           +- ReusedExchange (6)
-                     :     :     +- BroadcastExchange (22)
-                     :     :        +- Union (21)
-                     :     :           :- * Project (15)
-                     :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
-                     :     :           :     :- * ColumnarToRow (12)
-                     :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
-                     :     :           :     +- ReusedExchange (13)
-                     :     :           +- * Project (20)
-                     :     :              +- * BroadcastHashJoin Inner BuildRight (19)
-                     :     :                 :- * ColumnarToRow (17)
-                     :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
-                     :     :                 +- ReusedExchange (18)
-                     :     +- BroadcastExchange (28)
-                     :        +- * ColumnarToRow (27)
-                     :           +- CometFilter (26)
-                     :              +- CometScan parquet spark_catalog.default.customer_address (25)
-                     +- BroadcastExchange (34)
-                        +- * ColumnarToRow (33)
-                           +- CometFilter (32)
-                              +- CometScan parquet spark_catalog.default.customer_demographics (31)
+TakeOrderedAndProject (40)
++- * HashAggregate (39)
+   +- Exchange (38)
+      +- * HashAggregate (37)
+         +- * Project (36)
+            +- * BroadcastHashJoin Inner BuildRight (35)
+               :- * Project (30)
+               :  +- * BroadcastHashJoin Inner BuildRight (29)
+               :     :- * Project (24)
+               :     :  +- * BroadcastHashJoin LeftSemi BuildRight (23)
+               :     :     :- * BroadcastHashJoin LeftSemi BuildRight (10)
+               :     :     :  :- * ColumnarToRow (3)
+               :     :     :  :  +- CometFilter (2)
+               :     :     :  :     +- CometScan parquet spark_catalog.default.customer (1)
+               :     :     :  +- BroadcastExchange (9)
+               :     :     :     +- * Project (8)
+               :     :     :        +- * BroadcastHashJoin Inner BuildRight (7)
+               :     :     :           :- * ColumnarToRow (5)
+               :     :     :           :  +- CometScan parquet spark_catalog.default.store_sales (4)
+               :     :     :           +- ReusedExchange (6)
+               :     :     +- BroadcastExchange (22)
+               :     :        +- Union (21)
+               :     :           :- * Project (15)
+               :     :           :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :     :           :     :- * ColumnarToRow (12)
+               :     :           :     :  +- CometScan parquet spark_catalog.default.web_sales (11)
+               :     :           :     +- ReusedExchange (13)
+               :     :           +- * Project (20)
+               :     :              +- * BroadcastHashJoin Inner BuildRight (19)
+               :     :                 :- * ColumnarToRow (17)
+               :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (16)
+               :     :                 +- ReusedExchange (18)
+               :     +- BroadcastExchange (28)
+               :        +- * ColumnarToRow (27)
+               :           +- CometFilter (26)
+               :              +- CometScan parquet spark_catalog.default.customer_address (25)
+               +- BroadcastExchange (34)
+                  +- * ColumnarToRow (33)
+                     +- CometFilter (32)
+                        +- CometScan parquet spark_catalog.default.customer_demographics (31)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -67,7 +65,7 @@ ReadSchema: struct<ss_customer_sk:int>
 (5) ColumnarToRow [codegen id : 2]
 Input [2]: [ss_customer_sk#4, ss_sold_date_sk#5]
 
-(6) ReusedExchange [Reuses operator id: 47]
+(6) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#7]
 
 (7) BroadcastHashJoin [codegen id : 2]
@@ -100,7 +98,7 @@ ReadSchema: struct<ws_bill_customer_sk:int>
 (12) ColumnarToRow [codegen id : 4]
 Input [2]: [ws_bill_customer_sk#8, ws_sold_date_sk#9]
 
-(13) ReusedExchange [Reuses operator id: 47]
+(13) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#11]
 
 (14) BroadcastHashJoin [codegen id : 4]
@@ -123,7 +121,7 @@ ReadSchema: struct<cs_ship_customer_sk:int>
 (17) ColumnarToRow [codegen id : 6]
 Input [2]: [cs_ship_customer_sk#13, cs_sold_date_sk#14]
 
-(18) ReusedExchange [Reuses operator id: 47]
+(18) ReusedExchange [Reuses operator id: 45]
 Output [1]: [d_date_sk#16]
 
 (19) BroadcastHashJoin [codegen id : 6]
@@ -215,54 +213,50 @@ Functions [10]: [partial_count(1), partial_avg(cd_dep_count#23), partial_max(cd_
 Aggregate Attributes [13]: [count#26, sum#27, count#28, max#29, sum#30, sum#31, count#32, max#33, sum#34, sum#35, count#36, max#37, sum#38]
 Results [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 
-(38) RowToColumnar
+(38) Exchange
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
+Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) CometColumnarExchange
-Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
-Arguments: hashpartitioning(ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(40) CometHashAggregate
+(39) HashAggregate [codegen id : 10]
 Input [19]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25, count#39, sum#40, count#41, max#42, sum#43, sum#44, count#45, max#46, sum#47, sum#48, count#49, max#50, sum#51]
 Keys [6]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cd_dep_employed_count#24, cd_dep_college_count#25]
 Functions [10]: [count(1), avg(cd_dep_count#23), max(cd_dep_count#23), sum(cd_dep_count#23), avg(cd_dep_employed_count#24), max(cd_dep_employed_count#24), sum(cd_dep_employed_count#24), avg(cd_dep_college_count#25), max(cd_dep_college_count#25), sum(cd_dep_college_count#25)]
+Aggregate Attributes [10]: [count(1)#52, avg(cd_dep_count#23)#53, max(cd_dep_count#23)#54, sum(cd_dep_count#23)#55, avg(cd_dep_employed_count#24)#56, max(cd_dep_employed_count#24)#57, sum(cd_dep_employed_count#24)#58, avg(cd_dep_college_count#25)#59, max(cd_dep_college_count#25)#60, sum(cd_dep_college_count#25)#61]
+Results [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, count(1)#52 AS cnt1#62, avg(cd_dep_count#23)#53 AS avg(cd_dep_count)#63, max(cd_dep_count#23)#54 AS max(cd_dep_count)#64, sum(cd_dep_count#23)#55 AS sum(cd_dep_count)#65, cd_dep_employed_count#24, count(1)#52 AS cnt2#66, avg(cd_dep_employed_count#24)#56 AS avg(cd_dep_employed_count)#67, max(cd_dep_employed_count#24)#57 AS max(cd_dep_employed_count)#68, sum(cd_dep_employed_count#24)#58 AS sum(cd_dep_employed_count)#69, cd_dep_college_count#25, count(1)#52 AS cnt3#70, avg(cd_dep_college_count#25)#59 AS avg(cd_dep_college_count)#71, max(cd_dep_college_count#25)#60 AS max(cd_dep_college_count)#72, sum(cd_dep_college_count#25)#61 AS sum(cd_dep_college_count)#73]
 
-(41) CometTakeOrderedAndProject
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[ca_state#19 ASC NULLS FIRST,cd_gender#21 ASC NULLS FIRST,cd_marital_status#22 ASC NULLS FIRST,cd_dep_count#23 ASC NULLS FIRST,cd_dep_employed_count#24 ASC NULLS FIRST,cd_dep_college_count#25 ASC NULLS FIRST], output=[ca_state#19,cd_gender#21,cd_marital_status#22,cd_dep_count#23,cnt1#52,avg(cd_dep_count)#53,max(cd_dep_count)#54,sum(cd_dep_count)#55,cd_dep_employed_count#24,cnt2#56,avg(cd_dep_employed_count)#57,max(cd_dep_employed_count)#58,sum(cd_dep_employed_count)#59,cd_dep_college_count#25,cnt3#60,avg(cd_dep_college_count)#61,max(cd_dep_college_count)#62,sum(cd_dep_college_count)#63]), 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
-
-(42) ColumnarToRow [codegen id : 10]
-Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#52, avg(cd_dep_count)#53, max(cd_dep_count)#54, sum(cd_dep_count)#55, cd_dep_employed_count#24, cnt2#56, avg(cd_dep_employed_count)#57, max(cd_dep_employed_count)#58, sum(cd_dep_employed_count)#59, cd_dep_college_count#25, cnt3#60, avg(cd_dep_college_count)#61, max(cd_dep_college_count)#62, sum(cd_dep_college_count)#63]
+(40) TakeOrderedAndProject
+Input [18]: [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
+Arguments: 100, [ca_state#19 ASC NULLS FIRST, cd_gender#21 ASC NULLS FIRST, cd_marital_status#22 ASC NULLS FIRST, cd_dep_count#23 ASC NULLS FIRST, cd_dep_employed_count#24 ASC NULLS FIRST, cd_dep_college_count#25 ASC NULLS FIRST], [ca_state#19, cd_gender#21, cd_marital_status#22, cd_dep_count#23, cnt1#62, avg(cd_dep_count)#63, max(cd_dep_count)#64, sum(cd_dep_count)#65, cd_dep_employed_count#24, cnt2#66, avg(cd_dep_employed_count)#67, max(cd_dep_employed_count)#68, sum(cd_dep_employed_count)#69, cd_dep_college_count#25, cnt3#70, avg(cd_dep_college_count)#71, max(cd_dep_college_count)#72, sum(cd_dep_college_count)#73]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (47)
-+- * ColumnarToRow (46)
-   +- CometProject (45)
-      +- CometFilter (44)
-         +- CometScan parquet spark_catalog.default.date_dim (43)
+BroadcastExchange (45)
++- * ColumnarToRow (44)
+   +- CometProject (43)
+      +- CometFilter (42)
+         +- CometScan parquet spark_catalog.default.date_dim (41)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#7, d_year#64, d_qoy#65]
+Output [3]: [d_date_sk#7, d_year#74, d_qoy#75]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_qoy), EqualTo(d_year,1999), LessThan(d_qoy,4), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_qoy:int>
 
-(44) CometFilter
-Input [3]: [d_date_sk#7, d_year#64, d_qoy#65]
-Condition : ((((isnotnull(d_year#64) AND isnotnull(d_qoy#65)) AND (d_year#64 = 1999)) AND (d_qoy#65 < 4)) AND isnotnull(d_date_sk#7))
+(42) CometFilter
+Input [3]: [d_date_sk#7, d_year#74, d_qoy#75]
+Condition : ((((isnotnull(d_year#74) AND isnotnull(d_qoy#75)) AND (d_year#74 = 1999)) AND (d_qoy#75 < 4)) AND isnotnull(d_date_sk#7))
 
-(45) CometProject
-Input [3]: [d_date_sk#7, d_year#64, d_qoy#65]
+(43) CometProject
+Input [3]: [d_date_sk#7, d_year#74, d_qoy#75]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(46) ColumnarToRow [codegen id : 1]
+(44) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(47) BroadcastExchange
+(45) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=6]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt
index d5346d83b3..e5cb940552 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q35a/simplified.txt
@@ -1,73 +1,71 @@
-WholeStageCodegen (10)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
-        CometHashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-          CometColumnarExchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
-            RowToColumnar
-              WholeStageCodegen (9)
-                HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
-                  Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
-                    BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
-                      Project [c_current_cdemo_sk,ca_state]
-                        BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                          Project [c_current_cdemo_sk,c_current_addr_sk]
-                            BroadcastHashJoin [c_customer_sk,customsk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [c_current_addr_sk,c_current_cdemo_sk]
-                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
-                                InputAdapter
-                                  BroadcastExchange #2
-                                    WholeStageCodegen (2)
-                                      Project [ss_customer_sk]
-                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
-                                                SubqueryBroadcast [d_date_sk] #1
-                                                  BroadcastExchange #3
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometProject [d_date_sk]
-                                                            CometFilter [d_year,d_qoy,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+TakeOrderedAndProject [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count)]
+  WholeStageCodegen (10)
+    HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum] [count(1),avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),cnt1,avg(cd_dep_count),max(cd_dep_count),sum(cd_dep_count),cnt2,avg(cd_dep_employed_count),max(cd_dep_employed_count),sum(cd_dep_employed_count),cnt3,avg(cd_dep_college_count),max(cd_dep_college_count),sum(cd_dep_college_count),count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+      InputAdapter
+        Exchange [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] #1
+          WholeStageCodegen (9)
+            HashAggregate [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count] [count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum,count,sum,count,max,sum,sum,count,max,sum,sum,count,max,sum]
+              Project [ca_state,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk]
+                  Project [c_current_cdemo_sk,ca_state]
+                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                      Project [c_current_cdemo_sk,c_current_addr_sk]
+                        BroadcastHashJoin [c_customer_sk,customsk]
+                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                            ColumnarToRow
                               InputAdapter
-                                BroadcastExchange #4
-                                  Union
-                                    WholeStageCodegen (4)
-                                      Project [ws_bill_customer_sk]
-                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
-                                    WholeStageCodegen (6)
-                                      Project [cs_ship_customer_sk]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
-                                                ReusedSubquery [d_date_sk] #1
-                                          InputAdapter
-                                            ReusedExchange [d_date_sk] #3
+                                CometFilter [c_current_addr_sk,c_current_cdemo_sk]
+                                  CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_addr_sk]
+                            InputAdapter
+                              BroadcastExchange #2
+                                WholeStageCodegen (2)
+                                  Project [ss_customer_sk]
+                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_sold_date_sk]
+                                            SubqueryBroadcast [d_date_sk] #1
+                                              BroadcastExchange #3
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometProject [d_date_sk]
+                                                        CometFilter [d_year,d_qoy,d_date_sk]
+                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_qoy]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                           InputAdapter
-                            BroadcastExchange #5
-                              WholeStageCodegen (7)
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometFilter [ca_address_sk]
-                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                            BroadcastExchange #4
+                              Union
+                                WholeStageCodegen (4)
+                                  Project [ws_bill_customer_sk]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
+                                WholeStageCodegen (6)
+                                  Project [cs_ship_customer_sk]
+                                    BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometScan parquet spark_catalog.default.catalog_sales [cs_ship_customer_sk,cs_sold_date_sk]
+                                            ReusedSubquery [d_date_sk] #1
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk] #3
                       InputAdapter
-                        BroadcastExchange #6
-                          WholeStageCodegen (8)
+                        BroadcastExchange #5
+                          WholeStageCodegen (7)
                             ColumnarToRow
                               InputAdapter
-                                CometFilter [cd_demo_sk]
-                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
+                                CometFilter [ca_address_sk]
+                                  CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
+                  InputAdapter
+                    BroadcastExchange #6
+                      WholeStageCodegen (8)
+                        ColumnarToRow
+                          InputAdapter
+                            CometFilter [cd_demo_sk]
+                              CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_gender,cd_marital_status,cd_dep_count,cd_dep_employed_count,cd_dep_college_count]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt
index 060abaefb8..2519f23a25 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/explain.txt
@@ -1,47 +1,45 @@
 == Physical Plan ==
-TakeOrderedAndProject (43)
-+- * Project (42)
-   +- Window (41)
-      +- * ColumnarToRow (40)
-         +- CometSort (39)
-            +- CometColumnarExchange (38)
-               +- CometHashAggregate (37)
-                  +- CometColumnarExchange (36)
-                     +- CometHashAggregate (35)
-                        +- CometUnion (34)
-                           :- CometHashAggregate (23)
-                           :  +- CometColumnarExchange (22)
-                           :     +- RowToColumnar (21)
-                           :        +- * HashAggregate (20)
-                           :           +- * Project (19)
-                           :              +- * BroadcastHashJoin Inner BuildRight (18)
-                           :                 :- * Project (12)
-                           :                 :  +- * BroadcastHashJoin Inner BuildRight (11)
-                           :                 :     :- * Project (6)
-                           :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                           :                 :     :     :- * ColumnarToRow (3)
-                           :                 :     :     :  +- CometFilter (2)
-                           :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                           :                 :     :     +- ReusedExchange (4)
-                           :                 :     +- BroadcastExchange (10)
-                           :                 :        +- * ColumnarToRow (9)
-                           :                 :           +- CometFilter (8)
-                           :                 :              +- CometScan parquet spark_catalog.default.item (7)
-                           :                 +- BroadcastExchange (17)
-                           :                    +- * ColumnarToRow (16)
-                           :                       +- CometProject (15)
-                           :                          +- CometFilter (14)
-                           :                             +- CometScan parquet spark_catalog.default.store (13)
-                           :- CometHashAggregate (28)
-                           :  +- CometColumnarExchange (27)
-                           :     +- CometHashAggregate (26)
-                           :        +- CometHashAggregate (25)
-                           :           +- ReusedExchange (24)
-                           +- CometHashAggregate (33)
-                              +- CometColumnarExchange (32)
-                                 +- CometHashAggregate (31)
-                                    +- CometHashAggregate (30)
-                                       +- ReusedExchange (29)
+TakeOrderedAndProject (41)
++- * Project (40)
+   +- Window (39)
+      +- * Sort (38)
+         +- Exchange (37)
+            +- * HashAggregate (36)
+               +- Exchange (35)
+                  +- * HashAggregate (34)
+                     +- Union (33)
+                        :- * HashAggregate (22)
+                        :  +- Exchange (21)
+                        :     +- * HashAggregate (20)
+                        :        +- * Project (19)
+                        :           +- * BroadcastHashJoin Inner BuildRight (18)
+                        :              :- * Project (12)
+                        :              :  +- * BroadcastHashJoin Inner BuildRight (11)
+                        :              :     :- * Project (6)
+                        :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+                        :              :     :     :- * ColumnarToRow (3)
+                        :              :     :     :  +- CometFilter (2)
+                        :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                        :              :     :     +- ReusedExchange (4)
+                        :              :     +- BroadcastExchange (10)
+                        :              :        +- * ColumnarToRow (9)
+                        :              :           +- CometFilter (8)
+                        :              :              +- CometScan parquet spark_catalog.default.item (7)
+                        :              +- BroadcastExchange (17)
+                        :                 +- * ColumnarToRow (16)
+                        :                    +- CometProject (15)
+                        :                       +- CometFilter (14)
+                        :                          +- CometScan parquet spark_catalog.default.store (13)
+                        :- * HashAggregate (27)
+                        :  +- Exchange (26)
+                        :     +- * HashAggregate (25)
+                        :        +- * HashAggregate (24)
+                        :           +- ReusedExchange (23)
+                        +- * HashAggregate (32)
+                           +- Exchange (31)
+                              +- * HashAggregate (30)
+                                 +- * HashAggregate (29)
+                                    +- ReusedExchange (28)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -59,7 +57,7 @@ Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_store_sk#2))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_ext_sales_price#3, ss_net_profit#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 48]
+(4) ReusedExchange [Reuses operator id: 46]
 Output [1]: [d_date_sk#7]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -139,133 +137,142 @@ Functions [2]: [partial_sum(UnscaledValue(ss_net_profit#4)), partial_sum(Unscale
 Aggregate Attributes [2]: [sum#13, sum#14]
 Results [4]: [i_category#10, i_class#9, sum#15, sum#16]
 
-(21) RowToColumnar
+(21) Exchange
 Input [4]: [i_category#10, i_class#9, sum#15, sum#16]
+Arguments: hashpartitioning(i_category#10, i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(22) CometColumnarExchange
-Input [4]: [i_category#10, i_class#9, sum#15, sum#16]
-Arguments: hashpartitioning(i_category#10, i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(23) CometHashAggregate
+(22) HashAggregate [codegen id : 5]
 Input [4]: [i_category#10, i_class#9, sum#15, sum#16]
 Keys [2]: [i_category#10, i_class#9]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#17, sum(UnscaledValue(ss_ext_sales_price#3))#18]
+Results [6]: [cast((MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#17,17,2) / MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#18,17,2)) as decimal(38,20)) AS gross_margin#19, i_category#10, i_class#9, 0 AS t_category#20, 0 AS t_class#21, 0 AS lochierarchy#22]
 
-(24) ReusedExchange [Reuses operator id: 22]
-Output [4]: [i_category#10, i_class#9, sum#17, sum#18]
+(23) ReusedExchange [Reuses operator id: 21]
+Output [4]: [i_category#10, i_class#9, sum#23, sum#24]
 
-(25) CometHashAggregate
-Input [4]: [i_category#10, i_class#9, sum#17, sum#18]
+(24) HashAggregate [codegen id : 10]
+Input [4]: [i_category#10, i_class#9, sum#23, sum#24]
 Keys [2]: [i_category#10, i_class#9]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#25, sum(UnscaledValue(ss_ext_sales_price#3))#26]
+Results [3]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#25,17,2) AS ss_net_profit#27, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#26,17,2) AS ss_ext_sales_price#28, i_category#10]
 
-(26) CometHashAggregate
-Input [3]: [ss_net_profit#19, ss_ext_sales_price#20, i_category#10]
+(25) HashAggregate [codegen id : 10]
+Input [3]: [ss_net_profit#27, ss_ext_sales_price#28, i_category#10]
 Keys [1]: [i_category#10]
-Functions [2]: [partial_sum(ss_net_profit#19), partial_sum(ss_ext_sales_price#20)]
+Functions [2]: [partial_sum(ss_net_profit#27), partial_sum(ss_ext_sales_price#28)]
+Aggregate Attributes [4]: [sum#29, isEmpty#30, sum#31, isEmpty#32]
+Results [5]: [i_category#10, sum#33, isEmpty#34, sum#35, isEmpty#36]
 
-(27) CometColumnarExchange
-Input [5]: [i_category#10, sum#21, isEmpty#22, sum#23, isEmpty#24]
-Arguments: hashpartitioning(i_category#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(26) Exchange
+Input [5]: [i_category#10, sum#33, isEmpty#34, sum#35, isEmpty#36]
+Arguments: hashpartitioning(i_category#10, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(28) CometHashAggregate
-Input [5]: [i_category#10, sum#21, isEmpty#22, sum#23, isEmpty#24]
+(27) HashAggregate [codegen id : 11]
+Input [5]: [i_category#10, sum#33, isEmpty#34, sum#35, isEmpty#36]
 Keys [1]: [i_category#10]
-Functions [2]: [sum(ss_net_profit#19), sum(ss_ext_sales_price#20)]
+Functions [2]: [sum(ss_net_profit#27), sum(ss_ext_sales_price#28)]
+Aggregate Attributes [2]: [sum(ss_net_profit#27)#37, sum(ss_ext_sales_price#28)#38]
+Results [6]: [cast((sum(ss_net_profit#27)#37 / sum(ss_ext_sales_price#28)#38) as decimal(38,20)) AS gross_margin#39, i_category#10, null AS i_class#40, 0 AS t_category#41, 1 AS t_class#42, 1 AS lochierarchy#43]
 
-(29) ReusedExchange [Reuses operator id: 22]
-Output [4]: [i_category#10, i_class#9, sum#25, sum#26]
+(28) ReusedExchange [Reuses operator id: 21]
+Output [4]: [i_category#10, i_class#9, sum#44, sum#45]
 
-(30) CometHashAggregate
-Input [4]: [i_category#10, i_class#9, sum#25, sum#26]
+(29) HashAggregate [codegen id : 16]
+Input [4]: [i_category#10, i_class#9, sum#44, sum#45]
 Keys [2]: [i_category#10, i_class#9]
 Functions [2]: [sum(UnscaledValue(ss_net_profit#4)), sum(UnscaledValue(ss_ext_sales_price#3))]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_net_profit#4))#25, sum(UnscaledValue(ss_ext_sales_price#3))#26]
+Results [2]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#4))#25,17,2) AS ss_net_profit#27, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#3))#26,17,2) AS ss_ext_sales_price#28]
 
-(31) CometHashAggregate
-Input [2]: [ss_net_profit#19, ss_ext_sales_price#20]
+(30) HashAggregate [codegen id : 16]
+Input [2]: [ss_net_profit#27, ss_ext_sales_price#28]
 Keys: []
-Functions [2]: [partial_sum(ss_net_profit#19), partial_sum(ss_ext_sales_price#20)]
+Functions [2]: [partial_sum(ss_net_profit#27), partial_sum(ss_ext_sales_price#28)]
+Aggregate Attributes [4]: [sum#46, isEmpty#47, sum#48, isEmpty#49]
+Results [4]: [sum#50, isEmpty#51, sum#52, isEmpty#53]
 
-(32) CometColumnarExchange
-Input [4]: [sum#27, isEmpty#28, sum#29, isEmpty#30]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(31) Exchange
+Input [4]: [sum#50, isEmpty#51, sum#52, isEmpty#53]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=5]
 
-(33) CometHashAggregate
-Input [4]: [sum#27, isEmpty#28, sum#29, isEmpty#30]
+(32) HashAggregate [codegen id : 17]
+Input [4]: [sum#50, isEmpty#51, sum#52, isEmpty#53]
 Keys: []
-Functions [2]: [sum(ss_net_profit#19), sum(ss_ext_sales_price#20)]
+Functions [2]: [sum(ss_net_profit#27), sum(ss_ext_sales_price#28)]
+Aggregate Attributes [2]: [sum(ss_net_profit#27)#54, sum(ss_ext_sales_price#28)#55]
+Results [6]: [cast((sum(ss_net_profit#27)#54 / sum(ss_ext_sales_price#28)#55) as decimal(38,20)) AS gross_margin#56, null AS i_category#57, null AS i_class#58, 1 AS t_category#59, 1 AS t_class#60, 2 AS lochierarchy#61]
 
-(34) CometUnion
-Child 0 Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
-Child 1 Input [6]: [gross_margin#35, i_category#10, i_class#36, t_category#37, t_class#38, lochierarchy#39]
-Child 2 Input [6]: [gross_margin#40, i_category#41, i_class#42, t_category#43, t_class#44, lochierarchy#45]
+(33) Union
 
-(35) CometHashAggregate
-Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
-Keys [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
+(34) HashAggregate [codegen id : 18]
+Input [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
+Keys [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
 Functions: []
+Aggregate Attributes: []
+Results [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
 
-(36) CometColumnarExchange
-Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
-Arguments: hashpartitioning(gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(35) Exchange
+Input [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
+Arguments: hashpartitioning(gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(37) CometHashAggregate
-Input [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
-Keys [6]: [gross_margin#31, i_category#10, i_class#9, t_category#32, t_class#33, lochierarchy#34]
+(36) HashAggregate [codegen id : 19]
+Input [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
+Keys [6]: [gross_margin#19, i_category#10, i_class#9, t_category#20, t_class#21, lochierarchy#22]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, CASE WHEN (t_class#21 = 0) THEN i_category#10 END AS _w0#62]
 
-(38) CometColumnarExchange
-Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
-Arguments: hashpartitioning(lochierarchy#34, _w0#46, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(39) CometSort
-Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
-Arguments: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46], [lochierarchy#34 ASC NULLS FIRST, _w0#46 ASC NULLS FIRST, gross_margin#31 ASC NULLS FIRST]
+(37) Exchange
+Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62]
+Arguments: hashpartitioning(lochierarchy#22, _w0#62, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(40) ColumnarToRow [codegen id : 13]
-Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
+(38) Sort [codegen id : 20]
+Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62]
+Arguments: [lochierarchy#22 ASC NULLS FIRST, _w0#62 ASC NULLS FIRST, gross_margin#19 ASC NULLS FIRST], false, 0
 
-(41) Window
-Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46]
-Arguments: [rank(gross_margin#31) windowspecdefinition(lochierarchy#34, _w0#46, gross_margin#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#47], [lochierarchy#34, _w0#46], [gross_margin#31 ASC NULLS FIRST]
+(39) Window
+Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62]
+Arguments: [rank(gross_margin#19) windowspecdefinition(lochierarchy#22, _w0#62, gross_margin#19 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#63], [lochierarchy#22, _w0#62], [gross_margin#19 ASC NULLS FIRST]
 
-(42) Project [codegen id : 14]
-Output [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, rank_within_parent#47]
-Input [6]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, _w0#46, rank_within_parent#47]
+(40) Project [codegen id : 21]
+Output [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, rank_within_parent#63]
+Input [6]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, _w0#62, rank_within_parent#63]
 
-(43) TakeOrderedAndProject
-Input [5]: [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, rank_within_parent#47]
-Arguments: 100, [lochierarchy#34 DESC NULLS LAST, CASE WHEN (lochierarchy#34 = 0) THEN i_category#10 END ASC NULLS FIRST, rank_within_parent#47 ASC NULLS FIRST], [gross_margin#31, i_category#10, i_class#9, lochierarchy#34, rank_within_parent#47]
+(41) TakeOrderedAndProject
+Input [5]: [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, rank_within_parent#63]
+Arguments: 100, [lochierarchy#22 DESC NULLS LAST, CASE WHEN (lochierarchy#22 = 0) THEN i_category#10 END ASC NULLS FIRST, rank_within_parent#63 ASC NULLS FIRST], [gross_margin#19, i_category#10, i_class#9, lochierarchy#22, rank_within_parent#63]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (48)
-+- * ColumnarToRow (47)
-   +- CometProject (46)
-      +- CometFilter (45)
-         +- CometScan parquet spark_catalog.default.date_dim (44)
+BroadcastExchange (46)
++- * ColumnarToRow (45)
+   +- CometProject (44)
+      +- CometFilter (43)
+         +- CometScan parquet spark_catalog.default.date_dim (42)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#7, d_year#48]
+Output [2]: [d_date_sk#7, d_year#64]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(45) CometFilter
-Input [2]: [d_date_sk#7, d_year#48]
-Condition : ((isnotnull(d_year#48) AND (d_year#48 = 2001)) AND isnotnull(d_date_sk#7))
+(43) CometFilter
+Input [2]: [d_date_sk#7, d_year#64]
+Condition : ((isnotnull(d_year#64) AND (d_year#64 = 2001)) AND isnotnull(d_date_sk#7))
 
-(46) CometProject
-Input [2]: [d_date_sk#7, d_year#48]
+(44) CometProject
+Input [2]: [d_date_sk#7, d_year#64]
 Arguments: [d_date_sk#7], [d_date_sk#7]
 
-(47) ColumnarToRow [codegen id : 1]
+(45) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#7]
 
-(48) BroadcastExchange
+(46) BroadcastExchange
 Input [1]: [d_date_sk#7]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt
index 29ae8ca601..f265d20995 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q36a/simplified.txt
@@ -1,64 +1,76 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,gross_margin,i_class]
-  WholeStageCodegen (14)
+  WholeStageCodegen (21)
     Project [gross_margin,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [gross_margin,lochierarchy,_w0]
-          WholeStageCodegen (13)
-            ColumnarToRow
+          WholeStageCodegen (20)
+            Sort [lochierarchy,_w0,gross_margin]
               InputAdapter
-                CometSort [lochierarchy,_w0,gross_margin]
-                  CometColumnarExchange [lochierarchy,_w0] #1
-                    CometHashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy]
-                      CometColumnarExchange [gross_margin,i_category,i_class,t_category,t_class,lochierarchy] #2
-                        CometHashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy]
-                          CometUnion
-                            CometHashAggregate [i_category,i_class,sum,sum]
-                              CometColumnarExchange [i_category,i_class] #3
-                                RowToColumnar
-                                  WholeStageCodegen (4)
-                                    HashAggregate [i_category,i_class,ss_net_profit,ss_ext_sales_price] [sum,sum,sum,sum]
-                                      Project [ss_ext_sales_price,ss_net_profit,i_class,i_category]
-                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                          Project [ss_store_sk,ss_ext_sales_price,ss_net_profit,i_class,i_category]
-                                            BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                              Project [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit]
-                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [ss_item_sk,ss_store_sk]
-                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
-                                                          SubqueryBroadcast [d_date_sk] #1
-                                                            BroadcastExchange #4
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometProject [d_date_sk]
-                                                                      CometFilter [d_year,d_date_sk]
-                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                  InputAdapter
-                                                    ReusedExchange [d_date_sk] #4
-                                              InputAdapter
-                                                BroadcastExchange #5
-                                                  WholeStageCodegen (2)
-                                                    ColumnarToRow
+                Exchange [lochierarchy,_w0] #1
+                  WholeStageCodegen (19)
+                    HashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy] [_w0]
+                      InputAdapter
+                        Exchange [gross_margin,i_category,i_class,t_category,t_class,lochierarchy] #2
+                          WholeStageCodegen (18)
+                            HashAggregate [gross_margin,i_category,i_class,t_category,t_class,lochierarchy]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (5)
+                                    HashAggregate [i_category,i_class,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),gross_margin,t_category,t_class,lochierarchy,sum,sum]
+                                      InputAdapter
+                                        Exchange [i_category,i_class] #3
+                                          WholeStageCodegen (4)
+                                            HashAggregate [i_category,i_class,ss_net_profit,ss_ext_sales_price] [sum,sum,sum,sum]
+                                              Project [ss_ext_sales_price,ss_net_profit,i_class,i_category]
+                                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                  Project [ss_store_sk,ss_ext_sales_price,ss_net_profit,i_class,i_category]
+                                                    BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                      Project [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit]
+                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometFilter [ss_item_sk,ss_store_sk]
+                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
+                                                                  SubqueryBroadcast [d_date_sk] #1
+                                                                    BroadcastExchange #4
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometProject [d_date_sk]
+                                                                              CometFilter [d_year,d_date_sk]
+                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                          InputAdapter
+                                                            ReusedExchange [d_date_sk] #4
                                                       InputAdapter
-                                                        CometFilter [i_item_sk]
-                                                          CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (3)
-                                                ColumnarToRow
+                                                        BroadcastExchange #5
+                                                          WholeStageCodegen (2)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [i_item_sk]
+                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
                                                   InputAdapter
-                                                    CometProject [s_store_sk]
-                                                      CometFilter [s_state,s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                            CometHashAggregate [i_category,sum,isEmpty,sum,isEmpty]
-                              CometColumnarExchange [i_category] #7
-                                CometHashAggregate [i_category,ss_net_profit,ss_ext_sales_price]
-                                  CometHashAggregate [i_category,i_class,sum,sum]
-                                    ReusedExchange [i_category,i_class,sum,sum] #3
-                            CometHashAggregate [sum,isEmpty,sum,isEmpty]
-                              CometColumnarExchange #8
-                                CometHashAggregate [ss_net_profit,ss_ext_sales_price]
-                                  CometHashAggregate [i_category,i_class,sum,sum]
-                                    ReusedExchange [i_category,i_class,sum,sum] #3
+                                                    BroadcastExchange #6
+                                                      WholeStageCodegen (3)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometProject [s_store_sk]
+                                                              CometFilter [s_state,s_store_sk]
+                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
+                                  WholeStageCodegen (11)
+                                    HashAggregate [i_category,sum,isEmpty,sum,isEmpty] [sum(ss_net_profit),sum(ss_ext_sales_price),gross_margin,i_class,t_category,t_class,lochierarchy,sum,isEmpty,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [i_category] #7
+                                          WholeStageCodegen (10)
+                                            HashAggregate [i_category,ss_net_profit,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                              HashAggregate [i_category,i_class,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),ss_net_profit,ss_ext_sales_price,sum,sum]
+                                                InputAdapter
+                                                  ReusedExchange [i_category,i_class,sum,sum] #3
+                                  WholeStageCodegen (17)
+                                    HashAggregate [sum,isEmpty,sum,isEmpty] [sum(ss_net_profit),sum(ss_ext_sales_price),gross_margin,i_category,i_class,t_category,t_class,lochierarchy,sum,isEmpty,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange #8
+                                          WholeStageCodegen (16)
+                                            HashAggregate [ss_net_profit,ss_ext_sales_price] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                              HashAggregate [i_category,i_class,sum,sum] [sum(UnscaledValue(ss_net_profit)),sum(UnscaledValue(ss_ext_sales_price)),ss_net_profit,ss_ext_sales_price,sum,sum]
+                                                InputAdapter
+                                                  ReusedExchange [i_category,i_class,sum,sum] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt
index aa410a6b55..2be3c9c660 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-TakeOrderedAndProject (47)
-+- * Project (46)
-   +- * BroadcastHashJoin Inner BuildRight (45)
-      :- * Project (38)
-      :  +- * BroadcastHashJoin Inner BuildRight (37)
-      :     :- * Project (30)
-      :     :  +- * Filter (29)
-      :     :     +- Window (28)
-      :     :        +- * Filter (27)
-      :     :           +- Window (26)
-      :     :              +- * ColumnarToRow (25)
-      :     :                 +- CometSort (24)
-      :     :                    +- CometColumnarExchange (23)
-      :     :                       +- CometHashAggregate (22)
-      :     :                          +- CometColumnarExchange (21)
-      :     :                             +- RowToColumnar (20)
-      :     :                                +- * HashAggregate (19)
-      :     :                                   +- * Project (18)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                         :- * Project (12)
-      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                         :     :- * Project (9)
-      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                         :     :     :- * ColumnarToRow (3)
-      :     :                                         :     :     :  +- CometFilter (2)
-      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                         :     :     +- BroadcastExchange (7)
-      :     :                                         :     :        +- * ColumnarToRow (6)
-      :     :                                         :     :           +- CometFilter (5)
-      :     :                                         :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :                                         :     +- ReusedExchange (10)
-      :     :                                         +- BroadcastExchange (16)
-      :     :                                            +- * ColumnarToRow (15)
-      :     :                                               +- CometFilter (14)
-      :     :                                                  +- CometScan parquet spark_catalog.default.store (13)
-      :     +- BroadcastExchange (36)
-      :        +- * Project (35)
-      :           +- Window (34)
-      :              +- * ColumnarToRow (33)
-      :                 +- CometSort (32)
-      :                    +- ReusedExchange (31)
-      +- BroadcastExchange (44)
-         +- * Project (43)
-            +- Window (42)
-               +- * ColumnarToRow (41)
-                  +- CometSort (40)
-                     +- ReusedExchange (39)
+TakeOrderedAndProject (45)
++- * Project (44)
+   +- * BroadcastHashJoin Inner BuildRight (43)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * Project (28)
+      :     :  +- * Filter (27)
+      :     :     +- Window (26)
+      :     :        +- * Filter (25)
+      :     :           +- Window (24)
+      :     :              +- * Sort (23)
+      :     :                 +- Exchange (22)
+      :     :                    +- * HashAggregate (21)
+      :     :                       +- Exchange (20)
+      :     :                          +- * HashAggregate (19)
+      :     :                             +- * Project (18)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                   :- * Project (12)
+      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                   :     :- * Project (9)
+      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                   :     :     :- * ColumnarToRow (3)
+      :     :                                   :     :     :  +- CometFilter (2)
+      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                   :     :     +- BroadcastExchange (7)
+      :     :                                   :     :        +- * ColumnarToRow (6)
+      :     :                                   :     :           +- CometFilter (5)
+      :     :                                   :     :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :                                   :     +- ReusedExchange (10)
+      :     :                                   +- BroadcastExchange (16)
+      :     :                                      +- * ColumnarToRow (15)
+      :     :                                         +- CometFilter (14)
+      :     :                                            +- CometScan parquet spark_catalog.default.store (13)
+      :     +- BroadcastExchange (35)
+      :        +- * Project (34)
+      :           +- Window (33)
+      :              +- * Sort (32)
+      :                 +- Exchange (31)
+      :                    +- * HashAggregate (30)
+      :                       +- ReusedExchange (29)
+      +- BroadcastExchange (42)
+         +- * Project (41)
+            +- Window (40)
+               +- * Sort (39)
+                  +- ReusedExchange (38)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -91,7 +89,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, ss_item_sk#4, ss_store_sk#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 51]
+(10) ReusedExchange [Reuses operator id: 49]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -139,124 +137,125 @@ Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#6))]
 Aggregate Attributes [1]: [sum#15]
 Results [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 
-(20) RowToColumnar
+(20) Exchange
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [7]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum#16]
 Keys [6]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(ss_sales_price#6))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#6))#17]
+Results [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS sum_sales#18, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#17,17,2) AS _w0#19]
 
-(23) CometColumnarExchange
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(22) Exchange
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
+Arguments: hashpartitioning(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(24) CometSort
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(23) Sort [codegen id : 6]
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
+Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, s_store_name#13 ASC NULLS FIRST, s_company_name#14 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
 
-(25) ColumnarToRow [codegen id : 5]
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-
-(26) Window
-Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(24) Window
+Input [8]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(27) Filter [codegen id : 6]
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+(25) Filter [codegen id : 7]
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(28) Window
-Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
-Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
-
-(29) Filter [codegen id : 19]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
-
-(30) Project [codegen id : 19]
-Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
-Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
-
-(31) ReusedExchange [Reuses operator id: 23]
-Output [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-
-(32) CometSort
-Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-Arguments: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17], [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, s_store_name#23 ASC NULLS FIRST, s_company_name#24 ASC NULLS FIRST, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
-
-(33) ColumnarToRow [codegen id : 11]
-Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-
-(34) Window
-Input [7]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17]
-Arguments: [rank(d_year#25, d_moy#26) windowspecdefinition(i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#27], [i_category#21, i_brand#22, s_store_name#23, s_company_name#24], [d_year#25 ASC NULLS FIRST, d_moy#26 ASC NULLS FIRST]
-
-(35) Project [codegen id : 12]
-Output [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#17 AS sum_sales#28, rn#27]
-Input [8]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, d_year#25, d_moy#26, sum_sales#17, rn#27]
-
-(36) BroadcastExchange
-Input [6]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=5]
-
-(37) BroadcastHashJoin [codegen id : 19]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
-Right keys [5]: [i_category#21, i_brand#22, s_store_name#23, s_company_name#24, (rn#27 + 1)]
+(26) Window
+Input [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20]
+Arguments: [avg(_w0#19) windowspecdefinition(i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#21], [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10]
+
+(27) Filter [codegen id : 22]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
+Condition : ((isnotnull(avg_monthly_sales#21) AND (avg_monthly_sales#21 > 0.000000)) AND CASE WHEN (avg_monthly_sales#21 > 0.000000) THEN ((abs((sum_sales#18 - avg_monthly_sales#21)) / avg_monthly_sales#21) > 0.1000000000000000) END)
+
+(28) Project [codegen id : 22]
+Output [9]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20]
+Input [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, _w0#19, rn#20, avg_monthly_sales#21]
+
+(29) ReusedExchange [Reuses operator id: 20]
+Output [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
+
+(30) HashAggregate [codegen id : 12]
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum#28]
+Keys [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#29))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#29))#17]
+Results [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, MakeDecimal(sum(UnscaledValue(ss_sales_price#29))#17,17,2) AS sum_sales#18]
+
+(31) Exchange
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
+Arguments: hashpartitioning(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(32) Sort [codegen id : 13]
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
+Arguments: [i_category#22 ASC NULLS FIRST, i_brand#23 ASC NULLS FIRST, s_store_name#24 ASC NULLS FIRST, s_company_name#25 ASC NULLS FIRST, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST], false, 0
+
+(33) Window
+Input [7]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18]
+Arguments: [rank(d_year#26, d_moy#27) windowspecdefinition(i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#30], [i_category#22, i_brand#23, s_store_name#24, s_company_name#25], [d_year#26 ASC NULLS FIRST, d_moy#27 ASC NULLS FIRST]
+
+(34) Project [codegen id : 14]
+Output [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#18 AS sum_sales#31, rn#30]
+Input [8]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, d_year#26, d_moy#27, sum_sales#18, rn#30]
+
+(35) BroadcastExchange
+Input [6]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] + 1)),false), [plan_id=6]
+
+(36) BroadcastHashJoin [codegen id : 22]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
+Right keys [5]: [i_category#22, i_brand#23, s_store_name#24, s_company_name#25, (rn#30 + 1)]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 19]
-Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28]
-Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, s_store_name#23, s_company_name#24, sum_sales#28, rn#27]
-
-(39) ReusedExchange [Reuses operator id: 23]
-Output [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+(37) Project [codegen id : 22]
+Output [10]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31]
+Input [15]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, i_category#22, i_brand#23, s_store_name#24, s_company_name#25, sum_sales#31, rn#30]
 
-(40) CometSort
-Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17], [i_category#29 ASC NULLS FIRST, i_brand#30 ASC NULLS FIRST, s_store_name#31 ASC NULLS FIRST, s_company_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
+(38) ReusedExchange [Reuses operator id: 31]
+Output [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
 
-(41) ColumnarToRow [codegen id : 17]
-Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
+(39) Sort [codegen id : 20]
+Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
+Arguments: [i_category#32 ASC NULLS FIRST, i_brand#33 ASC NULLS FIRST, s_store_name#34 ASC NULLS FIRST, s_company_name#35 ASC NULLS FIRST, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST], false, 0
 
-(42) Window
-Input [7]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17]
-Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#29, i_brand#30, s_store_name#31, s_company_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
+(40) Window
+Input [7]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18]
+Arguments: [rank(d_year#36, d_moy#37) windowspecdefinition(i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#38], [i_category#32, i_brand#33, s_store_name#34, s_company_name#35], [d_year#36 ASC NULLS FIRST, d_moy#37 ASC NULLS FIRST]
 
-(43) Project [codegen id : 18]
-Output [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#17 AS sum_sales#36, rn#35]
-Input [8]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
+(41) Project [codegen id : 21]
+Output [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#18 AS sum_sales#39, rn#38]
+Input [8]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, d_year#36, d_moy#37, sum_sales#18, rn#38]
 
-(44) BroadcastExchange
-Input [6]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=6]
+(42) BroadcastExchange
+Input [6]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], input[3, string, true], (input[5, int, false] - 1)),false), [plan_id=7]
 
-(45) BroadcastHashJoin [codegen id : 19]
-Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#19]
-Right keys [5]: [i_category#29, i_brand#30, s_store_name#31, s_company_name#32, (rn#35 - 1)]
+(43) BroadcastHashJoin [codegen id : 22]
+Left keys [5]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, rn#20]
+Right keys [5]: [i_category#32, i_brand#33, s_store_name#34, s_company_name#35, (rn#38 - 1)]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 19]
-Output [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#28 AS psum#37, sum_sales#36 AS nsum#38]
-Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#28, i_category#29, i_brand#30, s_store_name#31, s_company_name#32, sum_sales#36, rn#35]
+(44) Project [codegen id : 22]
+Output [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, sum_sales#31 AS psum#40, sum_sales#39 AS nsum#41]
+Input [16]: [i_category#3, i_brand#2, s_store_name#13, s_company_name#14, d_year#10, d_moy#11, sum_sales#18, avg_monthly_sales#21, rn#20, sum_sales#31, i_category#32, i_brand#33, s_store_name#34, s_company_name#35, sum_sales#39, rn#38]
 
-(47) TakeOrderedAndProject
-Input [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
-Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+(45) TakeOrderedAndProject
+Input [7]: [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
+Arguments: 100, [(sum_sales#18 - avg_monthly_sales#21) ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], [i_category#3, d_year#10, d_moy#11, avg_monthly_sales#21, sum_sales#18, psum#40, nsum#41]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (51)
-+- * ColumnarToRow (50)
-   +- CometFilter (49)
-      +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometFilter (47)
+      +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -266,15 +265,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(49) CometFilter
+(47) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(50) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(51) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt
index d3aeefb861..a548953052 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q47/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_moy,i_category,d_year,psum,nsum]
-  WholeStageCodegen (19)
+  WholeStageCodegen (22)
     Project [i_category,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,s_store_name,s_company_name,rn,i_category,i_brand,s_store_name,s_company_name,rn]
         Project [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_moy,i_category,d_year,psum,
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,s_store_name,s_company_name,d_year]
-                    WholeStageCodegen (6)
+                    WholeStageCodegen (7)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                            WholeStageCodegen (5)
-                              ColumnarToRow
+                            WholeStageCodegen (6)
+                              Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
                                 InputAdapter
-                                  CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
-                                    CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name] #1
-                                      CometHashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum]
-                                        CometColumnarExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
-                                          RowToColumnar
+                                  Exchange [i_category,i_brand,s_store_name,s_company_name] #1
+                                    WholeStageCodegen (5)
+                                      HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,_w0,sum]
+                                        InputAdapter
+                                          Exchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy] #2
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,ss_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,ss_sales_price,d_year,d_moy,s_store_name,s_company_name]
@@ -57,23 +57,25 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_moy,i_category,d_year,psum,
                                                                 CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_company_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (12)
+                WholeStageCodegen (14)
                   Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                        WholeStageCodegen (11)
-                          ColumnarToRow
+                        WholeStageCodegen (13)
+                          Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
                             InputAdapter
-                              CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
-                                ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
+                              Exchange [i_category,i_brand,s_store_name,s_company_name] #7
+                                WholeStageCodegen (12)
+                                  HashAggregate [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] [sum(UnscaledValue(ss_sales_price)),sum_sales,sum]
+                                    InputAdapter
+                                      ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum] #2
         InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (18)
+          BroadcastExchange #8
+            WholeStageCodegen (21)
               Project [i_category,i_brand,s_store_name,s_company_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,s_store_name,s_company_name]
-                    WholeStageCodegen (17)
-                      ColumnarToRow
+                    WholeStageCodegen (20)
+                      Sort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
                         InputAdapter
-                          CometSort [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy]
-                            ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #1
+                          ReusedExchange [i_category,i_brand,s_store_name,s_company_name,d_year,d_moy,sum_sales] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt
index 17d2ccbec9..bf9c2c22cc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/explain.txt
@@ -1,89 +1,81 @@
 == Physical Plan ==
-* ColumnarToRow (85)
-+- CometTakeOrderedAndProject (84)
-   +- CometHashAggregate (83)
-      +- CometColumnarExchange (82)
-         +- RowToColumnar (81)
-            +- * HashAggregate (80)
-               +- Union (79)
-                  :- * Project (26)
-                  :  +- * Filter (25)
-                  :     +- Window (24)
-                  :        +- * Sort (23)
-                  :           +- Window (22)
-                  :              +- * ColumnarToRow (21)
-                  :                 +- CometSort (20)
-                  :                    +- CometColumnarExchange (19)
-                  :                       +- CometHashAggregate (18)
-                  :                          +- CometColumnarExchange (17)
-                  :                             +- RowToColumnar (16)
-                  :                                +- * HashAggregate (15)
-                  :                                   +- * Project (14)
-                  :                                      +- * BroadcastHashJoin Inner BuildRight (13)
-                  :                                         :- * Project (11)
-                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (10)
-                  :                                         :     :- BroadcastExchange (5)
-                  :                                         :     :  +- * ColumnarToRow (4)
-                  :                                         :     :     +- CometProject (3)
-                  :                                         :     :        +- CometFilter (2)
-                  :                                         :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
-                  :                                         :     +- * ColumnarToRow (9)
-                  :                                         :        +- CometProject (8)
-                  :                                         :           +- CometFilter (7)
-                  :                                         :              +- CometScan parquet spark_catalog.default.web_returns (6)
-                  :                                         +- ReusedExchange (12)
-                  :- * Project (52)
-                  :  +- * Filter (51)
-                  :     +- Window (50)
-                  :        +- * Sort (49)
-                  :           +- Window (48)
-                  :              +- * ColumnarToRow (47)
-                  :                 +- CometSort (46)
-                  :                    +- CometColumnarExchange (45)
-                  :                       +- CometHashAggregate (44)
-                  :                          +- CometColumnarExchange (43)
-                  :                             +- RowToColumnar (42)
-                  :                                +- * HashAggregate (41)
-                  :                                   +- * Project (40)
-                  :                                      +- * BroadcastHashJoin Inner BuildRight (39)
-                  :                                         :- * Project (37)
-                  :                                         :  +- * BroadcastHashJoin Inner BuildLeft (36)
-                  :                                         :     :- BroadcastExchange (31)
-                  :                                         :     :  +- * ColumnarToRow (30)
-                  :                                         :     :     +- CometProject (29)
-                  :                                         :     :        +- CometFilter (28)
-                  :                                         :     :           +- CometScan parquet spark_catalog.default.catalog_sales (27)
-                  :                                         :     +- * ColumnarToRow (35)
-                  :                                         :        +- CometProject (34)
-                  :                                         :           +- CometFilter (33)
-                  :                                         :              +- CometScan parquet spark_catalog.default.catalog_returns (32)
-                  :                                         +- ReusedExchange (38)
-                  +- * Project (78)
-                     +- * Filter (77)
-                        +- Window (76)
-                           +- * Sort (75)
-                              +- Window (74)
-                                 +- * ColumnarToRow (73)
-                                    +- CometSort (72)
-                                       +- CometColumnarExchange (71)
-                                          +- CometHashAggregate (70)
-                                             +- CometColumnarExchange (69)
-                                                +- RowToColumnar (68)
-                                                   +- * HashAggregate (67)
-                                                      +- * Project (66)
-                                                         +- * BroadcastHashJoin Inner BuildRight (65)
-                                                            :- * Project (63)
-                                                            :  +- * BroadcastHashJoin Inner BuildLeft (62)
-                                                            :     :- BroadcastExchange (57)
-                                                            :     :  +- * ColumnarToRow (56)
-                                                            :     :     +- CometProject (55)
-                                                            :     :        +- CometFilter (54)
-                                                            :     :           +- CometScan parquet spark_catalog.default.store_sales (53)
-                                                            :     +- * ColumnarToRow (61)
-                                                            :        +- CometProject (60)
-                                                            :           +- CometFilter (59)
-                                                            :              +- CometScan parquet spark_catalog.default.store_returns (58)
-                                                            +- ReusedExchange (64)
+TakeOrderedAndProject (77)
++- * HashAggregate (76)
+   +- Exchange (75)
+      +- * HashAggregate (74)
+         +- Union (73)
+            :- * Project (24)
+            :  +- * Filter (23)
+            :     +- Window (22)
+            :        +- * Sort (21)
+            :           +- Window (20)
+            :              +- * Sort (19)
+            :                 +- Exchange (18)
+            :                    +- * HashAggregate (17)
+            :                       +- Exchange (16)
+            :                          +- * HashAggregate (15)
+            :                             +- * Project (14)
+            :                                +- * BroadcastHashJoin Inner BuildRight (13)
+            :                                   :- * Project (11)
+            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (10)
+            :                                   :     :- BroadcastExchange (5)
+            :                                   :     :  +- * ColumnarToRow (4)
+            :                                   :     :     +- CometProject (3)
+            :                                   :     :        +- CometFilter (2)
+            :                                   :     :           +- CometScan parquet spark_catalog.default.web_sales (1)
+            :                                   :     +- * ColumnarToRow (9)
+            :                                   :        +- CometProject (8)
+            :                                   :           +- CometFilter (7)
+            :                                   :              +- CometScan parquet spark_catalog.default.web_returns (6)
+            :                                   +- ReusedExchange (12)
+            :- * Project (48)
+            :  +- * Filter (47)
+            :     +- Window (46)
+            :        +- * Sort (45)
+            :           +- Window (44)
+            :              +- * Sort (43)
+            :                 +- Exchange (42)
+            :                    +- * HashAggregate (41)
+            :                       +- Exchange (40)
+            :                          +- * HashAggregate (39)
+            :                             +- * Project (38)
+            :                                +- * BroadcastHashJoin Inner BuildRight (37)
+            :                                   :- * Project (35)
+            :                                   :  +- * BroadcastHashJoin Inner BuildLeft (34)
+            :                                   :     :- BroadcastExchange (29)
+            :                                   :     :  +- * ColumnarToRow (28)
+            :                                   :     :     +- CometProject (27)
+            :                                   :     :        +- CometFilter (26)
+            :                                   :     :           +- CometScan parquet spark_catalog.default.catalog_sales (25)
+            :                                   :     +- * ColumnarToRow (33)
+            :                                   :        +- CometProject (32)
+            :                                   :           +- CometFilter (31)
+            :                                   :              +- CometScan parquet spark_catalog.default.catalog_returns (30)
+            :                                   +- ReusedExchange (36)
+            +- * Project (72)
+               +- * Filter (71)
+                  +- Window (70)
+                     +- * Sort (69)
+                        +- Window (68)
+                           +- * Sort (67)
+                              +- Exchange (66)
+                                 +- * HashAggregate (65)
+                                    +- Exchange (64)
+                                       +- * HashAggregate (63)
+                                          +- * Project (62)
+                                             +- * BroadcastHashJoin Inner BuildRight (61)
+                                                :- * Project (59)
+                                                :  +- * BroadcastHashJoin Inner BuildLeft (58)
+                                                :     :- BroadcastExchange (53)
+                                                :     :  +- * ColumnarToRow (52)
+                                                :     :     +- CometProject (51)
+                                                :     :        +- CometFilter (50)
+                                                :     :           +- CometScan parquet spark_catalog.default.store_sales (49)
+                                                :     +- * ColumnarToRow (57)
+                                                :        +- CometProject (56)
+                                                :           +- CometFilter (55)
+                                                :              +- CometScan parquet spark_catalog.default.store_returns (54)
+                                                +- ReusedExchange (60)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -137,7 +129,7 @@ Join condition: None
 Output [6]: [ws_item_sk#1, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_return_quantity#10, wr_return_amt#11]
 Input [9]: [ws_item_sk#1, ws_order_number#2, ws_quantity#3, ws_net_paid#4, ws_sold_date_sk#6, wr_item_sk#8, wr_order_number#9, wr_return_quantity#10, wr_return_amt#11]
 
-(12) ReusedExchange [Reuses operator id: 90]
+(12) ReusedExchange [Reuses operator id: 82]
 Output [1]: [d_date_sk#13]
 
 (13) BroadcastHashJoin [codegen id : 3]
@@ -157,339 +149,323 @@ Functions [4]: [partial_sum(coalesce(wr_return_quantity#10, 0)), partial_sum(coa
 Aggregate Attributes [6]: [sum#14, sum#15, sum#16, isEmpty#17, sum#18, isEmpty#19]
 Results [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 
-(16) RowToColumnar
+(16) Exchange
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(17) CometColumnarExchange
-Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(18) CometHashAggregate
+(17) HashAggregate [codegen id : 4]
 Input [7]: [ws_item_sk#1, sum#20, sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Keys [1]: [ws_item_sk#1]
 Functions [4]: [sum(coalesce(wr_return_quantity#10, 0)), sum(coalesce(ws_quantity#3, 0)), sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00)), sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))]
+Aggregate Attributes [4]: [sum(coalesce(wr_return_quantity#10, 0))#26, sum(coalesce(ws_quantity#3, 0))#27, sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28, sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29]
+Results [3]: [ws_item_sk#1 AS item#30, (cast(sum(coalesce(wr_return_quantity#10, 0))#26 as decimal(15,4)) / cast(sum(coalesce(ws_quantity#3, 0))#27 as decimal(15,4))) AS return_ratio#31, (cast(sum(coalesce(cast(wr_return_amt#11 as decimal(12,2)), 0.00))#28 as decimal(15,4)) / cast(sum(coalesce(cast(ws_net_paid#4 as decimal(12,2)), 0.00))#29 as decimal(15,4))) AS currency_ratio#32]
 
-(19) CometColumnarExchange
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(20) CometSort
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
-Arguments: [item#26, return_ratio#27, currency_ratio#28], [return_ratio#27 ASC NULLS FIRST]
+(18) Exchange
+Input [3]: [item#30, return_ratio#31, currency_ratio#32]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) ColumnarToRow [codegen id : 4]
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
+(19) Sort [codegen id : 5]
+Input [3]: [item#30, return_ratio#31, currency_ratio#32]
+Arguments: [return_ratio#31 ASC NULLS FIRST], false, 0
 
-(22) Window
-Input [3]: [item#26, return_ratio#27, currency_ratio#28]
-Arguments: [rank(return_ratio#27) windowspecdefinition(return_ratio#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#29], [return_ratio#27 ASC NULLS FIRST]
+(20) Window
+Input [3]: [item#30, return_ratio#31, currency_ratio#32]
+Arguments: [rank(return_ratio#31) windowspecdefinition(return_ratio#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#33], [return_ratio#31 ASC NULLS FIRST]
 
-(23) Sort [codegen id : 5]
-Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
-Arguments: [currency_ratio#28 ASC NULLS FIRST], false, 0
+(21) Sort [codegen id : 6]
+Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
+Arguments: [currency_ratio#32 ASC NULLS FIRST], false, 0
 
-(24) Window
-Input [4]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29]
-Arguments: [rank(currency_ratio#28) windowspecdefinition(currency_ratio#28 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#30], [currency_ratio#28 ASC NULLS FIRST]
+(22) Window
+Input [4]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33]
+Arguments: [rank(currency_ratio#32) windowspecdefinition(currency_ratio#32 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#34], [currency_ratio#32 ASC NULLS FIRST]
 
-(25) Filter [codegen id : 6]
-Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
-Condition : ((return_rank#29 <= 10) OR (currency_rank#30 <= 10))
+(23) Filter [codegen id : 7]
+Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
+Condition : ((return_rank#33 <= 10) OR (currency_rank#34 <= 10))
 
-(26) Project [codegen id : 6]
-Output [5]: [web AS channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Input [5]: [item#26, return_ratio#27, currency_ratio#28, return_rank#29, currency_rank#30]
+(24) Project [codegen id : 7]
+Output [5]: [web AS channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Input [5]: [item#30, return_ratio#31, currency_ratio#32, return_rank#33, currency_rank#34]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
+Output [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#37), dynamicpruningexpression(cs_sold_date_sk#37 IN dynamicpruning#38)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#41), dynamicpruningexpression(cs_sold_date_sk#41 IN dynamicpruning#42)]
 PushedFilters: [IsNotNull(cs_net_profit), IsNotNull(cs_net_paid), IsNotNull(cs_quantity), GreaterThan(cs_net_profit,1.00), GreaterThan(cs_net_paid,0.00), GreaterThan(cs_quantity,0), IsNotNull(cs_order_number), IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_net_paid:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(28) CometFilter
-Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
-Condition : (((((((isnotnull(cs_net_profit#36) AND isnotnull(cs_net_paid#35)) AND isnotnull(cs_quantity#34)) AND (cs_net_profit#36 > 1.00)) AND (cs_net_paid#35 > 0.00)) AND (cs_quantity#34 > 0)) AND isnotnull(cs_order_number#33)) AND isnotnull(cs_item_sk#32))
+(26) CometFilter
+Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
+Condition : (((((((isnotnull(cs_net_profit#40) AND isnotnull(cs_net_paid#39)) AND isnotnull(cs_quantity#38)) AND (cs_net_profit#40 > 1.00)) AND (cs_net_paid#39 > 0.00)) AND (cs_quantity#38 > 0)) AND isnotnull(cs_order_number#37)) AND isnotnull(cs_item_sk#36))
 
-(29) CometProject
-Input [6]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_net_profit#36, cs_sold_date_sk#37]
-Arguments: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37], [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
+(27) CometProject
+Input [6]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_net_profit#40, cs_sold_date_sk#41]
+Arguments: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41], [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
 
-(30) ColumnarToRow [codegen id : 7]
-Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
+(28) ColumnarToRow [codegen id : 8]
+Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
 
-(31) BroadcastExchange
-Input [5]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37]
+(29) BroadcastExchange
+Input [5]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=4]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
+Output [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_return_amount), GreaterThan(cr_return_amount,10000.00), IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(33) CometFilter
-Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
-Condition : (((isnotnull(cr_return_amount#42) AND (cr_return_amount#42 > 10000.00)) AND isnotnull(cr_order_number#40)) AND isnotnull(cr_item_sk#39))
+(31) CometFilter
+Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
+Condition : (((isnotnull(cr_return_amount#46) AND (cr_return_amount#46 > 10000.00)) AND isnotnull(cr_order_number#44)) AND isnotnull(cr_item_sk#43))
 
-(34) CometProject
-Input [5]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42, cr_returned_date_sk#43]
-Arguments: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42], [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
+(32) CometProject
+Input [5]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46, cr_returned_date_sk#47]
+Arguments: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46], [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
 
-(35) ColumnarToRow
-Input [4]: [cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
+(33) ColumnarToRow
+Input [4]: [cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
 
-(36) BroadcastHashJoin [codegen id : 9]
-Left keys [2]: [cs_order_number#33, cs_item_sk#32]
-Right keys [2]: [cr_order_number#40, cr_item_sk#39]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [2]: [cs_order_number#37, cs_item_sk#36]
+Right keys [2]: [cr_order_number#44, cr_item_sk#43]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 9]
-Output [6]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42]
-Input [9]: [cs_item_sk#32, cs_order_number#33, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_item_sk#39, cr_order_number#40, cr_return_quantity#41, cr_return_amount#42]
+(35) Project [codegen id : 10]
+Output [6]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46]
+Input [9]: [cs_item_sk#36, cs_order_number#37, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_item_sk#43, cr_order_number#44, cr_return_quantity#45, cr_return_amount#46]
 
-(38) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#44]
+(36) ReusedExchange [Reuses operator id: 82]
+Output [1]: [d_date_sk#48]
 
-(39) BroadcastHashJoin [codegen id : 9]
-Left keys [1]: [cs_sold_date_sk#37]
-Right keys [1]: [d_date_sk#44]
+(37) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#41]
+Right keys [1]: [d_date_sk#48]
 Join type: Inner
 Join condition: None
 
-(40) Project [codegen id : 9]
-Output [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
-Input [7]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cs_sold_date_sk#37, cr_return_quantity#41, cr_return_amount#42, d_date_sk#44]
-
-(41) HashAggregate [codegen id : 9]
-Input [5]: [cs_item_sk#32, cs_quantity#34, cs_net_paid#35, cr_return_quantity#41, cr_return_amount#42]
-Keys [1]: [cs_item_sk#32]
-Functions [4]: [partial_sum(coalesce(cr_return_quantity#41, 0)), partial_sum(coalesce(cs_quantity#34, 0)), partial_sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#45, sum#46, sum#47, isEmpty#48, sum#49, isEmpty#50]
-Results [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+(38) Project [codegen id : 10]
+Output [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
+Input [7]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cs_sold_date_sk#41, cr_return_quantity#45, cr_return_amount#46, d_date_sk#48]
 
-(42) RowToColumnar
-Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
+(39) HashAggregate [codegen id : 10]
+Input [5]: [cs_item_sk#36, cs_quantity#38, cs_net_paid#39, cr_return_quantity#45, cr_return_amount#46]
+Keys [1]: [cs_item_sk#36]
+Functions [4]: [partial_sum(coalesce(cr_return_quantity#45, 0)), partial_sum(coalesce(cs_quantity#38, 0)), partial_sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#49, sum#50, sum#51, isEmpty#52, sum#53, isEmpty#54]
+Results [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
 
-(43) CometColumnarExchange
-Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
-Arguments: hashpartitioning(cs_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(40) Exchange
+Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
+Arguments: hashpartitioning(cs_item_sk#36, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(44) CometHashAggregate
-Input [7]: [cs_item_sk#32, sum#51, sum#52, sum#53, isEmpty#54, sum#55, isEmpty#56]
-Keys [1]: [cs_item_sk#32]
-Functions [4]: [sum(coalesce(cr_return_quantity#41, 0)), sum(coalesce(cs_quantity#34, 0)), sum(coalesce(cast(cr_return_amount#42 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#35 as decimal(12,2)), 0.00))]
+(41) HashAggregate [codegen id : 11]
+Input [7]: [cs_item_sk#36, sum#55, sum#56, sum#57, isEmpty#58, sum#59, isEmpty#60]
+Keys [1]: [cs_item_sk#36]
+Functions [4]: [sum(coalesce(cr_return_quantity#45, 0)), sum(coalesce(cs_quantity#38, 0)), sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00)), sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))]
+Aggregate Attributes [4]: [sum(coalesce(cr_return_quantity#45, 0))#61, sum(coalesce(cs_quantity#38, 0))#62, sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63, sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64]
+Results [3]: [cs_item_sk#36 AS item#65, (cast(sum(coalesce(cr_return_quantity#45, 0))#61 as decimal(15,4)) / cast(sum(coalesce(cs_quantity#38, 0))#62 as decimal(15,4))) AS return_ratio#66, (cast(sum(coalesce(cast(cr_return_amount#46 as decimal(12,2)), 0.00))#63 as decimal(15,4)) / cast(sum(coalesce(cast(cs_net_paid#39 as decimal(12,2)), 0.00))#64 as decimal(15,4))) AS currency_ratio#67]
 
-(45) CometColumnarExchange
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(42) Exchange
+Input [3]: [item#65, return_ratio#66, currency_ratio#67]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=6]
 
-(46) CometSort
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
-Arguments: [item#57, return_ratio#58, currency_ratio#59], [return_ratio#58 ASC NULLS FIRST]
+(43) Sort [codegen id : 12]
+Input [3]: [item#65, return_ratio#66, currency_ratio#67]
+Arguments: [return_ratio#66 ASC NULLS FIRST], false, 0
 
-(47) ColumnarToRow [codegen id : 10]
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
+(44) Window
+Input [3]: [item#65, return_ratio#66, currency_ratio#67]
+Arguments: [rank(return_ratio#66) windowspecdefinition(return_ratio#66 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#68], [return_ratio#66 ASC NULLS FIRST]
 
-(48) Window
-Input [3]: [item#57, return_ratio#58, currency_ratio#59]
-Arguments: [rank(return_ratio#58) windowspecdefinition(return_ratio#58 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#60], [return_ratio#58 ASC NULLS FIRST]
+(45) Sort [codegen id : 13]
+Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
+Arguments: [currency_ratio#67 ASC NULLS FIRST], false, 0
 
-(49) Sort [codegen id : 11]
-Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
-Arguments: [currency_ratio#59 ASC NULLS FIRST], false, 0
+(46) Window
+Input [4]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68]
+Arguments: [rank(currency_ratio#67) windowspecdefinition(currency_ratio#67 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#69], [currency_ratio#67 ASC NULLS FIRST]
 
-(50) Window
-Input [4]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60]
-Arguments: [rank(currency_ratio#59) windowspecdefinition(currency_ratio#59 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#61], [currency_ratio#59 ASC NULLS FIRST]
+(47) Filter [codegen id : 14]
+Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
+Condition : ((return_rank#68 <= 10) OR (currency_rank#69 <= 10))
 
-(51) Filter [codegen id : 12]
-Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
-Condition : ((return_rank#60 <= 10) OR (currency_rank#61 <= 10))
-
-(52) Project [codegen id : 12]
-Output [5]: [catalog AS channel#62, item#57, return_ratio#58, return_rank#60, currency_rank#61]
-Input [5]: [item#57, return_ratio#58, currency_ratio#59, return_rank#60, currency_rank#61]
+(48) Project [codegen id : 14]
+Output [5]: [catalog AS channel#70, item#65, return_ratio#66, return_rank#68, currency_rank#69]
+Input [5]: [item#65, return_ratio#66, currency_ratio#67, return_rank#68, currency_rank#69]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
+Output [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#68), dynamicpruningexpression(ss_sold_date_sk#68 IN dynamicpruning#69)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#76), dynamicpruningexpression(ss_sold_date_sk#76 IN dynamicpruning#77)]
 PushedFilters: [IsNotNull(ss_net_profit), IsNotNull(ss_net_paid), IsNotNull(ss_quantity), GreaterThan(ss_net_profit,1.00), GreaterThan(ss_net_paid,0.00), GreaterThan(ss_quantity,0), IsNotNull(ss_ticket_number), IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_net_paid:decimal(7,2),ss_net_profit:decimal(7,2)>
 
-(54) CometFilter
-Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
-Condition : (((((((isnotnull(ss_net_profit#67) AND isnotnull(ss_net_paid#66)) AND isnotnull(ss_quantity#65)) AND (ss_net_profit#67 > 1.00)) AND (ss_net_paid#66 > 0.00)) AND (ss_quantity#65 > 0)) AND isnotnull(ss_ticket_number#64)) AND isnotnull(ss_item_sk#63))
+(50) CometFilter
+Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
+Condition : (((((((isnotnull(ss_net_profit#75) AND isnotnull(ss_net_paid#74)) AND isnotnull(ss_quantity#73)) AND (ss_net_profit#75 > 1.00)) AND (ss_net_paid#74 > 0.00)) AND (ss_quantity#73 > 0)) AND isnotnull(ss_ticket_number#72)) AND isnotnull(ss_item_sk#71))
 
-(55) CometProject
-Input [6]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_net_profit#67, ss_sold_date_sk#68]
-Arguments: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68], [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
+(51) CometProject
+Input [6]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_net_profit#75, ss_sold_date_sk#76]
+Arguments: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76], [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
 
-(56) ColumnarToRow [codegen id : 13]
-Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
+(52) ColumnarToRow [codegen id : 15]
+Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
 
-(57) BroadcastExchange
-Input [5]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68]
+(53) BroadcastExchange
+Input [5]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[1, int, true] as bigint), 32) | (cast(input[0, int, true] as bigint) & 4294967295))),false), [plan_id=7]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
+Output [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_return_amt), GreaterThan(sr_return_amt,10000.00), IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(59) CometFilter
-Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
-Condition : (((isnotnull(sr_return_amt#73) AND (sr_return_amt#73 > 10000.00)) AND isnotnull(sr_ticket_number#71)) AND isnotnull(sr_item_sk#70))
+(55) CometFilter
+Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
+Condition : (((isnotnull(sr_return_amt#81) AND (sr_return_amt#81 > 10000.00)) AND isnotnull(sr_ticket_number#79)) AND isnotnull(sr_item_sk#78))
 
-(60) CometProject
-Input [5]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73, sr_returned_date_sk#74]
-Arguments: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73], [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
+(56) CometProject
+Input [5]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81, sr_returned_date_sk#82]
+Arguments: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81], [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
 
-(61) ColumnarToRow
-Input [4]: [sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
+(57) ColumnarToRow
+Input [4]: [sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
 
-(62) BroadcastHashJoin [codegen id : 15]
-Left keys [2]: [ss_ticket_number#64, ss_item_sk#63]
-Right keys [2]: [sr_ticket_number#71, sr_item_sk#70]
+(58) BroadcastHashJoin [codegen id : 17]
+Left keys [2]: [ss_ticket_number#72, ss_item_sk#71]
+Right keys [2]: [sr_ticket_number#79, sr_item_sk#78]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 15]
-Output [6]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73]
-Input [9]: [ss_item_sk#63, ss_ticket_number#64, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_item_sk#70, sr_ticket_number#71, sr_return_quantity#72, sr_return_amt#73]
+(59) Project [codegen id : 17]
+Output [6]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81]
+Input [9]: [ss_item_sk#71, ss_ticket_number#72, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_item_sk#78, sr_ticket_number#79, sr_return_quantity#80, sr_return_amt#81]
 
-(64) ReusedExchange [Reuses operator id: 90]
-Output [1]: [d_date_sk#75]
+(60) ReusedExchange [Reuses operator id: 82]
+Output [1]: [d_date_sk#83]
 
-(65) BroadcastHashJoin [codegen id : 15]
-Left keys [1]: [ss_sold_date_sk#68]
-Right keys [1]: [d_date_sk#75]
+(61) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ss_sold_date_sk#76]
+Right keys [1]: [d_date_sk#83]
 Join type: Inner
 Join condition: None
 
-(66) Project [codegen id : 15]
-Output [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
-Input [7]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, ss_sold_date_sk#68, sr_return_quantity#72, sr_return_amt#73, d_date_sk#75]
-
-(67) HashAggregate [codegen id : 15]
-Input [5]: [ss_item_sk#63, ss_quantity#65, ss_net_paid#66, sr_return_quantity#72, sr_return_amt#73]
-Keys [1]: [ss_item_sk#63]
-Functions [4]: [partial_sum(coalesce(sr_return_quantity#72, 0)), partial_sum(coalesce(ss_quantity#65, 0)), partial_sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
-Aggregate Attributes [6]: [sum#76, sum#77, sum#78, isEmpty#79, sum#80, isEmpty#81]
-Results [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-
-(68) RowToColumnar
-Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-
-(69) CometColumnarExchange
-Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-Arguments: hashpartitioning(ss_item_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
-
-(70) CometHashAggregate
-Input [7]: [ss_item_sk#63, sum#82, sum#83, sum#84, isEmpty#85, sum#86, isEmpty#87]
-Keys [1]: [ss_item_sk#63]
-Functions [4]: [sum(coalesce(sr_return_quantity#72, 0)), sum(coalesce(ss_quantity#65, 0)), sum(coalesce(cast(sr_return_amt#73 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#66 as decimal(12,2)), 0.00))]
-
-(71) CometColumnarExchange
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(72) CometSort
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-Arguments: [item#88, return_ratio#89, currency_ratio#90], [return_ratio#89 ASC NULLS FIRST]
-
-(73) ColumnarToRow [codegen id : 16]
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-
-(74) Window
-Input [3]: [item#88, return_ratio#89, currency_ratio#90]
-Arguments: [rank(return_ratio#89) windowspecdefinition(return_ratio#89 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#91], [return_ratio#89 ASC NULLS FIRST]
-
-(75) Sort [codegen id : 17]
-Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
-Arguments: [currency_ratio#90 ASC NULLS FIRST], false, 0
-
-(76) Window
-Input [4]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91]
-Arguments: [rank(currency_ratio#90) windowspecdefinition(currency_ratio#90 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#92], [currency_ratio#90 ASC NULLS FIRST]
-
-(77) Filter [codegen id : 18]
-Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
-Condition : ((return_rank#91 <= 10) OR (currency_rank#92 <= 10))
-
-(78) Project [codegen id : 18]
-Output [5]: [store AS channel#93, item#88, return_ratio#89, return_rank#91, currency_rank#92]
-Input [5]: [item#88, return_ratio#89, currency_ratio#90, return_rank#91, currency_rank#92]
-
-(79) Union
-
-(80) HashAggregate [codegen id : 19]
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(62) Project [codegen id : 17]
+Output [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
+Input [7]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, ss_sold_date_sk#76, sr_return_quantity#80, sr_return_amt#81, d_date_sk#83]
+
+(63) HashAggregate [codegen id : 17]
+Input [5]: [ss_item_sk#71, ss_quantity#73, ss_net_paid#74, sr_return_quantity#80, sr_return_amt#81]
+Keys [1]: [ss_item_sk#71]
+Functions [4]: [partial_sum(coalesce(sr_return_quantity#80, 0)), partial_sum(coalesce(ss_quantity#73, 0)), partial_sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), partial_sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
+Aggregate Attributes [6]: [sum#84, sum#85, sum#86, isEmpty#87, sum#88, isEmpty#89]
+Results [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+
+(64) Exchange
+Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+Arguments: hashpartitioning(ss_item_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=8]
+
+(65) HashAggregate [codegen id : 18]
+Input [7]: [ss_item_sk#71, sum#90, sum#91, sum#92, isEmpty#93, sum#94, isEmpty#95]
+Keys [1]: [ss_item_sk#71]
+Functions [4]: [sum(coalesce(sr_return_quantity#80, 0)), sum(coalesce(ss_quantity#73, 0)), sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00)), sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))]
+Aggregate Attributes [4]: [sum(coalesce(sr_return_quantity#80, 0))#96, sum(coalesce(ss_quantity#73, 0))#97, sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98, sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99]
+Results [3]: [ss_item_sk#71 AS item#100, (cast(sum(coalesce(sr_return_quantity#80, 0))#96 as decimal(15,4)) / cast(sum(coalesce(ss_quantity#73, 0))#97 as decimal(15,4))) AS return_ratio#101, (cast(sum(coalesce(cast(sr_return_amt#81 as decimal(12,2)), 0.00))#98 as decimal(15,4)) / cast(sum(coalesce(cast(ss_net_paid#74 as decimal(12,2)), 0.00))#99 as decimal(15,4))) AS currency_ratio#102]
+
+(66) Exchange
+Input [3]: [item#100, return_ratio#101, currency_ratio#102]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=9]
+
+(67) Sort [codegen id : 19]
+Input [3]: [item#100, return_ratio#101, currency_ratio#102]
+Arguments: [return_ratio#101 ASC NULLS FIRST], false, 0
+
+(68) Window
+Input [3]: [item#100, return_ratio#101, currency_ratio#102]
+Arguments: [rank(return_ratio#101) windowspecdefinition(return_ratio#101 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS return_rank#103], [return_ratio#101 ASC NULLS FIRST]
+
+(69) Sort [codegen id : 20]
+Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
+Arguments: [currency_ratio#102 ASC NULLS FIRST], false, 0
+
+(70) Window
+Input [4]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103]
+Arguments: [rank(currency_ratio#102) windowspecdefinition(currency_ratio#102 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS currency_rank#104], [currency_ratio#102 ASC NULLS FIRST]
+
+(71) Filter [codegen id : 21]
+Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
+Condition : ((return_rank#103 <= 10) OR (currency_rank#104 <= 10))
+
+(72) Project [codegen id : 21]
+Output [5]: [store AS channel#105, item#100, return_ratio#101, return_rank#103, currency_rank#104]
+Input [5]: [item#100, return_ratio#101, currency_ratio#102, return_rank#103, currency_rank#104]
+
+(73) Union
+
+(74) HashAggregate [codegen id : 22]
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 Functions: []
 Aggregate Attributes: []
-Results [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
-(81) RowToColumnar
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(75) Exchange
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Arguments: hashpartitioning(channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(82) CometColumnarExchange
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Arguments: hashpartitioning(channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(83) CometHashAggregate
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Keys [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(76) HashAggregate [codegen id : 23]
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Keys [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
-(84) CometTakeOrderedAndProject
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#31 ASC NULLS FIRST,return_rank#29 ASC NULLS FIRST,currency_rank#30 ASC NULLS FIRST,item#26 ASC NULLS FIRST], output=[channel#31,item#26,return_ratio#27,return_rank#29,currency_rank#30]), 100, [channel#31 ASC NULLS FIRST, return_rank#29 ASC NULLS FIRST, currency_rank#30 ASC NULLS FIRST, item#26 ASC NULLS FIRST], [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
-
-(85) ColumnarToRow [codegen id : 20]
-Input [5]: [channel#31, item#26, return_ratio#27, return_rank#29, currency_rank#30]
+(77) TakeOrderedAndProject
+Input [5]: [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
+Arguments: 100, [channel#35 ASC NULLS FIRST, return_rank#33 ASC NULLS FIRST, currency_rank#34 ASC NULLS FIRST, item#30 ASC NULLS FIRST], [channel#35, item#30, return_ratio#31, return_rank#33, currency_rank#34]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#6 IN dynamicpruning#7
-BroadcastExchange (90)
-+- * ColumnarToRow (89)
-   +- CometProject (88)
-      +- CometFilter (87)
-         +- CometScan parquet spark_catalog.default.date_dim (86)
+BroadcastExchange (82)
++- * ColumnarToRow (81)
+   +- CometProject (80)
+      +- CometFilter (79)
+         +- CometScan parquet spark_catalog.default.date_dim (78)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#13, d_year#94, d_moy#95]
+Output [3]: [d_date_sk#13, d_year#106, d_moy#107]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2001), EqualTo(d_moy,12), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(87) CometFilter
-Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
-Condition : ((((isnotnull(d_year#94) AND isnotnull(d_moy#95)) AND (d_year#94 = 2001)) AND (d_moy#95 = 12)) AND isnotnull(d_date_sk#13))
+(79) CometFilter
+Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
+Condition : ((((isnotnull(d_year#106) AND isnotnull(d_moy#107)) AND (d_year#106 = 2001)) AND (d_moy#107 = 12)) AND isnotnull(d_date_sk#13))
 
-(88) CometProject
-Input [3]: [d_date_sk#13, d_year#94, d_moy#95]
+(80) CometProject
+Input [3]: [d_date_sk#13, d_year#106, d_moy#107]
 Arguments: [d_date_sk#13], [d_date_sk#13]
 
-(89) ColumnarToRow [codegen id : 1]
+(81) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#13]
 
-(90) BroadcastExchange
+(82) BroadcastExchange
 Input [1]: [d_date_sk#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-Subquery:2 Hosting operator id = 27 Hosting Expression = cs_sold_date_sk#37 IN dynamicpruning#7
+Subquery:2 Hosting operator id = 25 Hosting Expression = cs_sold_date_sk#41 IN dynamicpruning#7
 
-Subquery:3 Hosting operator id = 53 Hosting Expression = ss_sold_date_sk#68 IN dynamicpruning#7
+Subquery:3 Hosting operator id = 49 Hosting Expression = ss_sold_date_sk#76 IN dynamicpruning#7
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt
index 728ec5ade5..f007c1c663 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q49/simplified.txt
@@ -1,135 +1,133 @@
-WholeStageCodegen (20)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
-        CometHashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-          CometColumnarExchange [channel,item,return_ratio,return_rank,currency_rank] #1
-            RowToColumnar
-              WholeStageCodegen (19)
-                HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
-                  InputAdapter
-                    Union
-                      WholeStageCodegen (6)
-                        Project [item,return_ratio,return_rank,currency_rank]
-                          Filter [return_rank,currency_rank]
-                            InputAdapter
-                              Window [currency_ratio]
-                                WholeStageCodegen (5)
-                                  Sort [currency_ratio]
-                                    InputAdapter
-                                      Window [return_ratio]
-                                        WholeStageCodegen (4)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [return_ratio]
-                                                CometColumnarExchange #2
-                                                  CometHashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                    CometColumnarExchange [ws_item_sk] #3
-                                                      RowToColumnar
-                                                        WholeStageCodegen (3)
-                                                          HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
-                                                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
-                                                                  BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #4
-                                                                        WholeStageCodegen (1)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
-                                                                                CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
-                                                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
-                                                                                    SubqueryBroadcast [d_date_sk] #1
-                                                                                      BroadcastExchange #5
-                                                                                        WholeStageCodegen (1)
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometProject [d_date_sk]
-                                                                                                CometFilter [d_year,d_moy,d_date_sk]
-                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                                                          CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
-                                                                            CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+TakeOrderedAndProject [channel,return_rank,currency_rank,item,return_ratio]
+  WholeStageCodegen (23)
+    HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+      InputAdapter
+        Exchange [channel,item,return_ratio,return_rank,currency_rank] #1
+          WholeStageCodegen (22)
+            HashAggregate [channel,item,return_ratio,return_rank,currency_rank]
+              InputAdapter
+                Union
+                  WholeStageCodegen (7)
+                    Project [item,return_ratio,return_rank,currency_rank]
+                      Filter [return_rank,currency_rank]
+                        InputAdapter
+                          Window [currency_ratio]
+                            WholeStageCodegen (6)
+                              Sort [currency_ratio]
+                                InputAdapter
+                                  Window [return_ratio]
+                                    WholeStageCodegen (5)
+                                      Sort [return_ratio]
+                                        InputAdapter
+                                          Exchange #2
+                                            WholeStageCodegen (4)
+                                              HashAggregate [ws_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(wr_return_quantity, 0)),sum(coalesce(ws_quantity, 0)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ws_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [ws_item_sk] #3
+                                                    WholeStageCodegen (3)
+                                                      HashAggregate [ws_item_sk,wr_return_quantity,ws_quantity,wr_return_amt,ws_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                        Project [ws_item_sk,ws_quantity,ws_net_paid,wr_return_quantity,wr_return_amt]
+                                                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                            Project [ws_item_sk,ws_quantity,ws_net_paid,ws_sold_date_sk,wr_return_quantity,wr_return_amt]
+                                                              BroadcastHashJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
                                                                 InputAdapter
-                                                                  ReusedExchange [d_date_sk] #5
-                      WholeStageCodegen (12)
-                        Project [item,return_ratio,return_rank,currency_rank]
-                          Filter [return_rank,currency_rank]
-                            InputAdapter
-                              Window [currency_ratio]
-                                WholeStageCodegen (11)
-                                  Sort [currency_ratio]
-                                    InputAdapter
-                                      Window [return_ratio]
-                                        WholeStageCodegen (10)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [return_ratio]
-                                                CometColumnarExchange #6
-                                                  CometHashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                    CometColumnarExchange [cs_item_sk] #7
-                                                      RowToColumnar
-                                                        WholeStageCodegen (9)
-                                                          HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
-                                                              BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                                Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
-                                                                  BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #8
-                                                                        WholeStageCodegen (7)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
-                                                                                CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
-                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
-                                                                                    ReusedSubquery [d_date_sk] #1
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                                                          CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
-                                                                            CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                                                  BroadcastExchange #4
+                                                                    WholeStageCodegen (1)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_sold_date_sk]
+                                                                            CometFilter [ws_net_profit,ws_net_paid,ws_quantity,ws_order_number,ws_item_sk]
+                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_net_paid,ws_net_profit,ws_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                                  BroadcastExchange #5
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometProject [d_date_sk]
+                                                                                            CometFilter [d_year,d_moy,d_date_sk]
+                                                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year,d_moy]
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                                                      CometFilter [wr_return_amt,wr_order_number,wr_item_sk]
+                                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+                                                            InputAdapter
+                                                              ReusedExchange [d_date_sk] #5
+                  WholeStageCodegen (14)
+                    Project [item,return_ratio,return_rank,currency_rank]
+                      Filter [return_rank,currency_rank]
+                        InputAdapter
+                          Window [currency_ratio]
+                            WholeStageCodegen (13)
+                              Sort [currency_ratio]
+                                InputAdapter
+                                  Window [return_ratio]
+                                    WholeStageCodegen (12)
+                                      Sort [return_ratio]
+                                        InputAdapter
+                                          Exchange #6
+                                            WholeStageCodegen (11)
+                                              HashAggregate [cs_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(cr_return_quantity, 0)),sum(coalesce(cs_quantity, 0)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum(coalesce(cast(cs_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [cs_item_sk] #7
+                                                    WholeStageCodegen (10)
+                                                      HashAggregate [cs_item_sk,cr_return_quantity,cs_quantity,cr_return_amount,cs_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                        Project [cs_item_sk,cs_quantity,cs_net_paid,cr_return_quantity,cr_return_amount]
+                                                          BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                            Project [cs_item_sk,cs_quantity,cs_net_paid,cs_sold_date_sk,cr_return_quantity,cr_return_amount]
+                                                              BroadcastHashJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
                                                                 InputAdapter
-                                                                  ReusedExchange [d_date_sk] #5
-                      WholeStageCodegen (18)
-                        Project [item,return_ratio,return_rank,currency_rank]
-                          Filter [return_rank,currency_rank]
-                            InputAdapter
-                              Window [currency_ratio]
-                                WholeStageCodegen (17)
-                                  Sort [currency_ratio]
-                                    InputAdapter
-                                      Window [return_ratio]
-                                        WholeStageCodegen (16)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometSort [return_ratio]
-                                                CometColumnarExchange #9
-                                                  CometHashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                    CometColumnarExchange [ss_item_sk] #10
-                                                      RowToColumnar
-                                                        WholeStageCodegen (15)
-                                                          HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
-                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
-                                                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
-                                                                  BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                                                    InputAdapter
-                                                                      BroadcastExchange #11
-                                                                        WholeStageCodegen (13)
-                                                                          ColumnarToRow
-                                                                            InputAdapter
-                                                                              CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
-                                                                                CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
-                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
-                                                                                    ReusedSubquery [d_date_sk] #1
-                                                                    ColumnarToRow
-                                                                      InputAdapter
-                                                                        CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                                                          CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
-                                                                            CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                                                  BroadcastExchange #8
+                                                                    WholeStageCodegen (8)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_sold_date_sk]
+                                                                            CometFilter [cs_net_profit,cs_net_paid,cs_quantity,cs_order_number,cs_item_sk]
+                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_net_paid,cs_net_profit,cs_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                                                      CometFilter [cr_return_amount,cr_order_number,cr_item_sk]
+                                                                        CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                                            InputAdapter
+                                                              ReusedExchange [d_date_sk] #5
+                  WholeStageCodegen (21)
+                    Project [item,return_ratio,return_rank,currency_rank]
+                      Filter [return_rank,currency_rank]
+                        InputAdapter
+                          Window [currency_ratio]
+                            WholeStageCodegen (20)
+                              Sort [currency_ratio]
+                                InputAdapter
+                                  Window [return_ratio]
+                                    WholeStageCodegen (19)
+                                      Sort [return_ratio]
+                                        InputAdapter
+                                          Exchange #9
+                                            WholeStageCodegen (18)
+                                              HashAggregate [ss_item_sk,sum,sum,sum,isEmpty,sum,isEmpty] [sum(coalesce(sr_return_quantity, 0)),sum(coalesce(ss_quantity, 0)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum(coalesce(cast(ss_net_paid as decimal(12,2)), 0.00)),item,return_ratio,currency_ratio,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [ss_item_sk] #10
+                                                    WholeStageCodegen (17)
+                                                      HashAggregate [ss_item_sk,sr_return_quantity,ss_quantity,sr_return_amt,ss_net_paid] [sum,sum,sum,isEmpty,sum,isEmpty,sum,sum,sum,isEmpty,sum,isEmpty]
+                                                        Project [ss_item_sk,ss_quantity,ss_net_paid,sr_return_quantity,sr_return_amt]
+                                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                            Project [ss_item_sk,ss_quantity,ss_net_paid,ss_sold_date_sk,sr_return_quantity,sr_return_amt]
+                                                              BroadcastHashJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                                 InputAdapter
-                                                                  ReusedExchange [d_date_sk] #5
+                                                                  BroadcastExchange #11
+                                                                    WholeStageCodegen (15)
+                                                                      ColumnarToRow
+                                                                        InputAdapter
+                                                                          CometProject [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_sold_date_sk]
+                                                                            CometFilter [ss_net_profit,ss_net_paid,ss_quantity,ss_ticket_number,ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_net_paid,ss_net_profit,ss_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                ColumnarToRow
+                                                                  InputAdapter
+                                                                    CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                                                      CometFilter [sr_return_amt,sr_ticket_number,sr_item_sk]
+                                                                        CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                                            InputAdapter
+                                                              ReusedExchange [d_date_sk] #5
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt
index 60f983923a..0dedd04721 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/explain.txt
@@ -1,81 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (77)
-+- * Filter (76)
-   +- * HashAggregate (75)
-      +- * HashAggregate (74)
-         +- * Project (73)
-            +- * BroadcastHashJoin Inner BuildRight (72)
-               :- Window (65)
-               :  +- * ColumnarToRow (64)
-               :     +- CometSort (63)
-               :        +- CometColumnarExchange (62)
-               :           +- CometProject (61)
-               :              +- CometFilter (60)
-               :                 +- CometSortMergeJoin (59)
-               :                    :- CometSort (29)
-               :                    :  +- CometColumnarExchange (28)
-               :                    :     +- CometHashAggregate (27)
-               :                    :        +- CometColumnarExchange (26)
-               :                    :           +- RowToColumnar (25)
-               :                    :              +- * HashAggregate (24)
-               :                    :                 +- * Project (23)
-               :                    :                    +- * BroadcastHashJoin Inner BuildRight (22)
-               :                    :                       :- * Project (15)
-               :                    :                       :  +- Window (14)
-               :                    :                       :     +- * ColumnarToRow (13)
-               :                    :                       :        +- CometSort (12)
-               :                    :                       :           +- CometColumnarExchange (11)
-               :                    :                       :              +- CometHashAggregate (10)
-               :                    :                       :                 +- CometColumnarExchange (9)
-               :                    :                       :                    +- RowToColumnar (8)
-               :                    :                       :                       +- * HashAggregate (7)
-               :                    :                       :                          +- * Project (6)
-               :                    :                       :                             +- * BroadcastHashJoin Inner BuildRight (5)
-               :                    :                       :                                :- * ColumnarToRow (3)
-               :                    :                       :                                :  +- CometFilter (2)
-               :                    :                       :                                :     +- CometScan parquet spark_catalog.default.web_sales (1)
-               :                    :                       :                                +- ReusedExchange (4)
-               :                    :                       +- BroadcastExchange (21)
-               :                    :                          +- * Project (20)
-               :                    :                             +- Window (19)
-               :                    :                                +- * ColumnarToRow (18)
-               :                    :                                   +- CometSort (17)
-               :                    :                                      +- ReusedExchange (16)
-               :                    +- CometSort (58)
-               :                       +- CometColumnarExchange (57)
-               :                          +- CometHashAggregate (56)
-               :                             +- CometColumnarExchange (55)
-               :                                +- RowToColumnar (54)
-               :                                   +- * HashAggregate (53)
-               :                                      +- * Project (52)
-               :                                         +- * BroadcastHashJoin Inner BuildRight (51)
-               :                                            :- * Project (44)
-               :                                            :  +- Window (43)
-               :                                            :     +- * ColumnarToRow (42)
-               :                                            :        +- CometSort (41)
-               :                                            :           +- CometColumnarExchange (40)
-               :                                            :              +- CometHashAggregate (39)
-               :                                            :                 +- CometColumnarExchange (38)
-               :                                            :                    +- RowToColumnar (37)
-               :                                            :                       +- * HashAggregate (36)
-               :                                            :                          +- * Project (35)
-               :                                            :                             +- * BroadcastHashJoin Inner BuildRight (34)
-               :                                            :                                :- * ColumnarToRow (32)
-               :                                            :                                :  +- CometFilter (31)
-               :                                            :                                :     +- CometScan parquet spark_catalog.default.store_sales (30)
-               :                                            :                                +- ReusedExchange (33)
-               :                                            +- BroadcastExchange (50)
-               :                                               +- * Project (49)
-               :                                                  +- Window (48)
-               :                                                     +- * ColumnarToRow (47)
-               :                                                        +- CometSort (46)
-               :                                                           +- ReusedExchange (45)
-               +- BroadcastExchange (71)
-                  +- * Project (70)
-                     +- Window (69)
-                        +- * ColumnarToRow (68)
-                           +- CometSort (67)
-                              +- ReusedExchange (66)
+TakeOrderedAndProject (67)
++- * Filter (66)
+   +- * HashAggregate (65)
+      +- * HashAggregate (64)
+         +- * Project (63)
+            +- * BroadcastHashJoin Inner BuildRight (62)
+               :- Window (56)
+               :  +- * Sort (55)
+               :     +- Exchange (54)
+               :        +- * Project (53)
+               :           +- * Filter (52)
+               :              +- * SortMergeJoin FullOuter (51)
+               :                 :- * Sort (25)
+               :                 :  +- Exchange (24)
+               :                 :     +- * HashAggregate (23)
+               :                 :        +- Exchange (22)
+               :                 :           +- * HashAggregate (21)
+               :                 :              +- * Project (20)
+               :                 :                 +- * BroadcastHashJoin Inner BuildRight (19)
+               :                 :                    :- * Project (13)
+               :                 :                    :  +- Window (12)
+               :                 :                    :     +- * Sort (11)
+               :                 :                    :        +- Exchange (10)
+               :                 :                    :           +- * HashAggregate (9)
+               :                 :                    :              +- Exchange (8)
+               :                 :                    :                 +- * HashAggregate (7)
+               :                 :                    :                    +- * Project (6)
+               :                 :                    :                       +- * BroadcastHashJoin Inner BuildRight (5)
+               :                 :                    :                          :- * ColumnarToRow (3)
+               :                 :                    :                          :  +- CometFilter (2)
+               :                 :                    :                          :     +- CometScan parquet spark_catalog.default.web_sales (1)
+               :                 :                    :                          +- ReusedExchange (4)
+               :                 :                    +- BroadcastExchange (18)
+               :                 :                       +- * Project (17)
+               :                 :                          +- Window (16)
+               :                 :                             +- * Sort (15)
+               :                 :                                +- ReusedExchange (14)
+               :                 +- * Sort (50)
+               :                    +- Exchange (49)
+               :                       +- * HashAggregate (48)
+               :                          +- Exchange (47)
+               :                             +- * HashAggregate (46)
+               :                                +- * Project (45)
+               :                                   +- * BroadcastHashJoin Inner BuildRight (44)
+               :                                      :- * Project (38)
+               :                                      :  +- Window (37)
+               :                                      :     +- * Sort (36)
+               :                                      :        +- Exchange (35)
+               :                                      :           +- * HashAggregate (34)
+               :                                      :              +- Exchange (33)
+               :                                      :                 +- * HashAggregate (32)
+               :                                      :                    +- * Project (31)
+               :                                      :                       +- * BroadcastHashJoin Inner BuildRight (30)
+               :                                      :                          :- * ColumnarToRow (28)
+               :                                      :                          :  +- CometFilter (27)
+               :                                      :                          :     +- CometScan parquet spark_catalog.default.store_sales (26)
+               :                                      :                          +- ReusedExchange (29)
+               :                                      +- BroadcastExchange (43)
+               :                                         +- * Project (42)
+               :                                            +- Window (41)
+               :                                               +- * Sort (40)
+               :                                                  +- ReusedExchange (39)
+               +- BroadcastExchange (61)
+                  +- * Project (60)
+                     +- Window (59)
+                        +- * Sort (58)
+                           +- ReusedExchange (57)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -93,7 +83,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 2]
 Input [3]: [ws_item_sk#1, ws_sales_price#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 82]
+(4) ReusedExchange [Reuses operator id: 72]
 Output [2]: [d_date_sk#5, d_date#6]
 
 (5) BroadcastHashJoin [codegen id : 2]
@@ -113,335 +103,314 @@ Functions [1]: [partial_sum(UnscaledValue(ws_sales_price#2))]
 Aggregate Attributes [1]: [sum#7]
 Results [3]: [ws_item_sk#1, d_date#6, sum#8]
 
-(8) RowToColumnar
+(8) Exchange
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
+Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=1]
 
-(9) CometColumnarExchange
-Input [3]: [ws_item_sk#1, d_date#6, sum#8]
-Arguments: hashpartitioning(ws_item_sk#1, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
-
-(10) CometHashAggregate
+(9) HashAggregate [codegen id : 3]
 Input [3]: [ws_item_sk#1, d_date#6, sum#8]
 Keys [2]: [ws_item_sk#1, d_date#6]
 Functions [1]: [sum(UnscaledValue(ws_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_sales_price#2))#9]
+Results [4]: [ws_item_sk#1 AS item_sk#10, d_date#6, MakeDecimal(sum(UnscaledValue(ws_sales_price#2))#9,17,2) AS sumws#11, ws_item_sk#1]
 
-(11) CometColumnarExchange
-Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
-Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(12) CometSort
-Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
-Arguments: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1], [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
+(10) Exchange
+Input [4]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1]
+Arguments: hashpartitioning(ws_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(13) ColumnarToRow [codegen id : 3]
-Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
+(11) Sort [codegen id : 4]
+Input [4]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1]
+Arguments: [ws_item_sk#1 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
 
-(14) Window
-Input [4]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1]
-Arguments: [row_number() windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#11], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
+(12) Window
+Input [4]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1]
+Arguments: [row_number() windowspecdefinition(ws_item_sk#1, d_date#6 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#12], [ws_item_sk#1], [d_date#6 ASC NULLS FIRST]
 
-(15) Project [codegen id : 8]
-Output [4]: [item_sk#9, d_date#6, sumws#10, rk#11]
-Input [5]: [item_sk#9, d_date#6, sumws#10, ws_item_sk#1, rk#11]
+(13) Project [codegen id : 10]
+Output [4]: [item_sk#10, d_date#6, sumws#11, rk#12]
+Input [5]: [item_sk#10, d_date#6, sumws#11, ws_item_sk#1, rk#12]
 
-(16) ReusedExchange [Reuses operator id: 11]
-Output [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
+(14) ReusedExchange [Reuses operator id: 10]
+Output [4]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14]
 
-(17) CometSort
-Input [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
-Arguments: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13], [ws_item_sk#13 ASC NULLS FIRST, d_date#12 ASC NULLS FIRST]
+(15) Sort [codegen id : 8]
+Input [4]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14]
+Arguments: [ws_item_sk#14 ASC NULLS FIRST, d_date#13 ASC NULLS FIRST], false, 0
 
-(18) ColumnarToRow [codegen id : 6]
-Input [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
+(16) Window
+Input [4]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14]
+Arguments: [row_number() windowspecdefinition(ws_item_sk#14, d_date#13 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#15], [ws_item_sk#14], [d_date#13 ASC NULLS FIRST]
 
-(19) Window
-Input [4]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13]
-Arguments: [row_number() windowspecdefinition(ws_item_sk#13, d_date#12 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#14], [ws_item_sk#13], [d_date#12 ASC NULLS FIRST]
+(17) Project [codegen id : 9]
+Output [3]: [item_sk#10 AS item_sk#16, sumws#11 AS sumws#17, rk#15]
+Input [5]: [item_sk#10, d_date#13, sumws#11, ws_item_sk#14, rk#15]
 
-(20) Project [codegen id : 7]
-Output [3]: [item_sk#9 AS item_sk#15, sumws#10 AS sumws#16, rk#14]
-Input [5]: [item_sk#9, d_date#12, sumws#10, ws_item_sk#13, rk#14]
-
-(21) BroadcastExchange
-Input [3]: [item_sk#15, sumws#16, rk#14]
+(18) BroadcastExchange
+Input [3]: [item_sk#16, sumws#17, rk#15]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=3]
 
-(22) BroadcastHashJoin [codegen id : 8]
-Left keys [1]: [item_sk#9]
-Right keys [1]: [item_sk#15]
+(19) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [item_sk#10]
+Right keys [1]: [item_sk#16]
 Join type: Inner
-Join condition: (rk#11 >= rk#14)
-
-(23) Project [codegen id : 8]
-Output [4]: [item_sk#9, d_date#6, sumws#10, sumws#16]
-Input [7]: [item_sk#9, d_date#6, sumws#10, rk#11, item_sk#15, sumws#16, rk#14]
-
-(24) HashAggregate [codegen id : 8]
-Input [4]: [item_sk#9, d_date#6, sumws#10, sumws#16]
-Keys [3]: [item_sk#9, d_date#6, sumws#10]
-Functions [1]: [partial_sum(sumws#16)]
-Aggregate Attributes [2]: [sum#17, isEmpty#18]
-Results [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
-
-(25) RowToColumnar
-Input [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
-
-(26) CometColumnarExchange
-Input [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
-Arguments: hashpartitioning(item_sk#9, d_date#6, sumws#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(27) CometHashAggregate
-Input [5]: [item_sk#9, d_date#6, sumws#10, sum#19, isEmpty#20]
-Keys [3]: [item_sk#9, d_date#6, sumws#10]
-Functions [1]: [sum(sumws#16)]
-
-(28) CometColumnarExchange
-Input [3]: [item_sk#9, d_date#6, cume_sales#21]
-Arguments: hashpartitioning(item_sk#9, d_date#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(29) CometSort
-Input [3]: [item_sk#9, d_date#6, cume_sales#21]
-Arguments: [item_sk#9, d_date#6, cume_sales#21], [item_sk#9 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST]
+Join condition: (rk#12 >= rk#15)
+
+(20) Project [codegen id : 10]
+Output [4]: [item_sk#10, d_date#6, sumws#11, sumws#17]
+Input [7]: [item_sk#10, d_date#6, sumws#11, rk#12, item_sk#16, sumws#17, rk#15]
+
+(21) HashAggregate [codegen id : 10]
+Input [4]: [item_sk#10, d_date#6, sumws#11, sumws#17]
+Keys [3]: [item_sk#10, d_date#6, sumws#11]
+Functions [1]: [partial_sum(sumws#17)]
+Aggregate Attributes [2]: [sum#18, isEmpty#19]
+Results [5]: [item_sk#10, d_date#6, sumws#11, sum#20, isEmpty#21]
+
+(22) Exchange
+Input [5]: [item_sk#10, d_date#6, sumws#11, sum#20, isEmpty#21]
+Arguments: hashpartitioning(item_sk#10, d_date#6, sumws#11, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(23) HashAggregate [codegen id : 11]
+Input [5]: [item_sk#10, d_date#6, sumws#11, sum#20, isEmpty#21]
+Keys [3]: [item_sk#10, d_date#6, sumws#11]
+Functions [1]: [sum(sumws#17)]
+Aggregate Attributes [1]: [sum(sumws#17)#22]
+Results [3]: [item_sk#10, d_date#6, sum(sumws#17)#22 AS cume_sales#23]
+
+(24) Exchange
+Input [3]: [item_sk#10, d_date#6, cume_sales#23]
+Arguments: hashpartitioning(item_sk#10, d_date#6, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(25) Sort [codegen id : 12]
+Input [3]: [item_sk#10, d_date#6, cume_sales#23]
+Arguments: [item_sk#10 ASC NULLS FIRST, d_date#6 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24]
+Output [3]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#24), dynamicpruningexpression(ss_sold_date_sk#24 IN dynamicpruning#25)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#26), dynamicpruningexpression(ss_sold_date_sk#26 IN dynamicpruning#27)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_sales_price:decimal(7,2)>
 
-(31) CometFilter
-Input [3]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24]
-Condition : isnotnull(ss_item_sk#22)
+(27) CometFilter
+Input [3]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26]
+Condition : isnotnull(ss_item_sk#24)
 
-(32) ColumnarToRow [codegen id : 10]
-Input [3]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24]
+(28) ColumnarToRow [codegen id : 14]
+Input [3]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26]
 
-(33) ReusedExchange [Reuses operator id: 82]
-Output [2]: [d_date_sk#26, d_date#27]
+(29) ReusedExchange [Reuses operator id: 72]
+Output [2]: [d_date_sk#28, d_date#29]
 
-(34) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ss_sold_date_sk#24]
-Right keys [1]: [d_date_sk#26]
+(30) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ss_sold_date_sk#26]
+Right keys [1]: [d_date_sk#28]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 10]
-Output [3]: [ss_item_sk#22, ss_sales_price#23, d_date#27]
-Input [5]: [ss_item_sk#22, ss_sales_price#23, ss_sold_date_sk#24, d_date_sk#26, d_date#27]
-
-(36) HashAggregate [codegen id : 10]
-Input [3]: [ss_item_sk#22, ss_sales_price#23, d_date#27]
-Keys [2]: [ss_item_sk#22, d_date#27]
-Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#23))]
-Aggregate Attributes [1]: [sum#28]
-Results [3]: [ss_item_sk#22, d_date#27, sum#29]
-
-(37) RowToColumnar
-Input [3]: [ss_item_sk#22, d_date#27, sum#29]
-
-(38) CometColumnarExchange
-Input [3]: [ss_item_sk#22, d_date#27, sum#29]
-Arguments: hashpartitioning(ss_item_sk#22, d_date#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(39) CometHashAggregate
-Input [3]: [ss_item_sk#22, d_date#27, sum#29]
-Keys [2]: [ss_item_sk#22, d_date#27]
-Functions [1]: [sum(UnscaledValue(ss_sales_price#23))]
-
-(40) CometColumnarExchange
-Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
-Arguments: hashpartitioning(ss_item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(41) CometSort
-Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
-Arguments: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22], [ss_item_sk#22 ASC NULLS FIRST, d_date#27 ASC NULLS FIRST]
-
-(42) ColumnarToRow [codegen id : 11]
-Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
-
-(43) Window
-Input [4]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22]
-Arguments: [row_number() windowspecdefinition(ss_item_sk#22, d_date#27 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#32], [ss_item_sk#22], [d_date#27 ASC NULLS FIRST]
-
-(44) Project [codegen id : 16]
-Output [4]: [item_sk#30, d_date#27, sumss#31, rk#32]
-Input [5]: [item_sk#30, d_date#27, sumss#31, ss_item_sk#22, rk#32]
-
-(45) ReusedExchange [Reuses operator id: 40]
-Output [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
-
-(46) CometSort
-Input [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
-Arguments: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34], [ss_item_sk#34 ASC NULLS FIRST, d_date#33 ASC NULLS FIRST]
-
-(47) ColumnarToRow [codegen id : 14]
-Input [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
-
-(48) Window
-Input [4]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34]
-Arguments: [row_number() windowspecdefinition(ss_item_sk#34, d_date#33 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#35], [ss_item_sk#34], [d_date#33 ASC NULLS FIRST]
-
-(49) Project [codegen id : 15]
-Output [3]: [item_sk#30 AS item_sk#36, sumss#31 AS sumss#37, rk#35]
-Input [5]: [item_sk#30, d_date#33, sumss#31, ss_item_sk#34, rk#35]
-
-(50) BroadcastExchange
-Input [3]: [item_sk#36, sumss#37, rk#35]
+(31) Project [codegen id : 14]
+Output [3]: [ss_item_sk#24, ss_sales_price#25, d_date#29]
+Input [5]: [ss_item_sk#24, ss_sales_price#25, ss_sold_date_sk#26, d_date_sk#28, d_date#29]
+
+(32) HashAggregate [codegen id : 14]
+Input [3]: [ss_item_sk#24, ss_sales_price#25, d_date#29]
+Keys [2]: [ss_item_sk#24, d_date#29]
+Functions [1]: [partial_sum(UnscaledValue(ss_sales_price#25))]
+Aggregate Attributes [1]: [sum#30]
+Results [3]: [ss_item_sk#24, d_date#29, sum#31]
+
+(33) Exchange
+Input [3]: [ss_item_sk#24, d_date#29, sum#31]
+Arguments: hashpartitioning(ss_item_sk#24, d_date#29, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(34) HashAggregate [codegen id : 15]
+Input [3]: [ss_item_sk#24, d_date#29, sum#31]
+Keys [2]: [ss_item_sk#24, d_date#29]
+Functions [1]: [sum(UnscaledValue(ss_sales_price#25))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_sales_price#25))#32]
+Results [4]: [ss_item_sk#24 AS item_sk#33, d_date#29, MakeDecimal(sum(UnscaledValue(ss_sales_price#25))#32,17,2) AS sumss#34, ss_item_sk#24]
+
+(35) Exchange
+Input [4]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24]
+Arguments: hashpartitioning(ss_item_sk#24, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(36) Sort [codegen id : 16]
+Input [4]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24]
+Arguments: [ss_item_sk#24 ASC NULLS FIRST, d_date#29 ASC NULLS FIRST], false, 0
+
+(37) Window
+Input [4]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24]
+Arguments: [row_number() windowspecdefinition(ss_item_sk#24, d_date#29 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#35], [ss_item_sk#24], [d_date#29 ASC NULLS FIRST]
+
+(38) Project [codegen id : 22]
+Output [4]: [item_sk#33, d_date#29, sumss#34, rk#35]
+Input [5]: [item_sk#33, d_date#29, sumss#34, ss_item_sk#24, rk#35]
+
+(39) ReusedExchange [Reuses operator id: 35]
+Output [4]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37]
+
+(40) Sort [codegen id : 20]
+Input [4]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37]
+Arguments: [ss_item_sk#37 ASC NULLS FIRST, d_date#36 ASC NULLS FIRST], false, 0
+
+(41) Window
+Input [4]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37]
+Arguments: [row_number() windowspecdefinition(ss_item_sk#37, d_date#36 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#38], [ss_item_sk#37], [d_date#36 ASC NULLS FIRST]
+
+(42) Project [codegen id : 21]
+Output [3]: [item_sk#33 AS item_sk#39, sumss#34 AS sumss#40, rk#38]
+Input [5]: [item_sk#33, d_date#36, sumss#34, ss_item_sk#37, rk#38]
+
+(43) BroadcastExchange
+Input [3]: [item_sk#39, sumss#40, rk#38]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=8]
 
-(51) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [item_sk#30]
-Right keys [1]: [item_sk#36]
+(44) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [item_sk#33]
+Right keys [1]: [item_sk#39]
 Join type: Inner
-Join condition: (rk#32 >= rk#35)
-
-(52) Project [codegen id : 16]
-Output [4]: [item_sk#30, d_date#27, sumss#31, sumss#37]
-Input [7]: [item_sk#30, d_date#27, sumss#31, rk#32, item_sk#36, sumss#37, rk#35]
-
-(53) HashAggregate [codegen id : 16]
-Input [4]: [item_sk#30, d_date#27, sumss#31, sumss#37]
-Keys [3]: [item_sk#30, d_date#27, sumss#31]
-Functions [1]: [partial_sum(sumss#37)]
-Aggregate Attributes [2]: [sum#38, isEmpty#39]
-Results [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
-
-(54) RowToColumnar
-Input [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
-
-(55) CometColumnarExchange
-Input [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
-Arguments: hashpartitioning(item_sk#30, d_date#27, sumss#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(56) CometHashAggregate
-Input [5]: [item_sk#30, d_date#27, sumss#31, sum#40, isEmpty#41]
-Keys [3]: [item_sk#30, d_date#27, sumss#31]
-Functions [1]: [sum(sumss#37)]
-
-(57) CometColumnarExchange
-Input [3]: [item_sk#30, d_date#27, cume_sales#42]
-Arguments: hashpartitioning(item_sk#30, d_date#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(58) CometSort
-Input [3]: [item_sk#30, d_date#27, cume_sales#42]
-Arguments: [item_sk#30, d_date#27, cume_sales#42], [item_sk#30 ASC NULLS FIRST, d_date#27 ASC NULLS FIRST]
-
-(59) CometSortMergeJoin
-Left output [3]: [item_sk#9, d_date#6, cume_sales#21]
-Right output [3]: [item_sk#30, d_date#27, cume_sales#42]
-Arguments: [item_sk#9, d_date#6], [item_sk#30, d_date#27], FullOuter
-
-(60) CometFilter
-Input [6]: [item_sk#9, d_date#6, cume_sales#21, item_sk#30, d_date#27, cume_sales#42]
-Condition : isnotnull(CASE WHEN isnotnull(item_sk#9) THEN item_sk#9 ELSE item_sk#30 END)
-
-(61) CometProject
-Input [6]: [item_sk#9, d_date#6, cume_sales#21, item_sk#30, d_date#27, cume_sales#42]
-Arguments: [item_sk#43, d_date#44, web_sales#45, store_sales#46], [CASE WHEN isnotnull(item_sk#9) THEN item_sk#9 ELSE item_sk#30 END AS item_sk#43, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#27 END AS d_date#44, cume_sales#21 AS web_sales#45, cume_sales#42 AS store_sales#46]
+Join condition: (rk#35 >= rk#38)
+
+(45) Project [codegen id : 22]
+Output [4]: [item_sk#33, d_date#29, sumss#34, sumss#40]
+Input [7]: [item_sk#33, d_date#29, sumss#34, rk#35, item_sk#39, sumss#40, rk#38]
+
+(46) HashAggregate [codegen id : 22]
+Input [4]: [item_sk#33, d_date#29, sumss#34, sumss#40]
+Keys [3]: [item_sk#33, d_date#29, sumss#34]
+Functions [1]: [partial_sum(sumss#40)]
+Aggregate Attributes [2]: [sum#41, isEmpty#42]
+Results [5]: [item_sk#33, d_date#29, sumss#34, sum#43, isEmpty#44]
+
+(47) Exchange
+Input [5]: [item_sk#33, d_date#29, sumss#34, sum#43, isEmpty#44]
+Arguments: hashpartitioning(item_sk#33, d_date#29, sumss#34, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+
+(48) HashAggregate [codegen id : 23]
+Input [5]: [item_sk#33, d_date#29, sumss#34, sum#43, isEmpty#44]
+Keys [3]: [item_sk#33, d_date#29, sumss#34]
+Functions [1]: [sum(sumss#40)]
+Aggregate Attributes [1]: [sum(sumss#40)#45]
+Results [3]: [item_sk#33, d_date#29, sum(sumss#40)#45 AS cume_sales#46]
+
+(49) Exchange
+Input [3]: [item_sk#33, d_date#29, cume_sales#46]
+Arguments: hashpartitioning(item_sk#33, d_date#29, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(50) Sort [codegen id : 24]
+Input [3]: [item_sk#33, d_date#29, cume_sales#46]
+Arguments: [item_sk#33 ASC NULLS FIRST, d_date#29 ASC NULLS FIRST], false, 0
+
+(51) SortMergeJoin [codegen id : 25]
+Left keys [2]: [item_sk#10, d_date#6]
+Right keys [2]: [item_sk#33, d_date#29]
+Join type: FullOuter
+Join condition: None
 
-(62) CometColumnarExchange
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Arguments: hashpartitioning(item_sk#43, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(52) Filter [codegen id : 25]
+Input [6]: [item_sk#10, d_date#6, cume_sales#23, item_sk#33, d_date#29, cume_sales#46]
+Condition : isnotnull(CASE WHEN isnotnull(item_sk#10) THEN item_sk#10 ELSE item_sk#33 END)
 
-(63) CometSort
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Arguments: [item_sk#43, d_date#44, web_sales#45, store_sales#46], [item_sk#43 ASC NULLS FIRST, d_date#44 ASC NULLS FIRST]
+(53) Project [codegen id : 25]
+Output [4]: [CASE WHEN isnotnull(item_sk#10) THEN item_sk#10 ELSE item_sk#33 END AS item_sk#47, CASE WHEN isnotnull(d_date#6) THEN d_date#6 ELSE d_date#29 END AS d_date#48, cume_sales#23 AS web_sales#49, cume_sales#46 AS store_sales#50]
+Input [6]: [item_sk#10, d_date#6, cume_sales#23, item_sk#33, d_date#29, cume_sales#46]
 
-(64) ColumnarToRow [codegen id : 17]
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+(54) Exchange
+Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Arguments: hashpartitioning(item_sk#47, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(65) Window
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Arguments: [row_number() windowspecdefinition(item_sk#43, d_date#44 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#47], [item_sk#43], [d_date#44 ASC NULLS FIRST]
+(55) Sort [codegen id : 26]
+Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Arguments: [item_sk#47 ASC NULLS FIRST, d_date#48 ASC NULLS FIRST], false, 0
 
-(66) ReusedExchange [Reuses operator id: 62]
-Output [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+(56) Window
+Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Arguments: [row_number() windowspecdefinition(item_sk#47, d_date#48 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#51], [item_sk#47], [d_date#48 ASC NULLS FIRST]
 
-(67) CometSort
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Arguments: [item_sk#43, d_date#44, web_sales#45, store_sales#46], [item_sk#43 ASC NULLS FIRST, d_date#44 ASC NULLS FIRST]
+(57) ReusedExchange [Reuses operator id: 54]
+Output [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
 
-(68) ColumnarToRow [codegen id : 34]
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
+(58) Sort [codegen id : 52]
+Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Arguments: [item_sk#47 ASC NULLS FIRST, d_date#48 ASC NULLS FIRST], false, 0
 
-(69) Window
-Input [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Arguments: [row_number() windowspecdefinition(item_sk#43, d_date#44 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#48], [item_sk#43], [d_date#44 ASC NULLS FIRST]
+(59) Window
+Input [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Arguments: [row_number() windowspecdefinition(item_sk#47, d_date#48 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#52], [item_sk#47], [d_date#48 ASC NULLS FIRST]
 
-(70) Project [codegen id : 35]
-Output [4]: [item_sk#43 AS item_sk#49, web_sales#45 AS web_sales#50, store_sales#46 AS store_sales#51, rk#48]
-Input [5]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, rk#48]
+(60) Project [codegen id : 53]
+Output [4]: [item_sk#47 AS item_sk#53, web_sales#49 AS web_sales#54, store_sales#50 AS store_sales#55, rk#52]
+Input [5]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, rk#52]
 
-(71) BroadcastExchange
-Input [4]: [item_sk#49, web_sales#50, store_sales#51, rk#48]
+(61) BroadcastExchange
+Input [4]: [item_sk#53, web_sales#54, store_sales#55, rk#52]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
-(72) BroadcastHashJoin [codegen id : 36]
-Left keys [1]: [item_sk#43]
-Right keys [1]: [item_sk#49]
+(62) BroadcastHashJoin [codegen id : 54]
+Left keys [1]: [item_sk#47]
+Right keys [1]: [item_sk#53]
 Join type: Inner
-Join condition: (rk#47 >= rk#48)
-
-(73) Project [codegen id : 36]
-Output [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_sales#50, store_sales#51]
-Input [9]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, rk#47, item_sk#49, web_sales#50, store_sales#51, rk#48]
-
-(74) HashAggregate [codegen id : 36]
-Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_sales#50, store_sales#51]
-Keys [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Functions [2]: [partial_max(web_sales#50), partial_max(store_sales#51)]
-Aggregate Attributes [2]: [max#52, max#53]
-Results [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, max#54, max#55]
-
-(75) HashAggregate [codegen id : 36]
-Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, max#54, max#55]
-Keys [4]: [item_sk#43, d_date#44, web_sales#45, store_sales#46]
-Functions [2]: [max(web_sales#50), max(store_sales#51)]
-Aggregate Attributes [2]: [max(web_sales#50)#56, max(store_sales#51)#57]
-Results [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, max(web_sales#50)#56 AS web_cumulative#58, max(store_sales#51)#57 AS store_cumulative#59]
-
-(76) Filter [codegen id : 36]
-Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_cumulative#58, store_cumulative#59]
-Condition : ((isnotnull(web_cumulative#58) AND isnotnull(store_cumulative#59)) AND (web_cumulative#58 > store_cumulative#59))
-
-(77) TakeOrderedAndProject
-Input [6]: [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_cumulative#58, store_cumulative#59]
-Arguments: 100, [item_sk#43 ASC NULLS FIRST, d_date#44 ASC NULLS FIRST], [item_sk#43, d_date#44, web_sales#45, store_sales#46, web_cumulative#58, store_cumulative#59]
+Join condition: (rk#51 >= rk#52)
+
+(63) Project [codegen id : 54]
+Output [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_sales#54, store_sales#55]
+Input [9]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, rk#51, item_sk#53, web_sales#54, store_sales#55, rk#52]
+
+(64) HashAggregate [codegen id : 54]
+Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_sales#54, store_sales#55]
+Keys [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Functions [2]: [partial_max(web_sales#54), partial_max(store_sales#55)]
+Aggregate Attributes [2]: [max#56, max#57]
+Results [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, max#58, max#59]
+
+(65) HashAggregate [codegen id : 54]
+Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, max#58, max#59]
+Keys [4]: [item_sk#47, d_date#48, web_sales#49, store_sales#50]
+Functions [2]: [max(web_sales#54), max(store_sales#55)]
+Aggregate Attributes [2]: [max(web_sales#54)#60, max(store_sales#55)#61]
+Results [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, max(web_sales#54)#60 AS web_cumulative#62, max(store_sales#55)#61 AS store_cumulative#63]
+
+(66) Filter [codegen id : 54]
+Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_cumulative#62, store_cumulative#63]
+Condition : ((isnotnull(web_cumulative#62) AND isnotnull(store_cumulative#63)) AND (web_cumulative#62 > store_cumulative#63))
+
+(67) TakeOrderedAndProject
+Input [6]: [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_cumulative#62, store_cumulative#63]
+Arguments: 100, [item_sk#47 ASC NULLS FIRST, d_date#48 ASC NULLS FIRST], [item_sk#47, d_date#48, web_sales#49, store_sales#50, web_cumulative#62, store_cumulative#63]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (82)
-+- * ColumnarToRow (81)
-   +- CometProject (80)
-      +- CometFilter (79)
-         +- CometScan parquet spark_catalog.default.date_dim (78)
+BroadcastExchange (72)
++- * ColumnarToRow (71)
+   +- CometProject (70)
+      +- CometFilter (69)
+         +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_date_sk#5, d_date#6, d_month_seq#60]
+Output [3]: [d_date_sk#5, d_date#6, d_month_seq#64]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_month_seq:int>
 
-(79) CometFilter
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#60]
-Condition : (((isnotnull(d_month_seq#60) AND (d_month_seq#60 >= 1212)) AND (d_month_seq#60 <= 1223)) AND isnotnull(d_date_sk#5))
+(69) CometFilter
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#64]
+Condition : (((isnotnull(d_month_seq#64) AND (d_month_seq#64 >= 1212)) AND (d_month_seq#64 <= 1223)) AND isnotnull(d_date_sk#5))
 
-(80) CometProject
-Input [3]: [d_date_sk#5, d_date#6, d_month_seq#60]
+(70) CometProject
+Input [3]: [d_date_sk#5, d_date#6, d_month_seq#64]
 Arguments: [d_date_sk#5, d_date#6], [d_date_sk#5, d_date#6]
 
-(81) ColumnarToRow [codegen id : 1]
+(71) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#5, d_date#6]
 
-(82) BroadcastExchange
+(72) BroadcastExchange
 Input [2]: [d_date_sk#5, d_date#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
-Subquery:2 Hosting operator id = 30 Hosting Expression = ss_sold_date_sk#24 IN dynamicpruning#4
+Subquery:2 Hosting operator id = 26 Hosting Expression = ss_sold_date_sk#26 IN dynamicpruning#4
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt
index ec52058fb9..3109290dc7 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q51a/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store_cumulative]
-  WholeStageCodegen (36)
+  WholeStageCodegen (54)
     Filter [web_cumulative,store_cumulative]
       HashAggregate [item_sk,d_date,web_sales,store_sales,max,max] [max(web_sales),max(store_sales),web_cumulative,store_cumulative,max,max]
         HashAggregate [item_sk,d_date,web_sales,store_sales,web_sales,store_sales] [max,max,max,max]
@@ -7,113 +7,118 @@ TakeOrderedAndProject [item_sk,d_date,web_sales,store_sales,web_cumulative,store
             BroadcastHashJoin [item_sk,item_sk,rk,rk]
               InputAdapter
                 Window [item_sk,d_date]
-                  WholeStageCodegen (17)
-                    ColumnarToRow
+                  WholeStageCodegen (26)
+                    Sort [item_sk,d_date]
                       InputAdapter
-                        CometSort [item_sk,d_date]
-                          CometColumnarExchange [item_sk] #1
-                            CometProject [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales] [item_sk,d_date,web_sales,store_sales]
-                              CometFilter [item_sk,item_sk]
-                                CometSortMergeJoin [item_sk,d_date,item_sk,d_date]
-                                  CometSort [item_sk,d_date]
-                                    CometColumnarExchange [item_sk,d_date] #2
-                                      CometHashAggregate [item_sk,d_date,sumws,sum,isEmpty]
-                                        CometColumnarExchange [item_sk,d_date,sumws] #3
-                                          RowToColumnar
-                                            WholeStageCodegen (8)
-                                              HashAggregate [item_sk,d_date,sumws,sumws] [sum,isEmpty,sum,isEmpty]
-                                                Project [item_sk,d_date,sumws,sumws]
-                                                  BroadcastHashJoin [item_sk,item_sk,rk,rk]
-                                                    Project [item_sk,d_date,sumws,rk]
-                                                      InputAdapter
-                                                        Window [ws_item_sk,d_date]
-                                                          WholeStageCodegen (3)
-                                                            ColumnarToRow
+                        Exchange [item_sk] #1
+                          WholeStageCodegen (25)
+                            Project [item_sk,item_sk,d_date,d_date,cume_sales,cume_sales]
+                              Filter [item_sk,item_sk]
+                                SortMergeJoin [item_sk,d_date,item_sk,d_date]
+                                  InputAdapter
+                                    WholeStageCodegen (12)
+                                      Sort [item_sk,d_date]
+                                        InputAdapter
+                                          Exchange [item_sk,d_date] #2
+                                            WholeStageCodegen (11)
+                                              HashAggregate [item_sk,d_date,sumws,sum,isEmpty] [sum(sumws),cume_sales,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [item_sk,d_date,sumws] #3
+                                                    WholeStageCodegen (10)
+                                                      HashAggregate [item_sk,d_date,sumws,sumws] [sum,isEmpty,sum,isEmpty]
+                                                        Project [item_sk,d_date,sumws,sumws]
+                                                          BroadcastHashJoin [item_sk,item_sk,rk,rk]
+                                                            Project [item_sk,d_date,sumws,rk]
                                                               InputAdapter
-                                                                CometSort [ws_item_sk,d_date]
-                                                                  CometColumnarExchange [ws_item_sk] #4
-                                                                    CometHashAggregate [ws_item_sk,d_date,sum]
-                                                                      CometColumnarExchange [ws_item_sk,d_date] #5
-                                                                        RowToColumnar
-                                                                          WholeStageCodegen (2)
-                                                                            HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
-                                                                              Project [ws_item_sk,ws_sales_price,d_date]
-                                                                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                                                  ColumnarToRow
-                                                                                    InputAdapter
-                                                                                      CometFilter [ws_item_sk]
-                                                                                        CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
-                                                                                          SubqueryBroadcast [d_date_sk] #1
-                                                                                            BroadcastExchange #6
-                                                                                              WholeStageCodegen (1)
-                                                                                                ColumnarToRow
-                                                                                                  InputAdapter
-                                                                                                    CometProject [d_date_sk,d_date]
-                                                                                                      CometFilter [d_month_seq,d_date_sk]
-                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
-                                                                                  InputAdapter
-                                                                                    ReusedExchange [d_date_sk,d_date] #6
-                                                    InputAdapter
-                                                      BroadcastExchange #7
-                                                        WholeStageCodegen (7)
-                                                          Project [item_sk,sumws,rk]
+                                                                Window [ws_item_sk,d_date]
+                                                                  WholeStageCodegen (4)
+                                                                    Sort [ws_item_sk,d_date]
+                                                                      InputAdapter
+                                                                        Exchange [ws_item_sk] #4
+                                                                          WholeStageCodegen (3)
+                                                                            HashAggregate [ws_item_sk,d_date,sum] [sum(UnscaledValue(ws_sales_price)),item_sk,sumws,sum]
+                                                                              InputAdapter
+                                                                                Exchange [ws_item_sk,d_date] #5
+                                                                                  WholeStageCodegen (2)
+                                                                                    HashAggregate [ws_item_sk,d_date,ws_sales_price] [sum,sum]
+                                                                                      Project [ws_item_sk,ws_sales_price,d_date]
+                                                                                        BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometFilter [ws_item_sk]
+                                                                                                CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_sales_price,ws_sold_date_sk]
+                                                                                                  SubqueryBroadcast [d_date_sk] #1
+                                                                                                    BroadcastExchange #6
+                                                                                                      WholeStageCodegen (1)
+                                                                                                        ColumnarToRow
+                                                                                                          InputAdapter
+                                                                                                            CometProject [d_date_sk,d_date]
+                                                                                                              CometFilter [d_month_seq,d_date_sk]
+                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_month_seq]
+                                                                                          InputAdapter
+                                                                                            ReusedExchange [d_date_sk,d_date] #6
                                                             InputAdapter
-                                                              Window [ws_item_sk,d_date]
-                                                                WholeStageCodegen (6)
-                                                                  ColumnarToRow
+                                                              BroadcastExchange #7
+                                                                WholeStageCodegen (9)
+                                                                  Project [item_sk,sumws,rk]
                                                                     InputAdapter
-                                                                      CometSort [ws_item_sk,d_date]
-                                                                        ReusedExchange [item_sk,d_date,sumws,ws_item_sk] #4
-                                  CometSort [item_sk,d_date]
-                                    CometColumnarExchange [item_sk,d_date] #8
-                                      CometHashAggregate [item_sk,d_date,sumss,sum,isEmpty]
-                                        CometColumnarExchange [item_sk,d_date,sumss] #9
-                                          RowToColumnar
-                                            WholeStageCodegen (16)
-                                              HashAggregate [item_sk,d_date,sumss,sumss] [sum,isEmpty,sum,isEmpty]
-                                                Project [item_sk,d_date,sumss,sumss]
-                                                  BroadcastHashJoin [item_sk,item_sk,rk,rk]
-                                                    Project [item_sk,d_date,sumss,rk]
-                                                      InputAdapter
-                                                        Window [ss_item_sk,d_date]
-                                                          WholeStageCodegen (11)
-                                                            ColumnarToRow
+                                                                      Window [ws_item_sk,d_date]
+                                                                        WholeStageCodegen (8)
+                                                                          Sort [ws_item_sk,d_date]
+                                                                            InputAdapter
+                                                                              ReusedExchange [item_sk,d_date,sumws,ws_item_sk] #4
+                                  InputAdapter
+                                    WholeStageCodegen (24)
+                                      Sort [item_sk,d_date]
+                                        InputAdapter
+                                          Exchange [item_sk,d_date] #8
+                                            WholeStageCodegen (23)
+                                              HashAggregate [item_sk,d_date,sumss,sum,isEmpty] [sum(sumss),cume_sales,sum,isEmpty]
+                                                InputAdapter
+                                                  Exchange [item_sk,d_date,sumss] #9
+                                                    WholeStageCodegen (22)
+                                                      HashAggregate [item_sk,d_date,sumss,sumss] [sum,isEmpty,sum,isEmpty]
+                                                        Project [item_sk,d_date,sumss,sumss]
+                                                          BroadcastHashJoin [item_sk,item_sk,rk,rk]
+                                                            Project [item_sk,d_date,sumss,rk]
                                                               InputAdapter
-                                                                CometSort [ss_item_sk,d_date]
-                                                                  CometColumnarExchange [ss_item_sk] #10
-                                                                    CometHashAggregate [ss_item_sk,d_date,sum]
-                                                                      CometColumnarExchange [ss_item_sk,d_date] #11
-                                                                        RowToColumnar
-                                                                          WholeStageCodegen (10)
-                                                                            HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
-                                                                              Project [ss_item_sk,ss_sales_price,d_date]
-                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                  ColumnarToRow
-                                                                                    InputAdapter
-                                                                                      CometFilter [ss_item_sk]
-                                                                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
-                                                                                          ReusedSubquery [d_date_sk] #1
-                                                                                  InputAdapter
-                                                                                    ReusedExchange [d_date_sk,d_date] #6
-                                                    InputAdapter
-                                                      BroadcastExchange #12
-                                                        WholeStageCodegen (15)
-                                                          Project [item_sk,sumss,rk]
+                                                                Window [ss_item_sk,d_date]
+                                                                  WholeStageCodegen (16)
+                                                                    Sort [ss_item_sk,d_date]
+                                                                      InputAdapter
+                                                                        Exchange [ss_item_sk] #10
+                                                                          WholeStageCodegen (15)
+                                                                            HashAggregate [ss_item_sk,d_date,sum] [sum(UnscaledValue(ss_sales_price)),item_sk,sumss,sum]
+                                                                              InputAdapter
+                                                                                Exchange [ss_item_sk,d_date] #11
+                                                                                  WholeStageCodegen (14)
+                                                                                    HashAggregate [ss_item_sk,d_date,ss_sales_price] [sum,sum]
+                                                                                      Project [ss_item_sk,ss_sales_price,d_date]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          ColumnarToRow
+                                                                                            InputAdapter
+                                                                                              CometFilter [ss_item_sk]
+                                                                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_sales_price,ss_sold_date_sk]
+                                                                                                  ReusedSubquery [d_date_sk] #1
+                                                                                          InputAdapter
+                                                                                            ReusedExchange [d_date_sk,d_date] #6
                                                             InputAdapter
-                                                              Window [ss_item_sk,d_date]
-                                                                WholeStageCodegen (14)
-                                                                  ColumnarToRow
+                                                              BroadcastExchange #12
+                                                                WholeStageCodegen (21)
+                                                                  Project [item_sk,sumss,rk]
                                                                     InputAdapter
-                                                                      CometSort [ss_item_sk,d_date]
-                                                                        ReusedExchange [item_sk,d_date,sumss,ss_item_sk] #10
+                                                                      Window [ss_item_sk,d_date]
+                                                                        WholeStageCodegen (20)
+                                                                          Sort [ss_item_sk,d_date]
+                                                                            InputAdapter
+                                                                              ReusedExchange [item_sk,d_date,sumss,ss_item_sk] #10
               InputAdapter
                 BroadcastExchange #13
-                  WholeStageCodegen (35)
+                  WholeStageCodegen (53)
                     Project [item_sk,web_sales,store_sales,rk]
                       InputAdapter
                         Window [item_sk,d_date]
-                          WholeStageCodegen (34)
-                            ColumnarToRow
+                          WholeStageCodegen (52)
+                            Sort [item_sk,d_date]
                               InputAdapter
-                                CometSort [item_sk,d_date]
-                                  ReusedExchange [item_sk,d_date,web_sales,store_sales] #1
+                                ReusedExchange [item_sk,d_date,web_sales,store_sales] #1
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt
index 966f99500b..dff12158b6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/explain.txt
@@ -1,51 +1,49 @@
 == Physical Plan ==
-TakeOrderedAndProject (47)
-+- * Project (46)
-   +- * BroadcastHashJoin Inner BuildRight (45)
-      :- * Project (38)
-      :  +- * BroadcastHashJoin Inner BuildRight (37)
-      :     :- * Project (30)
-      :     :  +- * Filter (29)
-      :     :     +- Window (28)
-      :     :        +- * Filter (27)
-      :     :           +- Window (26)
-      :     :              +- * ColumnarToRow (25)
-      :     :                 +- CometSort (24)
-      :     :                    +- CometColumnarExchange (23)
-      :     :                       +- CometHashAggregate (22)
-      :     :                          +- CometColumnarExchange (21)
-      :     :                             +- RowToColumnar (20)
-      :     :                                +- * HashAggregate (19)
-      :     :                                   +- * Project (18)
-      :     :                                      +- * BroadcastHashJoin Inner BuildRight (17)
-      :     :                                         :- * Project (12)
-      :     :                                         :  +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :                                         :     :- * Project (9)
-      :     :                                         :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :                                         :     :     :- * ColumnarToRow (3)
-      :     :                                         :     :     :  +- CometFilter (2)
-      :     :                                         :     :     :     +- CometScan parquet spark_catalog.default.item (1)
-      :     :                                         :     :     +- BroadcastExchange (7)
-      :     :                                         :     :        +- * ColumnarToRow (6)
-      :     :                                         :     :           +- CometFilter (5)
-      :     :                                         :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
-      :     :                                         :     +- ReusedExchange (10)
-      :     :                                         +- BroadcastExchange (16)
-      :     :                                            +- * ColumnarToRow (15)
-      :     :                                               +- CometFilter (14)
-      :     :                                                  +- CometScan parquet spark_catalog.default.call_center (13)
-      :     +- BroadcastExchange (36)
-      :        +- * Project (35)
-      :           +- Window (34)
-      :              +- * ColumnarToRow (33)
-      :                 +- CometSort (32)
-      :                    +- ReusedExchange (31)
-      +- BroadcastExchange (44)
-         +- * Project (43)
-            +- Window (42)
-               +- * ColumnarToRow (41)
-                  +- CometSort (40)
-                     +- ReusedExchange (39)
+TakeOrderedAndProject (45)
++- * Project (44)
+   +- * BroadcastHashJoin Inner BuildRight (43)
+      :- * Project (37)
+      :  +- * BroadcastHashJoin Inner BuildRight (36)
+      :     :- * Project (28)
+      :     :  +- * Filter (27)
+      :     :     +- Window (26)
+      :     :        +- * Filter (25)
+      :     :           +- Window (24)
+      :     :              +- * Sort (23)
+      :     :                 +- Exchange (22)
+      :     :                    +- * HashAggregate (21)
+      :     :                       +- Exchange (20)
+      :     :                          +- * HashAggregate (19)
+      :     :                             +- * Project (18)
+      :     :                                +- * BroadcastHashJoin Inner BuildRight (17)
+      :     :                                   :- * Project (12)
+      :     :                                   :  +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :                                   :     :- * Project (9)
+      :     :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :                                   :     :     :- * ColumnarToRow (3)
+      :     :                                   :     :     :  +- CometFilter (2)
+      :     :                                   :     :     :     +- CometScan parquet spark_catalog.default.item (1)
+      :     :                                   :     :     +- BroadcastExchange (7)
+      :     :                                   :     :        +- * ColumnarToRow (6)
+      :     :                                   :     :           +- CometFilter (5)
+      :     :                                   :     :              +- CometScan parquet spark_catalog.default.catalog_sales (4)
+      :     :                                   :     +- ReusedExchange (10)
+      :     :                                   +- BroadcastExchange (16)
+      :     :                                      +- * ColumnarToRow (15)
+      :     :                                         +- CometFilter (14)
+      :     :                                            +- CometScan parquet spark_catalog.default.call_center (13)
+      :     +- BroadcastExchange (35)
+      :        +- * Project (34)
+      :           +- Window (33)
+      :              +- * Sort (32)
+      :                 +- Exchange (31)
+      :                    +- * HashAggregate (30)
+      :                       +- ReusedExchange (29)
+      +- BroadcastExchange (42)
+         +- * Project (41)
+            +- Window (40)
+               +- * Sort (39)
+                  +- ReusedExchange (38)
 
 
 (unknown) Scan parquet spark_catalog.default.item
@@ -91,7 +89,7 @@ Join condition: None
 Output [5]: [i_brand#2, i_category#3, cs_call_center_sk#4, cs_sales_price#6, cs_sold_date_sk#7]
 Input [7]: [i_item_sk#1, i_brand#2, i_category#3, cs_call_center_sk#4, cs_item_sk#5, cs_sales_price#6, cs_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 51]
+(10) ReusedExchange [Reuses operator id: 49]
 Output [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
 (11) BroadcastHashJoin [codegen id : 4]
@@ -139,124 +137,125 @@ Functions [1]: [partial_sum(UnscaledValue(cs_sales_price#6))]
 Aggregate Attributes [1]: [sum#14]
 Results [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 
-(20) RowToColumnar
+(20) Exchange
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [6]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum#15]
 Keys [5]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11]
 Functions [1]: [sum(UnscaledValue(cs_sales_price#6))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#6))#16]
+Results [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS sum_sales#17, MakeDecimal(sum(UnscaledValue(cs_sales_price#6))#16,17,2) AS _w0#18]
 
-(23) CometColumnarExchange
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(22) Exchange
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: hashpartitioning(i_category#3, i_brand#2, cc_name#13, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(24) CometSort
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-Arguments: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17], [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(23) Sort [codegen id : 6]
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [i_category#3 ASC NULLS FIRST, i_brand#2 ASC NULLS FIRST, cc_name#13 ASC NULLS FIRST, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST], false, 0
 
-(25) ColumnarToRow [codegen id : 5]
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-
-(26) Window
-Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17]
-Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#18], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
+(24) Window
+Input [7]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18]
+Arguments: [rank(d_year#10, d_moy#11) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#19], [i_category#3, i_brand#2, cc_name#13], [d_year#10 ASC NULLS FIRST, d_moy#11 ASC NULLS FIRST]
 
-(27) Filter [codegen id : 6]
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
+(25) Filter [codegen id : 7]
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
 Condition : (isnotnull(d_year#10) AND (d_year#10 = 1999))
 
-(28) Window
-Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18]
-Arguments: [avg(_w0#17) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#19], [i_category#3, i_brand#2, cc_name#13, d_year#10]
-
-(29) Filter [codegen id : 19]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
-Condition : ((isnotnull(avg_monthly_sales#19) AND (avg_monthly_sales#19 > 0.000000)) AND CASE WHEN (avg_monthly_sales#19 > 0.000000) THEN ((abs((sum_sales#16 - avg_monthly_sales#19)) / avg_monthly_sales#19) > 0.1000000000000000) END)
-
-(30) Project [codegen id : 19]
-Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18]
-Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, _w0#17, rn#18, avg_monthly_sales#19]
-
-(31) ReusedExchange [Reuses operator id: 23]
-Output [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-
-(32) CometSort
-Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-Arguments: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16], [i_category#20 ASC NULLS FIRST, i_brand#21 ASC NULLS FIRST, cc_name#22 ASC NULLS FIRST, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
-
-(33) ColumnarToRow [codegen id : 11]
-Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-
-(34) Window
-Input [6]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16]
-Arguments: [rank(d_year#23, d_moy#24) windowspecdefinition(i_category#20, i_brand#21, cc_name#22, d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#25], [i_category#20, i_brand#21, cc_name#22], [d_year#23 ASC NULLS FIRST, d_moy#24 ASC NULLS FIRST]
-
-(35) Project [codegen id : 12]
-Output [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#16 AS sum_sales#26, rn#25]
-Input [7]: [i_category#20, i_brand#21, cc_name#22, d_year#23, d_moy#24, sum_sales#16, rn#25]
-
-(36) BroadcastExchange
-Input [5]: [i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=5]
-
-(37) BroadcastHashJoin [codegen id : 19]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
-Right keys [4]: [i_category#20, i_brand#21, cc_name#22, (rn#25 + 1)]
+(26) Window
+Input [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19]
+Arguments: [avg(_w0#18) windowspecdefinition(i_category#3, i_brand#2, cc_name#13, d_year#10, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS avg_monthly_sales#20], [i_category#3, i_brand#2, cc_name#13, d_year#10]
+
+(27) Filter [codegen id : 22]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+Condition : ((isnotnull(avg_monthly_sales#20) AND (avg_monthly_sales#20 > 0.000000)) AND CASE WHEN (avg_monthly_sales#20 > 0.000000) THEN ((abs((sum_sales#17 - avg_monthly_sales#20)) / avg_monthly_sales#20) > 0.1000000000000000) END)
+
+(28) Project [codegen id : 22]
+Output [8]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19]
+Input [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, _w0#18, rn#19, avg_monthly_sales#20]
+
+(29) ReusedExchange [Reuses operator id: 20]
+Output [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
+
+(30) HashAggregate [codegen id : 12]
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum#26]
+Keys [5]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25]
+Functions [1]: [sum(UnscaledValue(cs_sales_price#27))]
+Aggregate Attributes [1]: [sum(UnscaledValue(cs_sales_price#27))#16]
+Results [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, MakeDecimal(sum(UnscaledValue(cs_sales_price#27))#16,17,2) AS sum_sales#17]
+
+(31) Exchange
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
+Arguments: hashpartitioning(i_category#21, i_brand#22, cc_name#23, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(32) Sort [codegen id : 13]
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
+Arguments: [i_category#21 ASC NULLS FIRST, i_brand#22 ASC NULLS FIRST, cc_name#23 ASC NULLS FIRST, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST], false, 0
+
+(33) Window
+Input [6]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17]
+Arguments: [rank(d_year#24, d_moy#25) windowspecdefinition(i_category#21, i_brand#22, cc_name#23, d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#28], [i_category#21, i_brand#22, cc_name#23], [d_year#24 ASC NULLS FIRST, d_moy#25 ASC NULLS FIRST]
+
+(34) Project [codegen id : 14]
+Output [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#17 AS sum_sales#29, rn#28]
+Input [7]: [i_category#21, i_brand#22, cc_name#23, d_year#24, d_moy#25, sum_sales#17, rn#28]
+
+(35) BroadcastExchange
+Input [5]: [i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] + 1)),false), [plan_id=6]
+
+(36) BroadcastHashJoin [codegen id : 22]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
+Right keys [4]: [i_category#21, i_brand#22, cc_name#23, (rn#28 + 1)]
 Join type: Inner
 Join condition: None
 
-(38) Project [codegen id : 19]
-Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26]
-Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, i_category#20, i_brand#21, cc_name#22, sum_sales#26, rn#25]
-
-(39) ReusedExchange [Reuses operator id: 23]
-Output [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+(37) Project [codegen id : 22]
+Output [9]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29]
+Input [13]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, i_category#21, i_brand#22, cc_name#23, sum_sales#29, rn#28]
 
-(40) CometSort
-Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
-Arguments: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16], [i_category#27 ASC NULLS FIRST, i_brand#28 ASC NULLS FIRST, cc_name#29 ASC NULLS FIRST, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
+(38) ReusedExchange [Reuses operator id: 31]
+Output [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
 
-(41) ColumnarToRow [codegen id : 17]
-Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
+(39) Sort [codegen id : 20]
+Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [i_category#30 ASC NULLS FIRST, i_brand#31 ASC NULLS FIRST, cc_name#32 ASC NULLS FIRST, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST], false, 0
 
-(42) Window
-Input [6]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16]
-Arguments: [rank(d_year#30, d_moy#31) windowspecdefinition(i_category#27, i_brand#28, cc_name#29, d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#32], [i_category#27, i_brand#28, cc_name#29], [d_year#30 ASC NULLS FIRST, d_moy#31 ASC NULLS FIRST]
+(40) Window
+Input [6]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17]
+Arguments: [rank(d_year#33, d_moy#34) windowspecdefinition(i_category#30, i_brand#31, cc_name#32, d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rn#35], [i_category#30, i_brand#31, cc_name#32], [d_year#33 ASC NULLS FIRST, d_moy#34 ASC NULLS FIRST]
 
-(43) Project [codegen id : 18]
-Output [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#16 AS sum_sales#33, rn#32]
-Input [7]: [i_category#27, i_brand#28, cc_name#29, d_year#30, d_moy#31, sum_sales#16, rn#32]
+(41) Project [codegen id : 21]
+Output [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#17 AS sum_sales#36, rn#35]
+Input [7]: [i_category#30, i_brand#31, cc_name#32, d_year#33, d_moy#34, sum_sales#17, rn#35]
 
-(44) BroadcastExchange
-Input [5]: [i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
-Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=6]
+(42) BroadcastExchange
+Input [5]: [i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
+Arguments: HashedRelationBroadcastMode(List(input[0, string, true], input[1, string, true], input[2, string, true], (input[4, int, false] - 1)),false), [plan_id=7]
 
-(45) BroadcastHashJoin [codegen id : 19]
-Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#18]
-Right keys [4]: [i_category#27, i_brand#28, cc_name#29, (rn#32 - 1)]
+(43) BroadcastHashJoin [codegen id : 22]
+Left keys [4]: [i_category#3, i_brand#2, cc_name#13, rn#19]
+Right keys [4]: [i_category#30, i_brand#31, cc_name#32, (rn#35 - 1)]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 19]
-Output [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, sum_sales#26 AS psum#34, sum_sales#33 AS nsum#35]
-Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#16, avg_monthly_sales#19, rn#18, sum_sales#26, i_category#27, i_brand#28, cc_name#29, sum_sales#33, rn#32]
+(44) Project [codegen id : 22]
+Output [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, sum_sales#29 AS psum#37, sum_sales#36 AS nsum#38]
+Input [14]: [i_category#3, i_brand#2, cc_name#13, d_year#10, d_moy#11, sum_sales#17, avg_monthly_sales#20, rn#19, sum_sales#29, i_category#30, i_brand#31, cc_name#32, sum_sales#36, rn#35]
 
-(47) TakeOrderedAndProject
-Input [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
-Arguments: 100, [(sum_sales#16 - avg_monthly_sales#19) ASC NULLS FIRST, d_year#10 ASC NULLS FIRST], [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#19, sum_sales#16, psum#34, nsum#35]
+(45) TakeOrderedAndProject
+Input [8]: [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
+Arguments: 100, [(sum_sales#17 - avg_monthly_sales#20) ASC NULLS FIRST, d_year#10 ASC NULLS FIRST], [i_category#3, i_brand#2, d_year#10, d_moy#11, avg_monthly_sales#20, sum_sales#17, psum#37, nsum#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = cs_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (51)
-+- * ColumnarToRow (50)
-   +- CometFilter (49)
-      +- CometScan parquet spark_catalog.default.date_dim (48)
+BroadcastExchange (49)
++- * ColumnarToRow (48)
+   +- CometFilter (47)
+      +- CometScan parquet spark_catalog.default.date_dim (46)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -266,15 +265,15 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [Or(Or(EqualTo(d_year,1999),And(EqualTo(d_year,1998),EqualTo(d_moy,12))),And(EqualTo(d_year,2000),EqualTo(d_moy,1))), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int,d_moy:int>
 
-(49) CometFilter
+(47) CometFilter
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 Condition : ((((d_year#10 = 1999) OR ((d_year#10 = 1998) AND (d_moy#11 = 12))) OR ((d_year#10 = 2000) AND (d_moy#11 = 1))) AND isnotnull(d_date_sk#9))
 
-(50) ColumnarToRow [codegen id : 1]
+(48) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
 
-(51) BroadcastExchange
+(49) BroadcastExchange
 Input [3]: [d_date_sk#9, d_year#10, d_moy#11]
-Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
+Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt
index 174e9c66ae..56e33be9e4 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q57/simplified.txt
@@ -1,5 +1,5 @@
 TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_year,i_category,i_brand,d_moy,psum,nsum]
-  WholeStageCodegen (19)
+  WholeStageCodegen (22)
     Project [i_category,i_brand,d_year,d_moy,avg_monthly_sales,sum_sales,sum_sales,sum_sales]
       BroadcastHashJoin [i_category,i_brand,cc_name,rn,i_category,i_brand,cc_name,rn]
         Project [i_category,i_brand,cc_name,d_year,d_moy,sum_sales,avg_monthly_sales,rn,sum_sales]
@@ -8,18 +8,18 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_year,i_category,i_brand,d_m
               Filter [avg_monthly_sales,sum_sales]
                 InputAdapter
                   Window [_w0,i_category,i_brand,cc_name,d_year]
-                    WholeStageCodegen (6)
+                    WholeStageCodegen (7)
                       Filter [d_year]
                         InputAdapter
                           Window [d_year,d_moy,i_category,i_brand,cc_name]
-                            WholeStageCodegen (5)
-                              ColumnarToRow
+                            WholeStageCodegen (6)
+                              Sort [i_category,i_brand,cc_name,d_year,d_moy]
                                 InputAdapter
-                                  CometSort [i_category,i_brand,cc_name,d_year,d_moy]
-                                    CometColumnarExchange [i_category,i_brand,cc_name] #1
-                                      CometHashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum]
-                                        CometColumnarExchange [i_category,i_brand,cc_name,d_year,d_moy] #2
-                                          RowToColumnar
+                                  Exchange [i_category,i_brand,cc_name] #1
+                                    WholeStageCodegen (5)
+                                      HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,_w0,sum]
+                                        InputAdapter
+                                          Exchange [i_category,i_brand,cc_name,d_year,d_moy] #2
                                             WholeStageCodegen (4)
                                               HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,cs_sales_price] [sum,sum]
                                                 Project [i_brand,i_category,cs_sales_price,d_year,d_moy,cc_name]
@@ -57,23 +57,25 @@ TakeOrderedAndProject [sum_sales,avg_monthly_sales,d_year,i_category,i_brand,d_m
                                                                 CometScan parquet spark_catalog.default.call_center [cc_call_center_sk,cc_name]
             InputAdapter
               BroadcastExchange #6
-                WholeStageCodegen (12)
+                WholeStageCodegen (14)
                   Project [i_category,i_brand,cc_name,sum_sales,rn]
                     InputAdapter
                       Window [d_year,d_moy,i_category,i_brand,cc_name]
-                        WholeStageCodegen (11)
-                          ColumnarToRow
+                        WholeStageCodegen (13)
+                          Sort [i_category,i_brand,cc_name,d_year,d_moy]
                             InputAdapter
-                              CometSort [i_category,i_brand,cc_name,d_year,d_moy]
-                                ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
+                              Exchange [i_category,i_brand,cc_name] #7
+                                WholeStageCodegen (12)
+                                  HashAggregate [i_category,i_brand,cc_name,d_year,d_moy,sum] [sum(UnscaledValue(cs_sales_price)),sum_sales,sum]
+                                    InputAdapter
+                                      ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum] #2
         InputAdapter
-          BroadcastExchange #7
-            WholeStageCodegen (18)
+          BroadcastExchange #8
+            WholeStageCodegen (21)
               Project [i_category,i_brand,cc_name,sum_sales,rn]
                 InputAdapter
                   Window [d_year,d_moy,i_category,i_brand,cc_name]
-                    WholeStageCodegen (17)
-                      ColumnarToRow
+                    WholeStageCodegen (20)
+                      Sort [i_category,i_brand,cc_name,d_year,d_moy]
                         InputAdapter
-                          CometSort [i_category,i_brand,cc_name,d_year,d_moy]
-                            ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #1
+                          ReusedExchange [i_category,i_brand,cc_name,d_year,d_moy,sum_sales] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
index e38c90c38e..0cae422d0a 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/explain.txt
@@ -1,97 +1,89 @@
 == Physical Plan ==
-* ColumnarToRow (93)
-+- CometTakeOrderedAndProject (92)
-   +- CometHashAggregate (91)
-      +- CometColumnarExchange (90)
-         +- CometHashAggregate (89)
-            +- CometUnion (88)
-               :- CometHashAggregate (77)
-               :  +- CometColumnarExchange (76)
-               :     +- RowToColumnar (75)
-               :        +- * HashAggregate (74)
-               :           +- Union (73)
-               :              :- * HashAggregate (22)
-               :              :  +- * ColumnarToRow (21)
-               :              :     +- CometColumnarExchange (20)
-               :              :        +- RowToColumnar (19)
-               :              :           +- * HashAggregate (18)
-               :              :              +- * Project (17)
-               :              :                 +- * BroadcastHashJoin Inner BuildRight (16)
-               :              :                    :- * Project (11)
-               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (10)
-               :              :                    :     :- * ColumnarToRow (8)
-               :              :                    :     :  +- CometUnion (7)
-               :              :                    :     :     :- CometProject (3)
-               :              :                    :     :     :  +- CometFilter (2)
-               :              :                    :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :              :                    :     :     +- CometProject (6)
-               :              :                    :     :        +- CometFilter (5)
-               :              :                    :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
-               :              :                    :     +- ReusedExchange (9)
-               :              :                    +- BroadcastExchange (15)
-               :              :                       +- * ColumnarToRow (14)
-               :              :                          +- CometFilter (13)
-               :              :                             +- CometScan parquet spark_catalog.default.store (12)
-               :              :- * HashAggregate (44)
-               :              :  +- * ColumnarToRow (43)
-               :              :     +- CometColumnarExchange (42)
-               :              :        +- RowToColumnar (41)
-               :              :           +- * HashAggregate (40)
-               :              :              +- * Project (39)
-               :              :                 +- * BroadcastHashJoin Inner BuildRight (38)
-               :              :                    :- * Project (33)
-               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (32)
-               :              :                    :     :- * ColumnarToRow (30)
-               :              :                    :     :  +- CometUnion (29)
-               :              :                    :     :     :- CometProject (25)
-               :              :                    :     :     :  +- CometFilter (24)
-               :              :                    :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (23)
-               :              :                    :     :     +- CometProject (28)
-               :              :                    :     :        +- CometFilter (27)
-               :              :                    :     :           +- CometScan parquet spark_catalog.default.catalog_returns (26)
-               :              :                    :     +- ReusedExchange (31)
-               :              :                    +- BroadcastExchange (37)
-               :              :                       +- * ColumnarToRow (36)
-               :              :                          +- CometFilter (35)
-               :              :                             +- CometScan parquet spark_catalog.default.catalog_page (34)
-               :              +- * HashAggregate (72)
-               :                 +- * ColumnarToRow (71)
-               :                    +- CometColumnarExchange (70)
-               :                       +- RowToColumnar (69)
-               :                          +- * HashAggregate (68)
-               :                             +- * Project (67)
-               :                                +- * BroadcastHashJoin Inner BuildRight (66)
-               :                                   :- * Project (61)
-               :                                   :  +- * BroadcastHashJoin Inner BuildRight (60)
-               :                                   :     :- Union (58)
-               :                                   :     :  :- * ColumnarToRow (48)
-               :                                   :     :  :  +- CometProject (47)
-               :                                   :     :  :     +- CometFilter (46)
-               :                                   :     :  :        +- CometScan parquet spark_catalog.default.web_sales (45)
-               :                                   :     :  +- * Project (57)
-               :                                   :     :     +- * BroadcastHashJoin Inner BuildLeft (56)
-               :                                   :     :        :- BroadcastExchange (51)
-               :                                   :     :        :  +- * ColumnarToRow (50)
-               :                                   :     :        :     +- CometScan parquet spark_catalog.default.web_returns (49)
-               :                                   :     :        +- * ColumnarToRow (55)
-               :                                   :     :           +- CometProject (54)
-               :                                   :     :              +- CometFilter (53)
-               :                                   :     :                 +- CometScan parquet spark_catalog.default.web_sales (52)
-               :                                   :     +- ReusedExchange (59)
-               :                                   +- BroadcastExchange (65)
-               :                                      +- * ColumnarToRow (64)
-               :                                         +- CometFilter (63)
-               :                                            +- CometScan parquet spark_catalog.default.web_site (62)
-               :- CometHashAggregate (82)
-               :  +- CometColumnarExchange (81)
-               :     +- CometHashAggregate (80)
-               :        +- CometHashAggregate (79)
-               :           +- ReusedExchange (78)
-               +- CometHashAggregate (87)
-                  +- CometColumnarExchange (86)
-                     +- CometHashAggregate (85)
-                        +- CometHashAggregate (84)
-                           +- ReusedExchange (83)
+TakeOrderedAndProject (85)
++- * HashAggregate (84)
+   +- Exchange (83)
+      +- * HashAggregate (82)
+         +- Union (81)
+            :- * HashAggregate (70)
+            :  +- Exchange (69)
+            :     +- * HashAggregate (68)
+            :        +- Union (67)
+            :           :- * HashAggregate (20)
+            :           :  +- Exchange (19)
+            :           :     +- * HashAggregate (18)
+            :           :        +- * Project (17)
+            :           :           +- * BroadcastHashJoin Inner BuildRight (16)
+            :           :              :- * Project (11)
+            :           :              :  +- * BroadcastHashJoin Inner BuildRight (10)
+            :           :              :     :- * ColumnarToRow (8)
+            :           :              :     :  +- CometUnion (7)
+            :           :              :     :     :- CometProject (3)
+            :           :              :     :     :  +- CometFilter (2)
+            :           :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :           :              :     :     +- CometProject (6)
+            :           :              :     :        +- CometFilter (5)
+            :           :              :     :           +- CometScan parquet spark_catalog.default.store_returns (4)
+            :           :              :     +- ReusedExchange (9)
+            :           :              +- BroadcastExchange (15)
+            :           :                 +- * ColumnarToRow (14)
+            :           :                    +- CometFilter (13)
+            :           :                       +- CometScan parquet spark_catalog.default.store (12)
+            :           :- * HashAggregate (40)
+            :           :  +- Exchange (39)
+            :           :     +- * HashAggregate (38)
+            :           :        +- * Project (37)
+            :           :           +- * BroadcastHashJoin Inner BuildRight (36)
+            :           :              :- * Project (31)
+            :           :              :  +- * BroadcastHashJoin Inner BuildRight (30)
+            :           :              :     :- * ColumnarToRow (28)
+            :           :              :     :  +- CometUnion (27)
+            :           :              :     :     :- CometProject (23)
+            :           :              :     :     :  +- CometFilter (22)
+            :           :              :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (21)
+            :           :              :     :     +- CometProject (26)
+            :           :              :     :        +- CometFilter (25)
+            :           :              :     :           +- CometScan parquet spark_catalog.default.catalog_returns (24)
+            :           :              :     +- ReusedExchange (29)
+            :           :              +- BroadcastExchange (35)
+            :           :                 +- * ColumnarToRow (34)
+            :           :                    +- CometFilter (33)
+            :           :                       +- CometScan parquet spark_catalog.default.catalog_page (32)
+            :           +- * HashAggregate (66)
+            :              +- Exchange (65)
+            :                 +- * HashAggregate (64)
+            :                    +- * Project (63)
+            :                       +- * BroadcastHashJoin Inner BuildRight (62)
+            :                          :- * Project (57)
+            :                          :  +- * BroadcastHashJoin Inner BuildRight (56)
+            :                          :     :- Union (54)
+            :                          :     :  :- * ColumnarToRow (44)
+            :                          :     :  :  +- CometProject (43)
+            :                          :     :  :     +- CometFilter (42)
+            :                          :     :  :        +- CometScan parquet spark_catalog.default.web_sales (41)
+            :                          :     :  +- * Project (53)
+            :                          :     :     +- * BroadcastHashJoin Inner BuildLeft (52)
+            :                          :     :        :- BroadcastExchange (47)
+            :                          :     :        :  +- * ColumnarToRow (46)
+            :                          :     :        :     +- CometScan parquet spark_catalog.default.web_returns (45)
+            :                          :     :        +- * ColumnarToRow (51)
+            :                          :     :           +- CometProject (50)
+            :                          :     :              +- CometFilter (49)
+            :                          :     :                 +- CometScan parquet spark_catalog.default.web_sales (48)
+            :                          :     +- ReusedExchange (55)
+            :                          +- BroadcastExchange (61)
+            :                             +- * ColumnarToRow (60)
+            :                                +- CometFilter (59)
+            :                                   +- CometScan parquet spark_catalog.default.web_site (58)
+            :- * HashAggregate (75)
+            :  +- Exchange (74)
+            :     +- * HashAggregate (73)
+            :        +- * HashAggregate (72)
+            :           +- ReusedExchange (71)
+            +- * HashAggregate (80)
+               +- Exchange (79)
+                  +- * HashAggregate (78)
+                     +- * HashAggregate (77)
+                        +- ReusedExchange (76)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -133,7 +125,7 @@ Child 1 Input [6]: [store_sk#16, date_sk#17, sales_price#18, profit#19, return_a
 (8) ColumnarToRow [codegen id : 3]
 Input [6]: [store_sk#6, date_sk#7, sales_price#8, profit#9, return_amt#10, net_loss#11]
 
-(9) ReusedExchange [Reuses operator id: 98]
+(9) ReusedExchange [Reuses operator id: 90]
 Output [1]: [d_date_sk#22]
 
 (10) BroadcastHashJoin [codegen id : 3]
@@ -181,17 +173,11 @@ Functions [4]: [partial_sum(UnscaledValue(sales_price#8)), partial_sum(UnscaledV
 Aggregate Attributes [4]: [sum#25, sum#26, sum#27, sum#28]
 Results [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 
-(19) RowToColumnar
+(19) Exchange
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
+Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(20) CometColumnarExchange
-Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
-Arguments: hashpartitioning(s_store_id#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(21) ColumnarToRow [codegen id : 4]
-Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
-
-(22) HashAggregate [codegen id : 4]
+(20) HashAggregate [codegen id : 4]
 Input [5]: [s_store_id#24, sum#29, sum#30, sum#31, sum#32]
 Keys [1]: [s_store_id#24]
 Functions [4]: [sum(UnscaledValue(sales_price#8)), sum(UnscaledValue(return_amt#10)), sum(UnscaledValue(profit#9)), sum(UnscaledValue(net_loss#11))]
@@ -206,11 +192,11 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(24) CometFilter
+(22) CometFilter
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : isnotnull(cs_catalog_page_sk#42)
 
-(25) CometProject
+(23) CometProject
 Input [4]: [cs_catalog_page_sk#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52], [cs_catalog_page_sk#42 AS page_sk#47, cs_sold_date_sk#45 AS date_sk#48, cs_ext_sales_price#43 AS sales_price#49, cs_net_profit#44 AS profit#50, 0.00 AS return_amt#51, 0.00 AS net_loss#52]
 
@@ -222,31 +208,31 @@ PartitionFilters: [isnotnull(cr_returned_date_sk#56), dynamicpruningexpression(c
 PushedFilters: [IsNotNull(cr_catalog_page_sk)]
 ReadSchema: struct<cr_catalog_page_sk:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(27) CometFilter
+(25) CometFilter
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Condition : isnotnull(cr_catalog_page_sk#53)
 
-(28) CometProject
+(26) CometProject
 Input [4]: [cr_catalog_page_sk#53, cr_return_amount#54, cr_net_loss#55, cr_returned_date_sk#56]
 Arguments: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62], [cr_catalog_page_sk#53 AS page_sk#57, cr_returned_date_sk#56 AS date_sk#58, 0.00 AS sales_price#59, 0.00 AS profit#60, cr_return_amount#54 AS return_amt#61, cr_net_loss#55 AS net_loss#62]
 
-(29) CometUnion
+(27) CometUnion
 Child 0 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Child 1 Input [6]: [page_sk#57, date_sk#58, sales_price#59, profit#60, return_amt#61, net_loss#62]
 
-(30) ColumnarToRow [codegen id : 7]
+(28) ColumnarToRow [codegen id : 7]
 Input [6]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52]
 
-(31) ReusedExchange [Reuses operator id: 98]
+(29) ReusedExchange [Reuses operator id: 90]
 Output [1]: [d_date_sk#63]
 
-(32) BroadcastHashJoin [codegen id : 7]
+(30) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [date_sk#48]
 Right keys [1]: [d_date_sk#63]
 Join type: Inner
 Join condition: None
 
-(33) Project [codegen id : 7]
+(31) Project [codegen id : 7]
 Output [5]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52]
 Input [7]: [page_sk#47, date_sk#48, sales_price#49, profit#50, return_amt#51, net_loss#52, d_date_sk#63]
 
@@ -257,45 +243,39 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(35) CometFilter
+(33) CometFilter
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Condition : isnotnull(cp_catalog_page_sk#64)
 
-(36) ColumnarToRow [codegen id : 6]
+(34) ColumnarToRow [codegen id : 6]
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(37) BroadcastExchange
+(35) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#64, cp_catalog_page_id#65]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(38) BroadcastHashJoin [codegen id : 7]
+(36) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [page_sk#47]
 Right keys [1]: [cp_catalog_page_sk#64]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 7]
+(37) Project [codegen id : 7]
 Output [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Input [7]: [page_sk#47, sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_sk#64, cp_catalog_page_id#65]
 
-(40) HashAggregate [codegen id : 7]
+(38) HashAggregate [codegen id : 7]
 Input [5]: [sales_price#49, profit#50, return_amt#51, net_loss#52, cp_catalog_page_id#65]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#49)), partial_sum(UnscaledValue(return_amt#51)), partial_sum(UnscaledValue(profit#50)), partial_sum(UnscaledValue(net_loss#52))]
 Aggregate Attributes [4]: [sum#66, sum#67, sum#68, sum#69]
 Results [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 
-(41) RowToColumnar
-Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
-
-(42) CometColumnarExchange
-Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
-Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(43) ColumnarToRow [codegen id : 8]
+(39) Exchange
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
+Arguments: hashpartitioning(cp_catalog_page_id#65, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(44) HashAggregate [codegen id : 8]
+(40) HashAggregate [codegen id : 8]
 Input [5]: [cp_catalog_page_id#65, sum#70, sum#71, sum#72, sum#73]
 Keys [1]: [cp_catalog_page_id#65]
 Functions [4]: [sum(UnscaledValue(sales_price#49)), sum(UnscaledValue(return_amt#51)), sum(UnscaledValue(profit#50)), sum(UnscaledValue(net_loss#52))]
@@ -310,15 +290,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#86), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_web_site_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(46) CometFilter
+(42) CometFilter
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Condition : isnotnull(ws_web_site_sk#83)
 
-(47) CometProject
+(43) CometProject
 Input [4]: [ws_web_site_sk#83, ws_ext_sales_price#84, ws_net_profit#85, ws_sold_date_sk#86]
 Arguments: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93], [ws_web_site_sk#83 AS wsr_web_site_sk#88, ws_sold_date_sk#86 AS date_sk#89, ws_ext_sales_price#84 AS sales_price#90, ws_net_profit#85 AS profit#91, 0.00 AS return_amt#92, 0.00 AS net_loss#93]
 
-(48) ColumnarToRow [codegen id : 9]
+(44) ColumnarToRow [codegen id : 9]
 Input [6]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
@@ -328,10 +308,10 @@ Location: InMemoryFileIndex []
 PartitionFilters: [isnotnull(wr_returned_date_sk#98), dynamicpruningexpression(wr_returned_date_sk#98 IN dynamicpruning#87)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(50) ColumnarToRow [codegen id : 10]
+(46) ColumnarToRow [codegen id : 10]
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 
-(51) BroadcastExchange
+(47) BroadcastExchange
 Input [5]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, true] as bigint), 32) | (cast(input[1, int, true] as bigint) & 4294967295))),false), [plan_id=5]
 
@@ -342,39 +322,39 @@ Location [not included in comparison]/{warehouse_dir}/web_sales]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_order_number), IsNotNull(ws_web_site_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_order_number:int>
 
-(53) CometFilter
+(49) CometFilter
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Condition : ((isnotnull(ws_item_sk#99) AND isnotnull(ws_order_number#101)) AND isnotnull(ws_web_site_sk#100))
 
-(54) CometProject
+(50) CometProject
 Input [4]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101, ws_sold_date_sk#102]
 Arguments: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101], [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(55) ColumnarToRow
+(51) ColumnarToRow
 Input [3]: [ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(56) BroadcastHashJoin [codegen id : 11]
+(52) BroadcastHashJoin [codegen id : 11]
 Left keys [2]: [wr_item_sk#94, wr_order_number#95]
 Right keys [2]: [ws_item_sk#99, ws_order_number#101]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 11]
+(53) Project [codegen id : 11]
 Output [6]: [ws_web_site_sk#100 AS wsr_web_site_sk#103, wr_returned_date_sk#98 AS date_sk#104, 0.00 AS sales_price#105, 0.00 AS profit#106, wr_return_amt#96 AS return_amt#107, wr_net_loss#97 AS net_loss#108]
 Input [8]: [wr_item_sk#94, wr_order_number#95, wr_return_amt#96, wr_net_loss#97, wr_returned_date_sk#98, ws_item_sk#99, ws_web_site_sk#100, ws_order_number#101]
 
-(58) Union
+(54) Union
 
-(59) ReusedExchange [Reuses operator id: 98]
+(55) ReusedExchange [Reuses operator id: 90]
 Output [1]: [d_date_sk#109]
 
-(60) BroadcastHashJoin [codegen id : 14]
+(56) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [date_sk#89]
 Right keys [1]: [d_date_sk#109]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 14]
+(57) Project [codegen id : 14]
 Output [5]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93]
 Input [7]: [wsr_web_site_sk#88, date_sk#89, sales_price#90, profit#91, return_amt#92, net_loss#93, d_date_sk#109]
 
@@ -385,182 +365,185 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(63) CometFilter
+(59) CometFilter
 Input [2]: [web_site_sk#110, web_site_id#111]
 Condition : isnotnull(web_site_sk#110)
 
-(64) ColumnarToRow [codegen id : 13]
+(60) ColumnarToRow [codegen id : 13]
 Input [2]: [web_site_sk#110, web_site_id#111]
 
-(65) BroadcastExchange
+(61) BroadcastExchange
 Input [2]: [web_site_sk#110, web_site_id#111]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(66) BroadcastHashJoin [codegen id : 14]
+(62) BroadcastHashJoin [codegen id : 14]
 Left keys [1]: [wsr_web_site_sk#88]
 Right keys [1]: [web_site_sk#110]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 14]
+(63) Project [codegen id : 14]
 Output [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Input [7]: [wsr_web_site_sk#88, sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_sk#110, web_site_id#111]
 
-(68) HashAggregate [codegen id : 14]
+(64) HashAggregate [codegen id : 14]
 Input [5]: [sales_price#90, profit#91, return_amt#92, net_loss#93, web_site_id#111]
 Keys [1]: [web_site_id#111]
 Functions [4]: [partial_sum(UnscaledValue(sales_price#90)), partial_sum(UnscaledValue(return_amt#92)), partial_sum(UnscaledValue(profit#91)), partial_sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum#112, sum#113, sum#114, sum#115]
 Results [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 
-(69) RowToColumnar
+(65) Exchange
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
+Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(70) CometColumnarExchange
-Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
-Arguments: hashpartitioning(web_site_id#111, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(71) ColumnarToRow [codegen id : 15]
-Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
-
-(72) HashAggregate [codegen id : 15]
+(66) HashAggregate [codegen id : 15]
 Input [5]: [web_site_id#111, sum#116, sum#117, sum#118, sum#119]
 Keys [1]: [web_site_id#111]
 Functions [4]: [sum(UnscaledValue(sales_price#90)), sum(UnscaledValue(return_amt#92)), sum(UnscaledValue(profit#91)), sum(UnscaledValue(net_loss#93))]
 Aggregate Attributes [4]: [sum(UnscaledValue(sales_price#90))#120, sum(UnscaledValue(return_amt#92))#121, sum(UnscaledValue(profit#91))#122, sum(UnscaledValue(net_loss#93))#123]
 Results [5]: [web channel AS channel#124, concat(web_site, web_site_id#111) AS id#125, MakeDecimal(sum(UnscaledValue(sales_price#90))#120,17,2) AS sales#126, MakeDecimal(sum(UnscaledValue(return_amt#92))#121,17,2) AS returns#127, (MakeDecimal(sum(UnscaledValue(profit#91))#122,17,2) - MakeDecimal(sum(UnscaledValue(net_loss#93))#123,17,2)) AS profit#128]
 
-(73) Union
+(67) Union
 
-(74) HashAggregate [codegen id : 16]
+(68) HashAggregate [codegen id : 16]
 Input [5]: [channel#37, id#38, sales#39, returns#40, profit#41]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [partial_sum(sales#39), partial_sum(returns#40), partial_sum(profit#41)]
 Aggregate Attributes [6]: [sum#129, isEmpty#130, sum#131, isEmpty#132, sum#133, isEmpty#134]
 Results [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 
-(75) RowToColumnar
+(69) Exchange
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
+Arguments: hashpartitioning(channel#37, id#38, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(76) CometColumnarExchange
-Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
-Arguments: hashpartitioning(channel#37, id#38, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
-
-(77) CometHashAggregate
+(70) HashAggregate [codegen id : 17]
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [sum(sales#39), sum(returns#40), sum(profit#41)]
+Aggregate Attributes [3]: [sum(sales#39)#141, sum(returns#40)#142, sum(profit#41)#143]
+Results [5]: [channel#37, id#38, cast(sum(sales#39)#141 as decimal(37,2)) AS sales#144, cast(sum(returns#40)#142 as decimal(37,2)) AS returns#145, cast(sum(profit#41)#143 as decimal(38,2)) AS profit#146]
 
-(78) ReusedExchange [Reuses operator id: 76]
+(71) ReusedExchange [Reuses operator id: 69]
 Output [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 
-(79) CometHashAggregate
+(72) HashAggregate [codegen id : 34]
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [sum(sales#39), sum(returns#40), sum(profit#41)]
+Aggregate Attributes [3]: [sum(sales#39)#141, sum(returns#40)#142, sum(profit#41)#143]
+Results [4]: [channel#37, sum(sales#39)#141 AS sales#147, sum(returns#40)#142 AS returns#148, sum(profit#41)#143 AS profit#149]
 
-(80) CometHashAggregate
-Input [4]: [channel#37, sales#141, returns#142, profit#143]
+(73) HashAggregate [codegen id : 34]
+Input [4]: [channel#37, sales#147, returns#148, profit#149]
 Keys [1]: [channel#37]
-Functions [3]: [partial_sum(sales#141), partial_sum(returns#142), partial_sum(profit#143)]
+Functions [3]: [partial_sum(sales#147), partial_sum(returns#148), partial_sum(profit#149)]
+Aggregate Attributes [6]: [sum#150, isEmpty#151, sum#152, isEmpty#153, sum#154, isEmpty#155]
+Results [7]: [channel#37, sum#156, isEmpty#157, sum#158, isEmpty#159, sum#160, isEmpty#161]
 
-(81) CometColumnarExchange
-Input [7]: [channel#37, sum#144, isEmpty#145, sum#146, isEmpty#147, sum#148, isEmpty#149]
-Arguments: hashpartitioning(channel#37, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(74) Exchange
+Input [7]: [channel#37, sum#156, isEmpty#157, sum#158, isEmpty#159, sum#160, isEmpty#161]
+Arguments: hashpartitioning(channel#37, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(82) CometHashAggregate
-Input [7]: [channel#37, sum#144, isEmpty#145, sum#146, isEmpty#147, sum#148, isEmpty#149]
+(75) HashAggregate [codegen id : 35]
+Input [7]: [channel#37, sum#156, isEmpty#157, sum#158, isEmpty#159, sum#160, isEmpty#161]
 Keys [1]: [channel#37]
-Functions [3]: [sum(sales#141), sum(returns#142), sum(profit#143)]
+Functions [3]: [sum(sales#147), sum(returns#148), sum(profit#149)]
+Aggregate Attributes [3]: [sum(sales#147)#162, sum(returns#148)#163, sum(profit#149)#164]
+Results [5]: [channel#37, null AS id#165, sum(sales#147)#162 AS sum(sales)#166, sum(returns#148)#163 AS sum(returns)#167, sum(profit#149)#164 AS sum(profit)#168]
 
-(83) ReusedExchange [Reuses operator id: 76]
+(76) ReusedExchange [Reuses operator id: 69]
 Output [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 
-(84) CometHashAggregate
+(77) HashAggregate [codegen id : 52]
 Input [8]: [channel#37, id#38, sum#135, isEmpty#136, sum#137, isEmpty#138, sum#139, isEmpty#140]
 Keys [2]: [channel#37, id#38]
 Functions [3]: [sum(sales#39), sum(returns#40), sum(profit#41)]
+Aggregate Attributes [3]: [sum(sales#39)#141, sum(returns#40)#142, sum(profit#41)#143]
+Results [3]: [sum(sales#39)#141 AS sales#147, sum(returns#40)#142 AS returns#148, sum(profit#41)#143 AS profit#149]
 
-(85) CometHashAggregate
-Input [3]: [sales#141, returns#142, profit#143]
+(78) HashAggregate [codegen id : 52]
+Input [3]: [sales#147, returns#148, profit#149]
 Keys: []
-Functions [3]: [partial_sum(sales#141), partial_sum(returns#142), partial_sum(profit#143)]
+Functions [3]: [partial_sum(sales#147), partial_sum(returns#148), partial_sum(profit#149)]
+Aggregate Attributes [6]: [sum#169, isEmpty#170, sum#171, isEmpty#172, sum#173, isEmpty#174]
+Results [6]: [sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180]
 
-(86) CometColumnarExchange
-Input [6]: [sum#150, isEmpty#151, sum#152, isEmpty#153, sum#154, isEmpty#155]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(79) Exchange
+Input [6]: [sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=10]
 
-(87) CometHashAggregate
-Input [6]: [sum#150, isEmpty#151, sum#152, isEmpty#153, sum#154, isEmpty#155]
+(80) HashAggregate [codegen id : 53]
+Input [6]: [sum#175, isEmpty#176, sum#177, isEmpty#178, sum#179, isEmpty#180]
 Keys: []
-Functions [3]: [sum(sales#141), sum(returns#142), sum(profit#143)]
+Functions [3]: [sum(sales#147), sum(returns#148), sum(profit#149)]
+Aggregate Attributes [3]: [sum(sales#147)#181, sum(returns#148)#182, sum(profit#149)#183]
+Results [5]: [null AS channel#184, null AS id#185, sum(sales#147)#181 AS sum(sales)#186, sum(returns#148)#182 AS sum(returns)#187, sum(profit#149)#183 AS sum(profit)#188]
 
-(88) CometUnion
-Child 0 Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
-Child 1 Input [5]: [channel#37, id#159, sum(sales)#160, sum(returns)#161, sum(profit)#162]
-Child 2 Input [5]: [channel#163, id#164, sum(sales)#165, sum(returns)#166, sum(profit)#167]
+(81) Union
 
-(89) CometHashAggregate
-Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
-Keys [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+(82) HashAggregate [codegen id : 54]
+Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
+Keys [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
 
-(90) CometColumnarExchange
-Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
-Arguments: hashpartitioning(channel#37, id#38, sales#156, returns#157, profit#158, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(83) Exchange
+Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
+Arguments: hashpartitioning(channel#37, id#38, sales#144, returns#145, profit#146, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(91) CometHashAggregate
-Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
-Keys [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+(84) HashAggregate [codegen id : 55]
+Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
+Keys [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
 
-(92) CometTakeOrderedAndProject
-Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#37 ASC NULLS FIRST,id#38 ASC NULLS FIRST], output=[channel#37,id#38,sales#156,returns#157,profit#158]), 100, [channel#37 ASC NULLS FIRST, id#38 ASC NULLS FIRST], [channel#37, id#38, sales#156, returns#157, profit#158]
-
-(93) ColumnarToRow [codegen id : 49]
-Input [5]: [channel#37, id#38, sales#156, returns#157, profit#158]
+(85) TakeOrderedAndProject
+Input [5]: [channel#37, id#38, sales#144, returns#145, profit#146]
+Arguments: 100, [channel#37 ASC NULLS FIRST, id#38 ASC NULLS FIRST], [channel#37, id#38, sales#144, returns#145, profit#146]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (98)
-+- * ColumnarToRow (97)
-   +- CometProject (96)
-      +- CometFilter (95)
-         +- CometScan parquet spark_catalog.default.date_dim (94)
+BroadcastExchange (90)
++- * ColumnarToRow (89)
+   +- CometProject (88)
+      +- CometFilter (87)
+         +- CometScan parquet spark_catalog.default.date_dim (86)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#22, d_date#168]
+Output [2]: [d_date_sk#22, d_date#189]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-08-18), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(95) CometFilter
-Input [2]: [d_date_sk#22, d_date#168]
-Condition : (((isnotnull(d_date#168) AND (d_date#168 >= 1998-08-04)) AND (d_date#168 <= 1998-08-18)) AND isnotnull(d_date_sk#22))
+(87) CometFilter
+Input [2]: [d_date_sk#22, d_date#189]
+Condition : (((isnotnull(d_date#189) AND (d_date#189 >= 1998-08-04)) AND (d_date#189 <= 1998-08-18)) AND isnotnull(d_date_sk#22))
 
-(96) CometProject
-Input [2]: [d_date_sk#22, d_date#168]
+(88) CometProject
+Input [2]: [d_date_sk#22, d_date#189]
 Arguments: [d_date_sk#22], [d_date_sk#22]
 
-(97) ColumnarToRow [codegen id : 1]
+(89) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#22]
 
-(98) BroadcastExchange
+(90) BroadcastExchange
 Input [1]: [d_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
 Subquery:2 Hosting operator id = 4 Hosting Expression = sr_returned_date_sk#15 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 23 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 21 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 26 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 24 Hosting Expression = cr_returned_date_sk#56 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 45 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#86 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 49 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 45 Hosting Expression = wr_returned_date_sk#98 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt
index 95096f9961..2eaeff8cd8 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q5a/simplified.txt
@@ -1,24 +1,24 @@
-WholeStageCodegen (49)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
-        CometHashAggregate [channel,id,sales,returns,profit]
-          CometColumnarExchange [channel,id,sales,returns,profit] #1
-            CometHashAggregate [channel,id,sales,returns,profit]
-              CometUnion
-                CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [channel,id] #2
-                    RowToColumnar
-                      WholeStageCodegen (16)
-                        HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                          InputAdapter
-                            Union
-                              WholeStageCodegen (4)
-                                HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [s_store_id] #3
-                                        RowToColumnar
+TakeOrderedAndProject [channel,id,sales,returns,profit]
+  WholeStageCodegen (55)
+    HashAggregate [channel,id,sales,returns,profit]
+      InputAdapter
+        Exchange [channel,id,sales,returns,profit] #1
+          WholeStageCodegen (54)
+            HashAggregate [channel,id,sales,returns,profit]
+              InputAdapter
+                Union
+                  WholeStageCodegen (17)
+                    HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [channel,id] #2
+                          WholeStageCodegen (16)
+                            HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (4)
+                                    HashAggregate [s_store_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
+                                      InputAdapter
+                                        Exchange [s_store_id] #3
                                           WholeStageCodegen (3)
                                             HashAggregate [s_store_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                               Project [sales_price,profit,return_amt,net_loss,s_store_id]
@@ -52,12 +52,10 @@ WholeStageCodegen (49)
                                                           InputAdapter
                                                             CometFilter [s_store_sk]
                                                               CometScan parquet spark_catalog.default.store [s_store_sk,s_store_id]
-                              WholeStageCodegen (8)
-                                HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [cp_catalog_page_id] #6
-                                        RowToColumnar
+                                  WholeStageCodegen (8)
+                                    HashAggregate [cp_catalog_page_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
+                                      InputAdapter
+                                        Exchange [cp_catalog_page_id] #6
                                           WholeStageCodegen (7)
                                             HashAggregate [cp_catalog_page_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                               Project [sales_price,profit,return_amt,net_loss,cp_catalog_page_id]
@@ -84,12 +82,10 @@ WholeStageCodegen (49)
                                                           InputAdapter
                                                             CometFilter [cp_catalog_page_sk]
                                                               CometScan parquet spark_catalog.default.catalog_page [cp_catalog_page_sk,cp_catalog_page_id]
-                              WholeStageCodegen (15)
-                                HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [web_site_id] #8
-                                        RowToColumnar
+                                  WholeStageCodegen (15)
+                                    HashAggregate [web_site_id,sum,sum,sum,sum] [sum(UnscaledValue(sales_price)),sum(UnscaledValue(return_amt)),sum(UnscaledValue(profit)),sum(UnscaledValue(net_loss)),channel,id,sales,returns,profit,sum,sum,sum,sum]
+                                      InputAdapter
+                                        Exchange [web_site_id] #8
                                           WholeStageCodegen (14)
                                             HashAggregate [web_site_id,sales_price,return_amt,profit,net_loss] [sum,sum,sum,sum,sum,sum,sum,sum]
                                               Project [sales_price,profit,return_amt,net_loss,web_site_id]
@@ -129,13 +125,21 @@ WholeStageCodegen (49)
                                                           InputAdapter
                                                             CometFilter [web_site_sk]
                                                               CometScan parquet spark_catalog.default.web_site [web_site_sk,web_site_id]
-                CometHashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [channel] #11
-                    CometHashAggregate [channel,sales,returns,profit]
-                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
-                CometHashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange #12
-                    CometHashAggregate [sales,returns,profit]
-                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                  WholeStageCodegen (35)
+                    HashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),id,sum(sales),sum(returns),sum(profit),sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [channel] #11
+                          WholeStageCodegen (34)
+                            HashAggregate [channel,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                InputAdapter
+                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                  WholeStageCodegen (53)
+                    HashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),channel,id,sum(sales),sum(returns),sum(profit),sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange #12
+                          WholeStageCodegen (52)
+                            HashAggregate [sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                InputAdapter
+                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt
index ffd243c6af..fcaa84890b 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/explain.txt
@@ -1,45 +1,43 @@
 == Physical Plan ==
-* ColumnarToRow (41)
-+- CometTakeOrderedAndProject (40)
-   +- CometFilter (39)
-      +- CometHashAggregate (38)
-         +- CometColumnarExchange (37)
-            +- RowToColumnar (36)
-               +- * HashAggregate (35)
-                  +- * Project (34)
-                     +- * BroadcastHashJoin Inner BuildRight (33)
-                        :- * Project (18)
-                        :  +- * BroadcastHashJoin Inner BuildRight (17)
-                        :     :- * Project (15)
-                        :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                        :     :     :- * Project (9)
-                        :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                        :     :     :     :- * ColumnarToRow (3)
-                        :     :     :     :  +- CometFilter (2)
-                        :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
-                        :     :     :     +- BroadcastExchange (7)
-                        :     :     :        +- * ColumnarToRow (6)
-                        :     :     :           +- CometFilter (5)
-                        :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
-                        :     :     +- BroadcastExchange (13)
-                        :     :        +- * ColumnarToRow (12)
-                        :     :           +- CometFilter (11)
-                        :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
-                        :     +- ReusedExchange (16)
-                        +- BroadcastExchange (32)
-                           +- * Project (31)
-                              +- * BroadcastHashJoin Inner BuildRight (30)
-                                 :- * ColumnarToRow (21)
-                                 :  +- CometFilter (20)
-                                 :     +- CometScan parquet spark_catalog.default.item (19)
-                                 +- BroadcastExchange (29)
-                                    +- * ColumnarToRow (28)
-                                       +- CometFilter (27)
-                                          +- CometHashAggregate (26)
-                                             +- CometColumnarExchange (25)
-                                                +- CometHashAggregate (24)
-                                                   +- CometFilter (23)
-                                                      +- CometScan parquet spark_catalog.default.item (22)
+TakeOrderedAndProject (39)
++- * Filter (38)
+   +- * HashAggregate (37)
+      +- Exchange (36)
+         +- * HashAggregate (35)
+            +- * Project (34)
+               +- * BroadcastHashJoin Inner BuildRight (33)
+                  :- * Project (18)
+                  :  +- * BroadcastHashJoin Inner BuildRight (17)
+                  :     :- * Project (15)
+                  :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+                  :     :     :- * Project (9)
+                  :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+                  :     :     :     :- * ColumnarToRow (3)
+                  :     :     :     :  +- CometFilter (2)
+                  :     :     :     :     +- CometScan parquet spark_catalog.default.customer_address (1)
+                  :     :     :     +- BroadcastExchange (7)
+                  :     :     :        +- * ColumnarToRow (6)
+                  :     :     :           +- CometFilter (5)
+                  :     :     :              +- CometScan parquet spark_catalog.default.customer (4)
+                  :     :     +- BroadcastExchange (13)
+                  :     :        +- * ColumnarToRow (12)
+                  :     :           +- CometFilter (11)
+                  :     :              +- CometScan parquet spark_catalog.default.store_sales (10)
+                  :     +- ReusedExchange (16)
+                  +- BroadcastExchange (32)
+                     +- * Project (31)
+                        +- * BroadcastHashJoin Inner BuildRight (30)
+                           :- * ColumnarToRow (21)
+                           :  +- CometFilter (20)
+                           :     +- CometScan parquet spark_catalog.default.item (19)
+                           +- BroadcastExchange (29)
+                              +- * ColumnarToRow (28)
+                                 +- CometFilter (27)
+                                    +- CometHashAggregate (26)
+                                       +- CometExchange (25)
+                                          +- CometHashAggregate (24)
+                                             +- CometFilter (23)
+                                                +- CometScan parquet spark_catalog.default.item (22)
 
 
 (unknown) Scan parquet spark_catalog.default.customer_address
@@ -113,7 +111,7 @@ Join condition: None
 Output [3]: [ca_state#2, ss_item_sk#5, ss_sold_date_sk#7]
 Input [5]: [ca_state#2, c_customer_sk#3, ss_item_sk#5, ss_customer_sk#6, ss_sold_date_sk#7]
 
-(16) ReusedExchange [Reuses operator id: 46]
+(16) ReusedExchange [Reuses operator id: 44]
 Output [1]: [d_date_sk#9]
 
 (17) BroadcastHashJoin [codegen id : 6]
@@ -156,9 +154,9 @@ Input [2]: [i_current_price#13, i_category#14]
 Keys [1]: [i_category#14]
 Functions [1]: [partial_avg(UnscaledValue(i_current_price#13))]
 
-(25) CometColumnarExchange
+(25) CometExchange
 Input [3]: [i_category#14, sum#15, count#16]
-Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(i_category#14, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
 (26) CometHashAggregate
 Input [3]: [i_category#14, sum#15, count#16]
@@ -207,101 +205,97 @@ Functions [1]: [partial_count(1)]
 Aggregate Attributes [1]: [count#18]
 Results [2]: [ca_state#2, count#19]
 
-(36) RowToColumnar
+(36) Exchange
 Input [2]: [ca_state#2, count#19]
+Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(37) CometColumnarExchange
-Input [2]: [ca_state#2, count#19]
-Arguments: hashpartitioning(ca_state#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(38) CometHashAggregate
+(37) HashAggregate [codegen id : 7]
 Input [2]: [ca_state#2, count#19]
 Keys [1]: [ca_state#2]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#20]
+Results [3]: [ca_state#2 AS state#21, count(1)#20 AS cnt#22, ca_state#2]
 
-(39) CometFilter
-Input [3]: [state#20, cnt#21, ca_state#2]
-Condition : (cnt#21 >= 10)
-
-(40) CometTakeOrderedAndProject
-Input [3]: [state#20, cnt#21, ca_state#2]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[cnt#21 ASC NULLS FIRST,ca_state#2 ASC NULLS FIRST], output=[state#20,cnt#21]), 100, [cnt#21 ASC NULLS FIRST, ca_state#2 ASC NULLS FIRST], [state#20, cnt#21]
+(38) Filter [codegen id : 7]
+Input [3]: [state#21, cnt#22, ca_state#2]
+Condition : (cnt#22 >= 10)
 
-(41) ColumnarToRow [codegen id : 7]
-Input [2]: [state#20, cnt#21]
+(39) TakeOrderedAndProject
+Input [3]: [state#21, cnt#22, ca_state#2]
+Arguments: 100, [cnt#22 ASC NULLS FIRST, ca_state#2 ASC NULLS FIRST], [state#21, cnt#22]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 10 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (46)
-+- * ColumnarToRow (45)
-   +- CometProject (44)
-      +- CometFilter (43)
-         +- CometScan parquet spark_catalog.default.date_dim (42)
+BroadcastExchange (44)
++- * ColumnarToRow (43)
+   +- CometProject (42)
+      +- CometFilter (41)
+         +- CometScan parquet spark_catalog.default.date_dim (40)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#9, d_month_seq#22]
+Output [2]: [d_date_sk#9, d_month_seq#23]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(43) CometFilter
-Input [2]: [d_date_sk#9, d_month_seq#22]
-Condition : ((isnotnull(d_month_seq#22) AND (d_month_seq#22 = Subquery scalar-subquery#23, [id=#24])) AND isnotnull(d_date_sk#9))
+(41) CometFilter
+Input [2]: [d_date_sk#9, d_month_seq#23]
+Condition : ((isnotnull(d_month_seq#23) AND (d_month_seq#23 = Subquery scalar-subquery#24, [id=#25])) AND isnotnull(d_date_sk#9))
 
-(44) CometProject
-Input [2]: [d_date_sk#9, d_month_seq#22]
+(42) CometProject
+Input [2]: [d_date_sk#9, d_month_seq#23]
 Arguments: [d_date_sk#9], [d_date_sk#9]
 
-(45) ColumnarToRow [codegen id : 1]
+(43) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#9]
 
-(46) BroadcastExchange
+(44) BroadcastExchange
 Input [1]: [d_date_sk#9]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
-Subquery:2 Hosting operator id = 43 Hosting Expression = Subquery scalar-subquery#23, [id=#24]
-* ColumnarToRow (53)
-+- CometHashAggregate (52)
-   +- CometColumnarExchange (51)
-      +- CometHashAggregate (50)
-         +- CometProject (49)
-            +- CometFilter (48)
-               +- CometScan parquet spark_catalog.default.date_dim (47)
+Subquery:2 Hosting operator id = 41 Hosting Expression = Subquery scalar-subquery#24, [id=#25]
+* ColumnarToRow (51)
++- CometHashAggregate (50)
+   +- CometExchange (49)
+      +- CometHashAggregate (48)
+         +- CometProject (47)
+            +- CometFilter (46)
+               +- CometScan parquet spark_catalog.default.date_dim (45)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [3]: [d_month_seq#25, d_year#26, d_moy#27]
+Output [3]: [d_month_seq#26, d_year#27, d_moy#28]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), IsNotNull(d_moy), EqualTo(d_year,2000), EqualTo(d_moy,1)]
 ReadSchema: struct<d_month_seq:int,d_year:int,d_moy:int>
 
-(48) CometFilter
-Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
-Condition : (((isnotnull(d_year#26) AND isnotnull(d_moy#27)) AND (d_year#26 = 2000)) AND (d_moy#27 = 1))
+(46) CometFilter
+Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
+Condition : (((isnotnull(d_year#27) AND isnotnull(d_moy#28)) AND (d_year#27 = 2000)) AND (d_moy#28 = 1))
 
-(49) CometProject
-Input [3]: [d_month_seq#25, d_year#26, d_moy#27]
-Arguments: [d_month_seq#25], [d_month_seq#25]
+(47) CometProject
+Input [3]: [d_month_seq#26, d_year#27, d_moy#28]
+Arguments: [d_month_seq#26], [d_month_seq#26]
 
-(50) CometHashAggregate
-Input [1]: [d_month_seq#25]
-Keys [1]: [d_month_seq#25]
+(48) CometHashAggregate
+Input [1]: [d_month_seq#26]
+Keys [1]: [d_month_seq#26]
 Functions: []
 
-(51) CometColumnarExchange
-Input [1]: [d_month_seq#25]
-Arguments: hashpartitioning(d_month_seq#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(49) CometExchange
+Input [1]: [d_month_seq#26]
+Arguments: hashpartitioning(d_month_seq#26, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
 
-(52) CometHashAggregate
-Input [1]: [d_month_seq#25]
-Keys [1]: [d_month_seq#25]
+(50) CometHashAggregate
+Input [1]: [d_month_seq#26]
+Keys [1]: [d_month_seq#26]
 Functions: []
 
-(53) ColumnarToRow [codegen id : 1]
-Input [1]: [d_month_seq#25]
+(51) ColumnarToRow [codegen id : 1]
+Input [1]: [d_month_seq#26]
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt
index 2efd9c5510..d2126126d5 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q6/simplified.txt
@@ -1,76 +1,74 @@
-WholeStageCodegen (7)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [cnt,ca_state,state]
-        CometFilter [cnt]
-          CometHashAggregate [ca_state,count]
-            CometColumnarExchange [ca_state] #1
-              RowToColumnar
-                WholeStageCodegen (6)
-                  HashAggregate [ca_state] [count,count]
-                    Project [ca_state]
-                      BroadcastHashJoin [ss_item_sk,i_item_sk]
-                        Project [ca_state,ss_item_sk]
-                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                            Project [ca_state,ss_item_sk,ss_sold_date_sk]
-                              BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                Project [ca_state,c_customer_sk]
-                                  BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [ca_address_sk]
-                                          CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
-                                    InputAdapter
-                                      BroadcastExchange #2
-                                        WholeStageCodegen (1)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_current_addr_sk,c_customer_sk]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
+TakeOrderedAndProject [cnt,ca_state,state]
+  WholeStageCodegen (7)
+    Filter [cnt]
+      HashAggregate [ca_state,count] [count(1),state,cnt,count]
+        InputAdapter
+          Exchange [ca_state] #1
+            WholeStageCodegen (6)
+              HashAggregate [ca_state] [count,count]
+                Project [ca_state]
+                  BroadcastHashJoin [ss_item_sk,i_item_sk]
+                    Project [ca_state,ss_item_sk]
+                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                        Project [ca_state,ss_item_sk,ss_sold_date_sk]
+                          BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                            Project [ca_state,c_customer_sk]
+                              BroadcastHashJoin [ca_address_sk,c_current_addr_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [ca_address_sk]
+                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_state]
                                 InputAdapter
-                                  BroadcastExchange #3
-                                    WholeStageCodegen (2)
+                                  BroadcastExchange #2
+                                    WholeStageCodegen (1)
                                       ColumnarToRow
                                         InputAdapter
-                                          CometFilter [ss_customer_sk,ss_item_sk]
-                                            CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
-                                              SubqueryBroadcast [d_date_sk] #1
-                                                BroadcastExchange #4
-                                                  WholeStageCodegen (1)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [d_date_sk]
-                                                          CometFilter [d_month_seq,d_date_sk]
-                                                            Subquery #2
-                                                              WholeStageCodegen (1)
-                                                                ColumnarToRow
-                                                                  InputAdapter
-                                                                    CometHashAggregate [d_month_seq]
-                                                                      CometColumnarExchange [d_month_seq] #5
-                                                                        CometHashAggregate [d_month_seq]
-                                                                          CometProject [d_month_seq]
-                                                                            CometFilter [d_year,d_moy]
-                                                                              CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
-                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                          CometFilter [c_current_addr_sk,c_customer_sk]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_addr_sk]
                             InputAdapter
-                              ReusedExchange [d_date_sk] #4
-                        InputAdapter
-                          BroadcastExchange #6
-                            WholeStageCodegen (5)
-                              Project [i_item_sk]
-                                BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
+                              BroadcastExchange #3
+                                WholeStageCodegen (2)
                                   ColumnarToRow
                                     InputAdapter
-                                      CometFilter [i_current_price,i_category,i_item_sk]
-                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
-                                  InputAdapter
-                                    BroadcastExchange #7
-                                      WholeStageCodegen (4)
-                                        ColumnarToRow
-                                          InputAdapter
-                                            CometFilter [avg(i_current_price)]
-                                              CometHashAggregate [i_category,sum,count]
-                                                CometColumnarExchange [i_category] #8
-                                                  CometHashAggregate [i_category,i_current_price]
-                                                    CometFilter [i_category]
-                                                      CometScan parquet spark_catalog.default.item [i_current_price,i_category]
+                                      CometFilter [ss_customer_sk,ss_item_sk]
+                                        CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_sold_date_sk]
+                                          SubqueryBroadcast [d_date_sk] #1
+                                            BroadcastExchange #4
+                                              WholeStageCodegen (1)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometProject [d_date_sk]
+                                                      CometFilter [d_month_seq,d_date_sk]
+                                                        Subquery #2
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometHashAggregate [d_month_seq]
+                                                                  CometExchange [d_month_seq] #5
+                                                                    CometHashAggregate [d_month_seq]
+                                                                      CometProject [d_month_seq]
+                                                                        CometFilter [d_year,d_moy]
+                                                                          CometScan parquet spark_catalog.default.date_dim [d_month_seq,d_year,d_moy]
+                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                        InputAdapter
+                          ReusedExchange [d_date_sk] #4
+                    InputAdapter
+                      BroadcastExchange #6
+                        WholeStageCodegen (5)
+                          Project [i_item_sk]
+                            BroadcastHashJoin [i_category,i_category,i_current_price,avg(i_current_price)]
+                              ColumnarToRow
+                                InputAdapter
+                                  CometFilter [i_current_price,i_category,i_item_sk]
+                                    CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_category]
+                              InputAdapter
+                                BroadcastExchange #7
+                                  WholeStageCodegen (4)
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometFilter [avg(i_current_price)]
+                                          CometHashAggregate [i_category,sum,count]
+                                            CometExchange [i_category] #8
+                                              CometHashAggregate [i_category,i_current_price]
+                                                CometFilter [i_category]
+                                                  CometScan parquet spark_catalog.default.item [i_current_price,i_category]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt
index c94c2a6cc6..1e1b3ba45d 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/explain.txt
@@ -1,195 +1,187 @@
 == Physical Plan ==
-* ColumnarToRow (191)
-+- CometSort (190)
-   +- CometColumnarExchange (189)
-      +- RowToColumnar (188)
-         +- * Project (187)
-            +- * SortMergeJoin Inner (186)
-               :- * ColumnarToRow (113)
-               :  +- CometSort (112)
-               :     +- CometColumnarExchange (111)
-               :        +- RowToColumnar (110)
-               :           +- * HashAggregate (109)
-               :              +- * HashAggregate (108)
-               :                 +- * Project (107)
-               :                    +- * BroadcastHashJoin Inner BuildRight (106)
-               :                       :- * Project (100)
-               :                       :  +- * BroadcastHashJoin Inner BuildRight (99)
-               :                       :     :- * Project (97)
-               :                       :     :  +- * BroadcastHashJoin Inner BuildRight (96)
-               :                       :     :     :- * Project (91)
-               :                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (90)
-               :                       :     :     :     :- * Project (88)
-               :                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (87)
-               :                       :     :     :     :     :- * Project (82)
-               :                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (81)
-               :                       :     :     :     :     :     :- * Project (79)
-               :                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (78)
-               :                       :     :     :     :     :     :     :- * Project (73)
-               :                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (72)
-               :                       :     :     :     :     :     :     :     :- * Project (67)
-               :                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (66)
-               :                       :     :     :     :     :     :     :     :     :- * Project (64)
-               :                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (63)
-               :                       :     :     :     :     :     :     :     :     :     :- * Project (58)
-               :                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (57)
-               :                       :     :     :     :     :     :     :     :     :     :     :- * Project (55)
-               :                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (49)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (48)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (43)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (42)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (37)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (36)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (34)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (33)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (32)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (13)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (12)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (11)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (10)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (9)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (4)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (3)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (2)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (1)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (8)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (7)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (6)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (5)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (31)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (30)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (29)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (28)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometColumnarExchange (27)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (26)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (25)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (24)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (18)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometColumnarExchange (17)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (16)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (15)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (14)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (23)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometColumnarExchange (22)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (21)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (20)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (19)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (35)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (41)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (40)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (39)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (38)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (47)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (46)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (45)
-               :                       :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (44)
-               :                       :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (53)
-               :                       :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (52)
-               :                       :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (51)
-               :                       :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (50)
-               :                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (56)
-               :                       :     :     :     :     :     :     :     :     :     +- BroadcastExchange (62)
-               :                       :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (61)
-               :                       :     :     :     :     :     :     :     :     :           +- CometFilter (60)
-               :                       :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (59)
-               :                       :     :     :     :     :     :     :     :     +- ReusedExchange (65)
-               :                       :     :     :     :     :     :     :     +- BroadcastExchange (71)
-               :                       :     :     :     :     :     :     :        +- * ColumnarToRow (70)
-               :                       :     :     :     :     :     :     :           +- CometFilter (69)
-               :                       :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (68)
-               :                       :     :     :     :     :     :     +- BroadcastExchange (77)
-               :                       :     :     :     :     :     :        +- * ColumnarToRow (76)
-               :                       :     :     :     :     :     :           +- CometFilter (75)
-               :                       :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (74)
-               :                       :     :     :     :     :     +- ReusedExchange (80)
-               :                       :     :     :     :     +- BroadcastExchange (86)
-               :                       :     :     :     :        +- * ColumnarToRow (85)
-               :                       :     :     :     :           +- CometFilter (84)
-               :                       :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (83)
-               :                       :     :     :     +- ReusedExchange (89)
-               :                       :     :     +- BroadcastExchange (95)
-               :                       :     :        +- * ColumnarToRow (94)
-               :                       :     :           +- CometFilter (93)
-               :                       :     :              +- CometScan parquet spark_catalog.default.income_band (92)
-               :                       :     +- ReusedExchange (98)
-               :                       +- BroadcastExchange (105)
-               :                          +- * ColumnarToRow (104)
-               :                             +- CometProject (103)
-               :                                +- CometFilter (102)
-               :                                   +- CometScan parquet spark_catalog.default.item (101)
-               +- * ColumnarToRow (185)
-                  +- CometSort (184)
-                     +- CometColumnarExchange (183)
-                        +- RowToColumnar (182)
-                           +- * HashAggregate (181)
-                              +- * HashAggregate (180)
-                                 +- * Project (179)
-                                    +- * BroadcastHashJoin Inner BuildRight (178)
-                                       :- * Project (176)
-                                       :  +- * BroadcastHashJoin Inner BuildRight (175)
-                                       :     :- * Project (173)
-                                       :     :  +- * BroadcastHashJoin Inner BuildRight (172)
-                                       :     :     :- * Project (170)
-                                       :     :     :  +- * BroadcastHashJoin Inner BuildRight (169)
-                                       :     :     :     :- * Project (167)
-                                       :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (166)
-                                       :     :     :     :     :- * Project (164)
-                                       :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (163)
-                                       :     :     :     :     :     :- * Project (161)
-                                       :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (160)
-                                       :     :     :     :     :     :     :- * Project (158)
-                                       :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (157)
-                                       :     :     :     :     :     :     :     :- * Project (155)
-                                       :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (154)
-                                       :     :     :     :     :     :     :     :     :- * Project (152)
-                                       :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (151)
-                                       :     :     :     :     :     :     :     :     :     :- * Project (149)
-                                       :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (148)
-                                       :     :     :     :     :     :     :     :     :     :     :- * Project (146)
-                                       :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (145)
-                                       :     :     :     :     :     :     :     :     :     :     :     :- * Project (143)
-                                       :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (142)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (140)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (139)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (137)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (136)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * ColumnarToRow (134)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- CometProject (133)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- CometSortMergeJoin (132)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :- CometSort (126)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :  +- CometColumnarExchange (125)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :     +- RowToColumnar (124)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :        +- * Project (123)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :           +- * BroadcastHashJoin Inner BuildLeft (122)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :- BroadcastExchange (117)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :  +- * ColumnarToRow (116)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :     +- CometFilter (115)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              :        +- CometScan parquet spark_catalog.default.store_sales (114)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :              +- * ColumnarToRow (121)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                 +- CometProject (120)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                    +- CometFilter (119)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        :                       +- CometScan parquet spark_catalog.default.store_returns (118)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (131)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (130)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (129)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (128)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (127)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (135)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (138)
-                                       :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (141)
-                                       :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (144)
-                                       :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (147)
-                                       :     :     :     :     :     :     :     :     :     +- ReusedExchange (150)
-                                       :     :     :     :     :     :     :     :     +- ReusedExchange (153)
-                                       :     :     :     :     :     :     :     +- ReusedExchange (156)
-                                       :     :     :     :     :     :     +- ReusedExchange (159)
-                                       :     :     :     :     :     +- ReusedExchange (162)
-                                       :     :     :     :     +- ReusedExchange (165)
-                                       :     :     :     +- ReusedExchange (168)
-                                       :     :     +- ReusedExchange (171)
-                                       :     +- ReusedExchange (174)
-                                       +- ReusedExchange (177)
+* Sort (183)
++- Exchange (182)
+   +- * Project (181)
+      +- * SortMergeJoin Inner (180)
+         :- * Sort (110)
+         :  +- Exchange (109)
+         :     +- * HashAggregate (108)
+         :        +- * HashAggregate (107)
+         :           +- * Project (106)
+         :              +- * BroadcastHashJoin Inner BuildRight (105)
+         :                 :- * Project (99)
+         :                 :  +- * BroadcastHashJoin Inner BuildRight (98)
+         :                 :     :- * Project (96)
+         :                 :     :  +- * BroadcastHashJoin Inner BuildRight (95)
+         :                 :     :     :- * Project (90)
+         :                 :     :     :  +- * BroadcastHashJoin Inner BuildRight (89)
+         :                 :     :     :     :- * Project (87)
+         :                 :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
+         :                 :     :     :     :     :- * Project (81)
+         :                 :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (80)
+         :                 :     :     :     :     :     :- * Project (78)
+         :                 :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (77)
+         :                 :     :     :     :     :     :     :- * Project (72)
+         :                 :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (71)
+         :                 :     :     :     :     :     :     :     :- * Project (66)
+         :                 :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (65)
+         :                 :     :     :     :     :     :     :     :     :- * Project (63)
+         :                 :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (62)
+         :                 :     :     :     :     :     :     :     :     :     :- * Project (57)
+         :                 :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (56)
+         :                 :     :     :     :     :     :     :     :     :     :     :- * Project (54)
+         :                 :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (53)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :- * Project (48)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (47)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (42)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (41)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (36)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (35)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (33)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (32)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (12)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (11)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (10)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (9)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (4)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (3)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (2)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (8)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (7)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (6)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (31)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (30)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (29)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (28)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (27)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometExchange (26)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                       +- CometHashAggregate (25)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                          +- CometProject (24)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                             +- CometSortMergeJoin (23)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :- CometSort (17)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :  +- CometExchange (16)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :     +- CometProject (15)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :        +- CometFilter (14)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                :           +- CometScan parquet spark_catalog.default.catalog_sales (13)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                +- CometSort (22)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                   +- CometExchange (21)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                      +- CometProject (20)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                         +- CometFilter (19)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                                            +- CometScan parquet spark_catalog.default.catalog_returns (18)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (34)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (40)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (39)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (38)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.store (37)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (46)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (45)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (44)
+         :                 :     :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer (43)
+         :                 :     :     :     :     :     :     :     :     :     :     :     +- BroadcastExchange (52)
+         :                 :     :     :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (51)
+         :                 :     :     :     :     :     :     :     :     :     :     :           +- CometFilter (50)
+         :                 :     :     :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.date_dim (49)
+         :                 :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (55)
+         :                 :     :     :     :     :     :     :     :     :     +- BroadcastExchange (61)
+         :                 :     :     :     :     :     :     :     :     :        +- * ColumnarToRow (60)
+         :                 :     :     :     :     :     :     :     :     :           +- CometFilter (59)
+         :                 :     :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.customer_demographics (58)
+         :                 :     :     :     :     :     :     :     :     +- ReusedExchange (64)
+         :                 :     :     :     :     :     :     :     +- BroadcastExchange (70)
+         :                 :     :     :     :     :     :     :        +- * ColumnarToRow (69)
+         :                 :     :     :     :     :     :     :           +- CometFilter (68)
+         :                 :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.promotion (67)
+         :                 :     :     :     :     :     :     +- BroadcastExchange (76)
+         :                 :     :     :     :     :     :        +- * ColumnarToRow (75)
+         :                 :     :     :     :     :     :           +- CometFilter (74)
+         :                 :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.household_demographics (73)
+         :                 :     :     :     :     :     +- ReusedExchange (79)
+         :                 :     :     :     :     +- BroadcastExchange (85)
+         :                 :     :     :     :        +- * ColumnarToRow (84)
+         :                 :     :     :     :           +- CometFilter (83)
+         :                 :     :     :     :              +- CometScan parquet spark_catalog.default.customer_address (82)
+         :                 :     :     :     +- ReusedExchange (88)
+         :                 :     :     +- BroadcastExchange (94)
+         :                 :     :        +- * ColumnarToRow (93)
+         :                 :     :           +- CometFilter (92)
+         :                 :     :              +- CometScan parquet spark_catalog.default.income_band (91)
+         :                 :     +- ReusedExchange (97)
+         :                 +- BroadcastExchange (104)
+         :                    +- * ColumnarToRow (103)
+         :                       +- CometProject (102)
+         :                          +- CometFilter (101)
+         :                             +- CometScan parquet spark_catalog.default.item (100)
+         +- * Sort (179)
+            +- Exchange (178)
+               +- * HashAggregate (177)
+                  +- * HashAggregate (176)
+                     +- * Project (175)
+                        +- * BroadcastHashJoin Inner BuildRight (174)
+                           :- * Project (172)
+                           :  +- * BroadcastHashJoin Inner BuildRight (171)
+                           :     :- * Project (169)
+                           :     :  +- * BroadcastHashJoin Inner BuildRight (168)
+                           :     :     :- * Project (166)
+                           :     :     :  +- * BroadcastHashJoin Inner BuildRight (165)
+                           :     :     :     :- * Project (163)
+                           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (162)
+                           :     :     :     :     :- * Project (160)
+                           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (159)
+                           :     :     :     :     :     :- * Project (157)
+                           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (156)
+                           :     :     :     :     :     :     :- * Project (154)
+                           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (153)
+                           :     :     :     :     :     :     :     :- * Project (151)
+                           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (150)
+                           :     :     :     :     :     :     :     :     :- * Project (148)
+                           :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (147)
+                           :     :     :     :     :     :     :     :     :     :- * Project (145)
+                           :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (144)
+                           :     :     :     :     :     :     :     :     :     :     :- * Project (142)
+                           :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (141)
+                           :     :     :     :     :     :     :     :     :     :     :     :- * Project (139)
+                           :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (138)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (136)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (135)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (133)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (132)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Project (130)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- * SortMergeJoin Inner (129)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :- * Sort (122)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :  +- Exchange (121)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * Project (120)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- * BroadcastHashJoin Inner BuildLeft (119)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :- BroadcastExchange (114)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :  +- * ColumnarToRow (113)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :     +- CometFilter (112)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           :        +- CometScan parquet spark_catalog.default.store_sales (111)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- * ColumnarToRow (118)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometProject (117)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometFilter (116)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (115)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- * ColumnarToRow (128)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :        +- CometSort (127)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :           +- CometProject (126)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :              +- CometFilter (125)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                 +- CometHashAggregate (124)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     :                    +- ReusedExchange (123)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (131)
+                           :     :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (134)
+                           :     :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (137)
+                           :     :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (140)
+                           :     :     :     :     :     :     :     :     :     :     +- ReusedExchange (143)
+                           :     :     :     :     :     :     :     :     :     +- ReusedExchange (146)
+                           :     :     :     :     :     :     :     :     +- ReusedExchange (149)
+                           :     :     :     :     :     :     :     +- ReusedExchange (152)
+                           :     :     :     :     :     :     +- ReusedExchange (155)
+                           :     :     :     :     :     +- ReusedExchange (158)
+                           :     :     :     :     +- ReusedExchange (161)
+                           :     :     :     +- ReusedExchange (164)
+                           :     :     +- ReusedExchange (167)
+                           :     +- ReusedExchange (170)
+                           +- ReusedExchange (173)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -239,16 +231,13 @@ Join condition: None
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_ticket_number#8, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, sr_item_sk#14, sr_ticket_number#15]
 
-(11) RowToColumnar
+(11) Exchange
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(12) CometColumnarExchange
+(12) Sort [codegen id : 3]
 Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: hashpartitioning(ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(13) CometSort
-Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1 ASC NULLS FIRST]
+Arguments: [ss_item_sk#1 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
 Output [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
@@ -257,19 +246,19 @@ Location [not included in comparison]/{warehouse_dir}/catalog_sales]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_order_number)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_ext_list_price:decimal(7,2)>
 
-(15) CometFilter
+(14) CometFilter
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Condition : (isnotnull(cs_item_sk#17) AND isnotnull(cs_order_number#18))
 
-(16) CometProject
+(15) CometProject
 Input [4]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cs_sold_date_sk#20]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 
-(17) CometColumnarExchange
+(16) CometExchange
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
-Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(cs_item_sk#17, cs_order_number#18, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
-(18) CometSort
+(17) CometSort
 Input [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Arguments: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19], [cs_item_sk#17 ASC NULLS FIRST, cs_order_number#18 ASC NULLS FIRST]
 
@@ -280,79 +269,80 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_refunded_cash:decimal(7,2),cr_reversed_charge:decimal(7,2),cr_store_credit:decimal(7,2)>
 
-(20) CometFilter
+(19) CometFilter
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Condition : (isnotnull(cr_item_sk#21) AND isnotnull(cr_order_number#22))
 
-(21) CometProject
+(20) CometProject
 Input [6]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25, cr_returned_date_sk#26]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(22) CometColumnarExchange
+(21) CometExchange
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
-Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(cr_item_sk#21, cr_order_number#22, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
 
-(23) CometSort
+(22) CometSort
 Input [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cr_item_sk#21 ASC NULLS FIRST, cr_order_number#22 ASC NULLS FIRST]
 
-(24) CometSortMergeJoin
+(23) CometSortMergeJoin
 Left output [3]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19]
 Right output [5]: [cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_order_number#18], [cr_item_sk#21, cr_order_number#22], Inner
 
-(25) CometProject
+(24) CometProject
 Input [8]: [cs_item_sk#17, cs_order_number#18, cs_ext_list_price#19, cr_item_sk#21, cr_order_number#22, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Arguments: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25], [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 
-(26) CometHashAggregate
+(25) CometHashAggregate
 Input [5]: [cs_item_sk#17, cs_ext_list_price#19, cr_refunded_cash#23, cr_reversed_charge#24, cr_store_credit#25]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [partial_sum(UnscaledValue(cs_ext_list_price#19)), partial_sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(27) CometColumnarExchange
+(26) CometExchange
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
-Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: hashpartitioning(cs_item_sk#17, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
-(28) CometHashAggregate
+(27) CometHashAggregate
 Input [4]: [cs_item_sk#17, sum#27, sum#28, isEmpty#29]
 Keys [1]: [cs_item_sk#17]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#19)), sum(((cr_refunded_cash#23 + cr_reversed_charge#24) + cr_store_credit#25))]
 
-(29) CometFilter
+(28) CometFilter
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(30) CometProject
+(29) CometProject
 Input [3]: [cs_item_sk#17, sale#30, refund#31]
 Arguments: [cs_item_sk#17], [cs_item_sk#17]
 
-(31) CometSort
+(30) CometSort
 Input [1]: [cs_item_sk#17]
 Arguments: [cs_item_sk#17], [cs_item_sk#17 ASC NULLS FIRST]
 
-(32) CometSortMergeJoin
-Left output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
-Right output [1]: [cs_item_sk#17]
-Arguments: [ss_item_sk#1], [cs_item_sk#17], Inner
+(31) ColumnarToRow [codegen id : 4]
+Input [1]: [cs_item_sk#17]
 
-(33) CometProject
-Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, cs_item_sk#17]
-Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12], [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+(32) SortMergeJoin [codegen id : 20]
+Left keys [1]: [ss_item_sk#1]
+Right keys [1]: [cs_item_sk#17]
+Join type: Inner
+Join condition: None
 
-(34) ColumnarToRow [codegen id : 18]
-Input [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+(33) Project [codegen id : 20]
+Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12]
+Input [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, cs_item_sk#17]
 
-(35) ReusedExchange [Reuses operator id: 195]
+(34) ReusedExchange [Reuses operator id: 187]
 Output [2]: [d_date_sk#32, d_year#33]
 
-(36) BroadcastHashJoin [codegen id : 18]
+(35) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_sold_date_sk#12]
 Right keys [1]: [d_date_sk#32]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 18]
+(36) Project [codegen id : 20]
 Output [11]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33]
 Input [13]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, ss_sold_date_sk#12, d_date_sk#32, d_year#33]
 
@@ -363,24 +353,24 @@ Location [not included in comparison]/{warehouse_dir}/store]
 PushedFilters: [IsNotNull(s_store_sk), IsNotNull(s_store_name), IsNotNull(s_zip)]
 ReadSchema: struct<s_store_sk:int,s_store_name:string,s_zip:string>
 
-(39) CometFilter
+(38) CometFilter
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Condition : ((isnotnull(s_store_sk#34) AND isnotnull(s_store_name#35)) AND isnotnull(s_zip#36))
 
-(40) ColumnarToRow [codegen id : 4]
+(39) ColumnarToRow [codegen id : 6]
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 
-(41) BroadcastExchange
+(40) BroadcastExchange
 Input [3]: [s_store_sk#34, s_store_name#35, s_zip#36]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(42) BroadcastHashJoin [codegen id : 18]
+(41) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_store_sk#6]
 Right keys [1]: [s_store_sk#34]
 Join type: Inner
 Join condition: None
 
-(43) Project [codegen id : 18]
+(42) Project [codegen id : 20]
 Output [12]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36]
 Input [14]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_store_sk#6, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_sk#34, s_store_name#35, s_zip#36]
 
@@ -391,24 +381,24 @@ Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_first_sales_date_sk), IsNotNull(c_first_shipto_date_sk), IsNotNull(c_current_cdemo_sk), IsNotNull(c_current_hdemo_sk), IsNotNull(c_current_addr_sk)]
 ReadSchema: struct<c_customer_sk:int,c_current_cdemo_sk:int,c_current_hdemo_sk:int,c_current_addr_sk:int,c_first_shipto_date_sk:int,c_first_sales_date_sk:int>
 
-(45) CometFilter
+(44) CometFilter
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Condition : (((((isnotnull(c_customer_sk#37) AND isnotnull(c_first_sales_date_sk#42)) AND isnotnull(c_first_shipto_date_sk#41)) AND isnotnull(c_current_cdemo_sk#38)) AND isnotnull(c_current_hdemo_sk#39)) AND isnotnull(c_current_addr_sk#40))
 
-(46) ColumnarToRow [codegen id : 5]
+(45) ColumnarToRow [codegen id : 7]
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
-(47) BroadcastExchange
+(46) BroadcastExchange
 Input [6]: [c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=7]
 
-(48) BroadcastHashJoin [codegen id : 18]
+(47) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_customer_sk#2]
 Right keys [1]: [c_customer_sk#37]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 18]
+(48) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 Input [18]: [ss_item_sk#1, ss_customer_sk#2, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_customer_sk#37, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42]
 
@@ -419,37 +409,37 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(51) CometFilter
+(50) CometFilter
 Input [2]: [d_date_sk#43, d_year#44]
 Condition : isnotnull(d_date_sk#43)
 
-(52) ColumnarToRow [codegen id : 6]
+(51) ColumnarToRow [codegen id : 8]
 Input [2]: [d_date_sk#43, d_year#44]
 
-(53) BroadcastExchange
+(52) BroadcastExchange
 Input [2]: [d_date_sk#43, d_year#44]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(54) BroadcastHashJoin [codegen id : 18]
+(53) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_first_sales_date_sk#42]
 Right keys [1]: [d_date_sk#43]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 18]
+(54) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, c_first_sales_date_sk#42, d_date_sk#43, d_year#44]
 
-(56) ReusedExchange [Reuses operator id: 53]
+(55) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#45, d_year#46]
 
-(57) BroadcastHashJoin [codegen id : 18]
+(56) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_first_shipto_date_sk#41]
 Right keys [1]: [d_date_sk#45]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 18]
+(57) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, c_first_shipto_date_sk#41, d_year#44, d_date_sk#45, d_year#46]
 
@@ -460,37 +450,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_demographics]
 PushedFilters: [IsNotNull(cd_demo_sk), IsNotNull(cd_marital_status)]
 ReadSchema: struct<cd_demo_sk:int,cd_marital_status:string>
 
-(60) CometFilter
+(59) CometFilter
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Condition : (isnotnull(cd_demo_sk#47) AND isnotnull(cd_marital_status#48))
 
-(61) ColumnarToRow [codegen id : 8]
+(60) ColumnarToRow [codegen id : 10]
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 
-(62) BroadcastExchange
+(61) BroadcastExchange
 Input [2]: [cd_demo_sk#47, cd_marital_status#48]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(63) BroadcastHashJoin [codegen id : 18]
+(62) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_cdemo_sk#3]
 Right keys [1]: [cd_demo_sk#47]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 18]
+(63) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48]
 Input [18]: [ss_item_sk#1, ss_cdemo_sk#3, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_demo_sk#47, cd_marital_status#48]
 
-(65) ReusedExchange [Reuses operator id: 62]
+(64) ReusedExchange [Reuses operator id: 61]
 Output [2]: [cd_demo_sk#49, cd_marital_status#50]
 
-(66) BroadcastHashJoin [codegen id : 18]
+(65) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_current_cdemo_sk#38]
 Right keys [1]: [cd_demo_sk#49]
 Join type: Inner
 Join condition: NOT (cd_marital_status#48 = cd_marital_status#50)
 
-(67) Project [codegen id : 18]
+(66) Project [codegen id : 20]
 Output [14]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [18]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_cdemo_sk#38, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, cd_marital_status#48, cd_demo_sk#49, cd_marital_status#50]
 
@@ -501,24 +491,24 @@ Location [not included in comparison]/{warehouse_dir}/promotion]
 PushedFilters: [IsNotNull(p_promo_sk)]
 ReadSchema: struct<p_promo_sk:int>
 
-(69) CometFilter
+(68) CometFilter
 Input [1]: [p_promo_sk#51]
 Condition : isnotnull(p_promo_sk#51)
 
-(70) ColumnarToRow [codegen id : 10]
+(69) ColumnarToRow [codegen id : 12]
 Input [1]: [p_promo_sk#51]
 
-(71) BroadcastExchange
+(70) BroadcastExchange
 Input [1]: [p_promo_sk#51]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-(72) BroadcastHashJoin [codegen id : 18]
+(71) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_promo_sk#7]
 Right keys [1]: [p_promo_sk#51]
 Join type: Inner
 Join condition: None
 
-(73) Project [codegen id : 18]
+(72) Project [codegen id : 20]
 Output [13]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_promo_sk#7, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, p_promo_sk#51]
 
@@ -529,37 +519,37 @@ Location [not included in comparison]/{warehouse_dir}/household_demographics]
 PushedFilters: [IsNotNull(hd_demo_sk), IsNotNull(hd_income_band_sk)]
 ReadSchema: struct<hd_demo_sk:int,hd_income_band_sk:int>
 
-(75) CometFilter
+(74) CometFilter
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Condition : (isnotnull(hd_demo_sk#52) AND isnotnull(hd_income_band_sk#53))
 
-(76) ColumnarToRow [codegen id : 11]
+(75) ColumnarToRow [codegen id : 13]
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 
-(77) BroadcastExchange
+(76) BroadcastExchange
 Input [2]: [hd_demo_sk#52, hd_income_band_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=11]
 
-(78) BroadcastHashJoin [codegen id : 18]
+(77) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_hdemo_sk#4]
 Right keys [1]: [hd_demo_sk#52]
 Join type: Inner
 Join condition: None
 
-(79) Project [codegen id : 18]
+(78) Project [codegen id : 20]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53]
 Input [15]: [ss_item_sk#1, ss_hdemo_sk#4, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_demo_sk#52, hd_income_band_sk#53]
 
-(80) ReusedExchange [Reuses operator id: 77]
+(79) ReusedExchange [Reuses operator id: 76]
 Output [2]: [hd_demo_sk#54, hd_income_band_sk#55]
 
-(81) BroadcastHashJoin [codegen id : 18]
+(80) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_current_hdemo_sk#39]
 Right keys [1]: [hd_demo_sk#54]
 Join type: Inner
 Join condition: None
 
-(82) Project [codegen id : 18]
+(81) Project [codegen id : 20]
 Output [13]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55]
 Input [15]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_hdemo_sk#39, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_demo_sk#54, hd_income_band_sk#55]
 
@@ -570,37 +560,37 @@ Location [not included in comparison]/{warehouse_dir}/customer_address]
 PushedFilters: [IsNotNull(ca_address_sk)]
 ReadSchema: struct<ca_address_sk:int,ca_street_number:string,ca_street_name:string,ca_city:string,ca_zip:string>
 
-(84) CometFilter
+(83) CometFilter
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Condition : isnotnull(ca_address_sk#56)
 
-(85) ColumnarToRow [codegen id : 13]
+(84) ColumnarToRow [codegen id : 15]
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(86) BroadcastExchange
+(85) BroadcastExchange
 Input [5]: [ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-(87) BroadcastHashJoin [codegen id : 18]
+(86) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_addr_sk#5]
 Right keys [1]: [ca_address_sk#56]
 Join type: Inner
 Join condition: None
 
-(88) Project [codegen id : 18]
+(87) Project [codegen id : 20]
 Output [16]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 Input [18]: [ss_item_sk#1, ss_addr_sk#5, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_address_sk#56, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60]
 
-(89) ReusedExchange [Reuses operator id: 86]
+(88) ReusedExchange [Reuses operator id: 85]
 Output [5]: [ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
-(90) BroadcastHashJoin [codegen id : 18]
+(89) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [c_current_addr_sk#40]
 Right keys [1]: [ca_address_sk#61]
 Join type: Inner
 Join condition: None
 
-(91) Project [codegen id : 18]
+(90) Project [codegen id : 20]
 Output [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [21]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, c_current_addr_sk#40, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_address_sk#61, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 
@@ -611,37 +601,37 @@ Location [not included in comparison]/{warehouse_dir}/income_band]
 PushedFilters: [IsNotNull(ib_income_band_sk)]
 ReadSchema: struct<ib_income_band_sk:int>
 
-(93) CometFilter
+(92) CometFilter
 Input [1]: [ib_income_band_sk#66]
 Condition : isnotnull(ib_income_band_sk#66)
 
-(94) ColumnarToRow [codegen id : 15]
+(93) ColumnarToRow [codegen id : 17]
 Input [1]: [ib_income_band_sk#66]
 
-(95) BroadcastExchange
+(94) BroadcastExchange
 Input [1]: [ib_income_band_sk#66]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(96) BroadcastHashJoin [codegen id : 18]
+(95) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [hd_income_band_sk#53]
 Right keys [1]: [ib_income_band_sk#66]
 Join type: Inner
 Join condition: None
 
-(97) Project [codegen id : 18]
+(96) Project [codegen id : 20]
 Output [18]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [20]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#53, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#66]
 
-(98) ReusedExchange [Reuses operator id: 95]
+(97) ReusedExchange [Reuses operator id: 94]
 Output [1]: [ib_income_band_sk#67]
 
-(99) BroadcastHashJoin [codegen id : 18]
+(98) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [hd_income_band_sk#55]
 Right keys [1]: [ib_income_band_sk#67]
 Join type: Inner
 Join condition: None
 
-(100) Project [codegen id : 18]
+(99) Project [codegen id : 20]
 Output [17]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, hd_income_band_sk#55, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, ib_income_band_sk#67]
 
@@ -652,58 +642,52 @@ Location [not included in comparison]/{warehouse_dir}/item]
 PushedFilters: [IsNotNull(i_current_price), In(i_color, [burlywood           ,floral              ,indian              ,medium              ,purple              ,spring              ]), GreaterThanOrEqual(i_current_price,64.00), LessThanOrEqual(i_current_price,74.00), GreaterThanOrEqual(i_current_price,65.00), LessThanOrEqual(i_current_price,79.00), IsNotNull(i_item_sk)]
 ReadSchema: struct<i_item_sk:int,i_current_price:decimal(7,2),i_color:string,i_product_name:string>
 
-(102) CometFilter
+(101) CometFilter
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Condition : ((((((isnotnull(i_current_price#69) AND i_color#70 IN (purple              ,burlywood           ,indian              ,spring              ,floral              ,medium              )) AND (i_current_price#69 >= 64.00)) AND (i_current_price#69 <= 74.00)) AND (i_current_price#69 >= 65.00)) AND (i_current_price#69 <= 79.00)) AND isnotnull(i_item_sk#68))
 
-(103) CometProject
+(102) CometProject
 Input [4]: [i_item_sk#68, i_current_price#69, i_color#70, i_product_name#71]
 Arguments: [i_item_sk#68, i_product_name#71], [i_item_sk#68, i_product_name#71]
 
-(104) ColumnarToRow [codegen id : 17]
+(103) ColumnarToRow [codegen id : 19]
 Input [2]: [i_item_sk#68, i_product_name#71]
 
-(105) BroadcastExchange
+(104) BroadcastExchange
 Input [2]: [i_item_sk#68, i_product_name#71]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=14]
 
-(106) BroadcastHashJoin [codegen id : 18]
+(105) BroadcastHashJoin [codegen id : 20]
 Left keys [1]: [ss_item_sk#1]
 Right keys [1]: [i_item_sk#68]
 Join type: Inner
 Join condition: None
 
-(107) Project [codegen id : 18]
+(106) Project [codegen id : 20]
 Output [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Input [19]: [ss_item_sk#1, ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, s_store_name#35, s_zip#36, d_year#44, d_year#46, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 
-(108) HashAggregate [codegen id : 18]
+(107) HashAggregate [codegen id : 20]
 Input [18]: [ss_wholesale_cost#9, ss_list_price#10, ss_coupon_amt#11, d_year#33, d_year#44, d_year#46, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, i_item_sk#68, i_product_name#71]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#9)), partial_sum(UnscaledValue(ss_list_price#10)), partial_sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count#72, sum#73, sum#74, sum#75]
 Results [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 
-(109) HashAggregate [codegen id : 18]
+(108) HashAggregate [codegen id : 20]
 Input [19]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46, count#76, sum#77, sum#78, sum#79]
 Keys [15]: [i_product_name#71, i_item_sk#68, s_store_name#35, s_zip#36, ca_street_number#57, ca_street_name#58, ca_city#59, ca_zip#60, ca_street_number#62, ca_street_name#63, ca_city#64, ca_zip#65, d_year#33, d_year#44, d_year#46]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#9)), sum(UnscaledValue(ss_list_price#10)), sum(UnscaledValue(ss_coupon_amt#11))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#9))#81, sum(UnscaledValue(ss_list_price#10))#82, sum(UnscaledValue(ss_coupon_amt#11))#83]
 Results [17]: [i_product_name#71 AS product_name#84, i_item_sk#68 AS item_sk#85, s_store_name#35 AS store_name#86, s_zip#36 AS store_zip#87, ca_street_number#57 AS b_street_number#88, ca_street_name#58 AS b_streen_name#89, ca_city#59 AS b_city#90, ca_zip#60 AS b_zip#91, ca_street_number#62 AS c_street_number#92, ca_street_name#63 AS c_street_name#93, ca_city#64 AS c_city#94, ca_zip#65 AS c_zip#95, d_year#33 AS syear#96, count(1)#80 AS cnt#97, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#9))#81,17,2) AS s1#98, MakeDecimal(sum(UnscaledValue(ss_list_price#10))#82,17,2) AS s2#99, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#11))#83,17,2) AS s3#100]
 
-(110) RowToColumnar
-Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-
-(111) CometColumnarExchange
+(109) Exchange
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+Arguments: hashpartitioning(item_sk#85, store_name#86, store_zip#87, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(112) CometSort
-Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
-Arguments: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100], [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST]
-
-(113) ColumnarToRow [codegen id : 19]
+(110) Sort [codegen id : 21]
 Input [17]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100]
+Arguments: [item_sk#85 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, store_zip#87 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
@@ -713,14 +697,14 @@ PartitionFilters: [isnotnull(ss_sold_date_sk#112), dynamicpruningexpression(ss_s
 PushedFilters: [IsNotNull(ss_item_sk), IsNotNull(ss_ticket_number), IsNotNull(ss_store_sk), IsNotNull(ss_customer_sk), IsNotNull(ss_cdemo_sk), IsNotNull(ss_promo_sk), IsNotNull(ss_hdemo_sk), IsNotNull(ss_addr_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_cdemo_sk:int,ss_hdemo_sk:int,ss_addr_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_number:int,ss_wholesale_cost:decimal(7,2),ss_list_price:decimal(7,2),ss_coupon_amt:decimal(7,2)>
 
-(115) CometFilter
+(112) CometFilter
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Condition : (((((((isnotnull(ss_item_sk#101) AND isnotnull(ss_ticket_number#108)) AND isnotnull(ss_store_sk#106)) AND isnotnull(ss_customer_sk#102)) AND isnotnull(ss_cdemo_sk#103)) AND isnotnull(ss_promo_sk#107)) AND isnotnull(ss_hdemo_sk#104)) AND isnotnull(ss_addr_sk#105))
 
-(116) ColumnarToRow [codegen id : 20]
+(113) ColumnarToRow [codegen id : 22]
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 
-(117) BroadcastExchange
+(114) BroadcastExchange
 Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Arguments: HashedRelationBroadcastMode(List((shiftleft(cast(input[0, int, false] as bigint), 32) | (cast(input[7, int, false] as bigint) & 4294967295))),false), [plan_id=16]
 
@@ -731,324 +715,310 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_item_sk), IsNotNull(sr_ticket_number)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int>
 
-(119) CometFilter
+(116) CometFilter
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Condition : (isnotnull(sr_item_sk#114) AND isnotnull(sr_ticket_number#115))
 
-(120) CometProject
+(117) CometProject
 Input [3]: [sr_item_sk#114, sr_ticket_number#115, sr_returned_date_sk#116]
 Arguments: [sr_item_sk#114, sr_ticket_number#115], [sr_item_sk#114, sr_ticket_number#115]
 
-(121) ColumnarToRow
+(118) ColumnarToRow
 Input [2]: [sr_item_sk#114, sr_ticket_number#115]
 
-(122) BroadcastHashJoin [codegen id : 21]
+(119) BroadcastHashJoin [codegen id : 23]
 Left keys [2]: [ss_item_sk#101, ss_ticket_number#108]
 Right keys [2]: [sr_item_sk#114, sr_ticket_number#115]
 Join type: Inner
 Join condition: None
 
-(123) Project [codegen id : 21]
+(120) Project [codegen id : 23]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_ticket_number#108, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, sr_item_sk#114, sr_ticket_number#115]
 
-(124) RowToColumnar
-Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-
-(125) CometColumnarExchange
+(121) Exchange
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
+Arguments: hashpartitioning(ss_item_sk#101, 5), ENSURE_REQUIREMENTS, [plan_id=17]
 
-(126) CometSort
+(122) Sort [codegen id : 24]
 Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101 ASC NULLS FIRST]
+Arguments: [ss_item_sk#101 ASC NULLS FIRST], false, 0
 
-(127) ReusedExchange [Reuses operator id: 27]
+(123) ReusedExchange [Reuses operator id: 26]
 Output [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 
-(128) CometHashAggregate
+(124) CometHashAggregate
 Input [4]: [cs_item_sk#117, sum#118, sum#119, isEmpty#120]
 Keys [1]: [cs_item_sk#117]
 Functions [2]: [sum(UnscaledValue(cs_ext_list_price#121)), sum(((cr_refunded_cash#122 + cr_reversed_charge#123) + cr_store_credit#124))]
 
-(129) CometFilter
+(125) CometFilter
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Condition : ((isnotnull(sale#30) AND isnotnull(refund#31)) AND (cast(sale#30 as decimal(21,2)) > (2 * refund#31)))
 
-(130) CometProject
+(126) CometProject
 Input [3]: [cs_item_sk#117, sale#30, refund#31]
 Arguments: [cs_item_sk#117], [cs_item_sk#117]
 
-(131) CometSort
+(127) CometSort
 Input [1]: [cs_item_sk#117]
 Arguments: [cs_item_sk#117], [cs_item_sk#117 ASC NULLS FIRST]
 
-(132) CometSortMergeJoin
-Left output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
-Right output [1]: [cs_item_sk#117]
-Arguments: [ss_item_sk#101], [cs_item_sk#117], Inner
+(128) ColumnarToRow [codegen id : 25]
+Input [1]: [cs_item_sk#117]
 
-(133) CometProject
-Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, cs_item_sk#117]
-Arguments: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112], [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+(129) SortMergeJoin [codegen id : 41]
+Left keys [1]: [ss_item_sk#101]
+Right keys [1]: [cs_item_sk#117]
+Join type: Inner
+Join condition: None
 
-(134) ColumnarToRow [codegen id : 37]
-Input [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+(130) Project [codegen id : 41]
+Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112]
+Input [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, cs_item_sk#117]
 
-(135) ReusedExchange [Reuses operator id: 199]
+(131) ReusedExchange [Reuses operator id: 191]
 Output [2]: [d_date_sk#125, d_year#126]
 
-(136) BroadcastHashJoin [codegen id : 37]
+(132) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_sold_date_sk#112]
 Right keys [1]: [d_date_sk#125]
 Join type: Inner
 Join condition: None
 
-(137) Project [codegen id : 37]
+(133) Project [codegen id : 41]
 Output [11]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126]
 Input [13]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, ss_sold_date_sk#112, d_date_sk#125, d_year#126]
 
-(138) ReusedExchange [Reuses operator id: 41]
+(134) ReusedExchange [Reuses operator id: 40]
 Output [3]: [s_store_sk#127, s_store_name#128, s_zip#129]
 
-(139) BroadcastHashJoin [codegen id : 37]
+(135) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_store_sk#106]
 Right keys [1]: [s_store_sk#127]
 Join type: Inner
 Join condition: None
 
-(140) Project [codegen id : 37]
+(136) Project [codegen id : 41]
 Output [12]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129]
 Input [14]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_store_sk#106, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_sk#127, s_store_name#128, s_zip#129]
 
-(141) ReusedExchange [Reuses operator id: 47]
+(137) ReusedExchange [Reuses operator id: 46]
 Output [6]: [c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(142) BroadcastHashJoin [codegen id : 37]
+(138) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_customer_sk#102]
 Right keys [1]: [c_customer_sk#130]
 Join type: Inner
 Join condition: None
 
-(143) Project [codegen id : 37]
+(139) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 Input [18]: [ss_item_sk#101, ss_customer_sk#102, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_customer_sk#130, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135]
 
-(144) ReusedExchange [Reuses operator id: 53]
+(140) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#136, d_year#137]
 
-(145) BroadcastHashJoin [codegen id : 37]
+(141) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_first_sales_date_sk#135]
 Right keys [1]: [d_date_sk#136]
 Join type: Inner
 Join condition: None
 
-(146) Project [codegen id : 37]
+(142) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, c_first_sales_date_sk#135, d_date_sk#136, d_year#137]
 
-(147) ReusedExchange [Reuses operator id: 53]
+(143) ReusedExchange [Reuses operator id: 52]
 Output [2]: [d_date_sk#138, d_year#139]
 
-(148) BroadcastHashJoin [codegen id : 37]
+(144) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_first_shipto_date_sk#134]
 Right keys [1]: [d_date_sk#138]
 Join type: Inner
 Join condition: None
 
-(149) Project [codegen id : 37]
+(145) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, c_first_shipto_date_sk#134, d_year#137, d_date_sk#138, d_year#139]
 
-(150) ReusedExchange [Reuses operator id: 62]
+(146) ReusedExchange [Reuses operator id: 61]
 Output [2]: [cd_demo_sk#140, cd_marital_status#141]
 
-(151) BroadcastHashJoin [codegen id : 37]
+(147) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_cdemo_sk#103]
 Right keys [1]: [cd_demo_sk#140]
 Join type: Inner
 Join condition: None
 
-(152) Project [codegen id : 37]
+(148) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141]
 Input [18]: [ss_item_sk#101, ss_cdemo_sk#103, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_demo_sk#140, cd_marital_status#141]
 
-(153) ReusedExchange [Reuses operator id: 62]
+(149) ReusedExchange [Reuses operator id: 61]
 Output [2]: [cd_demo_sk#142, cd_marital_status#143]
 
-(154) BroadcastHashJoin [codegen id : 37]
+(150) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_current_cdemo_sk#131]
 Right keys [1]: [cd_demo_sk#142]
 Join type: Inner
 Join condition: NOT (cd_marital_status#141 = cd_marital_status#143)
 
-(155) Project [codegen id : 37]
+(151) Project [codegen id : 41]
 Output [14]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [18]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_cdemo_sk#131, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, cd_marital_status#141, cd_demo_sk#142, cd_marital_status#143]
 
-(156) ReusedExchange [Reuses operator id: 71]
+(152) ReusedExchange [Reuses operator id: 70]
 Output [1]: [p_promo_sk#144]
 
-(157) BroadcastHashJoin [codegen id : 37]
+(153) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_promo_sk#107]
 Right keys [1]: [p_promo_sk#144]
 Join type: Inner
 Join condition: None
 
-(158) Project [codegen id : 37]
+(154) Project [codegen id : 41]
 Output [13]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_promo_sk#107, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, p_promo_sk#144]
 
-(159) ReusedExchange [Reuses operator id: 77]
+(155) ReusedExchange [Reuses operator id: 76]
 Output [2]: [hd_demo_sk#145, hd_income_band_sk#146]
 
-(160) BroadcastHashJoin [codegen id : 37]
+(156) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_hdemo_sk#104]
 Right keys [1]: [hd_demo_sk#145]
 Join type: Inner
 Join condition: None
 
-(161) Project [codegen id : 37]
+(157) Project [codegen id : 41]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146]
 Input [15]: [ss_item_sk#101, ss_hdemo_sk#104, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_demo_sk#145, hd_income_band_sk#146]
 
-(162) ReusedExchange [Reuses operator id: 77]
+(158) ReusedExchange [Reuses operator id: 76]
 Output [2]: [hd_demo_sk#147, hd_income_band_sk#148]
 
-(163) BroadcastHashJoin [codegen id : 37]
+(159) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_current_hdemo_sk#132]
 Right keys [1]: [hd_demo_sk#147]
 Join type: Inner
 Join condition: None
 
-(164) Project [codegen id : 37]
+(160) Project [codegen id : 41]
 Output [13]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148]
 Input [15]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_hdemo_sk#132, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_demo_sk#147, hd_income_band_sk#148]
 
-(165) ReusedExchange [Reuses operator id: 86]
+(161) ReusedExchange [Reuses operator id: 85]
 Output [5]: [ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(166) BroadcastHashJoin [codegen id : 37]
+(162) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_addr_sk#105]
 Right keys [1]: [ca_address_sk#149]
 Join type: Inner
 Join condition: None
 
-(167) Project [codegen id : 37]
+(163) Project [codegen id : 41]
 Output [16]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 Input [18]: [ss_item_sk#101, ss_addr_sk#105, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_address_sk#149, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153]
 
-(168) ReusedExchange [Reuses operator id: 86]
+(164) ReusedExchange [Reuses operator id: 85]
 Output [5]: [ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(169) BroadcastHashJoin [codegen id : 37]
+(165) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [c_current_addr_sk#133]
 Right keys [1]: [ca_address_sk#154]
 Join type: Inner
 Join condition: None
 
-(170) Project [codegen id : 37]
+(166) Project [codegen id : 41]
 Output [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [21]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, c_current_addr_sk#133, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_address_sk#154, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 
-(171) ReusedExchange [Reuses operator id: 95]
+(167) ReusedExchange [Reuses operator id: 94]
 Output [1]: [ib_income_band_sk#159]
 
-(172) BroadcastHashJoin [codegen id : 37]
+(168) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [hd_income_band_sk#146]
 Right keys [1]: [ib_income_band_sk#159]
 Join type: Inner
 Join condition: None
 
-(173) Project [codegen id : 37]
+(169) Project [codegen id : 41]
 Output [18]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [20]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#146, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#159]
 
-(174) ReusedExchange [Reuses operator id: 95]
+(170) ReusedExchange [Reuses operator id: 94]
 Output [1]: [ib_income_band_sk#160]
 
-(175) BroadcastHashJoin [codegen id : 37]
+(171) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [hd_income_band_sk#148]
 Right keys [1]: [ib_income_band_sk#160]
 Join type: Inner
 Join condition: None
 
-(176) Project [codegen id : 37]
+(172) Project [codegen id : 41]
 Output [17]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, hd_income_band_sk#148, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, ib_income_band_sk#160]
 
-(177) ReusedExchange [Reuses operator id: 105]
+(173) ReusedExchange [Reuses operator id: 104]
 Output [2]: [i_item_sk#161, i_product_name#162]
 
-(178) BroadcastHashJoin [codegen id : 37]
+(174) BroadcastHashJoin [codegen id : 41]
 Left keys [1]: [ss_item_sk#101]
 Right keys [1]: [i_item_sk#161]
 Join type: Inner
 Join condition: None
 
-(179) Project [codegen id : 37]
+(175) Project [codegen id : 41]
 Output [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Input [19]: [ss_item_sk#101, ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, s_store_name#128, s_zip#129, d_year#137, d_year#139, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 
-(180) HashAggregate [codegen id : 37]
+(176) HashAggregate [codegen id : 41]
 Input [18]: [ss_wholesale_cost#109, ss_list_price#110, ss_coupon_amt#111, d_year#126, d_year#137, d_year#139, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, i_item_sk#161, i_product_name#162]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [partial_count(1), partial_sum(UnscaledValue(ss_wholesale_cost#109)), partial_sum(UnscaledValue(ss_list_price#110)), partial_sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count#72, sum#163, sum#164, sum#165]
 Results [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 
-(181) HashAggregate [codegen id : 37]
+(177) HashAggregate [codegen id : 41]
 Input [19]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139, count#76, sum#166, sum#167, sum#168]
 Keys [15]: [i_product_name#162, i_item_sk#161, s_store_name#128, s_zip#129, ca_street_number#150, ca_street_name#151, ca_city#152, ca_zip#153, ca_street_number#155, ca_street_name#156, ca_city#157, ca_zip#158, d_year#126, d_year#137, d_year#139]
 Functions [4]: [count(1), sum(UnscaledValue(ss_wholesale_cost#109)), sum(UnscaledValue(ss_list_price#110)), sum(UnscaledValue(ss_coupon_amt#111))]
 Aggregate Attributes [4]: [count(1)#80, sum(UnscaledValue(ss_wholesale_cost#109))#81, sum(UnscaledValue(ss_list_price#110))#82, sum(UnscaledValue(ss_coupon_amt#111))#83]
 Results [8]: [i_item_sk#161 AS item_sk#169, s_store_name#128 AS store_name#170, s_zip#129 AS store_zip#171, d_year#126 AS syear#172, count(1)#80 AS cnt#173, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#109))#81,17,2) AS s1#174, MakeDecimal(sum(UnscaledValue(ss_list_price#110))#82,17,2) AS s2#175, MakeDecimal(sum(UnscaledValue(ss_coupon_amt#111))#83,17,2) AS s3#176]
 
-(182) RowToColumnar
+(178) Exchange
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
+Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, [plan_id=18]
 
-(183) CometColumnarExchange
+(179) Sort [codegen id : 42]
 Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: hashpartitioning(item_sk#169, store_name#170, store_zip#171, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
+Arguments: [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST], false, 0
 
-(184) CometSort
-Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-Arguments: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176], [item_sk#169 ASC NULLS FIRST, store_name#170 ASC NULLS FIRST, store_zip#171 ASC NULLS FIRST]
-
-(185) ColumnarToRow [codegen id : 38]
-Input [8]: [item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
-
-(186) SortMergeJoin [codegen id : 39]
+(180) SortMergeJoin [codegen id : 43]
 Left keys [3]: [item_sk#85, store_name#86, store_zip#87]
 Right keys [3]: [item_sk#169, store_name#170, store_zip#171]
 Join type: Inner
 Join condition: (cnt#173 <= cnt#97)
 
-(187) Project [codegen id : 39]
+(181) Project [codegen id : 43]
 Output [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
 Input [25]: [product_name#84, item_sk#85, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, item_sk#169, store_name#170, store_zip#171, syear#172, cnt#173, s1#174, s2#175, s3#176]
 
-(188) RowToColumnar
-Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-
-(189) CometColumnarExchange
-Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=19]
-
-(190) CometSort
+(182) Exchange
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
-Arguments: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173], [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST]
+Arguments: rangepartitioning(product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=19]
 
-(191) ColumnarToRow [codegen id : 40]
+(183) Sort [codegen id : 44]
 Input [21]: [product_name#84, store_name#86, store_zip#87, b_street_number#88, b_streen_name#89, b_city#90, b_zip#91, c_street_number#92, c_street_name#93, c_city#94, c_zip#95, syear#96, cnt#97, s1#98, s2#99, s3#100, s1#174, s2#175, s3#176, syear#172, cnt#173]
+Arguments: [product_name#84 ASC NULLS FIRST, store_name#86 ASC NULLS FIRST, cnt#173 ASC NULLS FIRST, s1#98 ASC NULLS FIRST, s1#174 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#12 IN dynamicpruning#13
-BroadcastExchange (195)
-+- * ColumnarToRow (194)
-   +- CometFilter (193)
-      +- CometScan parquet spark_catalog.default.date_dim (192)
+BroadcastExchange (187)
++- * ColumnarToRow (186)
+   +- CometFilter (185)
+      +- CometScan parquet spark_catalog.default.date_dim (184)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1058,22 +1028,22 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,1999), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(193) CometFilter
+(185) CometFilter
 Input [2]: [d_date_sk#32, d_year#33]
 Condition : ((isnotnull(d_year#33) AND (d_year#33 = 1999)) AND isnotnull(d_date_sk#32))
 
-(194) ColumnarToRow [codegen id : 1]
+(186) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#32, d_year#33]
 
-(195) BroadcastExchange
+(187) BroadcastExchange
 Input [2]: [d_date_sk#32, d_year#33]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=20]
 
-Subquery:2 Hosting operator id = 114 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
-BroadcastExchange (199)
-+- * ColumnarToRow (198)
-   +- CometFilter (197)
-      +- CometScan parquet spark_catalog.default.date_dim (196)
+Subquery:2 Hosting operator id = 111 Hosting Expression = ss_sold_date_sk#112 IN dynamicpruning#113
+BroadcastExchange (191)
++- * ColumnarToRow (190)
+   +- CometFilter (189)
+      +- CometScan parquet spark_catalog.default.date_dim (188)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -1083,14 +1053,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(197) CometFilter
+(189) CometFilter
 Input [2]: [d_date_sk#125, d_year#126]
 Condition : ((isnotnull(d_year#126) AND (d_year#126 = 2000)) AND isnotnull(d_date_sk#125))
 
-(198) ColumnarToRow [codegen id : 1]
+(190) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#125, d_year#126]
 
-(199) BroadcastExchange
+(191) BroadcastExchange
 Input [2]: [d_date_sk#125, d_year#126]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=21]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt
index e4f0b78a77..4aa8376d19 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q64/simplified.txt
@@ -1,276 +1,278 @@
-WholeStageCodegen (40)
-  ColumnarToRow
+WholeStageCodegen (44)
+  Sort [product_name,store_name,cnt,s1,s1]
     InputAdapter
-      CometSort [product_name,store_name,cnt,s1,s1]
-        CometColumnarExchange [product_name,store_name,cnt,s1,s1] #1
-          RowToColumnar
-            WholeStageCodegen (39)
-              Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
-                SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
-                  InputAdapter
-                    WholeStageCodegen (19)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [item_sk,store_name,store_zip]
-                            CometColumnarExchange [item_sk,store_name,store_zip] #2
-                              RowToColumnar
-                                WholeStageCodegen (18)
-                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                                  ColumnarToRow
+      Exchange [product_name,store_name,cnt,s1,s1] #1
+        WholeStageCodegen (43)
+          Project [product_name,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,s1,s2,s3,syear,cnt]
+            SortMergeJoin [item_sk,store_name,store_zip,item_sk,store_name,store_zip,cnt,cnt]
+              InputAdapter
+                WholeStageCodegen (21)
+                  Sort [item_sk,store_name,store_zip]
+                    InputAdapter
+                      Exchange [item_sk,store_name,store_zip] #2
+                        WholeStageCodegen (20)
+                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),product_name,item_sk,store_name,store_zip,b_street_number,b_streen_name,b_city,b_zip,c_street_number,c_street_name,c_city,c_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                              InputAdapter
+                                                                                                WholeStageCodegen (3)
+                                                                                                  Sort [ss_item_sk]
                                                                                                     InputAdapter
-                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                                          CometSort [ss_item_sk]
-                                                                                                            CometColumnarExchange [ss_item_sk] #3
-                                                                                                              RowToColumnar
-                                                                                                                WholeStageCodegen (2)
-                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                      Exchange [ss_item_sk] #3
+                                                                                                        WholeStageCodegen (2)
+                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                              InputAdapter
+                                                                                                                BroadcastExchange #4
+                                                                                                                  WholeStageCodegen (1)
+                                                                                                                    ColumnarToRow
                                                                                                                       InputAdapter
-                                                                                                                        BroadcastExchange #4
-                                                                                                                          WholeStageCodegen (1)
-                                                                                                                            ColumnarToRow
-                                                                                                                              InputAdapter
-                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                                    SubqueryBroadcast [d_date_sk] #1
-                                                                                                                                      BroadcastExchange #5
-                                                                                                                                        WholeStageCodegen (1)
-                                                                                                                                          ColumnarToRow
-                                                                                                                                            InputAdapter
-                                                                                                                                              CometFilter [d_year,d_date_sk]
-                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                                      ColumnarToRow
-                                                                                                                        InputAdapter
-                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                                                                                          CometSort [cs_item_sk]
-                                                                                                            CometProject [cs_item_sk]
-                                                                                                              CometFilter [sale,refund]
-                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                                  CometColumnarExchange [cs_item_sk] #6
-                                                                                                                    CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                      CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                        CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                                                                                                                          CometSort [cs_item_sk,cs_order_number]
-                                                                                                                            CometColumnarExchange [cs_item_sk,cs_order_number] #7
-                                                                                                                              CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
-                                                                                                                                CometFilter [cs_item_sk,cs_order_number]
-                                                                                                                                  CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
-                                                                                                                          CometSort [cr_item_sk,cr_order_number]
-                                                                                                                            CometColumnarExchange [cr_item_sk,cr_order_number] #8
-                                                                                                                              CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
-                                                                                                                                CometFilter [cr_item_sk,cr_order_number]
-                                                                                                                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
-                                                                                                  InputAdapter
-                                                                                                    ReusedExchange [d_date_sk,d_year] #5
+                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                            SubqueryBroadcast [d_date_sk] #1
+                                                                                                                              BroadcastExchange #5
+                                                                                                                                WholeStageCodegen (1)
+                                                                                                                                  ColumnarToRow
+                                                                                                                                    InputAdapter
+                                                                                                                                      CometFilter [d_year,d_date_sk]
+                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                              ColumnarToRow
+                                                                                                                InputAdapter
+                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                                                                               InputAdapter
-                                                                                                BroadcastExchange #9
-                                                                                                  WholeStageCodegen (4)
-                                                                                                    ColumnarToRow
-                                                                                                      InputAdapter
-                                                                                                        CometFilter [s_store_sk,s_store_name,s_zip]
-                                                                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
+                                                                                                WholeStageCodegen (4)
+                                                                                                  ColumnarToRow
+                                                                                                    InputAdapter
+                                                                                                      CometSort [cs_item_sk]
+                                                                                                        CometProject [cs_item_sk]
+                                                                                                          CometFilter [sale,refund]
+                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                              CometExchange [cs_item_sk] #6
+                                                                                                                CometHashAggregate [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                  CometProject [cs_item_sk,cs_ext_list_price,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                    CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                                                                                                                      CometSort [cs_item_sk,cs_order_number]
+                                                                                                                        CometExchange [cs_item_sk,cs_order_number] #7
+                                                                                                                          CometProject [cs_item_sk,cs_order_number,cs_ext_list_price]
+                                                                                                                            CometFilter [cs_item_sk,cs_order_number]
+                                                                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_ext_list_price,cs_sold_date_sk]
+                                                                                                                      CometSort [cr_item_sk,cr_order_number]
+                                                                                                                        CometExchange [cr_item_sk,cr_order_number] #8
+                                                                                                                          CometProject [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit]
+                                                                                                                            CometFilter [cr_item_sk,cr_order_number]
+                                                                                                                              CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_returned_date_sk]
                                                                                           InputAdapter
-                                                                                            BroadcastExchange #10
-                                                                                              WholeStageCodegen (5)
-                                                                                                ColumnarToRow
-                                                                                                  InputAdapter
-                                                                                                    CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
-                                                                                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                            ReusedExchange [d_date_sk,d_year] #5
                                                                                       InputAdapter
-                                                                                        BroadcastExchange #11
+                                                                                        BroadcastExchange #9
                                                                                           WholeStageCodegen (6)
                                                                                             ColumnarToRow
                                                                                               InputAdapter
-                                                                                                CometFilter [d_date_sk]
-                                                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                CometFilter [s_store_sk,s_store_name,s_zip]
+                                                                                                  CometScan parquet spark_catalog.default.store [s_store_sk,s_store_name,s_zip]
                                                                                   InputAdapter
-                                                                                    ReusedExchange [d_date_sk,d_year] #11
+                                                                                    BroadcastExchange #10
+                                                                                      WholeStageCodegen (7)
+                                                                                        ColumnarToRow
+                                                                                          InputAdapter
+                                                                                            CometFilter [c_customer_sk,c_first_sales_date_sk,c_first_shipto_date_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk]
+                                                                                              CometScan parquet spark_catalog.default.customer [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
                                                                               InputAdapter
-                                                                                BroadcastExchange #12
+                                                                                BroadcastExchange #11
                                                                                   WholeStageCodegen (8)
                                                                                     ColumnarToRow
                                                                                       InputAdapter
-                                                                                        CometFilter [cd_demo_sk,cd_marital_status]
-                                                                                          CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                                                        CometFilter [d_date_sk]
+                                                                                          CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                           InputAdapter
-                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                            ReusedExchange [d_date_sk,d_year] #11
                                                                       InputAdapter
-                                                                        BroadcastExchange #13
+                                                                        BroadcastExchange #12
                                                                           WholeStageCodegen (10)
                                                                             ColumnarToRow
                                                                               InputAdapter
-                                                                                CometFilter [p_promo_sk]
-                                                                                  CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                                                                                CometFilter [cd_demo_sk,cd_marital_status]
+                                                                                  CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                                                   InputAdapter
-                                                                    BroadcastExchange #14
-                                                                      WholeStageCodegen (11)
-                                                                        ColumnarToRow
-                                                                          InputAdapter
-                                                                            CometFilter [hd_demo_sk,hd_income_band_sk]
-                                                                              CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
+                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                               InputAdapter
-                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                                BroadcastExchange #13
+                                                                  WholeStageCodegen (12)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometFilter [p_promo_sk]
+                                                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
                                                           InputAdapter
-                                                            BroadcastExchange #15
+                                                            BroadcastExchange #14
                                                               WholeStageCodegen (13)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [ca_address_sk]
-                                                                      CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                                    CometFilter [hd_demo_sk,hd_income_band_sk]
+                                                                      CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_income_band_sk]
                                                       InputAdapter
-                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                   InputAdapter
-                                                    BroadcastExchange #16
+                                                    BroadcastExchange #15
                                                       WholeStageCodegen (15)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ib_income_band_sk]
-                                                              CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
+                                                            CometFilter [ca_address_sk]
+                                                              CometScan parquet spark_catalog.default.customer_address [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
                                               InputAdapter
-                                                ReusedExchange [ib_income_band_sk] #16
+                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                           InputAdapter
-                                            BroadcastExchange #17
+                                            BroadcastExchange #16
                                               WholeStageCodegen (17)
                                                 ColumnarToRow
                                                   InputAdapter
-                                                    CometProject [i_item_sk,i_product_name]
-                                                      CometFilter [i_current_price,i_color,i_item_sk]
-                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
-                  InputAdapter
-                    WholeStageCodegen (38)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [item_sk,store_name,store_zip]
-                            CometColumnarExchange [item_sk,store_name,store_zip] #18
-                              RowToColumnar
-                                WholeStageCodegen (37)
-                                  HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
-                                    HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
-                                      Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
-                                        BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                            BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
-                                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                    BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
-                                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
-                                                        BroadcastHashJoin [ss_addr_sk,ca_address_sk]
-                                                          Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
-                                                            BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
-                                                              Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
-                                                                BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
-                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                    BroadcastHashJoin [ss_promo_sk,p_promo_sk]
-                                                                      Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                        BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
-                                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
-                                                                            BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
-                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
-                                                                                BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
-                                                                                  Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
-                                                                                    BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
-                                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
-                                                                                        BroadcastHashJoin [ss_customer_sk,c_customer_sk]
-                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
-                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                              Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
-                                                                                                BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                                  ColumnarToRow
+                                                    CometFilter [ib_income_band_sk]
+                                                      CometScan parquet spark_catalog.default.income_band [ib_income_band_sk]
+                                      InputAdapter
+                                        ReusedExchange [ib_income_band_sk] #16
+                                  InputAdapter
+                                    BroadcastExchange #17
+                                      WholeStageCodegen (19)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometProject [i_item_sk,i_product_name]
+                                              CometFilter [i_current_price,i_color,i_item_sk]
+                                                CometScan parquet spark_catalog.default.item [i_item_sk,i_current_price,i_color,i_product_name]
+              InputAdapter
+                WholeStageCodegen (42)
+                  Sort [item_sk,store_name,store_zip]
+                    InputAdapter
+                      Exchange [item_sk,store_name,store_zip] #18
+                        WholeStageCodegen (41)
+                          HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,count,sum,sum,sum] [count(1),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_list_price)),sum(UnscaledValue(ss_coupon_amt)),item_sk,store_name,store_zip,syear,cnt,s1,s2,s3,count,sum,sum,sum]
+                            HashAggregate [i_product_name,i_item_sk,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,d_year,d_year,d_year,ss_wholesale_cost,ss_list_price,ss_coupon_amt] [count,sum,sum,sum,count,sum,sum,sum]
+                              Project [ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,d_year,d_year,s_store_name,s_zip,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip,i_item_sk,i_product_name]
+                                BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                  Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                    BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                      Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                        BroadcastHashJoin [hd_income_band_sk,ib_income_band_sk]
+                                          Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                            BroadcastHashJoin [c_current_addr_sk,ca_address_sk]
+                                              Project [ss_item_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk,ca_street_number,ca_street_name,ca_city,ca_zip]
+                                                BroadcastHashJoin [ss_addr_sk,ca_address_sk]
+                                                  Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_addr_sk,d_year,d_year,hd_income_band_sk,hd_income_band_sk]
+                                                    BroadcastHashJoin [c_current_hdemo_sk,hd_demo_sk]
+                                                      Project [ss_item_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,hd_income_band_sk]
+                                                        BroadcastHashJoin [ss_hdemo_sk,hd_demo_sk]
+                                                          Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                            BroadcastHashJoin [ss_promo_sk,p_promo_sk]
+                                                              Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                BroadcastHashJoin [c_current_cdemo_sk,cd_demo_sk,cd_marital_status,cd_marital_status]
+                                                                  Project [ss_item_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year,cd_marital_status]
+                                                                    BroadcastHashJoin [ss_cdemo_sk,cd_demo_sk]
+                                                                      Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,d_year,d_year]
+                                                                        BroadcastHashJoin [c_first_shipto_date_sk,d_date_sk]
+                                                                          Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,d_year]
+                                                                            BroadcastHashJoin [c_first_sales_date_sk,d_date_sk]
+                                                                              Project [ss_item_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk]
+                                                                                BroadcastHashJoin [ss_customer_sk,c_customer_sk]
+                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year,s_store_name,s_zip]
+                                                                                    BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                      Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,d_year]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                            SortMergeJoin [ss_item_sk,cs_item_sk]
+                                                                                              InputAdapter
+                                                                                                WholeStageCodegen (24)
+                                                                                                  Sort [ss_item_sk]
                                                                                                     InputAdapter
-                                                                                                      CometProject [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                        CometSortMergeJoin [ss_item_sk,cs_item_sk]
-                                                                                                          CometSort [ss_item_sk]
-                                                                                                            CometColumnarExchange [ss_item_sk] #19
-                                                                                                              RowToColumnar
-                                                                                                                WholeStageCodegen (21)
-                                                                                                                  Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                    BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                      Exchange [ss_item_sk] #19
+                                                                                                        WholeStageCodegen (23)
+                                                                                                          Project [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                            BroadcastHashJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
+                                                                                                              InputAdapter
+                                                                                                                BroadcastExchange #20
+                                                                                                                  WholeStageCodegen (22)
+                                                                                                                    ColumnarToRow
                                                                                                                       InputAdapter
-                                                                                                                        BroadcastExchange #20
-                                                                                                                          WholeStageCodegen (20)
-                                                                                                                            ColumnarToRow
-                                                                                                                              InputAdapter
-                                                                                                                                CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
-                                                                                                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
-                                                                                                                                    SubqueryBroadcast [d_date_sk] #2
-                                                                                                                                      BroadcastExchange #21
-                                                                                                                                        WholeStageCodegen (1)
-                                                                                                                                          ColumnarToRow
-                                                                                                                                            InputAdapter
-                                                                                                                                              CometFilter [d_year,d_date_sk]
-                                                                                                                                                CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                                                                                      ColumnarToRow
-                                                                                                                        InputAdapter
-                                                                                                                          CometProject [sr_item_sk,sr_ticket_number]
-                                                                                                                            CometFilter [sr_item_sk,sr_ticket_number]
-                                                                                                                              CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                                                                                          CometSort [cs_item_sk]
-                                                                                                            CometProject [cs_item_sk]
-                                                                                                              CometFilter [sale,refund]
-                                                                                                                CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
-                                                                                                                  ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
-                                                                                                  InputAdapter
-                                                                                                    ReusedExchange [d_date_sk,d_year] #21
+                                                                                                                        CometFilter [ss_item_sk,ss_ticket_number,ss_store_sk,ss_customer_sk,ss_cdemo_sk,ss_promo_sk,ss_hdemo_sk,ss_addr_sk]
+                                                                                                                          CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_cdemo_sk,ss_hdemo_sk,ss_addr_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_wholesale_cost,ss_list_price,ss_coupon_amt,ss_sold_date_sk]
+                                                                                                                            SubqueryBroadcast [d_date_sk] #2
+                                                                                                                              BroadcastExchange #21
+                                                                                                                                WholeStageCodegen (1)
+                                                                                                                                  ColumnarToRow
+                                                                                                                                    InputAdapter
+                                                                                                                                      CometFilter [d_year,d_date_sk]
+                                                                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                                                                                              ColumnarToRow
+                                                                                                                InputAdapter
+                                                                                                                  CometProject [sr_item_sk,sr_ticket_number]
+                                                                                                                    CometFilter [sr_item_sk,sr_ticket_number]
+                                                                                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                                                                               InputAdapter
-                                                                                                ReusedExchange [s_store_sk,s_store_name,s_zip] #9
+                                                                                                WholeStageCodegen (25)
+                                                                                                  ColumnarToRow
+                                                                                                    InputAdapter
+                                                                                                      CometSort [cs_item_sk]
+                                                                                                        CometProject [cs_item_sk]
+                                                                                                          CometFilter [sale,refund]
+                                                                                                            CometHashAggregate [cs_item_sk,sum,sum,isEmpty]
+                                                                                                              ReusedExchange [cs_item_sk,sum,sum,isEmpty] #6
                                                                                           InputAdapter
-                                                                                            ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
+                                                                                            ReusedExchange [d_date_sk,d_year] #21
                                                                                       InputAdapter
-                                                                                        ReusedExchange [d_date_sk,d_year] #11
+                                                                                        ReusedExchange [s_store_sk,s_store_name,s_zip] #9
                                                                                   InputAdapter
-                                                                                    ReusedExchange [d_date_sk,d_year] #11
+                                                                                    ReusedExchange [c_customer_sk,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk] #10
                                                                               InputAdapter
-                                                                                ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                                ReusedExchange [d_date_sk,d_year] #11
                                                                           InputAdapter
-                                                                            ReusedExchange [cd_demo_sk,cd_marital_status] #12
+                                                                            ReusedExchange [d_date_sk,d_year] #11
                                                                       InputAdapter
-                                                                        ReusedExchange [p_promo_sk] #13
+                                                                        ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                                   InputAdapter
-                                                                    ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                                    ReusedExchange [cd_demo_sk,cd_marital_status] #12
                                                               InputAdapter
-                                                                ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
+                                                                ReusedExchange [p_promo_sk] #13
                                                           InputAdapter
-                                                            ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                            ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                       InputAdapter
-                                                        ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
+                                                        ReusedExchange [hd_demo_sk,hd_income_band_sk] #14
                                                   InputAdapter
-                                                    ReusedExchange [ib_income_band_sk] #16
+                                                    ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                               InputAdapter
-                                                ReusedExchange [ib_income_band_sk] #16
+                                                ReusedExchange [ca_address_sk,ca_street_number,ca_street_name,ca_city,ca_zip] #15
                                           InputAdapter
-                                            ReusedExchange [i_item_sk,i_product_name] #17
+                                            ReusedExchange [ib_income_band_sk] #16
+                                      InputAdapter
+                                        ReusedExchange [ib_income_band_sk] #16
+                                  InputAdapter
+                                    ReusedExchange [i_item_sk,i_product_name] #17
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt
index 5c22de6679..68be5c8723 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/explain.txt
@@ -1,73 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (69)
-+- * Filter (68)
-   +- Window (67)
-      +- * ColumnarToRow (66)
-         +- CometSort (65)
-            +- CometColumnarExchange (64)
-               +- CometUnion (63)
-                  :- CometHashAggregate (22)
-                  :  +- CometColumnarExchange (21)
-                  :     +- RowToColumnar (20)
-                  :        +- * HashAggregate (19)
-                  :           +- * Project (18)
-                  :              +- * BroadcastHashJoin Inner BuildRight (17)
-                  :                 :- * Project (12)
-                  :                 :  +- * BroadcastHashJoin Inner BuildRight (11)
-                  :                 :     :- * Project (6)
-                  :                 :     :  +- * BroadcastHashJoin Inner BuildRight (5)
-                  :                 :     :     :- * ColumnarToRow (3)
-                  :                 :     :     :  +- CometFilter (2)
-                  :                 :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                  :                 :     :     +- ReusedExchange (4)
-                  :                 :     +- BroadcastExchange (10)
-                  :                 :        +- * ColumnarToRow (9)
-                  :                 :           +- CometFilter (8)
-                  :                 :              +- CometScan parquet spark_catalog.default.store (7)
-                  :                 +- BroadcastExchange (16)
-                  :                    +- * ColumnarToRow (15)
-                  :                       +- CometFilter (14)
-                  :                          +- CometScan parquet spark_catalog.default.item (13)
-                  :- CometHashAggregate (27)
-                  :  +- CometColumnarExchange (26)
-                  :     +- CometHashAggregate (25)
-                  :        +- CometHashAggregate (24)
-                  :           +- ReusedExchange (23)
-                  :- CometHashAggregate (32)
-                  :  +- CometColumnarExchange (31)
-                  :     +- CometHashAggregate (30)
-                  :        +- CometHashAggregate (29)
-                  :           +- ReusedExchange (28)
-                  :- CometHashAggregate (37)
-                  :  +- CometColumnarExchange (36)
-                  :     +- CometHashAggregate (35)
-                  :        +- CometHashAggregate (34)
-                  :           +- ReusedExchange (33)
-                  :- CometHashAggregate (42)
-                  :  +- CometColumnarExchange (41)
-                  :     +- CometHashAggregate (40)
-                  :        +- CometHashAggregate (39)
-                  :           +- ReusedExchange (38)
-                  :- CometHashAggregate (47)
-                  :  +- CometColumnarExchange (46)
-                  :     +- CometHashAggregate (45)
-                  :        +- CometHashAggregate (44)
-                  :           +- ReusedExchange (43)
-                  :- CometHashAggregate (52)
-                  :  +- CometColumnarExchange (51)
-                  :     +- CometHashAggregate (50)
-                  :        +- CometHashAggregate (49)
-                  :           +- ReusedExchange (48)
-                  :- CometHashAggregate (57)
-                  :  +- CometColumnarExchange (56)
-                  :     +- CometHashAggregate (55)
-                  :        +- CometHashAggregate (54)
-                  :           +- ReusedExchange (53)
-                  +- CometHashAggregate (62)
-                     +- CometColumnarExchange (61)
-                        +- CometHashAggregate (60)
-                           +- CometHashAggregate (59)
-                              +- ReusedExchange (58)
+TakeOrderedAndProject (67)
++- * Filter (66)
+   +- Window (65)
+      +- * Sort (64)
+         +- Exchange (63)
+            +- Union (62)
+               :- * HashAggregate (21)
+               :  +- Exchange (20)
+               :     +- * HashAggregate (19)
+               :        +- * Project (18)
+               :           +- * BroadcastHashJoin Inner BuildRight (17)
+               :              :- * Project (12)
+               :              :  +- * BroadcastHashJoin Inner BuildRight (11)
+               :              :     :- * Project (6)
+               :              :     :  +- * BroadcastHashJoin Inner BuildRight (5)
+               :              :     :     :- * ColumnarToRow (3)
+               :              :     :     :  +- CometFilter (2)
+               :              :     :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+               :              :     :     +- ReusedExchange (4)
+               :              :     +- BroadcastExchange (10)
+               :              :        +- * ColumnarToRow (9)
+               :              :           +- CometFilter (8)
+               :              :              +- CometScan parquet spark_catalog.default.store (7)
+               :              +- BroadcastExchange (16)
+               :                 +- * ColumnarToRow (15)
+               :                    +- CometFilter (14)
+               :                       +- CometScan parquet spark_catalog.default.item (13)
+               :- * HashAggregate (26)
+               :  +- Exchange (25)
+               :     +- * HashAggregate (24)
+               :        +- * HashAggregate (23)
+               :           +- ReusedExchange (22)
+               :- * HashAggregate (31)
+               :  +- Exchange (30)
+               :     +- * HashAggregate (29)
+               :        +- * HashAggregate (28)
+               :           +- ReusedExchange (27)
+               :- * HashAggregate (36)
+               :  +- Exchange (35)
+               :     +- * HashAggregate (34)
+               :        +- * HashAggregate (33)
+               :           +- ReusedExchange (32)
+               :- * HashAggregate (41)
+               :  +- Exchange (40)
+               :     +- * HashAggregate (39)
+               :        +- * HashAggregate (38)
+               :           +- ReusedExchange (37)
+               :- * HashAggregate (46)
+               :  +- Exchange (45)
+               :     +- * HashAggregate (44)
+               :        +- * HashAggregate (43)
+               :           +- ReusedExchange (42)
+               :- * HashAggregate (51)
+               :  +- Exchange (50)
+               :     +- * HashAggregate (49)
+               :        +- * HashAggregate (48)
+               :           +- ReusedExchange (47)
+               :- * HashAggregate (56)
+               :  +- Exchange (55)
+               :     +- * HashAggregate (54)
+               :        +- * HashAggregate (53)
+               :           +- ReusedExchange (52)
+               +- * HashAggregate (61)
+                  +- Exchange (60)
+                     +- * HashAggregate (59)
+                        +- * HashAggregate (58)
+                           +- ReusedExchange (57)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -85,7 +83,7 @@ Condition : (isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1))
 (3) ColumnarToRow [codegen id : 4]
 Input [5]: [ss_item_sk#1, ss_store_sk#2, ss_quantity#3, ss_sales_price#4, ss_sold_date_sk#5]
 
-(4) ReusedExchange [Reuses operator id: 74]
+(4) ReusedExchange [Reuses operator id: 72]
 Output [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
 (5) BroadcastHashJoin [codegen id : 4]
@@ -161,257 +159,292 @@ Functions [1]: [partial_sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as d
 Aggregate Attributes [2]: [sum#18, isEmpty#19]
 Results [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
 
-(20) RowToColumnar
+(20) Exchange
 Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometColumnarExchange
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(22) CometHashAggregate
+(21) HashAggregate [codegen id : 5]
 Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#20, isEmpty#21]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, cast(sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 as decimal(38,2)) AS sumsales#23]
 
-(23) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#22, isEmpty#23]
+(22) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#24, isEmpty#25]
 
-(24) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#22, isEmpty#23]
+(23) HashAggregate [codegen id : 10]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#24, isEmpty#25]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(25) CometHashAggregate
-Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sumsales#24]
+(24) HashAggregate [codegen id : 10]
+Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sumsales#26]
 Keys [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#27, isEmpty#28]
+Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#29, isEmpty#30]
 
-(26) CometColumnarExchange
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#25, isEmpty#26]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(25) Exchange
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#29, isEmpty#30]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(27) CometHashAggregate
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#25, isEmpty#26]
+(26) HashAggregate [codegen id : 11]
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, sum#29, isEmpty#30]
 Keys [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#31]
+Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, null AS s_store_id#32, sum(sumsales#26)#31 AS sumsales#33]
 
-(28) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#27, isEmpty#28]
+(27) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#34, isEmpty#35]
 
-(29) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#27, isEmpty#28]
+(28) HashAggregate [codegen id : 16]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#34, isEmpty#35]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(30) CometHashAggregate
-Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sumsales#24]
+(29) HashAggregate [codegen id : 16]
+Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sumsales#26]
 Keys [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#36, isEmpty#37]
+Results [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#38, isEmpty#39]
 
-(31) CometColumnarExchange
-Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#29, isEmpty#30]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(30) Exchange
+Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#38, isEmpty#39]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(32) CometHashAggregate
-Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#29, isEmpty#30]
+(31) HashAggregate [codegen id : 17]
+Input [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, sum#38, isEmpty#39]
 Keys [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#40]
+Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, null AS d_moy#41, null AS s_store_id#42, sum(sumsales#26)#40 AS sumsales#43]
 
-(33) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#31, isEmpty#32]
+(32) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#44, isEmpty#45]
 
-(34) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#31, isEmpty#32]
+(33) HashAggregate [codegen id : 22]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#44, isEmpty#45]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(35) CometHashAggregate
-Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sumsales#24]
+(34) HashAggregate [codegen id : 22]
+Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sumsales#26]
 Keys [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#46, isEmpty#47]
+Results [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#48, isEmpty#49]
 
-(36) CometColumnarExchange
-Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#33, isEmpty#34]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(35) Exchange
+Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#48, isEmpty#49]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(37) CometHashAggregate
-Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#33, isEmpty#34]
+(36) HashAggregate [codegen id : 23]
+Input [7]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, sum#48, isEmpty#49]
 Keys [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#50]
+Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, null AS d_qoy#51, null AS d_moy#52, null AS s_store_id#53, sum(sumsales#26)#50 AS sumsales#54]
 
-(38) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#35, isEmpty#36]
+(37) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#55, isEmpty#56]
 
-(39) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#35, isEmpty#36]
+(38) HashAggregate [codegen id : 28]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#55, isEmpty#56]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(40) CometHashAggregate
-Input [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sumsales#24]
+(39) HashAggregate [codegen id : 28]
+Input [5]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sumsales#26]
 Keys [4]: [i_category#16, i_class#15, i_brand#14, i_product_name#17]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#57, isEmpty#58]
+Results [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#59, isEmpty#60]
 
-(41) CometColumnarExchange
-Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#37, isEmpty#38]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(40) Exchange
+Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#59, isEmpty#60]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, i_product_name#17, 5), ENSURE_REQUIREMENTS, [plan_id=7]
 
-(42) CometHashAggregate
-Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#37, isEmpty#38]
+(41) HashAggregate [codegen id : 29]
+Input [6]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, sum#59, isEmpty#60]
 Keys [4]: [i_category#16, i_class#15, i_brand#14, i_product_name#17]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#61]
+Results [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, null AS d_year#62, null AS d_qoy#63, null AS d_moy#64, null AS s_store_id#65, sum(sumsales#26)#61 AS sumsales#66]
 
-(43) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#39, isEmpty#40]
+(42) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#67, isEmpty#68]
 
-(44) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#39, isEmpty#40]
+(43) HashAggregate [codegen id : 34]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#67, isEmpty#68]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [4]: [i_category#16, i_class#15, i_brand#14, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(45) CometHashAggregate
-Input [4]: [i_category#16, i_class#15, i_brand#14, sumsales#24]
+(44) HashAggregate [codegen id : 34]
+Input [4]: [i_category#16, i_class#15, i_brand#14, sumsales#26]
 Keys [3]: [i_category#16, i_class#15, i_brand#14]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#69, isEmpty#70]
+Results [5]: [i_category#16, i_class#15, i_brand#14, sum#71, isEmpty#72]
 
-(46) CometColumnarExchange
-Input [5]: [i_category#16, i_class#15, i_brand#14, sum#41, isEmpty#42]
-Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(45) Exchange
+Input [5]: [i_category#16, i_class#15, i_brand#14, sum#71, isEmpty#72]
+Arguments: hashpartitioning(i_category#16, i_class#15, i_brand#14, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(47) CometHashAggregate
-Input [5]: [i_category#16, i_class#15, i_brand#14, sum#41, isEmpty#42]
+(46) HashAggregate [codegen id : 35]
+Input [5]: [i_category#16, i_class#15, i_brand#14, sum#71, isEmpty#72]
 Keys [3]: [i_category#16, i_class#15, i_brand#14]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#73]
+Results [9]: [i_category#16, i_class#15, i_brand#14, null AS i_product_name#74, null AS d_year#75, null AS d_qoy#76, null AS d_moy#77, null AS s_store_id#78, sum(sumsales#26)#73 AS sumsales#79]
 
-(48) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#43, isEmpty#44]
+(47) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#80, isEmpty#81]
 
-(49) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#43, isEmpty#44]
+(48) HashAggregate [codegen id : 40]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#80, isEmpty#81]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [3]: [i_category#16, i_class#15, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(50) CometHashAggregate
-Input [3]: [i_category#16, i_class#15, sumsales#24]
+(49) HashAggregate [codegen id : 40]
+Input [3]: [i_category#16, i_class#15, sumsales#26]
 Keys [2]: [i_category#16, i_class#15]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#82, isEmpty#83]
+Results [4]: [i_category#16, i_class#15, sum#84, isEmpty#85]
 
-(51) CometColumnarExchange
-Input [4]: [i_category#16, i_class#15, sum#45, isEmpty#46]
-Arguments: hashpartitioning(i_category#16, i_class#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(50) Exchange
+Input [4]: [i_category#16, i_class#15, sum#84, isEmpty#85]
+Arguments: hashpartitioning(i_category#16, i_class#15, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(52) CometHashAggregate
-Input [4]: [i_category#16, i_class#15, sum#45, isEmpty#46]
+(51) HashAggregate [codegen id : 41]
+Input [4]: [i_category#16, i_class#15, sum#84, isEmpty#85]
 Keys [2]: [i_category#16, i_class#15]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#86]
+Results [9]: [i_category#16, i_class#15, null AS i_brand#87, null AS i_product_name#88, null AS d_year#89, null AS d_qoy#90, null AS d_moy#91, null AS s_store_id#92, sum(sumsales#26)#86 AS sumsales#93]
 
-(53) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#47, isEmpty#48]
+(52) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#94, isEmpty#95]
 
-(54) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#47, isEmpty#48]
+(53) HashAggregate [codegen id : 46]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#94, isEmpty#95]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [2]: [i_category#16, sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(55) CometHashAggregate
-Input [2]: [i_category#16, sumsales#24]
+(54) HashAggregate [codegen id : 46]
+Input [2]: [i_category#16, sumsales#26]
 Keys [1]: [i_category#16]
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#96, isEmpty#97]
+Results [3]: [i_category#16, sum#98, isEmpty#99]
 
-(56) CometColumnarExchange
-Input [3]: [i_category#16, sum#49, isEmpty#50]
-Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(55) Exchange
+Input [3]: [i_category#16, sum#98, isEmpty#99]
+Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(57) CometHashAggregate
-Input [3]: [i_category#16, sum#49, isEmpty#50]
+(56) HashAggregate [codegen id : 47]
+Input [3]: [i_category#16, sum#98, isEmpty#99]
 Keys [1]: [i_category#16]
-Functions [1]: [sum(sumsales#24)]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#100]
+Results [9]: [i_category#16, null AS i_class#101, null AS i_brand#102, null AS i_product_name#103, null AS d_year#104, null AS d_qoy#105, null AS d_moy#106, null AS s_store_id#107, sum(sumsales#26)#100 AS sumsales#108]
 
-(58) ReusedExchange [Reuses operator id: 21]
-Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#51, isEmpty#52]
+(57) ReusedExchange [Reuses operator id: 20]
+Output [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#109, isEmpty#110]
 
-(59) CometHashAggregate
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#51, isEmpty#52]
+(58) HashAggregate [codegen id : 52]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sum#109, isEmpty#110]
 Keys [8]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12]
 Functions [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))]
+Aggregate Attributes [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22]
+Results [1]: [sum(coalesce((ss_sales_price#4 * cast(ss_quantity#3 as decimal(10,0))), 0.00))#22 AS sumsales#26]
 
-(60) CometHashAggregate
-Input [1]: [sumsales#24]
+(59) HashAggregate [codegen id : 52]
+Input [1]: [sumsales#26]
 Keys: []
-Functions [1]: [partial_sum(sumsales#24)]
+Functions [1]: [partial_sum(sumsales#26)]
+Aggregate Attributes [2]: [sum#111, isEmpty#112]
+Results [2]: [sum#113, isEmpty#114]
 
-(61) CometColumnarExchange
-Input [2]: [sum#53, isEmpty#54]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(60) Exchange
+Input [2]: [sum#113, isEmpty#114]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=11]
 
-(62) CometHashAggregate
-Input [2]: [sum#53, isEmpty#54]
+(61) HashAggregate [codegen id : 53]
+Input [2]: [sum#113, isEmpty#114]
 Keys: []
-Functions [1]: [sum(sumsales#24)]
-
-(63) CometUnion
-Child 0 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
-Child 1 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#56, sumsales#57]
-Child 2 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#58, s_store_id#59, sumsales#60]
-Child 3 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#61, d_moy#62, s_store_id#63, sumsales#64]
-Child 4 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#65, d_qoy#66, d_moy#67, s_store_id#68, sumsales#69]
-Child 5 Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#70, d_year#71, d_qoy#72, d_moy#73, s_store_id#74, sumsales#75]
-Child 6 Input [9]: [i_category#16, i_class#15, i_brand#76, i_product_name#77, d_year#78, d_qoy#79, d_moy#80, s_store_id#81, sumsales#82]
-Child 7 Input [9]: [i_category#16, i_class#83, i_brand#84, i_product_name#85, d_year#86, d_qoy#87, d_moy#88, s_store_id#89, sumsales#90]
-Child 8 Input [9]: [i_category#91, i_class#92, i_brand#93, i_product_name#94, d_year#95, d_qoy#96, d_moy#97, s_store_id#98, sumsales#99]
-
-(64) CometColumnarExchange
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
-Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
-
-(65) CometSort
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
-Arguments: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55], [i_category#16 ASC NULLS FIRST, sumsales#55 DESC NULLS LAST]
-
-(66) ColumnarToRow [codegen id : 37]
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
-
-(67) Window
-Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55]
-Arguments: [rank(sumsales#55) windowspecdefinition(i_category#16, sumsales#55 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#100], [i_category#16], [sumsales#55 DESC NULLS LAST]
-
-(68) Filter [codegen id : 38]
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55, rk#100]
-Condition : (rk#100 <= 100)
-
-(69) TakeOrderedAndProject
-Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55, rk#100]
-Arguments: 100, [i_category#16 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_product_name#17 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#10 ASC NULLS FIRST, d_moy#9 ASC NULLS FIRST, s_store_id#12 ASC NULLS FIRST, sumsales#55 ASC NULLS FIRST, rk#100 ASC NULLS FIRST], [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#55, rk#100]
+Functions [1]: [sum(sumsales#26)]
+Aggregate Attributes [1]: [sum(sumsales#26)#115]
+Results [9]: [null AS i_category#116, null AS i_class#117, null AS i_brand#118, null AS i_product_name#119, null AS d_year#120, null AS d_qoy#121, null AS d_moy#122, null AS s_store_id#123, sum(sumsales#26)#115 AS sumsales#124]
+
+(62) Union
+
+(63) Exchange
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23]
+Arguments: hashpartitioning(i_category#16, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+
+(64) Sort [codegen id : 54]
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23]
+Arguments: [i_category#16 ASC NULLS FIRST, sumsales#23 DESC NULLS LAST], false, 0
+
+(65) Window
+Input [9]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23]
+Arguments: [rank(sumsales#23) windowspecdefinition(i_category#16, sumsales#23 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rk#125], [i_category#16], [sumsales#23 DESC NULLS LAST]
+
+(66) Filter [codegen id : 55]
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23, rk#125]
+Condition : (rk#125 <= 100)
+
+(67) TakeOrderedAndProject
+Input [10]: [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23, rk#125]
+Arguments: 100, [i_category#16 ASC NULLS FIRST, i_class#15 ASC NULLS FIRST, i_brand#14 ASC NULLS FIRST, i_product_name#17 ASC NULLS FIRST, d_year#8 ASC NULLS FIRST, d_qoy#10 ASC NULLS FIRST, d_moy#9 ASC NULLS FIRST, s_store_id#12 ASC NULLS FIRST, sumsales#23 ASC NULLS FIRST, rk#125 ASC NULLS FIRST], [i_category#16, i_class#15, i_brand#14, i_product_name#17, d_year#8, d_qoy#10, d_moy#9, s_store_id#12, sumsales#23, rk#125]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (74)
-+- * ColumnarToRow (73)
-   +- CometProject (72)
-      +- CometFilter (71)
-         +- CometScan parquet spark_catalog.default.date_dim (70)
+BroadcastExchange (72)
++- * ColumnarToRow (71)
+   +- CometProject (70)
+      +- CometFilter (69)
+         +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [5]: [d_date_sk#7, d_month_seq#101, d_year#8, d_moy#9, d_qoy#10]
+Output [5]: [d_date_sk#7, d_month_seq#126, d_year#8, d_moy#9, d_qoy#10]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int,d_year:int,d_moy:int,d_qoy:int>
 
-(71) CometFilter
-Input [5]: [d_date_sk#7, d_month_seq#101, d_year#8, d_moy#9, d_qoy#10]
-Condition : (((isnotnull(d_month_seq#101) AND (d_month_seq#101 >= 1212)) AND (d_month_seq#101 <= 1223)) AND isnotnull(d_date_sk#7))
+(69) CometFilter
+Input [5]: [d_date_sk#7, d_month_seq#126, d_year#8, d_moy#9, d_qoy#10]
+Condition : (((isnotnull(d_month_seq#126) AND (d_month_seq#126 >= 1212)) AND (d_month_seq#126 <= 1223)) AND isnotnull(d_date_sk#7))
 
-(72) CometProject
-Input [5]: [d_date_sk#7, d_month_seq#101, d_year#8, d_moy#9, d_qoy#10]
+(70) CometProject
+Input [5]: [d_date_sk#7, d_month_seq#126, d_year#8, d_moy#9, d_qoy#10]
 Arguments: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10], [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(73) ColumnarToRow [codegen id : 1]
+(71) ColumnarToRow [codegen id : 1]
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 
-(74) BroadcastExchange
+(72) BroadcastExchange
 Input [4]: [d_date_sk#7, d_year#8, d_moy#9, d_qoy#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=13]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt
index 1949bc1306..cfac29f8a3 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q67a/simplified.txt
@@ -1,17 +1,17 @@
 TakeOrderedAndProject [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,rk]
-  WholeStageCodegen (38)
+  WholeStageCodegen (55)
     Filter [rk]
       InputAdapter
         Window [sumsales,i_category]
-          WholeStageCodegen (37)
-            ColumnarToRow
+          WholeStageCodegen (54)
+            Sort [i_category,sumsales]
               InputAdapter
-                CometSort [i_category,sumsales]
-                  CometColumnarExchange [i_category] #1
-                    CometUnion
-                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id] #2
-                          RowToColumnar
+                Exchange [i_category] #1
+                  Union
+                    WholeStageCodegen (5)
+                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id] #2
                             WholeStageCodegen (4)
                               HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,ss_sales_price,ss_quantity] [sum,isEmpty,sum,isEmpty]
                                 Project [ss_quantity,ss_sales_price,d_year,d_moy,d_qoy,s_store_id,i_brand,i_class,i_category,i_product_name]
@@ -48,43 +48,75 @@ TakeOrderedAndProject [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_
                                             InputAdapter
                                               CometFilter [i_item_sk]
                                                 CometScan parquet spark_catalog.default.item [i_item_sk,i_brand,i_class,i_category,i_product_name]
-                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy] #6
-                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy] #7
-                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name,d_year] #8
-                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [i_category,i_class,i_brand,i_product_name,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class,i_brand,i_product_name] #9
-                          CometHashAggregate [i_category,i_class,i_brand,i_product_name,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [i_category,i_class,i_brand,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class,i_brand] #10
-                          CometHashAggregate [i_category,i_class,i_brand,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [i_category,i_class,sum,isEmpty]
-                        CometColumnarExchange [i_category,i_class] #11
-                          CometHashAggregate [i_category,i_class,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [i_category,sum,isEmpty]
-                        CometColumnarExchange [i_category] #12
-                          CometHashAggregate [i_category,sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
-                      CometHashAggregate [sum,isEmpty]
-                        CometColumnarExchange #13
-                          CometHashAggregate [sumsales]
-                            CometHashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty]
-                              ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (11)
+                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sum,isEmpty] [sum(sumsales),s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy] #6
+                            WholeStageCodegen (10)
+                              HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (17)
+                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sum,isEmpty] [sum(sumsales),d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy] #7
+                            WholeStageCodegen (16)
+                              HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (23)
+                      HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sum,isEmpty] [sum(sumsales),d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand,i_product_name,d_year] #8
+                            WholeStageCodegen (22)
+                              HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (29)
+                      HashAggregate [i_category,i_class,i_brand,i_product_name,sum,isEmpty] [sum(sumsales),d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand,i_product_name] #9
+                            WholeStageCodegen (28)
+                              HashAggregate [i_category,i_class,i_brand,i_product_name,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (35)
+                      HashAggregate [i_category,i_class,i_brand,sum,isEmpty] [sum(sumsales),i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class,i_brand] #10
+                            WholeStageCodegen (34)
+                              HashAggregate [i_category,i_class,i_brand,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (41)
+                      HashAggregate [i_category,i_class,sum,isEmpty] [sum(sumsales),i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category,i_class] #11
+                            WholeStageCodegen (40)
+                              HashAggregate [i_category,i_class,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (47)
+                      HashAggregate [i_category,sum,isEmpty] [sum(sumsales),i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange [i_category] #12
+                            WholeStageCodegen (46)
+                              HashAggregate [i_category,sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
+                    WholeStageCodegen (53)
+                      HashAggregate [sum,isEmpty] [sum(sumsales),i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sumsales,sum,isEmpty]
+                        InputAdapter
+                          Exchange #13
+                            WholeStageCodegen (52)
+                              HashAggregate [sumsales] [sum,isEmpty,sum,isEmpty]
+                                HashAggregate [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] [sum(coalesce((ss_sales_price * cast(ss_quantity as decimal(10,0))), 0.00)),sumsales,sum,isEmpty]
+                                  InputAdapter
+                                    ReusedExchange [i_category,i_class,i_brand,i_product_name,d_year,d_qoy,d_moy,s_store_id,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt
index c3d9525d52..77dcb698fc 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/explain.txt
@@ -1,63 +1,59 @@
 == Physical Plan ==
-TakeOrderedAndProject (59)
-+- * Project (58)
-   +- Window (57)
-      +- * ColumnarToRow (56)
-         +- CometSort (55)
-            +- CometColumnarExchange (54)
-               +- CometHashAggregate (53)
-                  +- CometColumnarExchange (52)
-                     +- CometHashAggregate (51)
-                        +- CometUnion (50)
-                           :- CometHashAggregate (39)
-                           :  +- CometColumnarExchange (38)
-                           :     +- RowToColumnar (37)
-                           :        +- * HashAggregate (36)
-                           :           +- * Project (35)
-                           :              +- * BroadcastHashJoin Inner BuildRight (34)
-                           :                 :- * Project (6)
-                           :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
-                           :                 :     :- * ColumnarToRow (3)
-                           :                 :     :  +- CometFilter (2)
-                           :                 :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                           :                 :     +- ReusedExchange (4)
-                           :                 +- BroadcastExchange (33)
-                           :                    +- * BroadcastHashJoin LeftSemi BuildRight (32)
-                           :                       :- * ColumnarToRow (9)
-                           :                       :  +- CometFilter (8)
-                           :                       :     +- CometScan parquet spark_catalog.default.store (7)
-                           :                       +- BroadcastExchange (31)
-                           :                          +- * Project (30)
-                           :                             +- * Filter (29)
-                           :                                +- Window (28)
-                           :                                   +- * ColumnarToRow (27)
-                           :                                      +- CometSort (26)
-                           :                                         +- CometHashAggregate (25)
-                           :                                            +- CometColumnarExchange (24)
-                           :                                               +- RowToColumnar (23)
-                           :                                                  +- * HashAggregate (22)
-                           :                                                     +- * Project (21)
-                           :                                                        +- * BroadcastHashJoin Inner BuildRight (20)
-                           :                                                           :- * Project (18)
-                           :                                                           :  +- * BroadcastHashJoin Inner BuildRight (17)
-                           :                                                           :     :- * ColumnarToRow (12)
-                           :                                                           :     :  +- CometFilter (11)
-                           :                                                           :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
-                           :                                                           :     +- BroadcastExchange (16)
-                           :                                                           :        +- * ColumnarToRow (15)
-                           :                                                           :           +- CometFilter (14)
-                           :                                                           :              +- CometScan parquet spark_catalog.default.store (13)
-                           :                                                           +- ReusedExchange (19)
-                           :- CometHashAggregate (44)
-                           :  +- CometColumnarExchange (43)
-                           :     +- CometHashAggregate (42)
-                           :        +- CometHashAggregate (41)
-                           :           +- ReusedExchange (40)
-                           +- CometHashAggregate (49)
-                              +- CometColumnarExchange (48)
-                                 +- CometHashAggregate (47)
-                                    +- CometHashAggregate (46)
-                                       +- ReusedExchange (45)
+TakeOrderedAndProject (55)
++- * Project (54)
+   +- Window (53)
+      +- * Sort (52)
+         +- Exchange (51)
+            +- * HashAggregate (50)
+               +- Exchange (49)
+                  +- * HashAggregate (48)
+                     +- Union (47)
+                        :- * HashAggregate (36)
+                        :  +- Exchange (35)
+                        :     +- * HashAggregate (34)
+                        :        +- * Project (33)
+                        :           +- * BroadcastHashJoin Inner BuildRight (32)
+                        :              :- * Project (6)
+                        :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+                        :              :     :- * ColumnarToRow (3)
+                        :              :     :  +- CometFilter (2)
+                        :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                        :              :     +- ReusedExchange (4)
+                        :              +- BroadcastExchange (31)
+                        :                 +- * BroadcastHashJoin LeftSemi BuildRight (30)
+                        :                    :- * ColumnarToRow (9)
+                        :                    :  +- CometFilter (8)
+                        :                    :     +- CometScan parquet spark_catalog.default.store (7)
+                        :                    +- BroadcastExchange (29)
+                        :                       +- * Project (28)
+                        :                          +- * Filter (27)
+                        :                             +- Window (26)
+                        :                                +- * Sort (25)
+                        :                                   +- * HashAggregate (24)
+                        :                                      +- Exchange (23)
+                        :                                         +- * HashAggregate (22)
+                        :                                            +- * Project (21)
+                        :                                               +- * BroadcastHashJoin Inner BuildRight (20)
+                        :                                                  :- * Project (18)
+                        :                                                  :  +- * BroadcastHashJoin Inner BuildRight (17)
+                        :                                                  :     :- * ColumnarToRow (12)
+                        :                                                  :     :  +- CometFilter (11)
+                        :                                                  :     :     +- CometScan parquet spark_catalog.default.store_sales (10)
+                        :                                                  :     +- BroadcastExchange (16)
+                        :                                                  :        +- * ColumnarToRow (15)
+                        :                                                  :           +- CometFilter (14)
+                        :                                                  :              +- CometScan parquet spark_catalog.default.store (13)
+                        :                                                  +- ReusedExchange (19)
+                        :- * HashAggregate (41)
+                        :  +- Exchange (40)
+                        :     +- * HashAggregate (39)
+                        :        +- * HashAggregate (38)
+                        :           +- ReusedExchange (37)
+                        +- * HashAggregate (46)
+                           +- Exchange (45)
+                              +- * HashAggregate (44)
+                                 +- * HashAggregate (43)
+                                    +- ReusedExchange (42)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -75,7 +71,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 8]
 Input [3]: [ss_store_sk#1, ss_net_profit#2, ss_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 64]
+(4) ReusedExchange [Reuses operator id: 60]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 8]
@@ -145,7 +141,7 @@ Join condition: None
 Output [3]: [ss_net_profit#10, ss_sold_date_sk#11, s_state#14]
 Input [5]: [ss_store_sk#9, ss_net_profit#10, ss_sold_date_sk#11, s_store_sk#13, s_state#14]
 
-(19) ReusedExchange [Reuses operator id: 64]
+(19) ReusedExchange [Reuses operator id: 60]
 Output [1]: [d_date_sk#15]
 
 (20) BroadcastHashJoin [codegen id : 4]
@@ -165,195 +161,200 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#10))]
 Aggregate Attributes [1]: [sum#16]
 Results [2]: [s_state#14, sum#17]
 
-(23) RowToColumnar
+(23) Exchange
 Input [2]: [s_state#14, sum#17]
+Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(24) CometColumnarExchange
-Input [2]: [s_state#14, sum#17]
-Arguments: hashpartitioning(s_state#14, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(25) CometHashAggregate
+(24) HashAggregate [codegen id : 5]
 Input [2]: [s_state#14, sum#17]
 Keys [1]: [s_state#14]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#10))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#10))#18]
+Results [3]: [s_state#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#10))#18,17,2) AS _w0#19, s_state#14]
 
-(26) CometSort
-Input [3]: [s_state#14, _w0#18, s_state#14]
-Arguments: [s_state#14, _w0#18, s_state#14], [s_state#14 ASC NULLS FIRST, _w0#18 DESC NULLS LAST]
-
-(27) ColumnarToRow [codegen id : 5]
-Input [3]: [s_state#14, _w0#18, s_state#14]
+(25) Sort [codegen id : 5]
+Input [3]: [s_state#14, _w0#19, s_state#14]
+Arguments: [s_state#14 ASC NULLS FIRST, _w0#19 DESC NULLS LAST], false, 0
 
-(28) Window
-Input [3]: [s_state#14, _w0#18, s_state#14]
-Arguments: [rank(_w0#18) windowspecdefinition(s_state#14, _w0#18 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#19], [s_state#14], [_w0#18 DESC NULLS LAST]
+(26) Window
+Input [3]: [s_state#14, _w0#19, s_state#14]
+Arguments: [rank(_w0#19) windowspecdefinition(s_state#14, _w0#19 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS ranking#20], [s_state#14], [_w0#19 DESC NULLS LAST]
 
-(29) Filter [codegen id : 6]
-Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
-Condition : (ranking#19 <= 5)
+(27) Filter [codegen id : 6]
+Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
+Condition : (ranking#20 <= 5)
 
-(30) Project [codegen id : 6]
+(28) Project [codegen id : 6]
 Output [1]: [s_state#14]
-Input [4]: [s_state#14, _w0#18, s_state#14, ranking#19]
+Input [4]: [s_state#14, _w0#19, s_state#14, ranking#20]
 
-(31) BroadcastExchange
+(29) BroadcastExchange
 Input [1]: [s_state#14]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=3]
 
-(32) BroadcastHashJoin [codegen id : 7]
+(30) BroadcastHashJoin [codegen id : 7]
 Left keys [1]: [s_state#8]
 Right keys [1]: [s_state#14]
 Join type: LeftSemi
 Join condition: None
 
-(33) BroadcastExchange
+(31) BroadcastExchange
 Input [3]: [s_store_sk#6, s_county#7, s_state#8]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=4]
 
-(34) BroadcastHashJoin [codegen id : 8]
+(32) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [ss_store_sk#1]
 Right keys [1]: [s_store_sk#6]
 Join type: Inner
 Join condition: None
 
-(35) Project [codegen id : 8]
+(33) Project [codegen id : 8]
 Output [3]: [ss_net_profit#2, s_county#7, s_state#8]
 Input [5]: [ss_store_sk#1, ss_net_profit#2, s_store_sk#6, s_county#7, s_state#8]
 
-(36) HashAggregate [codegen id : 8]
+(34) HashAggregate [codegen id : 8]
 Input [3]: [ss_net_profit#2, s_county#7, s_state#8]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [partial_sum(UnscaledValue(ss_net_profit#2))]
-Aggregate Attributes [1]: [sum#20]
-Results [3]: [s_state#8, s_county#7, sum#21]
+Aggregate Attributes [1]: [sum#21]
+Results [3]: [s_state#8, s_county#7, sum#22]
 
-(37) RowToColumnar
-Input [3]: [s_state#8, s_county#7, sum#21]
-
-(38) CometColumnarExchange
-Input [3]: [s_state#8, s_county#7, sum#21]
-Arguments: hashpartitioning(s_state#8, s_county#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(35) Exchange
+Input [3]: [s_state#8, s_county#7, sum#22]
+Arguments: hashpartitioning(s_state#8, s_county#7, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(39) CometHashAggregate
-Input [3]: [s_state#8, s_county#7, sum#21]
+(36) HashAggregate [codegen id : 9]
+Input [3]: [s_state#8, s_county#7, sum#22]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#23]
+Results [6]: [cast(MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#23,17,2) as decimal(27,2)) AS total_sum#24, s_state#8, s_county#7, 0 AS g_state#25, 0 AS g_county#26, 0 AS lochierarchy#27]
 
-(40) ReusedExchange [Reuses operator id: 38]
-Output [3]: [s_state#8, s_county#7, sum#22]
+(37) ReusedExchange [Reuses operator id: 35]
+Output [3]: [s_state#8, s_county#7, sum#28]
 
-(41) CometHashAggregate
-Input [3]: [s_state#8, s_county#7, sum#22]
+(38) HashAggregate [codegen id : 18]
+Input [3]: [s_state#8, s_county#7, sum#28]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#23]
+Results [2]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#23,17,2) AS total_sum#29, s_state#8]
 
-(42) CometHashAggregate
-Input [2]: [total_sum#23, s_state#8]
+(39) HashAggregate [codegen id : 18]
+Input [2]: [total_sum#29, s_state#8]
 Keys [1]: [s_state#8]
-Functions [1]: [partial_sum(total_sum#23)]
+Functions [1]: [partial_sum(total_sum#29)]
+Aggregate Attributes [2]: [sum#30, isEmpty#31]
+Results [3]: [s_state#8, sum#32, isEmpty#33]
 
-(43) CometColumnarExchange
-Input [3]: [s_state#8, sum#24, isEmpty#25]
-Arguments: hashpartitioning(s_state#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
+(40) Exchange
+Input [3]: [s_state#8, sum#32, isEmpty#33]
+Arguments: hashpartitioning(s_state#8, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(44) CometHashAggregate
-Input [3]: [s_state#8, sum#24, isEmpty#25]
+(41) HashAggregate [codegen id : 19]
+Input [3]: [s_state#8, sum#32, isEmpty#33]
 Keys [1]: [s_state#8]
-Functions [1]: [sum(total_sum#23)]
+Functions [1]: [sum(total_sum#29)]
+Aggregate Attributes [1]: [sum(total_sum#29)#34]
+Results [6]: [sum(total_sum#29)#34 AS total_sum#35, s_state#8, null AS s_county#36, 0 AS g_state#37, 1 AS g_county#38, 1 AS lochierarchy#39]
 
-(45) ReusedExchange [Reuses operator id: 38]
-Output [3]: [s_state#8, s_county#7, sum#26]
+(42) ReusedExchange [Reuses operator id: 35]
+Output [3]: [s_state#8, s_county#7, sum#40]
 
-(46) CometHashAggregate
-Input [3]: [s_state#8, s_county#7, sum#26]
+(43) HashAggregate [codegen id : 28]
+Input [3]: [s_state#8, s_county#7, sum#40]
 Keys [2]: [s_state#8, s_county#7]
 Functions [1]: [sum(UnscaledValue(ss_net_profit#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_profit#2))#23]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ss_net_profit#2))#23,17,2) AS total_sum#29]
 
-(47) CometHashAggregate
-Input [1]: [total_sum#23]
+(44) HashAggregate [codegen id : 28]
+Input [1]: [total_sum#29]
 Keys: []
-Functions [1]: [partial_sum(total_sum#23)]
+Functions [1]: [partial_sum(total_sum#29)]
+Aggregate Attributes [2]: [sum#41, isEmpty#42]
+Results [2]: [sum#43, isEmpty#44]
 
-(48) CometColumnarExchange
-Input [2]: [sum#27, isEmpty#28]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(45) Exchange
+Input [2]: [sum#43, isEmpty#44]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(49) CometHashAggregate
-Input [2]: [sum#27, isEmpty#28]
+(46) HashAggregate [codegen id : 29]
+Input [2]: [sum#43, isEmpty#44]
 Keys: []
-Functions [1]: [sum(total_sum#23)]
+Functions [1]: [sum(total_sum#29)]
+Aggregate Attributes [1]: [sum(total_sum#29)#45]
+Results [6]: [sum(total_sum#29)#45 AS total_sum#46, null AS s_state#47, null AS s_county#48, 1 AS g_state#49, 1 AS g_county#50, 2 AS lochierarchy#51]
 
-(50) CometUnion
-Child 0 Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
-Child 1 Input [6]: [total_sum#33, s_state#8, s_county#34, g_state#35, g_county#36, lochierarchy#37]
-Child 2 Input [6]: [total_sum#38, s_state#39, s_county#40, g_state#41, g_county#42, lochierarchy#43]
+(47) Union
 
-(51) CometHashAggregate
-Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
-Keys [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
+(48) HashAggregate [codegen id : 30]
+Input [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
+Keys [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
 Functions: []
+Aggregate Attributes: []
+Results [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
 
-(52) CometColumnarExchange
-Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
-Arguments: hashpartitioning(total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(49) Exchange
+Input [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
+Arguments: hashpartitioning(total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(53) CometHashAggregate
-Input [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
-Keys [6]: [total_sum#29, s_state#8, s_county#7, g_state#30, g_county#31, lochierarchy#32]
+(50) HashAggregate [codegen id : 31]
+Input [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
+Keys [6]: [total_sum#24, s_state#8, s_county#7, g_state#25, g_county#26, lochierarchy#27]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, CASE WHEN (g_county#26 = 0) THEN s_state#8 END AS _w0#52]
 
-(54) CometColumnarExchange
-Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
-Arguments: hashpartitioning(lochierarchy#32, _w0#44, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(55) CometSort
-Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
-Arguments: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44], [lochierarchy#32 ASC NULLS FIRST, _w0#44 ASC NULLS FIRST, total_sum#29 DESC NULLS LAST]
+(51) Exchange
+Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52]
+Arguments: hashpartitioning(lochierarchy#27, _w0#52, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(56) ColumnarToRow [codegen id : 25]
-Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
+(52) Sort [codegen id : 32]
+Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52]
+Arguments: [lochierarchy#27 ASC NULLS FIRST, _w0#52 ASC NULLS FIRST, total_sum#24 DESC NULLS LAST], false, 0
 
-(57) Window
-Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44]
-Arguments: [rank(total_sum#29) windowspecdefinition(lochierarchy#32, _w0#44, total_sum#29 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#45], [lochierarchy#32, _w0#44], [total_sum#29 DESC NULLS LAST]
+(53) Window
+Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52]
+Arguments: [rank(total_sum#24) windowspecdefinition(lochierarchy#27, _w0#52, total_sum#24 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#53], [lochierarchy#27, _w0#52], [total_sum#24 DESC NULLS LAST]
 
-(58) Project [codegen id : 26]
-Output [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, rank_within_parent#45]
-Input [6]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, _w0#44, rank_within_parent#45]
+(54) Project [codegen id : 33]
+Output [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, rank_within_parent#53]
+Input [6]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, _w0#52, rank_within_parent#53]
 
-(59) TakeOrderedAndProject
-Input [5]: [total_sum#29, s_state#8, s_county#7, lochierarchy#32, rank_within_parent#45]
-Arguments: 100, [lochierarchy#32 DESC NULLS LAST, CASE WHEN (lochierarchy#32 = 0) THEN s_state#8 END ASC NULLS FIRST, rank_within_parent#45 ASC NULLS FIRST], [total_sum#29, s_state#8, s_county#7, lochierarchy#32, rank_within_parent#45]
+(55) TakeOrderedAndProject
+Input [5]: [total_sum#24, s_state#8, s_county#7, lochierarchy#27, rank_within_parent#53]
+Arguments: 100, [lochierarchy#27 DESC NULLS LAST, CASE WHEN (lochierarchy#27 = 0) THEN s_state#8 END ASC NULLS FIRST, rank_within_parent#53 ASC NULLS FIRST], [total_sum#24, s_state#8, s_county#7, lochierarchy#27, rank_within_parent#53]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (64)
-+- * ColumnarToRow (63)
-   +- CometProject (62)
-      +- CometFilter (61)
-         +- CometScan parquet spark_catalog.default.date_dim (60)
+BroadcastExchange (60)
++- * ColumnarToRow (59)
+   +- CometProject (58)
+      +- CometFilter (57)
+         +- CometScan parquet spark_catalog.default.date_dim (56)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#46]
+Output [2]: [d_date_sk#5, d_month_seq#54]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(61) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#46]
-Condition : (((isnotnull(d_month_seq#46) AND (d_month_seq#46 >= 1212)) AND (d_month_seq#46 <= 1223)) AND isnotnull(d_date_sk#5))
+(57) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#54]
+Condition : (((isnotnull(d_month_seq#54) AND (d_month_seq#54 >= 1212)) AND (d_month_seq#54 <= 1223)) AND isnotnull(d_date_sk#5))
 
-(62) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#46]
+(58) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#54]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(63) ColumnarToRow [codegen id : 1]
+(59) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(64) BroadcastExchange
+(60) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=10]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt
index 4719e8ea07..663f828f46 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q70a/simplified.txt
@@ -1,89 +1,99 @@
 TakeOrderedAndProject [lochierarchy,s_state,rank_within_parent,total_sum,s_county]
-  WholeStageCodegen (26)
+  WholeStageCodegen (33)
     Project [total_sum,s_state,s_county,lochierarchy,rank_within_parent]
       InputAdapter
         Window [total_sum,lochierarchy,_w0]
-          WholeStageCodegen (25)
-            ColumnarToRow
+          WholeStageCodegen (32)
+            Sort [lochierarchy,_w0,total_sum]
               InputAdapter
-                CometSort [lochierarchy,_w0,total_sum]
-                  CometColumnarExchange [lochierarchy,_w0] #1
-                    CometHashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy]
-                      CometColumnarExchange [total_sum,s_state,s_county,g_state,g_county,lochierarchy] #2
-                        CometHashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy]
-                          CometUnion
-                            CometHashAggregate [s_state,s_county,sum]
-                              CometColumnarExchange [s_state,s_county] #3
-                                RowToColumnar
-                                  WholeStageCodegen (8)
-                                    HashAggregate [s_state,s_county,ss_net_profit] [sum,sum]
-                                      Project [ss_net_profit,s_county,s_state]
-                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                          Project [ss_store_sk,ss_net_profit]
-                                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ss_store_sk]
-                                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #4
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_month_seq,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #4
-                                          InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (7)
-                                                BroadcastHashJoin [s_state,s_state]
-                                                  ColumnarToRow
-                                                    InputAdapter
-                                                      CometFilter [s_store_sk]
-                                                        CometScan parquet spark_catalog.default.store [s_store_sk,s_county,s_state]
+                Exchange [lochierarchy,_w0] #1
+                  WholeStageCodegen (31)
+                    HashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy] [_w0]
+                      InputAdapter
+                        Exchange [total_sum,s_state,s_county,g_state,g_county,lochierarchy] #2
+                          WholeStageCodegen (30)
+                            HashAggregate [total_sum,s_state,s_county,g_state,g_county,lochierarchy]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (9)
+                                    HashAggregate [s_state,s_county,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,g_state,g_county,lochierarchy,sum]
+                                      InputAdapter
+                                        Exchange [s_state,s_county] #3
+                                          WholeStageCodegen (8)
+                                            HashAggregate [s_state,s_county,ss_net_profit] [sum,sum]
+                                              Project [ss_net_profit,s_county,s_state]
+                                                BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                  Project [ss_store_sk,ss_net_profit]
+                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [ss_store_sk]
+                                                            CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                                              SubqueryBroadcast [d_date_sk] #1
+                                                                BroadcastExchange #4
+                                                                  WholeStageCodegen (1)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [d_date_sk]
+                                                                          CometFilter [d_month_seq,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                                      InputAdapter
+                                                        ReusedExchange [d_date_sk] #4
                                                   InputAdapter
-                                                    BroadcastExchange #6
-                                                      WholeStageCodegen (6)
-                                                        Project [s_state]
-                                                          Filter [ranking]
+                                                    BroadcastExchange #5
+                                                      WholeStageCodegen (7)
+                                                        BroadcastHashJoin [s_state,s_state]
+                                                          ColumnarToRow
                                                             InputAdapter
-                                                              Window [_w0,s_state]
-                                                                WholeStageCodegen (5)
-                                                                  ColumnarToRow
+                                                              CometFilter [s_store_sk]
+                                                                CometScan parquet spark_catalog.default.store [s_store_sk,s_county,s_state]
+                                                          InputAdapter
+                                                            BroadcastExchange #6
+                                                              WholeStageCodegen (6)
+                                                                Project [s_state]
+                                                                  Filter [ranking]
                                                                     InputAdapter
-                                                                      CometSort [s_state,_w0]
-                                                                        CometHashAggregate [s_state,sum]
-                                                                          CometColumnarExchange [s_state] #7
-                                                                            RowToColumnar
-                                                                              WholeStageCodegen (4)
-                                                                                HashAggregate [s_state,ss_net_profit] [sum,sum]
-                                                                                  Project [ss_net_profit,s_state]
-                                                                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                                                      Project [ss_net_profit,ss_sold_date_sk,s_state]
-                                                                                        BroadcastHashJoin [ss_store_sk,s_store_sk]
-                                                                                          ColumnarToRow
-                                                                                            InputAdapter
-                                                                                              CometFilter [ss_store_sk]
-                                                                                                CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
-                                                                                                  ReusedSubquery [d_date_sk] #1
+                                                                      Window [_w0,s_state]
+                                                                        WholeStageCodegen (5)
+                                                                          Sort [s_state,_w0]
+                                                                            HashAggregate [sum] [sum(UnscaledValue(ss_net_profit)),_w0,s_state,sum]
+                                                                              InputAdapter
+                                                                                Exchange [s_state] #7
+                                                                                  WholeStageCodegen (4)
+                                                                                    HashAggregate [s_state,ss_net_profit] [sum,sum]
+                                                                                      Project [ss_net_profit,s_state]
+                                                                                        BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                                          Project [ss_net_profit,ss_sold_date_sk,s_state]
+                                                                                            BroadcastHashJoin [ss_store_sk,s_store_sk]
+                                                                                              ColumnarToRow
+                                                                                                InputAdapter
+                                                                                                  CometFilter [ss_store_sk]
+                                                                                                    CometScan parquet spark_catalog.default.store_sales [ss_store_sk,ss_net_profit,ss_sold_date_sk]
+                                                                                                      ReusedSubquery [d_date_sk] #1
+                                                                                              InputAdapter
+                                                                                                BroadcastExchange #8
+                                                                                                  WholeStageCodegen (2)
+                                                                                                    ColumnarToRow
+                                                                                                      InputAdapter
+                                                                                                        CometFilter [s_store_sk]
+                                                                                                          CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
                                                                                           InputAdapter
-                                                                                            BroadcastExchange #8
-                                                                                              WholeStageCodegen (2)
-                                                                                                ColumnarToRow
-                                                                                                  InputAdapter
-                                                                                                    CometFilter [s_store_sk]
-                                                                                                      CometScan parquet spark_catalog.default.store [s_store_sk,s_state]
-                                                                                      InputAdapter
-                                                                                        ReusedExchange [d_date_sk] #4
-                            CometHashAggregate [s_state,sum,isEmpty]
-                              CometColumnarExchange [s_state] #9
-                                CometHashAggregate [s_state,total_sum]
-                                  CometHashAggregate [s_state,s_county,sum]
-                                    ReusedExchange [s_state,s_county,sum] #3
-                            CometHashAggregate [sum,isEmpty]
-                              CometColumnarExchange #10
-                                CometHashAggregate [total_sum]
-                                  CometHashAggregate [s_state,s_county,sum]
-                                    ReusedExchange [s_state,s_county,sum] #3
+                                                                                            ReusedExchange [d_date_sk] #4
+                                  WholeStageCodegen (19)
+                                    HashAggregate [s_state,sum,isEmpty] [sum(total_sum),total_sum,s_county,g_state,g_county,lochierarchy,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [s_state] #9
+                                          WholeStageCodegen (18)
+                                            HashAggregate [s_state,total_sum] [sum,isEmpty,sum,isEmpty]
+                                              HashAggregate [s_state,s_county,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,sum]
+                                                InputAdapter
+                                                  ReusedExchange [s_state,s_county,sum] #3
+                                  WholeStageCodegen (29)
+                                    HashAggregate [sum,isEmpty] [sum(total_sum),total_sum,s_state,s_county,g_state,g_county,lochierarchy,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange #10
+                                          WholeStageCodegen (28)
+                                            HashAggregate [total_sum] [sum,isEmpty,sum,isEmpty]
+                                              HashAggregate [s_state,s_county,sum] [sum(UnscaledValue(ss_net_profit)),total_sum,sum]
+                                                InputAdapter
+                                                  ReusedExchange [s_state,s_county,sum] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt
index 9fe23081f5..46b9e51d5e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/explain.txt
@@ -1,75 +1,74 @@
 == Physical Plan ==
-* ColumnarToRow (71)
-+- CometTakeOrderedAndProject (70)
-   +- CometHashAggregate (69)
-      +- CometColumnarExchange (68)
-         +- CometHashAggregate (67)
-            +- CometProject (66)
-               +- CometSortMergeJoin (65)
-                  :- CometSort (59)
-                  :  +- CometColumnarExchange (58)
-                  :     +- RowToColumnar (57)
-                  :        +- * Project (56)
-                  :           +- * BroadcastHashJoin LeftOuter BuildRight (55)
-                  :              :- * Project (50)
-                  :              :  +- * BroadcastHashJoin Inner BuildRight (49)
-                  :              :     :- * Project (44)
-                  :              :     :  +- * BroadcastHashJoin Inner BuildRight (43)
-                  :              :     :     :- * Project (38)
-                  :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
-                  :              :     :     :     :- * Project (35)
-                  :              :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
-                  :              :     :     :     :     :- * Project (28)
-                  :              :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
-                  :              :     :     :     :     :     :- * Project (21)
-                  :              :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-                  :              :     :     :     :     :     :     :- * Project (15)
-                  :              :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-                  :              :     :     :     :     :     :     :     :- * Project (9)
-                  :              :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
-                  :              :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
-                  :              :     :     :     :     :     :     :     :     :  +- CometFilter (2)
-                  :              :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-                  :              :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
-                  :              :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
-                  :              :     :     :     :     :     :     :     :           +- CometFilter (5)
-                  :              :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
-                  :              :     :     :     :     :     :     :     +- BroadcastExchange (13)
-                  :              :     :     :     :     :     :     :        +- * ColumnarToRow (12)
-                  :              :     :     :     :     :     :     :           +- CometFilter (11)
-                  :              :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
-                  :              :     :     :     :     :     :     +- BroadcastExchange (19)
-                  :              :     :     :     :     :     :        +- * ColumnarToRow (18)
-                  :              :     :     :     :     :     :           +- CometFilter (17)
-                  :              :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
-                  :              :     :     :     :     :     +- BroadcastExchange (26)
-                  :              :     :     :     :     :        +- * ColumnarToRow (25)
-                  :              :     :     :     :     :           +- CometProject (24)
-                  :              :     :     :     :     :              +- CometFilter (23)
-                  :              :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
-                  :              :     :     :     :     +- BroadcastExchange (33)
-                  :              :     :     :     :        +- * ColumnarToRow (32)
-                  :              :     :     :     :           +- CometProject (31)
-                  :              :     :     :     :              +- CometFilter (30)
-                  :              :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
-                  :              :     :     :     +- ReusedExchange (36)
-                  :              :     :     +- BroadcastExchange (42)
-                  :              :     :        +- * ColumnarToRow (41)
-                  :              :     :           +- CometFilter (40)
-                  :              :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
-                  :              :     +- BroadcastExchange (48)
-                  :              :        +- * ColumnarToRow (47)
-                  :              :           +- CometFilter (46)
-                  :              :              +- CometScan parquet spark_catalog.default.date_dim (45)
-                  :              +- BroadcastExchange (54)
-                  :                 +- * ColumnarToRow (53)
-                  :                    +- CometFilter (52)
-                  :                       +- CometScan parquet spark_catalog.default.promotion (51)
-                  +- CometSort (64)
-                     +- CometColumnarExchange (63)
-                        +- CometProject (62)
-                           +- CometFilter (61)
-                              +- CometScan parquet spark_catalog.default.catalog_returns (60)
+TakeOrderedAndProject (70)
++- * HashAggregate (69)
+   +- Exchange (68)
+      +- * HashAggregate (67)
+         +- * Project (66)
+            +- * SortMergeJoin LeftOuter (65)
+               :- * Sort (58)
+               :  +- Exchange (57)
+               :     +- * Project (56)
+               :        +- * BroadcastHashJoin LeftOuter BuildRight (55)
+               :           :- * Project (50)
+               :           :  +- * BroadcastHashJoin Inner BuildRight (49)
+               :           :     :- * Project (44)
+               :           :     :  +- * BroadcastHashJoin Inner BuildRight (43)
+               :           :     :     :- * Project (38)
+               :           :     :     :  +- * BroadcastHashJoin Inner BuildRight (37)
+               :           :     :     :     :- * Project (35)
+               :           :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (34)
+               :           :     :     :     :     :- * Project (28)
+               :           :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (27)
+               :           :     :     :     :     :     :- * Project (21)
+               :           :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+               :           :     :     :     :     :     :     :- * Project (15)
+               :           :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+               :           :     :     :     :     :     :     :     :- * Project (9)
+               :           :     :     :     :     :     :     :     :  +- * BroadcastHashJoin Inner BuildRight (8)
+               :           :     :     :     :     :     :     :     :     :- * ColumnarToRow (3)
+               :           :     :     :     :     :     :     :     :     :  +- CometFilter (2)
+               :           :     :     :     :     :     :     :     :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+               :           :     :     :     :     :     :     :     :     +- BroadcastExchange (7)
+               :           :     :     :     :     :     :     :     :        +- * ColumnarToRow (6)
+               :           :     :     :     :     :     :     :     :           +- CometFilter (5)
+               :           :     :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.inventory (4)
+               :           :     :     :     :     :     :     :     +- BroadcastExchange (13)
+               :           :     :     :     :     :     :     :        +- * ColumnarToRow (12)
+               :           :     :     :     :     :     :     :           +- CometFilter (11)
+               :           :     :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.warehouse (10)
+               :           :     :     :     :     :     :     +- BroadcastExchange (19)
+               :           :     :     :     :     :     :        +- * ColumnarToRow (18)
+               :           :     :     :     :     :     :           +- CometFilter (17)
+               :           :     :     :     :     :     :              +- CometScan parquet spark_catalog.default.item (16)
+               :           :     :     :     :     :     +- BroadcastExchange (26)
+               :           :     :     :     :     :        +- * ColumnarToRow (25)
+               :           :     :     :     :     :           +- CometProject (24)
+               :           :     :     :     :     :              +- CometFilter (23)
+               :           :     :     :     :     :                 +- CometScan parquet spark_catalog.default.customer_demographics (22)
+               :           :     :     :     :     +- BroadcastExchange (33)
+               :           :     :     :     :        +- * ColumnarToRow (32)
+               :           :     :     :     :           +- CometProject (31)
+               :           :     :     :     :              +- CometFilter (30)
+               :           :     :     :     :                 +- CometScan parquet spark_catalog.default.household_demographics (29)
+               :           :     :     :     +- ReusedExchange (36)
+               :           :     :     +- BroadcastExchange (42)
+               :           :     :        +- * ColumnarToRow (41)
+               :           :     :           +- CometFilter (40)
+               :           :     :              +- CometScan parquet spark_catalog.default.date_dim (39)
+               :           :     +- BroadcastExchange (48)
+               :           :        +- * ColumnarToRow (47)
+               :           :           +- CometFilter (46)
+               :           :              +- CometScan parquet spark_catalog.default.date_dim (45)
+               :           +- BroadcastExchange (54)
+               :              +- * ColumnarToRow (53)
+               :                 +- CometFilter (52)
+               :                    +- CometScan parquet spark_catalog.default.promotion (51)
+               +- * ColumnarToRow (64)
+                  +- CometSort (63)
+                     +- CometExchange (62)
+                        +- CometProject (61)
+                           +- CometFilter (60)
+                              +- CometScan parquet spark_catalog.default.catalog_returns (59)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -236,7 +235,7 @@ Join condition: None
 Output [8]: [cs_ship_date_sk#1, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17]
 Input [10]: [cs_ship_date_sk#1, cs_bill_hdemo_sk#3, cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, cs_sold_date_sk#8, inv_date_sk#13, w_warehouse_name#15, i_item_desc#17, hd_demo_sk#20]
 
-(36) ReusedExchange [Reuses operator id: 76]
+(36) ReusedExchange [Reuses operator id: 75]
 Output [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
 (37) BroadcastHashJoin [codegen id : 10]
@@ -333,16 +332,13 @@ Join condition: None
 Output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Input [7]: [cs_item_sk#4, cs_promo_sk#5, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, p_promo_sk#29]
 
-(57) RowToColumnar
+(57) Exchange
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
+Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(58) CometColumnarExchange
+(58) Sort [codegen id : 11]
 Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: hashpartitioning(cs_item_sk#4, cs_order_number#6, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(59) CometSort
-Input [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Arguments: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST]
+Arguments: [cs_item_sk#4 ASC NULLS FIRST, cs_order_number#6 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
@@ -351,81 +347,86 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(61) CometFilter
+(60) CometFilter
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Condition : (isnotnull(cr_item_sk#30) AND isnotnull(cr_order_number#31))
 
-(62) CometProject
+(61) CometProject
 Input [3]: [cr_item_sk#30, cr_order_number#31, cr_returned_date_sk#32]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30, cr_order_number#31]
 
-(63) CometColumnarExchange
+(62) CometExchange
 Input [2]: [cr_item_sk#30, cr_order_number#31]
-Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+Arguments: hashpartitioning(cr_item_sk#30, cr_order_number#31, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=10]
 
-(64) CometSort
+(63) CometSort
 Input [2]: [cr_item_sk#30, cr_order_number#31]
 Arguments: [cr_item_sk#30, cr_order_number#31], [cr_item_sk#30 ASC NULLS FIRST, cr_order_number#31 ASC NULLS FIRST]
 
-(65) CometSortMergeJoin
-Left output [5]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
-Right output [2]: [cr_item_sk#30, cr_order_number#31]
-Arguments: [cs_item_sk#4, cs_order_number#6], [cr_item_sk#30, cr_order_number#31], LeftOuter
+(64) ColumnarToRow [codegen id : 12]
+Input [2]: [cr_item_sk#30, cr_order_number#31]
 
-(66) CometProject
+(65) SortMergeJoin [codegen id : 13]
+Left keys [2]: [cs_item_sk#4, cs_order_number#6]
+Right keys [2]: [cr_item_sk#30, cr_order_number#31]
+Join type: LeftOuter
+Join condition: None
+
+(66) Project [codegen id : 13]
+Output [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Input [7]: [cs_item_sk#4, cs_order_number#6, w_warehouse_name#15, i_item_desc#17, d_week_seq#24, cr_item_sk#30, cr_order_number#31]
-Arguments: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24], [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 
-(67) CometHashAggregate
+(67) HashAggregate [codegen id : 13]
 Input [3]: [w_warehouse_name#15, i_item_desc#17, d_week_seq#24]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [partial_count(1)]
+Aggregate Attributes [1]: [count#33]
+Results [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
 
-(68) CometColumnarExchange
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
-Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(68) Exchange
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
+Arguments: hashpartitioning(i_item_desc#17, w_warehouse_name#15, d_week_seq#24, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(69) CometHashAggregate
-Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#33]
+(69) HashAggregate [codegen id : 14]
+Input [4]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count#34]
 Keys [3]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24]
 Functions [1]: [count(1)]
+Aggregate Attributes [1]: [count(1)#35]
+Results [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, count(1)#35 AS no_promo#36, count(1)#35 AS promo#37, count(1)#35 AS total_cnt#38]
 
-(70) CometTakeOrderedAndProject
-Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[total_cnt#36 DESC NULLS LAST,i_item_desc#17 ASC NULLS FIRST,w_warehouse_name#15 ASC NULLS FIRST,d_week_seq#24 ASC NULLS FIRST], output=[i_item_desc#17,w_warehouse_name#15,d_week_seq#24,no_promo#34,promo#35,total_cnt#36]), 100, [total_cnt#36 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
-
-(71) ColumnarToRow [codegen id : 11]
-Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#34, promo#35, total_cnt#36]
+(70) TakeOrderedAndProject
+Input [6]: [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
+Arguments: 100, [total_cnt#38 DESC NULLS LAST, i_item_desc#17 ASC NULLS FIRST, w_warehouse_name#15 ASC NULLS FIRST, d_week_seq#24 ASC NULLS FIRST], [i_item_desc#17, w_warehouse_name#15, d_week_seq#24, no_promo#36, promo#37, total_cnt#38]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#8 IN dynamicpruning#9
-BroadcastExchange (76)
-+- * ColumnarToRow (75)
-   +- CometProject (74)
-      +- CometFilter (73)
-         +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometProject (73)
+      +- CometFilter (72)
+         +- CometScan parquet spark_catalog.default.date_dim (71)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
+Output [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk), IsNotNull(d_week_seq), IsNotNull(d_date)]
 ReadSchema: struct<d_date_sk:int,d_date:date,d_week_seq:int,d_year:int>
 
-(73) CometFilter
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
-Condition : ((((isnotnull(d_year#37) AND (d_year#37 = 2001)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
+(72) CometFilter
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
+Condition : ((((isnotnull(d_year#39) AND (d_year#39 = 2001)) AND isnotnull(d_date_sk#22)) AND isnotnull(d_week_seq#24)) AND isnotnull(d_date#23))
 
-(74) CometProject
-Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#37]
+(73) CometProject
+Input [4]: [d_date_sk#22, d_date#23, d_week_seq#24, d_year#39]
 Arguments: [d_date_sk#22, d_date#23, d_week_seq#24], [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(75) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 
-(76) BroadcastExchange
+(75) BroadcastExchange
 Input [3]: [d_date_sk#22, d_date#23, d_week_seq#24]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=12]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt
index 5bf7ab343a..5eb8ea5275 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q72/simplified.txt
@@ -1,108 +1,114 @@
-WholeStageCodegen (11)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
-        CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count]
-          CometColumnarExchange [i_item_desc,w_warehouse_name,d_week_seq] #1
-            CometHashAggregate [i_item_desc,w_warehouse_name,d_week_seq]
-              CometProject [w_warehouse_name,i_item_desc,d_week_seq]
-                CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
-                  CometSort [cs_item_sk,cs_order_number]
-                    CometColumnarExchange [cs_item_sk,cs_order_number] #2
-                      RowToColumnar
-                        WholeStageCodegen (10)
-                          Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                            BroadcastHashJoin [cs_promo_sk,p_promo_sk]
-                              Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
-                                BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
-                                  Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                    BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
-                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
-                                        BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                            BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
-                                              Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
-                                                  Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
-                                                    BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
-                                                        BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
-                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
-                                                            BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
-                                                                    CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
-                                                                      SubqueryBroadcast [d_date_sk] #1
-                                                                        BroadcastExchange #3
-                                                                          WholeStageCodegen (1)
-                                                                            ColumnarToRow
-                                                                              InputAdapter
-                                                                                CometProject [d_date_sk,d_date,d_week_seq]
-                                                                                  CometFilter [d_year,d_date_sk,d_week_seq,d_date]
-                                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
+TakeOrderedAndProject [total_cnt,i_item_desc,w_warehouse_name,d_week_seq,no_promo,promo]
+  WholeStageCodegen (14)
+    HashAggregate [i_item_desc,w_warehouse_name,d_week_seq,count] [count(1),no_promo,promo,total_cnt,count]
+      InputAdapter
+        Exchange [i_item_desc,w_warehouse_name,d_week_seq] #1
+          WholeStageCodegen (13)
+            HashAggregate [i_item_desc,w_warehouse_name,d_week_seq] [count,count]
+              Project [w_warehouse_name,i_item_desc,d_week_seq]
+                SortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
+                  InputAdapter
+                    WholeStageCodegen (11)
+                      Sort [cs_item_sk,cs_order_number]
+                        InputAdapter
+                          Exchange [cs_item_sk,cs_order_number] #2
+                            WholeStageCodegen (10)
+                              Project [cs_item_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                                BroadcastHashJoin [cs_promo_sk,p_promo_sk]
+                                  Project [cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_week_seq]
+                                    BroadcastHashJoin [cs_ship_date_sk,d_date_sk,d_date,d_date]
+                                      Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                        BroadcastHashJoin [d_week_seq,inv_date_sk,d_week_seq,d_date_sk]
+                                          Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,inv_date_sk,w_warehouse_name,i_item_desc,d_date,d_week_seq]
+                                            BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                              Project [cs_ship_date_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                BroadcastHashJoin [cs_bill_hdemo_sk,hd_demo_sk]
+                                                  Project [cs_ship_date_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                    BroadcastHashJoin [cs_bill_cdemo_sk,cd_demo_sk]
+                                                      Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name,i_item_desc]
+                                                        BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                          Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_date_sk,w_warehouse_name]
+                                                            BroadcastHashJoin [inv_warehouse_sk,w_warehouse_sk]
+                                                              Project [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_sold_date_sk,inv_warehouse_sk,inv_date_sk]
+                                                                BroadcastHashJoin [cs_item_sk,inv_item_sk,inv_quantity_on_hand,cs_quantity]
+                                                                  ColumnarToRow
+                                                                    InputAdapter
+                                                                      CometFilter [cs_quantity,cs_item_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_ship_date_sk]
+                                                                        CometScan parquet spark_catalog.default.catalog_sales [cs_ship_date_sk,cs_bill_cdemo_sk,cs_bill_hdemo_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_quantity,cs_sold_date_sk]
+                                                                          SubqueryBroadcast [d_date_sk] #1
+                                                                            BroadcastExchange #3
+                                                                              WholeStageCodegen (1)
+                                                                                ColumnarToRow
+                                                                                  InputAdapter
+                                                                                    CometProject [d_date_sk,d_date,d_week_seq]
+                                                                                      CometFilter [d_year,d_date_sk,d_week_seq,d_date]
+                                                                                        CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date,d_week_seq,d_year]
+                                                                  InputAdapter
+                                                                    BroadcastExchange #4
+                                                                      WholeStageCodegen (1)
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
+                                                                              CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
                                                               InputAdapter
-                                                                BroadcastExchange #4
-                                                                  WholeStageCodegen (1)
+                                                                BroadcastExchange #5
+                                                                  WholeStageCodegen (2)
                                                                     ColumnarToRow
                                                                       InputAdapter
-                                                                        CometFilter [inv_quantity_on_hand,inv_item_sk,inv_warehouse_sk]
-                                                                          CometScan parquet spark_catalog.default.inventory [inv_item_sk,inv_warehouse_sk,inv_quantity_on_hand,inv_date_sk]
+                                                                        CometFilter [w_warehouse_sk]
+                                                                          CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
                                                           InputAdapter
-                                                            BroadcastExchange #5
-                                                              WholeStageCodegen (2)
+                                                            BroadcastExchange #6
+                                                              WholeStageCodegen (3)
                                                                 ColumnarToRow
                                                                   InputAdapter
-                                                                    CometFilter [w_warehouse_sk]
-                                                                      CometScan parquet spark_catalog.default.warehouse [w_warehouse_sk,w_warehouse_name]
+                                                                    CometFilter [i_item_sk]
+                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
                                                       InputAdapter
-                                                        BroadcastExchange #6
-                                                          WholeStageCodegen (3)
+                                                        BroadcastExchange #7
+                                                          WholeStageCodegen (4)
                                                             ColumnarToRow
                                                               InputAdapter
-                                                                CometFilter [i_item_sk]
-                                                                  CometScan parquet spark_catalog.default.item [i_item_sk,i_item_desc]
+                                                                CometProject [cd_demo_sk]
+                                                                  CometFilter [cd_marital_status,cd_demo_sk]
+                                                                    CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
                                                   InputAdapter
-                                                    BroadcastExchange #7
-                                                      WholeStageCodegen (4)
+                                                    BroadcastExchange #8
+                                                      WholeStageCodegen (5)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometProject [cd_demo_sk]
-                                                              CometFilter [cd_marital_status,cd_demo_sk]
-                                                                CometScan parquet spark_catalog.default.customer_demographics [cd_demo_sk,cd_marital_status]
+                                                            CometProject [hd_demo_sk]
+                                                              CometFilter [hd_buy_potential,hd_demo_sk]
+                                                                CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
                                               InputAdapter
-                                                BroadcastExchange #8
-                                                  WholeStageCodegen (5)
-                                                    ColumnarToRow
-                                                      InputAdapter
-                                                        CometProject [hd_demo_sk]
-                                                          CometFilter [hd_buy_potential,hd_demo_sk]
-                                                            CometScan parquet spark_catalog.default.household_demographics [hd_demo_sk,hd_buy_potential]
+                                                ReusedExchange [d_date_sk,d_date,d_week_seq] #3
                                           InputAdapter
-                                            ReusedExchange [d_date_sk,d_date,d_week_seq] #3
+                                            BroadcastExchange #9
+                                              WholeStageCodegen (7)
+                                                ColumnarToRow
+                                                  InputAdapter
+                                                    CometFilter [d_week_seq,d_date_sk]
+                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
                                       InputAdapter
-                                        BroadcastExchange #9
-                                          WholeStageCodegen (7)
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (8)
                                             ColumnarToRow
                                               InputAdapter
-                                                CometFilter [d_week_seq,d_date_sk]
-                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_week_seq]
+                                                CometFilter [d_date,d_date_sk]
+                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                   InputAdapter
-                                    BroadcastExchange #10
-                                      WholeStageCodegen (8)
+                                    BroadcastExchange #11
+                                      WholeStageCodegen (9)
                                         ColumnarToRow
                                           InputAdapter
-                                            CometFilter [d_date,d_date_sk]
-                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                              InputAdapter
-                                BroadcastExchange #11
-                                  WholeStageCodegen (9)
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [p_promo_sk]
-                                          CometScan parquet spark_catalog.default.promotion [p_promo_sk]
-                  CometSort [cr_item_sk,cr_order_number]
-                    CometColumnarExchange [cr_item_sk,cr_order_number] #12
-                      CometProject [cr_item_sk,cr_order_number]
-                        CometFilter [cr_item_sk,cr_order_number]
-                          CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
+                                            CometFilter [p_promo_sk]
+                                              CometScan parquet spark_catalog.default.promotion [p_promo_sk]
+                  InputAdapter
+                    WholeStageCodegen (12)
+                      ColumnarToRow
+                        InputAdapter
+                          CometSort [cr_item_sk,cr_order_number]
+                            CometExchange [cr_item_sk,cr_order_number] #12
+                              CometProject [cr_item_sk,cr_order_number]
+                                CometFilter [cr_item_sk,cr_order_number]
+                                  CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt
index 46315a3c4f..776fad0078 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/explain.txt
@@ -1,83 +1,75 @@
 == Physical Plan ==
-TakeOrderedAndProject (79)
-+- * Project (78)
-   +- * BroadcastHashJoin Inner BuildRight (77)
-      :- * Project (58)
-      :  +- * BroadcastHashJoin Inner BuildRight (57)
-      :     :- * BroadcastHashJoin Inner BuildRight (37)
-      :     :  :- * ColumnarToRow (18)
-      :     :  :  +- CometFilter (17)
-      :     :  :     +- CometHashAggregate (16)
-      :     :  :        +- CometColumnarExchange (15)
-      :     :  :           +- RowToColumnar (14)
-      :     :  :              +- * HashAggregate (13)
-      :     :  :                 +- * Project (12)
-      :     :  :                    +- * BroadcastHashJoin Inner BuildRight (11)
-      :     :  :                       :- * Project (9)
-      :     :  :                       :  +- * BroadcastHashJoin Inner BuildRight (8)
-      :     :  :                       :     :- * ColumnarToRow (3)
-      :     :  :                       :     :  +- CometFilter (2)
-      :     :  :                       :     :     +- CometScan parquet spark_catalog.default.customer (1)
-      :     :  :                       :     +- BroadcastExchange (7)
-      :     :  :                       :        +- * ColumnarToRow (6)
-      :     :  :                       :           +- CometFilter (5)
-      :     :  :                       :              +- CometScan parquet spark_catalog.default.store_sales (4)
-      :     :  :                       +- ReusedExchange (10)
-      :     :  +- BroadcastExchange (36)
-      :     :     +- * ColumnarToRow (35)
-      :     :        +- CometHashAggregate (34)
-      :     :           +- CometColumnarExchange (33)
-      :     :              +- RowToColumnar (32)
-      :     :                 +- * HashAggregate (31)
-      :     :                    +- * Project (30)
-      :     :                       +- * BroadcastHashJoin Inner BuildRight (29)
-      :     :                          :- * Project (27)
-      :     :                          :  +- * BroadcastHashJoin Inner BuildRight (26)
-      :     :                          :     :- * ColumnarToRow (21)
-      :     :                          :     :  +- CometFilter (20)
-      :     :                          :     :     +- CometScan parquet spark_catalog.default.customer (19)
-      :     :                          :     +- BroadcastExchange (25)
-      :     :                          :        +- * ColumnarToRow (24)
-      :     :                          :           +- CometFilter (23)
-      :     :                          :              +- CometScan parquet spark_catalog.default.store_sales (22)
-      :     :                          +- ReusedExchange (28)
-      :     +- BroadcastExchange (56)
-      :        +- * ColumnarToRow (55)
-      :           +- CometFilter (54)
-      :              +- CometHashAggregate (53)
-      :                 +- CometColumnarExchange (52)
-      :                    +- RowToColumnar (51)
-      :                       +- * HashAggregate (50)
-      :                          +- * Project (49)
-      :                             +- * BroadcastHashJoin Inner BuildRight (48)
-      :                                :- * Project (46)
-      :                                :  +- * BroadcastHashJoin Inner BuildRight (45)
-      :                                :     :- * ColumnarToRow (40)
-      :                                :     :  +- CometFilter (39)
-      :                                :     :     +- CometScan parquet spark_catalog.default.customer (38)
-      :                                :     +- BroadcastExchange (44)
-      :                                :        +- * ColumnarToRow (43)
-      :                                :           +- CometFilter (42)
-      :                                :              +- CometScan parquet spark_catalog.default.web_sales (41)
-      :                                +- ReusedExchange (47)
-      +- BroadcastExchange (76)
-         +- * ColumnarToRow (75)
-            +- CometHashAggregate (74)
-               +- CometColumnarExchange (73)
-                  +- RowToColumnar (72)
-                     +- * HashAggregate (71)
-                        +- * Project (70)
-                           +- * BroadcastHashJoin Inner BuildRight (69)
-                              :- * Project (67)
-                              :  +- * BroadcastHashJoin Inner BuildRight (66)
-                              :     :- * ColumnarToRow (61)
-                              :     :  +- CometFilter (60)
-                              :     :     +- CometScan parquet spark_catalog.default.customer (59)
-                              :     +- BroadcastExchange (65)
-                              :        +- * ColumnarToRow (64)
-                              :           +- CometFilter (63)
-                              :              +- CometScan parquet spark_catalog.default.web_sales (62)
-                              +- ReusedExchange (68)
+TakeOrderedAndProject (71)
++- * Project (70)
+   +- * BroadcastHashJoin Inner BuildRight (69)
+      :- * Project (52)
+      :  +- * BroadcastHashJoin Inner BuildRight (51)
+      :     :- * BroadcastHashJoin Inner BuildRight (33)
+      :     :  :- * Filter (16)
+      :     :  :  +- * HashAggregate (15)
+      :     :  :     +- Exchange (14)
+      :     :  :        +- * HashAggregate (13)
+      :     :  :           +- * Project (12)
+      :     :  :              +- * BroadcastHashJoin Inner BuildRight (11)
+      :     :  :                 :- * Project (9)
+      :     :  :                 :  +- * BroadcastHashJoin Inner BuildRight (8)
+      :     :  :                 :     :- * ColumnarToRow (3)
+      :     :  :                 :     :  +- CometFilter (2)
+      :     :  :                 :     :     +- CometScan parquet spark_catalog.default.customer (1)
+      :     :  :                 :     +- BroadcastExchange (7)
+      :     :  :                 :        +- * ColumnarToRow (6)
+      :     :  :                 :           +- CometFilter (5)
+      :     :  :                 :              +- CometScan parquet spark_catalog.default.store_sales (4)
+      :     :  :                 +- ReusedExchange (10)
+      :     :  +- BroadcastExchange (32)
+      :     :     +- * HashAggregate (31)
+      :     :        +- Exchange (30)
+      :     :           +- * HashAggregate (29)
+      :     :              +- * Project (28)
+      :     :                 +- * BroadcastHashJoin Inner BuildRight (27)
+      :     :                    :- * Project (25)
+      :     :                    :  +- * BroadcastHashJoin Inner BuildRight (24)
+      :     :                    :     :- * ColumnarToRow (19)
+      :     :                    :     :  +- CometFilter (18)
+      :     :                    :     :     +- CometScan parquet spark_catalog.default.customer (17)
+      :     :                    :     +- BroadcastExchange (23)
+      :     :                    :        +- * ColumnarToRow (22)
+      :     :                    :           +- CometFilter (21)
+      :     :                    :              +- CometScan parquet spark_catalog.default.store_sales (20)
+      :     :                    +- ReusedExchange (26)
+      :     +- BroadcastExchange (50)
+      :        +- * Filter (49)
+      :           +- * HashAggregate (48)
+      :              +- Exchange (47)
+      :                 +- * HashAggregate (46)
+      :                    +- * Project (45)
+      :                       +- * BroadcastHashJoin Inner BuildRight (44)
+      :                          :- * Project (42)
+      :                          :  +- * BroadcastHashJoin Inner BuildRight (41)
+      :                          :     :- * ColumnarToRow (36)
+      :                          :     :  +- CometFilter (35)
+      :                          :     :     +- CometScan parquet spark_catalog.default.customer (34)
+      :                          :     +- BroadcastExchange (40)
+      :                          :        +- * ColumnarToRow (39)
+      :                          :           +- CometFilter (38)
+      :                          :              +- CometScan parquet spark_catalog.default.web_sales (37)
+      :                          +- ReusedExchange (43)
+      +- BroadcastExchange (68)
+         +- * HashAggregate (67)
+            +- Exchange (66)
+               +- * HashAggregate (65)
+                  +- * Project (64)
+                     +- * BroadcastHashJoin Inner BuildRight (63)
+                        :- * Project (61)
+                        :  +- * BroadcastHashJoin Inner BuildRight (60)
+                        :     :- * ColumnarToRow (55)
+                        :     :  +- CometFilter (54)
+                        :     :     +- CometScan parquet spark_catalog.default.customer (53)
+                        :     +- BroadcastExchange (59)
+                        :        +- * ColumnarToRow (58)
+                        :           +- CometFilter (57)
+                        :              +- CometScan parquet spark_catalog.default.web_sales (56)
+                        +- ReusedExchange (62)
 
 
 (unknown) Scan parquet spark_catalog.default.customer
@@ -123,7 +115,7 @@ Join condition: None
 Output [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, ss_net_paid#6, ss_sold_date_sk#7]
 Input [7]: [c_customer_sk#1, c_customer_id#2, c_first_name#3, c_last_name#4, ss_customer_sk#5, ss_net_paid#6, ss_sold_date_sk#7]
 
-(10) ReusedExchange [Reuses operator id: 83]
+(10) ReusedExchange [Reuses operator id: 75]
 Output [2]: [d_date_sk#9, d_year#10]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -143,312 +135,296 @@ Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#6))]
 Aggregate Attributes [1]: [sum#11]
 Results [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 
-(14) RowToColumnar
+(14) Exchange
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
+Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
-Arguments: hashpartitioning(c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 16]
 Input [5]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10, sum#12]
 Keys [4]: [c_customer_id#2, c_first_name#3, c_last_name#4, d_year#10]
 Functions [1]: [sum(UnscaledValue(ss_net_paid#6))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#6))#13]
+Results [2]: [c_customer_id#2 AS customer_id#14, MakeDecimal(sum(UnscaledValue(ss_net_paid#6))#13,17,2) AS year_total#15]
 
-(17) CometFilter
-Input [2]: [customer_id#13, year_total#14]
-Condition : (isnotnull(year_total#14) AND (year_total#14 > 0.00))
-
-(18) ColumnarToRow [codegen id : 16]
-Input [2]: [customer_id#13, year_total#14]
+(16) Filter [codegen id : 16]
+Input [2]: [customer_id#14, year_total#15]
+Condition : (isnotnull(year_total#15) AND (year_total#15 > 0.00))
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
+Output [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(20) CometFilter
-Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
-Condition : (isnotnull(c_customer_sk#15) AND isnotnull(c_customer_id#16))
+(18) CometFilter
+Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
+Condition : (isnotnull(c_customer_sk#16) AND isnotnull(c_customer_id#17))
 
-(21) ColumnarToRow [codegen id : 6]
-Input [4]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18]
+(19) ColumnarToRow [codegen id : 6]
+Input [4]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+Output [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#21), dynamicpruningexpression(ss_sold_date_sk#21 IN dynamicpruning#22)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#22), dynamicpruningexpression(ss_sold_date_sk#22 IN dynamicpruning#23)]
 PushedFilters: [IsNotNull(ss_customer_sk)]
 ReadSchema: struct<ss_customer_sk:int,ss_net_paid:decimal(7,2)>
 
-(23) CometFilter
-Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
-Condition : isnotnull(ss_customer_sk#19)
+(21) CometFilter
+Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
+Condition : isnotnull(ss_customer_sk#20)
 
-(24) ColumnarToRow [codegen id : 4]
-Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+(22) ColumnarToRow [codegen id : 4]
+Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 
-(25) BroadcastExchange
-Input [3]: [ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+(23) BroadcastExchange
+Input [3]: [ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=3]
 
-(26) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [c_customer_sk#15]
-Right keys [1]: [ss_customer_sk#19]
+(24) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [c_customer_sk#16]
+Right keys [1]: [ss_customer_sk#20]
 Join type: Inner
 Join condition: None
 
-(27) Project [codegen id : 6]
-Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21]
-Input [7]: [c_customer_sk#15, c_customer_id#16, c_first_name#17, c_last_name#18, ss_customer_sk#19, ss_net_paid#20, ss_sold_date_sk#21]
+(25) Project [codegen id : 6]
+Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22]
+Input [7]: [c_customer_sk#16, c_customer_id#17, c_first_name#18, c_last_name#19, ss_customer_sk#20, ss_net_paid#21, ss_sold_date_sk#22]
 
-(28) ReusedExchange [Reuses operator id: 87]
-Output [2]: [d_date_sk#23, d_year#24]
+(26) ReusedExchange [Reuses operator id: 79]
+Output [2]: [d_date_sk#24, d_year#25]
 
-(29) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [ss_sold_date_sk#21]
-Right keys [1]: [d_date_sk#23]
+(27) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [ss_sold_date_sk#22]
+Right keys [1]: [d_date_sk#24]
 Join type: Inner
 Join condition: None
 
-(30) Project [codegen id : 6]
-Output [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
-Input [7]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, ss_sold_date_sk#21, d_date_sk#23, d_year#24]
-
-(31) HashAggregate [codegen id : 6]
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, ss_net_paid#20, d_year#24]
-Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
-Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#20))]
-Aggregate Attributes [1]: [sum#25]
-Results [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-
-(32) RowToColumnar
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-
-(33) CometColumnarExchange
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-Arguments: hashpartitioning(c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
-
-(34) CometHashAggregate
-Input [5]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24, sum#26]
-Keys [4]: [c_customer_id#16, c_first_name#17, c_last_name#18, d_year#24]
-Functions [1]: [sum(UnscaledValue(ss_net_paid#20))]
-
-(35) ColumnarToRow [codegen id : 7]
-Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
-
-(36) BroadcastExchange
-Input [4]: [customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30]
+(28) Project [codegen id : 6]
+Output [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
+Input [7]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, ss_sold_date_sk#22, d_date_sk#24, d_year#25]
+
+(29) HashAggregate [codegen id : 6]
+Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, ss_net_paid#21, d_year#25]
+Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
+Functions [1]: [partial_sum(UnscaledValue(ss_net_paid#21))]
+Aggregate Attributes [1]: [sum#26]
+Results [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
+
+(30) Exchange
+Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
+Arguments: hashpartitioning(c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, 5), ENSURE_REQUIREMENTS, [plan_id=4]
+
+(31) HashAggregate [codegen id : 7]
+Input [5]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25, sum#27]
+Keys [4]: [c_customer_id#17, c_first_name#18, c_last_name#19, d_year#25]
+Functions [1]: [sum(UnscaledValue(ss_net_paid#21))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_net_paid#21))#13]
+Results [4]: [c_customer_id#17 AS customer_id#28, c_first_name#18 AS customer_first_name#29, c_last_name#19 AS customer_last_name#30, MakeDecimal(sum(UnscaledValue(ss_net_paid#21))#13,17,2) AS year_total#31]
+
+(32) BroadcastExchange
+Input [4]: [customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=5]
 
-(37) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#13]
-Right keys [1]: [customer_id#27]
+(33) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#14]
+Right keys [1]: [customer_id#28]
 Join type: Inner
 Join condition: None
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
+Output [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(39) CometFilter
-Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
-Condition : (isnotnull(c_customer_sk#31) AND isnotnull(c_customer_id#32))
+(35) CometFilter
+Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
+Condition : (isnotnull(c_customer_sk#32) AND isnotnull(c_customer_id#33))
 
-(40) ColumnarToRow [codegen id : 10]
-Input [4]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34]
+(36) ColumnarToRow [codegen id : 10]
+Input [4]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+Output [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#37), dynamicpruningexpression(ws_sold_date_sk#37 IN dynamicpruning#38)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#38), dynamicpruningexpression(ws_sold_date_sk#38 IN dynamicpruning#39)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(42) CometFilter
-Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
-Condition : isnotnull(ws_bill_customer_sk#35)
+(38) CometFilter
+Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
+Condition : isnotnull(ws_bill_customer_sk#36)
 
-(43) ColumnarToRow [codegen id : 8]
-Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+(39) ColumnarToRow [codegen id : 8]
+Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 
-(44) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+(40) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=6]
 
-(45) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [c_customer_sk#31]
-Right keys [1]: [ws_bill_customer_sk#35]
+(41) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [c_customer_sk#32]
+Right keys [1]: [ws_bill_customer_sk#36]
 Join type: Inner
 Join condition: None
 
-(46) Project [codegen id : 10]
-Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37]
-Input [7]: [c_customer_sk#31, c_customer_id#32, c_first_name#33, c_last_name#34, ws_bill_customer_sk#35, ws_net_paid#36, ws_sold_date_sk#37]
+(42) Project [codegen id : 10]
+Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38]
+Input [7]: [c_customer_sk#32, c_customer_id#33, c_first_name#34, c_last_name#35, ws_bill_customer_sk#36, ws_net_paid#37, ws_sold_date_sk#38]
 
-(47) ReusedExchange [Reuses operator id: 83]
-Output [2]: [d_date_sk#39, d_year#40]
+(43) ReusedExchange [Reuses operator id: 75]
+Output [2]: [d_date_sk#40, d_year#41]
 
-(48) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [ws_sold_date_sk#37]
-Right keys [1]: [d_date_sk#39]
+(44) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [ws_sold_date_sk#38]
+Right keys [1]: [d_date_sk#40]
 Join type: Inner
 Join condition: None
 
-(49) Project [codegen id : 10]
-Output [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
-Input [7]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, ws_sold_date_sk#37, d_date_sk#39, d_year#40]
-
-(50) HashAggregate [codegen id : 10]
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, ws_net_paid#36, d_year#40]
-Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#36))]
-Aggregate Attributes [1]: [sum#41]
-Results [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-
-(51) RowToColumnar
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-
-(52) CometColumnarExchange
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-Arguments: hashpartitioning(c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(53) CometHashAggregate
-Input [5]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40, sum#42]
-Keys [4]: [c_customer_id#32, c_first_name#33, c_last_name#34, d_year#40]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#36))]
-
-(54) CometFilter
-Input [2]: [customer_id#43, year_total#44]
-Condition : (isnotnull(year_total#44) AND (year_total#44 > 0.00))
-
-(55) ColumnarToRow [codegen id : 11]
-Input [2]: [customer_id#43, year_total#44]
-
-(56) BroadcastExchange
-Input [2]: [customer_id#43, year_total#44]
+(45) Project [codegen id : 10]
+Output [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
+Input [7]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, ws_sold_date_sk#38, d_date_sk#40, d_year#41]
+
+(46) HashAggregate [codegen id : 10]
+Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, ws_net_paid#37, d_year#41]
+Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#37))]
+Aggregate Attributes [1]: [sum#42]
+Results [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
+
+(47) Exchange
+Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
+Arguments: hashpartitioning(c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, 5), ENSURE_REQUIREMENTS, [plan_id=7]
+
+(48) HashAggregate [codegen id : 11]
+Input [5]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41, sum#43]
+Keys [4]: [c_customer_id#33, c_first_name#34, c_last_name#35, d_year#41]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#37))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#37))#44]
+Results [2]: [c_customer_id#33 AS customer_id#45, MakeDecimal(sum(UnscaledValue(ws_net_paid#37))#44,17,2) AS year_total#46]
+
+(49) Filter [codegen id : 11]
+Input [2]: [customer_id#45, year_total#46]
+Condition : (isnotnull(year_total#46) AND (year_total#46 > 0.00))
+
+(50) BroadcastExchange
+Input [2]: [customer_id#45, year_total#46]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=8]
 
-(57) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#13]
-Right keys [1]: [customer_id#43]
+(51) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#14]
+Right keys [1]: [customer_id#45]
 Join type: Inner
 Join condition: None
 
-(58) Project [codegen id : 16]
-Output [7]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44]
-Input [8]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, customer_id#43, year_total#44]
+(52) Project [codegen id : 16]
+Output [7]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46]
+Input [8]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, customer_id#45, year_total#46]
 
 (unknown) Scan parquet spark_catalog.default.customer
-Output [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
+Output [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/customer]
 PushedFilters: [IsNotNull(c_customer_sk), IsNotNull(c_customer_id)]
 ReadSchema: struct<c_customer_sk:int,c_customer_id:string,c_first_name:string,c_last_name:string>
 
-(60) CometFilter
-Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
-Condition : (isnotnull(c_customer_sk#45) AND isnotnull(c_customer_id#46))
+(54) CometFilter
+Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
+Condition : (isnotnull(c_customer_sk#47) AND isnotnull(c_customer_id#48))
 
-(61) ColumnarToRow [codegen id : 14]
-Input [4]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48]
+(55) ColumnarToRow [codegen id : 14]
+Input [4]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+Output [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#51), dynamicpruningexpression(ws_sold_date_sk#51 IN dynamicpruning#52)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#53), dynamicpruningexpression(ws_sold_date_sk#53 IN dynamicpruning#54)]
 PushedFilters: [IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_bill_customer_sk:int,ws_net_paid:decimal(7,2)>
 
-(63) CometFilter
-Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
-Condition : isnotnull(ws_bill_customer_sk#49)
+(57) CometFilter
+Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
+Condition : isnotnull(ws_bill_customer_sk#51)
 
-(64) ColumnarToRow [codegen id : 12]
-Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+(58) ColumnarToRow [codegen id : 12]
+Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 
-(65) BroadcastExchange
-Input [3]: [ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+(59) BroadcastExchange
+Input [3]: [ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(66) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [c_customer_sk#45]
-Right keys [1]: [ws_bill_customer_sk#49]
+(60) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [c_customer_sk#47]
+Right keys [1]: [ws_bill_customer_sk#51]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 14]
-Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51]
-Input [7]: [c_customer_sk#45, c_customer_id#46, c_first_name#47, c_last_name#48, ws_bill_customer_sk#49, ws_net_paid#50, ws_sold_date_sk#51]
+(61) Project [codegen id : 14]
+Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53]
+Input [7]: [c_customer_sk#47, c_customer_id#48, c_first_name#49, c_last_name#50, ws_bill_customer_sk#51, ws_net_paid#52, ws_sold_date_sk#53]
 
-(68) ReusedExchange [Reuses operator id: 87]
-Output [2]: [d_date_sk#53, d_year#54]
+(62) ReusedExchange [Reuses operator id: 79]
+Output [2]: [d_date_sk#55, d_year#56]
 
-(69) BroadcastHashJoin [codegen id : 14]
-Left keys [1]: [ws_sold_date_sk#51]
-Right keys [1]: [d_date_sk#53]
+(63) BroadcastHashJoin [codegen id : 14]
+Left keys [1]: [ws_sold_date_sk#53]
+Right keys [1]: [d_date_sk#55]
 Join type: Inner
 Join condition: None
 
-(70) Project [codegen id : 14]
-Output [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
-Input [7]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, ws_sold_date_sk#51, d_date_sk#53, d_year#54]
-
-(71) HashAggregate [codegen id : 14]
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, ws_net_paid#50, d_year#54]
-Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
-Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#50))]
-Aggregate Attributes [1]: [sum#55]
-Results [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-
-(72) RowToColumnar
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-
-(73) CometColumnarExchange
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-Arguments: hashpartitioning(c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(74) CometHashAggregate
-Input [5]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54, sum#56]
-Keys [4]: [c_customer_id#46, c_first_name#47, c_last_name#48, d_year#54]
-Functions [1]: [sum(UnscaledValue(ws_net_paid#50))]
-
-(75) ColumnarToRow [codegen id : 15]
-Input [2]: [customer_id#57, year_total#58]
-
-(76) BroadcastExchange
-Input [2]: [customer_id#57, year_total#58]
+(64) Project [codegen id : 14]
+Output [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
+Input [7]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, ws_sold_date_sk#53, d_date_sk#55, d_year#56]
+
+(65) HashAggregate [codegen id : 14]
+Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, ws_net_paid#52, d_year#56]
+Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
+Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#52))]
+Aggregate Attributes [1]: [sum#57]
+Results [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
+
+(66) Exchange
+Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
+Arguments: hashpartitioning(c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(67) HashAggregate [codegen id : 15]
+Input [5]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56, sum#58]
+Keys [4]: [c_customer_id#48, c_first_name#49, c_last_name#50, d_year#56]
+Functions [1]: [sum(UnscaledValue(ws_net_paid#52))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#52))#44]
+Results [2]: [c_customer_id#48 AS customer_id#59, MakeDecimal(sum(UnscaledValue(ws_net_paid#52))#44,17,2) AS year_total#60]
+
+(68) BroadcastExchange
+Input [2]: [customer_id#59, year_total#60]
 Arguments: HashedRelationBroadcastMode(List(input[0, string, true]),false), [plan_id=11]
 
-(77) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [customer_id#13]
-Right keys [1]: [customer_id#57]
+(69) BroadcastHashJoin [codegen id : 16]
+Left keys [1]: [customer_id#14]
+Right keys [1]: [customer_id#59]
 Join type: Inner
-Join condition: (CASE WHEN (year_total#44 > 0.00) THEN (year_total#58 / year_total#44) END > CASE WHEN (year_total#14 > 0.00) THEN (year_total#30 / year_total#14) END)
+Join condition: (CASE WHEN (year_total#46 > 0.00) THEN (year_total#60 / year_total#46) END > CASE WHEN (year_total#15 > 0.00) THEN (year_total#31 / year_total#15) END)
 
-(78) Project [codegen id : 16]
-Output [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
-Input [9]: [customer_id#13, year_total#14, customer_id#27, customer_first_name#28, customer_last_name#29, year_total#30, year_total#44, customer_id#57, year_total#58]
+(70) Project [codegen id : 16]
+Output [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
+Input [9]: [customer_id#14, year_total#15, customer_id#28, customer_first_name#29, customer_last_name#30, year_total#31, year_total#46, customer_id#59, year_total#60]
 
-(79) TakeOrderedAndProject
-Input [3]: [customer_id#27, customer_first_name#28, customer_last_name#29]
-Arguments: 100, [customer_first_name#28 ASC NULLS FIRST, customer_id#27 ASC NULLS FIRST, customer_last_name#29 ASC NULLS FIRST], [customer_id#27, customer_first_name#28, customer_last_name#29]
+(71) TakeOrderedAndProject
+Input [3]: [customer_id#28, customer_first_name#29, customer_last_name#30]
+Arguments: 100, [customer_first_name#29 ASC NULLS FIRST, customer_id#28 ASC NULLS FIRST, customer_last_name#30 ASC NULLS FIRST], [customer_id#28, customer_first_name#29, customer_last_name#30]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 4 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (83)
-+- * ColumnarToRow (82)
-   +- CometFilter (81)
-      +- CometScan parquet spark_catalog.default.date_dim (80)
+BroadcastExchange (75)
++- * ColumnarToRow (74)
+   +- CometFilter (73)
+      +- CometScan parquet spark_catalog.default.date_dim (72)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -458,44 +434,44 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(81) CometFilter
+(73) CometFilter
 Input [2]: [d_date_sk#9, d_year#10]
 Condition : (((isnotnull(d_year#10) AND (d_year#10 = 2001)) AND d_year#10 IN (2001,2002)) AND isnotnull(d_date_sk#9))
 
-(82) ColumnarToRow [codegen id : 1]
+(74) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#9, d_year#10]
 
-(83) BroadcastExchange
+(75) BroadcastExchange
 Input [2]: [d_date_sk#9, d_year#10]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=12]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ss_sold_date_sk#21 IN dynamicpruning#22
-BroadcastExchange (87)
-+- * ColumnarToRow (86)
-   +- CometFilter (85)
-      +- CometScan parquet spark_catalog.default.date_dim (84)
+Subquery:2 Hosting operator id = 20 Hosting Expression = ss_sold_date_sk#22 IN dynamicpruning#23
+BroadcastExchange (79)
++- * ColumnarToRow (78)
+   +- CometFilter (77)
+      +- CometScan parquet spark_catalog.default.date_dim (76)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#23, d_year#24]
+Output [2]: [d_date_sk#24, d_year#25]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), In(d_year, [2001,2002]), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(85) CometFilter
-Input [2]: [d_date_sk#23, d_year#24]
-Condition : (((isnotnull(d_year#24) AND (d_year#24 = 2002)) AND d_year#24 IN (2001,2002)) AND isnotnull(d_date_sk#23))
+(77) CometFilter
+Input [2]: [d_date_sk#24, d_year#25]
+Condition : (((isnotnull(d_year#25) AND (d_year#25 = 2002)) AND d_year#25 IN (2001,2002)) AND isnotnull(d_date_sk#24))
 
-(86) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#23, d_year#24]
+(78) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#24, d_year#25]
 
-(87) BroadcastExchange
-Input [2]: [d_date_sk#23, d_year#24]
+(79) BroadcastExchange
+Input [2]: [d_date_sk#24, d_year#25]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-Subquery:3 Hosting operator id = 41 Hosting Expression = ws_sold_date_sk#37 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 37 Hosting Expression = ws_sold_date_sk#38 IN dynamicpruning#8
 
-Subquery:4 Hosting operator id = 62 Hosting Expression = ws_sold_date_sk#51 IN dynamicpruning#22
+Subquery:4 Hosting operator id = 56 Hosting Expression = ws_sold_date_sk#53 IN dynamicpruning#23
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt
index e8b5c93db2..26989b0c00 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q74/simplified.txt
@@ -5,13 +5,43 @@ TakeOrderedAndProject [customer_first_name,customer_id,customer_last_name]
         Project [customer_id,year_total,customer_id,customer_first_name,customer_last_name,year_total,year_total]
           BroadcastHashJoin [customer_id,customer_id]
             BroadcastHashJoin [customer_id,customer_id]
-              ColumnarToRow
-                InputAdapter
-                  CometFilter [year_total]
-                    CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                      CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #1
-                        RowToColumnar
-                          WholeStageCodegen (3)
+              Filter [year_total]
+                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,year_total,sum]
+                  InputAdapter
+                    Exchange [c_customer_id,c_first_name,c_last_name,d_year] #1
+                      WholeStageCodegen (3)
+                        HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
+                          Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
+                            BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                              Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
+                                BroadcastHashJoin [c_customer_sk,ss_customer_sk]
+                                  ColumnarToRow
+                                    InputAdapter
+                                      CometFilter [c_customer_sk,c_customer_id]
+                                        CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
+                                  InputAdapter
+                                    BroadcastExchange #2
+                                      WholeStageCodegen (1)
+                                        ColumnarToRow
+                                          InputAdapter
+                                            CometFilter [ss_customer_sk]
+                                              CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
+                                                SubqueryBroadcast [d_date_sk] #1
+                                                  BroadcastExchange #3
+                                                    WholeStageCodegen (1)
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [d_year,d_date_sk]
+                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                              InputAdapter
+                                ReusedExchange [d_date_sk,d_year] #3
+              InputAdapter
+                BroadcastExchange #4
+                  WholeStageCodegen (7)
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ss_net_paid)),customer_id,customer_first_name,customer_last_name,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #5
+                          WholeStageCodegen (6)
                             HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
                               Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
                                 BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
@@ -22,109 +52,71 @@ TakeOrderedAndProject [customer_first_name,customer_id,customer_last_name]
                                           CometFilter [c_customer_sk,c_customer_id]
                                             CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                       InputAdapter
-                                        BroadcastExchange #2
-                                          WholeStageCodegen (1)
+                                        BroadcastExchange #6
+                                          WholeStageCodegen (4)
                                             ColumnarToRow
                                               InputAdapter
                                                 CometFilter [ss_customer_sk]
                                                   CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                    SubqueryBroadcast [d_date_sk] #1
-                                                      BroadcastExchange #3
+                                                    SubqueryBroadcast [d_date_sk] #2
+                                                      BroadcastExchange #7
                                                         WholeStageCodegen (1)
                                                           ColumnarToRow
                                                             InputAdapter
                                                               CometFilter [d_year,d_date_sk]
                                                                 CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                   InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
-              InputAdapter
-                BroadcastExchange #4
-                  WholeStageCodegen (7)
-                    ColumnarToRow
-                      InputAdapter
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #5
-                            RowToColumnar
-                              WholeStageCodegen (6)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ss_net_paid] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,d_year]
-                                    BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,ss_net_paid,ss_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ss_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                          InputAdapter
-                                            BroadcastExchange #6
-                                              WholeStageCodegen (4)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ss_customer_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_customer_sk,ss_net_paid,ss_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #2
-                                                          BroadcastExchange #7
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometFilter [d_year,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                      InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #7
+                                    ReusedExchange [d_date_sk,d_year] #7
             InputAdapter
               BroadcastExchange #8
                 WholeStageCodegen (11)
-                  ColumnarToRow
-                    InputAdapter
-                      CometFilter [year_total]
-                        CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                          CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #9
-                            RowToColumnar
-                              WholeStageCodegen (10)
-                                HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                      Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                                        BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [c_customer_sk,c_customer_id]
-                                                CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                          InputAdapter
-                                            BroadcastExchange #10
-                                              WholeStageCodegen (8)
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ws_bill_customer_sk]
-                                                      CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                                        ReusedSubquery [d_date_sk] #1
+                  Filter [year_total]
+                    HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
+                      InputAdapter
+                        Exchange [c_customer_id,c_first_name,c_last_name,d_year] #9
+                          WholeStageCodegen (10)
+                            HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                              Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                  Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                                    BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [c_customer_sk,c_customer_id]
+                                            CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                       InputAdapter
-                                        ReusedExchange [d_date_sk,d_year] #3
+                                        BroadcastExchange #10
+                                          WholeStageCodegen (8)
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ws_bill_customer_sk]
+                                                  CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                                    ReusedSubquery [d_date_sk] #1
+                                  InputAdapter
+                                    ReusedExchange [d_date_sk,d_year] #3
         InputAdapter
           BroadcastExchange #11
             WholeStageCodegen (15)
-              ColumnarToRow
+              HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum] [sum(UnscaledValue(ws_net_paid)),customer_id,year_total,sum]
                 InputAdapter
-                  CometHashAggregate [c_customer_id,c_first_name,c_last_name,d_year,sum]
-                    CometColumnarExchange [c_customer_id,c_first_name,c_last_name,d_year] #12
-                      RowToColumnar
-                        WholeStageCodegen (14)
-                          HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
-                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
-                              BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
-                                  BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometFilter [c_customer_sk,c_customer_id]
-                                          CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
-                                    InputAdapter
-                                      BroadcastExchange #13
-                                        WholeStageCodegen (12)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometFilter [ws_bill_customer_sk]
-                                                CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
-                                                  ReusedSubquery [d_date_sk] #2
+                  Exchange [c_customer_id,c_first_name,c_last_name,d_year] #12
+                    WholeStageCodegen (14)
+                      HashAggregate [c_customer_id,c_first_name,c_last_name,d_year,ws_net_paid] [sum,sum]
+                        Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,d_year]
+                          BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                            Project [c_customer_id,c_first_name,c_last_name,ws_net_paid,ws_sold_date_sk]
+                              BroadcastHashJoin [c_customer_sk,ws_bill_customer_sk]
+                                ColumnarToRow
+                                  InputAdapter
+                                    CometFilter [c_customer_sk,c_customer_id]
+                                      CometScan parquet spark_catalog.default.customer [c_customer_sk,c_customer_id,c_first_name,c_last_name]
                                 InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #7
+                                  BroadcastExchange #13
+                                    WholeStageCodegen (12)
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometFilter [ws_bill_customer_sk]
+                                            CometScan parquet spark_catalog.default.web_sales [ws_bill_customer_sk,ws_net_paid,ws_sold_date_sk]
+                                              ReusedSubquery [d_date_sk] #2
+                            InputAdapter
+                              ReusedExchange [d_date_sk,d_year] #7
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt
index 98da31a346..3922f7efe6 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/explain.txt
@@ -1,138 +1,136 @@
 == Physical Plan ==
-TakeOrderedAndProject (134)
-+- * Project (133)
-   +- * SortMergeJoin Inner (132)
-      :- * ColumnarToRow (72)
-      :  +- CometSort (71)
-      :     +- CometColumnarExchange (70)
-      :        +- CometFilter (69)
-      :           +- CometHashAggregate (68)
-      :              +- CometColumnarExchange (67)
-      :                 +- CometHashAggregate (66)
-      :                    +- CometHashAggregate (65)
-      :                       +- CometColumnarExchange (64)
-      :                          +- CometHashAggregate (63)
-      :                             +- CometUnion (62)
-      :                                :- CometProject (23)
-      :                                :  +- CometSortMergeJoin (22)
-      :                                :     :- CometSort (16)
-      :                                :     :  +- CometColumnarExchange (15)
-      :                                :     :     +- RowToColumnar (14)
-      :                                :     :        +- * Project (13)
-      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (12)
-      :                                :     :              :- * Project (10)
-      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (9)
-      :                                :     :              :     :- * ColumnarToRow (3)
-      :                                :     :              :     :  +- CometFilter (2)
-      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
-      :                                :     :              :     +- BroadcastExchange (8)
-      :                                :     :              :        +- * ColumnarToRow (7)
-      :                                :     :              :           +- CometProject (6)
-      :                                :     :              :              +- CometFilter (5)
-      :                                :     :              :                 +- CometScan parquet spark_catalog.default.item (4)
-      :                                :     :              +- ReusedExchange (11)
-      :                                :     +- CometSort (21)
-      :                                :        +- CometColumnarExchange (20)
-      :                                :           +- CometProject (19)
-      :                                :              +- CometFilter (18)
-      :                                :                 +- CometScan parquet spark_catalog.default.catalog_returns (17)
-      :                                :- CometProject (42)
-      :                                :  +- CometSortMergeJoin (41)
-      :                                :     :- CometSort (35)
-      :                                :     :  +- CometColumnarExchange (34)
-      :                                :     :     +- RowToColumnar (33)
-      :                                :     :        +- * Project (32)
-      :                                :     :           +- * BroadcastHashJoin Inner BuildRight (31)
-      :                                :     :              :- * Project (29)
-      :                                :     :              :  +- * BroadcastHashJoin Inner BuildRight (28)
-      :                                :     :              :     :- * ColumnarToRow (26)
-      :                                :     :              :     :  +- CometFilter (25)
-      :                                :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
-      :                                :     :              :     +- ReusedExchange (27)
-      :                                :     :              +- ReusedExchange (30)
-      :                                :     +- CometSort (40)
-      :                                :        +- CometColumnarExchange (39)
-      :                                :           +- CometProject (38)
-      :                                :              +- CometFilter (37)
-      :                                :                 +- CometScan parquet spark_catalog.default.store_returns (36)
-      :                                +- CometProject (61)
-      :                                   +- CometSortMergeJoin (60)
-      :                                      :- CometSort (54)
-      :                                      :  +- CometColumnarExchange (53)
-      :                                      :     +- RowToColumnar (52)
-      :                                      :        +- * Project (51)
-      :                                      :           +- * BroadcastHashJoin Inner BuildRight (50)
-      :                                      :              :- * Project (48)
-      :                                      :              :  +- * BroadcastHashJoin Inner BuildRight (47)
-      :                                      :              :     :- * ColumnarToRow (45)
-      :                                      :              :     :  +- CometFilter (44)
-      :                                      :              :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
-      :                                      :              :     +- ReusedExchange (46)
-      :                                      :              +- ReusedExchange (49)
-      :                                      +- CometSort (59)
-      :                                         +- CometColumnarExchange (58)
-      :                                            +- CometProject (57)
-      :                                               +- CometFilter (56)
-      :                                                  +- CometScan parquet spark_catalog.default.web_returns (55)
-      +- * ColumnarToRow (131)
-         +- CometSort (130)
-            +- CometColumnarExchange (129)
-               +- CometFilter (128)
-                  +- CometHashAggregate (127)
-                     +- CometColumnarExchange (126)
-                        +- CometHashAggregate (125)
-                           +- CometHashAggregate (124)
-                              +- CometColumnarExchange (123)
-                                 +- CometHashAggregate (122)
-                                    +- CometUnion (121)
-                                       :- CometProject (88)
-                                       :  +- CometSortMergeJoin (87)
-                                       :     :- CometSort (84)
-                                       :     :  +- CometColumnarExchange (83)
-                                       :     :     +- RowToColumnar (82)
-                                       :     :        +- * Project (81)
-                                       :     :           +- * BroadcastHashJoin Inner BuildRight (80)
-                                       :     :              :- * Project (78)
-                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (77)
-                                       :     :              :     :- * ColumnarToRow (75)
-                                       :     :              :     :  +- CometFilter (74)
-                                       :     :              :     :     +- CometScan parquet spark_catalog.default.catalog_sales (73)
-                                       :     :              :     +- ReusedExchange (76)
-                                       :     :              +- ReusedExchange (79)
-                                       :     +- CometSort (86)
-                                       :        +- ReusedExchange (85)
-                                       :- CometProject (104)
-                                       :  +- CometSortMergeJoin (103)
-                                       :     :- CometSort (100)
-                                       :     :  +- CometColumnarExchange (99)
-                                       :     :     +- RowToColumnar (98)
-                                       :     :        +- * Project (97)
-                                       :     :           +- * BroadcastHashJoin Inner BuildRight (96)
-                                       :     :              :- * Project (94)
-                                       :     :              :  +- * BroadcastHashJoin Inner BuildRight (93)
-                                       :     :              :     :- * ColumnarToRow (91)
-                                       :     :              :     :  +- CometFilter (90)
-                                       :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (89)
-                                       :     :              :     +- ReusedExchange (92)
-                                       :     :              +- ReusedExchange (95)
-                                       :     +- CometSort (102)
-                                       :        +- ReusedExchange (101)
-                                       +- CometProject (120)
-                                          +- CometSortMergeJoin (119)
-                                             :- CometSort (116)
-                                             :  +- CometColumnarExchange (115)
-                                             :     +- RowToColumnar (114)
-                                             :        +- * Project (113)
-                                             :           +- * BroadcastHashJoin Inner BuildRight (112)
-                                             :              :- * Project (110)
-                                             :              :  +- * BroadcastHashJoin Inner BuildRight (109)
-                                             :              :     :- * ColumnarToRow (107)
-                                             :              :     :  +- CometFilter (106)
-                                             :              :     :     +- CometScan parquet spark_catalog.default.web_sales (105)
-                                             :              :     +- ReusedExchange (108)
-                                             :              +- ReusedExchange (111)
-                                             +- CometSort (118)
-                                                +- ReusedExchange (117)
+TakeOrderedAndProject (132)
++- * Project (131)
+   +- * SortMergeJoin Inner (130)
+      :- * Sort (71)
+      :  +- Exchange (70)
+      :     +- * Filter (69)
+      :        +- * HashAggregate (68)
+      :           +- Exchange (67)
+      :              +- * HashAggregate (66)
+      :                 +- * HashAggregate (65)
+      :                    +- Exchange (64)
+      :                       +- * HashAggregate (63)
+      :                          +- Union (62)
+      :                             :- * Project (23)
+      :                             :  +- * SortMergeJoin LeftOuter (22)
+      :                             :     :- * Sort (15)
+      :                             :     :  +- Exchange (14)
+      :                             :     :     +- * Project (13)
+      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (12)
+      :                             :     :           :- * Project (10)
+      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (9)
+      :                             :     :           :     :- * ColumnarToRow (3)
+      :                             :     :           :     :  +- CometFilter (2)
+      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (1)
+      :                             :     :           :     +- BroadcastExchange (8)
+      :                             :     :           :        +- * ColumnarToRow (7)
+      :                             :     :           :           +- CometProject (6)
+      :                             :     :           :              +- CometFilter (5)
+      :                             :     :           :                 +- CometScan parquet spark_catalog.default.item (4)
+      :                             :     :           +- ReusedExchange (11)
+      :                             :     +- * ColumnarToRow (21)
+      :                             :        +- CometSort (20)
+      :                             :           +- CometExchange (19)
+      :                             :              +- CometProject (18)
+      :                             :                 +- CometFilter (17)
+      :                             :                    +- CometScan parquet spark_catalog.default.catalog_returns (16)
+      :                             :- * Project (42)
+      :                             :  +- * SortMergeJoin LeftOuter (41)
+      :                             :     :- * Sort (34)
+      :                             :     :  +- Exchange (33)
+      :                             :     :     +- * Project (32)
+      :                             :     :        +- * BroadcastHashJoin Inner BuildRight (31)
+      :                             :     :           :- * Project (29)
+      :                             :     :           :  +- * BroadcastHashJoin Inner BuildRight (28)
+      :                             :     :           :     :- * ColumnarToRow (26)
+      :                             :     :           :     :  +- CometFilter (25)
+      :                             :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (24)
+      :                             :     :           :     +- ReusedExchange (27)
+      :                             :     :           +- ReusedExchange (30)
+      :                             :     +- * ColumnarToRow (40)
+      :                             :        +- CometSort (39)
+      :                             :           +- CometExchange (38)
+      :                             :              +- CometProject (37)
+      :                             :                 +- CometFilter (36)
+      :                             :                    +- CometScan parquet spark_catalog.default.store_returns (35)
+      :                             +- * Project (61)
+      :                                +- * SortMergeJoin LeftOuter (60)
+      :                                   :- * Sort (53)
+      :                                   :  +- Exchange (52)
+      :                                   :     +- * Project (51)
+      :                                   :        +- * BroadcastHashJoin Inner BuildRight (50)
+      :                                   :           :- * Project (48)
+      :                                   :           :  +- * BroadcastHashJoin Inner BuildRight (47)
+      :                                   :           :     :- * ColumnarToRow (45)
+      :                                   :           :     :  +- CometFilter (44)
+      :                                   :           :     :     +- CometScan parquet spark_catalog.default.web_sales (43)
+      :                                   :           :     +- ReusedExchange (46)
+      :                                   :           +- ReusedExchange (49)
+      :                                   +- * ColumnarToRow (59)
+      :                                      +- CometSort (58)
+      :                                         +- CometExchange (57)
+      :                                            +- CometProject (56)
+      :                                               +- CometFilter (55)
+      :                                                  +- CometScan parquet spark_catalog.default.web_returns (54)
+      +- * Sort (129)
+         +- Exchange (128)
+            +- * Filter (127)
+               +- * HashAggregate (126)
+                  +- Exchange (125)
+                     +- * HashAggregate (124)
+                        +- * HashAggregate (123)
+                           +- Exchange (122)
+                              +- * HashAggregate (121)
+                                 +- Union (120)
+                                    :- * Project (87)
+                                    :  +- * SortMergeJoin LeftOuter (86)
+                                    :     :- * Sort (82)
+                                    :     :  +- Exchange (81)
+                                    :     :     +- * Project (80)
+                                    :     :        +- * BroadcastHashJoin Inner BuildRight (79)
+                                    :     :           :- * Project (77)
+                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (76)
+                                    :     :           :     :- * ColumnarToRow (74)
+                                    :     :           :     :  +- CometFilter (73)
+                                    :     :           :     :     +- CometScan parquet spark_catalog.default.catalog_sales (72)
+                                    :     :           :     +- ReusedExchange (75)
+                                    :     :           +- ReusedExchange (78)
+                                    :     +- * ColumnarToRow (85)
+                                    :        +- CometSort (84)
+                                    :           +- ReusedExchange (83)
+                                    :- * Project (103)
+                                    :  +- * SortMergeJoin LeftOuter (102)
+                                    :     :- * Sort (98)
+                                    :     :  +- Exchange (97)
+                                    :     :     +- * Project (96)
+                                    :     :        +- * BroadcastHashJoin Inner BuildRight (95)
+                                    :     :           :- * Project (93)
+                                    :     :           :  +- * BroadcastHashJoin Inner BuildRight (92)
+                                    :     :           :     :- * ColumnarToRow (90)
+                                    :     :           :     :  +- CometFilter (89)
+                                    :     :           :     :     +- CometScan parquet spark_catalog.default.store_sales (88)
+                                    :     :           :     +- ReusedExchange (91)
+                                    :     :           +- ReusedExchange (94)
+                                    :     +- * ColumnarToRow (101)
+                                    :        +- CometSort (100)
+                                    :           +- ReusedExchange (99)
+                                    +- * Project (119)
+                                       +- * SortMergeJoin LeftOuter (118)
+                                          :- * Sort (114)
+                                          :  +- Exchange (113)
+                                          :     +- * Project (112)
+                                          :        +- * BroadcastHashJoin Inner BuildRight (111)
+                                          :           :- * Project (109)
+                                          :           :  +- * BroadcastHashJoin Inner BuildRight (108)
+                                          :           :     :- * ColumnarToRow (106)
+                                          :           :     :  +- CometFilter (105)
+                                          :           :     :     +- CometScan parquet spark_catalog.default.web_sales (104)
+                                          :           :     +- ReusedExchange (107)
+                                          :           +- ReusedExchange (110)
+                                          +- * ColumnarToRow (117)
+                                             +- CometSort (116)
+                                                +- ReusedExchange (115)
 
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
@@ -182,7 +180,7 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Input [10]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_item_sk#7, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 
-(11) ReusedExchange [Reuses operator id: 138]
+(11) ReusedExchange [Reuses operator id: 136]
 Output [2]: [d_date_sk#13, d_year#14]
 
 (12) BroadcastHashJoin [codegen id : 3]
@@ -195,16 +193,13 @@ Join condition: None
 Output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
 Input [11]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, cs_sold_date_sk#5, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_date_sk#13, d_year#14]
 
-(14) RowToColumnar
+(14) Exchange
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
+Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
+(15) Sort [codegen id : 4]
 Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: hashpartitioning(cs_order_number#2, cs_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometSort
-Input [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Arguments: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14], [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST]
+Arguments: [cs_order_number#2 ASC NULLS FIRST, cs_item_sk#1 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
 Output [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
@@ -213,30 +208,34 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_quantity:int,cr_return_amount:decimal(7,2)>
 
-(18) CometFilter
+(17) CometFilter
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Condition : (isnotnull(cr_order_number#16) AND isnotnull(cr_item_sk#15))
 
-(19) CometProject
+(18) CometProject
 Input [5]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18, cr_returned_date_sk#19]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 
-(20) CometColumnarExchange
+(19) CometExchange
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+Arguments: hashpartitioning(cr_order_number#16, cr_item_sk#15, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=3]
 
-(21) CometSort
+(20) CometSort
 Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 Arguments: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18], [cr_order_number#16 ASC NULLS FIRST, cr_item_sk#15 ASC NULLS FIRST]
 
-(22) CometSortMergeJoin
-Left output [9]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14]
-Right output [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: [cs_order_number#2, cs_item_sk#1], [cr_order_number#16, cr_item_sk#15], LeftOuter
+(21) ColumnarToRow [codegen id : 5]
+Input [4]: [cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
 
-(23) CometProject
+(22) SortMergeJoin [codegen id : 6]
+Left keys [2]: [cs_order_number#2, cs_item_sk#1]
+Right keys [2]: [cr_order_number#16, cr_item_sk#15]
+Join type: LeftOuter
+Join condition: None
+
+(23) Project [codegen id : 6]
+Output [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
 Input [13]: [cs_item_sk#1, cs_order_number#2, cs_quantity#3, cs_ext_sales_price#4, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, d_year#14, cr_item_sk#15, cr_order_number#16, cr_return_quantity#17, cr_return_amount#18]
-Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21], [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, (cs_quantity#3 - coalesce(cr_return_quantity#17, 0)) AS sales_cnt#20, (cs_ext_sales_price#4 - coalesce(cr_return_amount#18, 0.00)) AS sales_amt#21]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
 Output [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
@@ -250,45 +249,42 @@ ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sa
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 Condition : isnotnull(ss_item_sk#22)
 
-(26) ColumnarToRow [codegen id : 6]
+(26) ColumnarToRow [codegen id : 9]
 Input [5]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26]
 
 (27) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(28) BroadcastHashJoin [codegen id : 6]
+(28) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_item_sk#22]
 Right keys [1]: [i_item_sk#28]
 Join type: Inner
 Join condition: None
 
-(29) Project [codegen id : 6]
+(29) Project [codegen id : 9]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 Input [10]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_item_sk#28, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32]
 
-(30) ReusedExchange [Reuses operator id: 138]
+(30) ReusedExchange [Reuses operator id: 136]
 Output [2]: [d_date_sk#33, d_year#34]
 
-(31) BroadcastHashJoin [codegen id : 6]
+(31) BroadcastHashJoin [codegen id : 9]
 Left keys [1]: [ss_sold_date_sk#26]
 Right keys [1]: [d_date_sk#33]
 Join type: Inner
 Join condition: None
 
-(32) Project [codegen id : 6]
+(32) Project [codegen id : 9]
 Output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
 Input [11]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, ss_sold_date_sk#26, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_date_sk#33, d_year#34]
 
-(33) RowToColumnar
-Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-
-(34) CometColumnarExchange
+(33) Exchange
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+Arguments: hashpartitioning(ss_ticket_number#23, ss_item_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(35) CometSort
+(34) Sort [codegen id : 10]
 Input [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Arguments: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34], [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST]
+Arguments: [ss_ticket_number#23 ASC NULLS FIRST, ss_item_sk#22 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.store_returns
 Output [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
@@ -297,30 +293,34 @@ Location [not included in comparison]/{warehouse_dir}/store_returns]
 PushedFilters: [IsNotNull(sr_ticket_number), IsNotNull(sr_item_sk)]
 ReadSchema: struct<sr_item_sk:int,sr_ticket_number:int,sr_return_quantity:int,sr_return_amt:decimal(7,2)>
 
-(37) CometFilter
+(36) CometFilter
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Condition : (isnotnull(sr_ticket_number#36) AND isnotnull(sr_item_sk#35))
 
-(38) CometProject
+(37) CometProject
 Input [5]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38, sr_returned_date_sk#39]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 
-(39) CometColumnarExchange
+(38) CometExchange
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+Arguments: hashpartitioning(sr_ticket_number#36, sr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
-(40) CometSort
+(39) CometSort
 Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
 Arguments: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38], [sr_ticket_number#36 ASC NULLS FIRST, sr_item_sk#35 ASC NULLS FIRST]
 
-(41) CometSortMergeJoin
-Left output [9]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34]
-Right output [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: [ss_ticket_number#23, ss_item_sk#22], [sr_ticket_number#36, sr_item_sk#35], LeftOuter
+(40) ColumnarToRow [codegen id : 11]
+Input [4]: [sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
+
+(41) SortMergeJoin [codegen id : 12]
+Left keys [2]: [ss_ticket_number#23, ss_item_sk#22]
+Right keys [2]: [sr_ticket_number#36, sr_item_sk#35]
+Join type: LeftOuter
+Join condition: None
 
-(42) CometProject
+(42) Project [codegen id : 12]
+Output [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
 Input [13]: [ss_item_sk#22, ss_ticket_number#23, ss_quantity#24, ss_ext_sales_price#25, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, d_year#34, sr_item_sk#35, sr_ticket_number#36, sr_return_quantity#37, sr_return_amt#38]
-Arguments: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41], [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, (ss_quantity#24 - coalesce(sr_return_quantity#37, 0)) AS sales_cnt#40, (ss_ext_sales_price#25 - coalesce(sr_return_amt#38, 0.00)) AS sales_amt#41]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
 Output [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
@@ -334,45 +334,42 @@ ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sal
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 Condition : isnotnull(ws_item_sk#42)
 
-(45) ColumnarToRow [codegen id : 9]
+(45) ColumnarToRow [codegen id : 15]
 Input [5]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46]
 
 (46) ReusedExchange [Reuses operator id: 8]
 Output [5]: [i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(47) BroadcastHashJoin [codegen id : 9]
+(47) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ws_item_sk#42]
 Right keys [1]: [i_item_sk#48]
 Join type: Inner
 Join condition: None
 
-(48) Project [codegen id : 9]
+(48) Project [codegen id : 15]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 Input [10]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_item_sk#48, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52]
 
-(49) ReusedExchange [Reuses operator id: 138]
+(49) ReusedExchange [Reuses operator id: 136]
 Output [2]: [d_date_sk#53, d_year#54]
 
-(50) BroadcastHashJoin [codegen id : 9]
+(50) BroadcastHashJoin [codegen id : 15]
 Left keys [1]: [ws_sold_date_sk#46]
 Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(51) Project [codegen id : 9]
+(51) Project [codegen id : 15]
 Output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
 Input [11]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, ws_sold_date_sk#46, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_date_sk#53, d_year#54]
 
-(52) RowToColumnar
+(52) Exchange
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
+Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(53) CometColumnarExchange
+(53) Sort [codegen id : 16]
 Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: hashpartitioning(ws_order_number#43, ws_item_sk#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(54) CometSort
-Input [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Arguments: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54], [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST]
+Arguments: [ws_order_number#43 ASC NULLS FIRST, ws_item_sk#42 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.web_returns
 Output [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
@@ -381,352 +378,363 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_quantity:int,wr_return_amt:decimal(7,2)>
 
-(56) CometFilter
+(55) CometFilter
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Condition : (isnotnull(wr_order_number#56) AND isnotnull(wr_item_sk#55))
 
-(57) CometProject
+(56) CometProject
 Input [5]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58, wr_returned_date_sk#59]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 
-(58) CometColumnarExchange
+(57) CometExchange
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+Arguments: hashpartitioning(wr_order_number#56, wr_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(59) CometSort
+(58) CometSort
 Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
 Arguments: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58], [wr_order_number#56 ASC NULLS FIRST, wr_item_sk#55 ASC NULLS FIRST]
 
-(60) CometSortMergeJoin
-Left output [9]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54]
-Right output [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: [ws_order_number#43, ws_item_sk#42], [wr_order_number#56, wr_item_sk#55], LeftOuter
+(59) ColumnarToRow [codegen id : 17]
+Input [4]: [wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
+
+(60) SortMergeJoin [codegen id : 18]
+Left keys [2]: [ws_order_number#43, ws_item_sk#42]
+Right keys [2]: [wr_order_number#56, wr_item_sk#55]
+Join type: LeftOuter
+Join condition: None
 
-(61) CometProject
+(61) Project [codegen id : 18]
+Output [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
 Input [13]: [ws_item_sk#42, ws_order_number#43, ws_quantity#44, ws_ext_sales_price#45, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, d_year#54, wr_item_sk#55, wr_order_number#56, wr_return_quantity#57, wr_return_amt#58]
-Arguments: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61], [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, (ws_quantity#44 - coalesce(wr_return_quantity#57, 0)) AS sales_cnt#60, (ws_ext_sales_price#45 - coalesce(wr_return_amt#58, 0.00)) AS sales_amt#61]
 
-(62) CometUnion
-Child 0 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
-Child 1 Input [7]: [d_year#34, i_brand_id#29, i_class_id#30, i_category_id#31, i_manufact_id#32, sales_cnt#40, sales_amt#41]
-Child 2 Input [7]: [d_year#54, i_brand_id#49, i_class_id#50, i_category_id#51, i_manufact_id#52, sales_cnt#60, sales_amt#61]
+(62) Union
 
-(63) CometHashAggregate
+(63) HashAggregate [codegen id : 19]
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(64) CometColumnarExchange
+(64) Exchange
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=8]
 
-(65) CometHashAggregate
+(65) HashAggregate [codegen id : 20]
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 
-(66) CometHashAggregate
+(66) HashAggregate [codegen id : 20]
 Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#20, sales_amt#21]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum#62, sum#63]
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
 
-(67) CometColumnarExchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
-Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(67) Exchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
+Arguments: hashpartitioning(d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(68) CometHashAggregate
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#62, sum#63]
+(68) HashAggregate [codegen id : 21]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum#64, sum#65]
 Keys [5]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
+Results [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sum(sales_cnt#20)#66 AS sales_cnt#68, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#69]
 
-(69) CometFilter
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
-Condition : isnotnull(sales_cnt#64)
+(69) Filter [codegen id : 21]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
+Condition : isnotnull(sales_cnt#68)
 
-(70) CometColumnarExchange
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
-Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
+(70) Exchange
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
+Arguments: hashpartitioning(i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(71) CometSort
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
-Arguments: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65], [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST]
-
-(72) ColumnarToRow [codegen id : 10]
-Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65]
+(71) Sort [codegen id : 22]
+Input [7]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69]
+Arguments: [i_brand_id#8 ASC NULLS FIRST, i_class_id#9 ASC NULLS FIRST, i_category_id#10 ASC NULLS FIRST, i_manufact_id#12 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
+Output [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#70), dynamicpruningexpression(cs_sold_date_sk#70 IN dynamicpruning#71)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#74), dynamicpruningexpression(cs_sold_date_sk#74 IN dynamicpruning#75)]
 PushedFilters: [IsNotNull(cs_item_sk)]
 ReadSchema: struct<cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_ext_sales_price:decimal(7,2)>
 
-(74) CometFilter
-Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
-Condition : isnotnull(cs_item_sk#66)
+(73) CometFilter
+Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
+Condition : isnotnull(cs_item_sk#70)
 
-(75) ColumnarToRow [codegen id : 13]
-Input [5]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70]
+(74) ColumnarToRow [codegen id : 25]
+Input [5]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74]
 
-(76) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(75) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 
-(77) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cs_item_sk#66]
-Right keys [1]: [i_item_sk#72]
+(76) BroadcastHashJoin [codegen id : 25]
+Left keys [1]: [cs_item_sk#70]
+Right keys [1]: [i_item_sk#76]
 Join type: Inner
 Join condition: None
 
-(78) Project [codegen id : 13]
-Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
-Input [10]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_item_sk#72, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(77) Project [codegen id : 25]
+Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
+Input [10]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_item_sk#76, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 
-(79) ReusedExchange [Reuses operator id: 142]
-Output [2]: [d_date_sk#77, d_year#78]
+(78) ReusedExchange [Reuses operator id: 140]
+Output [2]: [d_date_sk#81, d_year#82]
 
-(80) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cs_sold_date_sk#70]
-Right keys [1]: [d_date_sk#77]
+(79) BroadcastHashJoin [codegen id : 25]
+Left keys [1]: [cs_sold_date_sk#74]
+Right keys [1]: [d_date_sk#81]
 Join type: Inner
 Join condition: None
 
-(81) Project [codegen id : 13]
-Output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Input [11]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, cs_sold_date_sk#70, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_date_sk#77, d_year#78]
+(80) Project [codegen id : 25]
+Output [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
+Input [11]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, cs_sold_date_sk#74, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_date_sk#81, d_year#82]
 
-(82) RowToColumnar
-Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
+(81) Exchange
+Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
+Arguments: hashpartitioning(cs_order_number#71, cs_item_sk#70, 5), ENSURE_REQUIREMENTS, [plan_id=11]
 
-(83) CometColumnarExchange
-Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Arguments: hashpartitioning(cs_order_number#67, cs_item_sk#66, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+(82) Sort [codegen id : 26]
+Input [9]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82]
+Arguments: [cs_order_number#71 ASC NULLS FIRST, cs_item_sk#70 ASC NULLS FIRST], false, 0
 
-(84) CometSort
-Input [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Arguments: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78], [cs_order_number#67 ASC NULLS FIRST, cs_item_sk#66 ASC NULLS FIRST]
+(83) ReusedExchange [Reuses operator id: 19]
+Output [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
 
-(85) ReusedExchange [Reuses operator id: 20]
-Output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
+(84) CometSort
+Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
+Arguments: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86], [cr_order_number#84 ASC NULLS FIRST, cr_item_sk#83 ASC NULLS FIRST]
 
-(86) CometSort
-Input [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
-Arguments: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82], [cr_order_number#80 ASC NULLS FIRST, cr_item_sk#79 ASC NULLS FIRST]
+(85) ColumnarToRow [codegen id : 27]
+Input [4]: [cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
 
-(87) CometSortMergeJoin
-Left output [9]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78]
-Right output [4]: [cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
-Arguments: [cs_order_number#67, cs_item_sk#66], [cr_order_number#80, cr_item_sk#79], LeftOuter
+(86) SortMergeJoin [codegen id : 28]
+Left keys [2]: [cs_order_number#71, cs_item_sk#70]
+Right keys [2]: [cr_order_number#84, cr_item_sk#83]
+Join type: LeftOuter
+Join condition: None
 
-(88) CometProject
-Input [13]: [cs_item_sk#66, cs_order_number#67, cs_quantity#68, cs_ext_sales_price#69, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, d_year#78, cr_item_sk#79, cr_order_number#80, cr_return_quantity#81, cr_return_amount#82]
-Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21], [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, (cs_quantity#68 - coalesce(cr_return_quantity#81, 0)) AS sales_cnt#20, (cs_ext_sales_price#69 - coalesce(cr_return_amount#82, 0.00)) AS sales_amt#21]
+(87) Project [codegen id : 28]
+Output [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, (cs_quantity#72 - coalesce(cr_return_quantity#85, 0)) AS sales_cnt#20, (cs_ext_sales_price#73 - coalesce(cr_return_amount#86, 0.00)) AS sales_amt#21]
+Input [13]: [cs_item_sk#70, cs_order_number#71, cs_quantity#72, cs_ext_sales_price#73, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, d_year#82, cr_item_sk#83, cr_order_number#84, cr_return_quantity#85, cr_return_amount#86]
 
 (unknown) Scan parquet spark_catalog.default.store_sales
-Output [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
+Output [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ss_sold_date_sk#87), dynamicpruningexpression(ss_sold_date_sk#87 IN dynamicpruning#88)]
+PartitionFilters: [isnotnull(ss_sold_date_sk#91), dynamicpruningexpression(ss_sold_date_sk#91 IN dynamicpruning#92)]
 PushedFilters: [IsNotNull(ss_item_sk)]
 ReadSchema: struct<ss_item_sk:int,ss_ticket_number:int,ss_quantity:int,ss_ext_sales_price:decimal(7,2)>
 
-(90) CometFilter
-Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
-Condition : isnotnull(ss_item_sk#83)
+(89) CometFilter
+Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
+Condition : isnotnull(ss_item_sk#87)
 
-(91) ColumnarToRow [codegen id : 16]
-Input [5]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87]
+(90) ColumnarToRow [codegen id : 31]
+Input [5]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91]
 
-(92) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
+(91) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
 
-(93) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [ss_item_sk#83]
-Right keys [1]: [i_item_sk#89]
+(92) BroadcastHashJoin [codegen id : 31]
+Left keys [1]: [ss_item_sk#87]
+Right keys [1]: [i_item_sk#93]
 Join type: Inner
 Join condition: None
 
-(94) Project [codegen id : 16]
-Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
-Input [10]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_item_sk#89, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93]
+(93) Project [codegen id : 31]
+Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
+Input [10]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_item_sk#93, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97]
 
-(95) ReusedExchange [Reuses operator id: 142]
-Output [2]: [d_date_sk#94, d_year#95]
+(94) ReusedExchange [Reuses operator id: 140]
+Output [2]: [d_date_sk#98, d_year#99]
 
-(96) BroadcastHashJoin [codegen id : 16]
-Left keys [1]: [ss_sold_date_sk#87]
-Right keys [1]: [d_date_sk#94]
+(95) BroadcastHashJoin [codegen id : 31]
+Left keys [1]: [ss_sold_date_sk#91]
+Right keys [1]: [d_date_sk#98]
 Join type: Inner
 Join condition: None
 
-(97) Project [codegen id : 16]
-Output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Input [11]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, ss_sold_date_sk#87, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_date_sk#94, d_year#95]
+(96) Project [codegen id : 31]
+Output [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
+Input [11]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, ss_sold_date_sk#91, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_date_sk#98, d_year#99]
 
-(98) RowToColumnar
-Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
+(97) Exchange
+Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
+Arguments: hashpartitioning(ss_ticket_number#88, ss_item_sk#87, 5), ENSURE_REQUIREMENTS, [plan_id=12]
 
-(99) CometColumnarExchange
-Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Arguments: hashpartitioning(ss_ticket_number#84, ss_item_sk#83, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+(98) Sort [codegen id : 32]
+Input [9]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99]
+Arguments: [ss_ticket_number#88 ASC NULLS FIRST, ss_item_sk#87 ASC NULLS FIRST], false, 0
 
-(100) CometSort
-Input [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Arguments: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95], [ss_ticket_number#84 ASC NULLS FIRST, ss_item_sk#83 ASC NULLS FIRST]
+(99) ReusedExchange [Reuses operator id: 38]
+Output [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
 
-(101) ReusedExchange [Reuses operator id: 39]
-Output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
+(100) CometSort
+Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
+Arguments: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103], [sr_ticket_number#101 ASC NULLS FIRST, sr_item_sk#100 ASC NULLS FIRST]
 
-(102) CometSort
-Input [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
-Arguments: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99], [sr_ticket_number#97 ASC NULLS FIRST, sr_item_sk#96 ASC NULLS FIRST]
+(101) ColumnarToRow [codegen id : 33]
+Input [4]: [sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
 
-(103) CometSortMergeJoin
-Left output [9]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95]
-Right output [4]: [sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
-Arguments: [ss_ticket_number#84, ss_item_sk#83], [sr_ticket_number#97, sr_item_sk#96], LeftOuter
+(102) SortMergeJoin [codegen id : 34]
+Left keys [2]: [ss_ticket_number#88, ss_item_sk#87]
+Right keys [2]: [sr_ticket_number#101, sr_item_sk#100]
+Join type: LeftOuter
+Join condition: None
 
-(104) CometProject
-Input [13]: [ss_item_sk#83, ss_ticket_number#84, ss_quantity#85, ss_ext_sales_price#86, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, d_year#95, sr_item_sk#96, sr_ticket_number#97, sr_return_quantity#98, sr_return_amt#99]
-Arguments: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41], [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, (ss_quantity#85 - coalesce(sr_return_quantity#98, 0)) AS sales_cnt#40, (ss_ext_sales_price#86 - coalesce(sr_return_amt#99, 0.00)) AS sales_amt#41]
+(103) Project [codegen id : 34]
+Output [7]: [d_year#99, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, (ss_quantity#89 - coalesce(sr_return_quantity#102, 0)) AS sales_cnt#40, (ss_ext_sales_price#90 - coalesce(sr_return_amt#103, 0.00)) AS sales_amt#41]
+Input [13]: [ss_item_sk#87, ss_ticket_number#88, ss_quantity#89, ss_ext_sales_price#90, i_brand_id#94, i_class_id#95, i_category_id#96, i_manufact_id#97, d_year#99, sr_item_sk#100, sr_ticket_number#101, sr_return_quantity#102, sr_return_amt#103]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
+Output [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#104), dynamicpruningexpression(ws_sold_date_sk#104 IN dynamicpruning#105)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#108), dynamicpruningexpression(ws_sold_date_sk#108 IN dynamicpruning#109)]
 PushedFilters: [IsNotNull(ws_item_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_order_number:int,ws_quantity:int,ws_ext_sales_price:decimal(7,2)>
 
-(106) CometFilter
-Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
-Condition : isnotnull(ws_item_sk#100)
+(105) CometFilter
+Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
+Condition : isnotnull(ws_item_sk#104)
 
-(107) ColumnarToRow [codegen id : 19]
-Input [5]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104]
+(106) ColumnarToRow [codegen id : 37]
+Input [5]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108]
 
-(108) ReusedExchange [Reuses operator id: 8]
-Output [5]: [i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
+(107) ReusedExchange [Reuses operator id: 8]
+Output [5]: [i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
 
-(109) BroadcastHashJoin [codegen id : 19]
-Left keys [1]: [ws_item_sk#100]
-Right keys [1]: [i_item_sk#106]
+(108) BroadcastHashJoin [codegen id : 37]
+Left keys [1]: [ws_item_sk#104]
+Right keys [1]: [i_item_sk#110]
 Join type: Inner
 Join condition: None
 
-(110) Project [codegen id : 19]
-Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
-Input [10]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_item_sk#106, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110]
+(109) Project [codegen id : 37]
+Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
+Input [10]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_item_sk#110, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114]
 
-(111) ReusedExchange [Reuses operator id: 142]
-Output [2]: [d_date_sk#111, d_year#112]
+(110) ReusedExchange [Reuses operator id: 140]
+Output [2]: [d_date_sk#115, d_year#116]
 
-(112) BroadcastHashJoin [codegen id : 19]
-Left keys [1]: [ws_sold_date_sk#104]
-Right keys [1]: [d_date_sk#111]
+(111) BroadcastHashJoin [codegen id : 37]
+Left keys [1]: [ws_sold_date_sk#108]
+Right keys [1]: [d_date_sk#115]
 Join type: Inner
 Join condition: None
 
-(113) Project [codegen id : 19]
-Output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Input [11]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, ws_sold_date_sk#104, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_date_sk#111, d_year#112]
+(112) Project [codegen id : 37]
+Output [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
+Input [11]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, ws_sold_date_sk#108, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_date_sk#115, d_year#116]
 
-(114) RowToColumnar
-Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
+(113) Exchange
+Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
+Arguments: hashpartitioning(ws_order_number#105, ws_item_sk#104, 5), ENSURE_REQUIREMENTS, [plan_id=13]
 
-(115) CometColumnarExchange
-Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Arguments: hashpartitioning(ws_order_number#101, ws_item_sk#100, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
+(114) Sort [codegen id : 38]
+Input [9]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116]
+Arguments: [ws_order_number#105 ASC NULLS FIRST, ws_item_sk#104 ASC NULLS FIRST], false, 0
 
-(116) CometSort
-Input [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Arguments: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112], [ws_order_number#101 ASC NULLS FIRST, ws_item_sk#100 ASC NULLS FIRST]
+(115) ReusedExchange [Reuses operator id: 57]
+Output [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
 
-(117) ReusedExchange [Reuses operator id: 58]
-Output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
+(116) CometSort
+Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
+Arguments: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120], [wr_order_number#118 ASC NULLS FIRST, wr_item_sk#117 ASC NULLS FIRST]
 
-(118) CometSort
-Input [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
-Arguments: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116], [wr_order_number#114 ASC NULLS FIRST, wr_item_sk#113 ASC NULLS FIRST]
+(117) ColumnarToRow [codegen id : 39]
+Input [4]: [wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
 
-(119) CometSortMergeJoin
-Left output [9]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112]
-Right output [4]: [wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
-Arguments: [ws_order_number#101, ws_item_sk#100], [wr_order_number#114, wr_item_sk#113], LeftOuter
+(118) SortMergeJoin [codegen id : 40]
+Left keys [2]: [ws_order_number#105, ws_item_sk#104]
+Right keys [2]: [wr_order_number#118, wr_item_sk#117]
+Join type: LeftOuter
+Join condition: None
 
-(120) CometProject
-Input [13]: [ws_item_sk#100, ws_order_number#101, ws_quantity#102, ws_ext_sales_price#103, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, d_year#112, wr_item_sk#113, wr_order_number#114, wr_return_quantity#115, wr_return_amt#116]
-Arguments: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61], [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, (ws_quantity#102 - coalesce(wr_return_quantity#115, 0)) AS sales_cnt#60, (ws_ext_sales_price#103 - coalesce(wr_return_amt#116, 0.00)) AS sales_amt#61]
+(119) Project [codegen id : 40]
+Output [7]: [d_year#116, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, (ws_quantity#106 - coalesce(wr_return_quantity#119, 0)) AS sales_cnt#60, (ws_ext_sales_price#107 - coalesce(wr_return_amt#120, 0.00)) AS sales_amt#61]
+Input [13]: [ws_item_sk#104, ws_order_number#105, ws_quantity#106, ws_ext_sales_price#107, i_brand_id#111, i_class_id#112, i_category_id#113, i_manufact_id#114, d_year#116, wr_item_sk#117, wr_order_number#118, wr_return_quantity#119, wr_return_amt#120]
 
-(121) CometUnion
-Child 0 Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Child 1 Input [7]: [d_year#95, i_brand_id#90, i_class_id#91, i_category_id#92, i_manufact_id#93, sales_cnt#40, sales_amt#41]
-Child 2 Input [7]: [d_year#112, i_brand_id#107, i_class_id#108, i_category_id#109, i_manufact_id#110, sales_cnt#60, sales_amt#61]
+(120) Union
 
-(122) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+(121) HashAggregate [codegen id : 41]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(123) CometColumnarExchange
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+(122) Exchange
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21, 5), ENSURE_REQUIREMENTS, [plan_id=14]
 
-(124) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Keys [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
+(123) HashAggregate [codegen id : 42]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Keys [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 Functions: []
+Aggregate Attributes: []
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
 
-(125) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#20, sales_amt#21]
-Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(124) HashAggregate [codegen id : 42]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#20, sales_amt#21]
+Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 Functions [2]: [partial_sum(sales_cnt#20), partial_sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum#62, sum#121]
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
 
-(126) CometColumnarExchange
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
-Arguments: hashpartitioning(d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+(125) Exchange
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
+Arguments: hashpartitioning(d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(127) CometHashAggregate
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sum#62, sum#117]
-Keys [5]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+(126) HashAggregate [codegen id : 43]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum#64, sum#122]
+Keys [5]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 Functions [2]: [sum(sales_cnt#20), sum(UnscaledValue(sales_amt#21))]
+Aggregate Attributes [2]: [sum(sales_cnt#20)#66, sum(UnscaledValue(sales_amt#21))#67]
+Results [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sum(sales_cnt#20)#66 AS sales_cnt#123, MakeDecimal(sum(UnscaledValue(sales_amt#21))#67,18,2) AS sales_amt#124]
 
-(128) CometFilter
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
-Condition : isnotnull(sales_cnt#118)
-
-(129) CometColumnarExchange
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
-Arguments: hashpartitioning(i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
+(127) Filter [codegen id : 43]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+Condition : isnotnull(sales_cnt#123)
 
-(130) CometSort
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
-Arguments: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119], [i_brand_id#73 ASC NULLS FIRST, i_class_id#74 ASC NULLS FIRST, i_category_id#75 ASC NULLS FIRST, i_manufact_id#76 ASC NULLS FIRST]
+(128) Exchange
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+Arguments: hashpartitioning(i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, 5), ENSURE_REQUIREMENTS, [plan_id=16]
 
-(131) ColumnarToRow [codegen id : 20]
-Input [7]: [d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+(129) Sort [codegen id : 44]
+Input [7]: [d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
+Arguments: [i_brand_id#77 ASC NULLS FIRST, i_class_id#78 ASC NULLS FIRST, i_category_id#79 ASC NULLS FIRST, i_manufact_id#80 ASC NULLS FIRST], false, 0
 
-(132) SortMergeJoin [codegen id : 21]
+(130) SortMergeJoin [codegen id : 45]
 Left keys [4]: [i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12]
-Right keys [4]: [i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76]
+Right keys [4]: [i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80]
 Join type: Inner
-Join condition: ((cast(sales_cnt#64 as decimal(17,2)) / cast(sales_cnt#118 as decimal(17,2))) < 0.90000000000000000000)
+Join condition: ((cast(sales_cnt#68 as decimal(17,2)) / cast(sales_cnt#123 as decimal(17,2))) < 0.90000000000000000000)
 
-(133) Project [codegen id : 21]
-Output [10]: [d_year#78 AS prev_year#120, d_year#14 AS year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#118 AS prev_yr_cnt#122, sales_cnt#64 AS curr_yr_cnt#123, (sales_cnt#64 - sales_cnt#118) AS sales_cnt_diff#124, (sales_amt#65 - sales_amt#119) AS sales_amt_diff#125]
-Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#64, sales_amt#65, d_year#78, i_brand_id#73, i_class_id#74, i_category_id#75, i_manufact_id#76, sales_cnt#118, sales_amt#119]
+(131) Project [codegen id : 45]
+Output [10]: [d_year#82 AS prev_year#125, d_year#14 AS year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#123 AS prev_yr_cnt#127, sales_cnt#68 AS curr_yr_cnt#128, (sales_cnt#68 - sales_cnt#123) AS sales_cnt_diff#129, (sales_amt#69 - sales_amt#124) AS sales_amt_diff#130]
+Input [14]: [d_year#14, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, sales_cnt#68, sales_amt#69, d_year#82, i_brand_id#77, i_class_id#78, i_category_id#79, i_manufact_id#80, sales_cnt#123, sales_amt#124]
 
-(134) TakeOrderedAndProject
-Input [10]: [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
-Arguments: 100, [sales_cnt_diff#124 ASC NULLS FIRST, sales_amt_diff#125 ASC NULLS FIRST], [prev_year#120, year#121, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#122, curr_yr_cnt#123, sales_cnt_diff#124, sales_amt_diff#125]
+(132) TakeOrderedAndProject
+Input [10]: [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
+Arguments: 100, [sales_cnt_diff#129 ASC NULLS FIRST, sales_amt_diff#130 ASC NULLS FIRST], [prev_year#125, year#126, i_brand_id#8, i_class_id#9, i_category_id#10, i_manufact_id#12, prev_yr_cnt#127, curr_yr_cnt#128, sales_cnt_diff#129, sales_amt_diff#130]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = cs_sold_date_sk#5 IN dynamicpruning#6
-BroadcastExchange (138)
-+- * ColumnarToRow (137)
-   +- CometFilter (136)
-      +- CometScan parquet spark_catalog.default.date_dim (135)
+BroadcastExchange (136)
++- * ColumnarToRow (135)
+   +- CometFilter (134)
+      +- CometScan parquet spark_catalog.default.date_dim (133)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -736,14 +744,14 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2002), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(136) CometFilter
+(134) CometFilter
 Input [2]: [d_date_sk#13, d_year#14]
 Condition : ((isnotnull(d_year#14) AND (d_year#14 = 2002)) AND isnotnull(d_date_sk#13))
 
-(137) ColumnarToRow [codegen id : 1]
+(135) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#13, d_year#14]
 
-(138) BroadcastExchange
+(136) BroadcastExchange
 Input [2]: [d_date_sk#13, d_year#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=17]
 
@@ -751,33 +759,33 @@ Subquery:2 Hosting operator id = 24 Hosting Expression = ss_sold_date_sk#26 IN d
 
 Subquery:3 Hosting operator id = 43 Hosting Expression = ws_sold_date_sk#46 IN dynamicpruning#6
 
-Subquery:4 Hosting operator id = 73 Hosting Expression = cs_sold_date_sk#70 IN dynamicpruning#71
-BroadcastExchange (142)
-+- * ColumnarToRow (141)
-   +- CometFilter (140)
-      +- CometScan parquet spark_catalog.default.date_dim (139)
+Subquery:4 Hosting operator id = 72 Hosting Expression = cs_sold_date_sk#74 IN dynamicpruning#75
+BroadcastExchange (140)
++- * ColumnarToRow (139)
+   +- CometFilter (138)
+      +- CometScan parquet spark_catalog.default.date_dim (137)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#77, d_year#78]
+Output [2]: [d_date_sk#81, d_year#82]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2001), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(140) CometFilter
-Input [2]: [d_date_sk#77, d_year#78]
-Condition : ((isnotnull(d_year#78) AND (d_year#78 = 2001)) AND isnotnull(d_date_sk#77))
+(138) CometFilter
+Input [2]: [d_date_sk#81, d_year#82]
+Condition : ((isnotnull(d_year#82) AND (d_year#82 = 2001)) AND isnotnull(d_date_sk#81))
 
-(141) ColumnarToRow [codegen id : 1]
-Input [2]: [d_date_sk#77, d_year#78]
+(139) ColumnarToRow [codegen id : 1]
+Input [2]: [d_date_sk#81, d_year#82]
 
-(142) BroadcastExchange
-Input [2]: [d_date_sk#77, d_year#78]
+(140) BroadcastExchange
+Input [2]: [d_date_sk#81, d_year#82]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=18]
 
-Subquery:5 Hosting operator id = 89 Hosting Expression = ss_sold_date_sk#87 IN dynamicpruning#71
+Subquery:5 Hosting operator id = 88 Hosting Expression = ss_sold_date_sk#91 IN dynamicpruning#75
 
-Subquery:6 Hosting operator id = 105 Hosting Expression = ws_sold_date_sk#104 IN dynamicpruning#71
+Subquery:6 Hosting operator id = 104 Hosting Expression = ws_sold_date_sk#108 IN dynamicpruning#75
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt
index a0e22e72fb..25dd0f9468 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q75/simplified.txt
@@ -1,185 +1,237 @@
 TakeOrderedAndProject [sales_cnt_diff,sales_amt_diff,prev_year,year,i_brand_id,i_class_id,i_category_id,i_manufact_id,prev_yr_cnt,curr_yr_cnt]
-  WholeStageCodegen (21)
+  WholeStageCodegen (45)
     Project [d_year,d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt,sales_amt,sales_amt]
       SortMergeJoin [i_brand_id,i_class_id,i_category_id,i_manufact_id,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_cnt]
         InputAdapter
-          WholeStageCodegen (10)
-            ColumnarToRow
+          WholeStageCodegen (22)
+            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
               InputAdapter
-                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
-                    CometFilter [sales_cnt]
-                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
-                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
-                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
-                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  CometUnion
-                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                        CometSort [cs_order_number,cs_item_sk]
-                                          CometColumnarExchange [cs_order_number,cs_item_sk] #4
-                                            RowToColumnar
-                                              WholeStageCodegen (3)
-                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                        ColumnarToRow
+                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #1
+                  WholeStageCodegen (21)
+                    Filter [sales_cnt]
+                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
+                        InputAdapter
+                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #2
+                            WholeStageCodegen (20)
+                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
+                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  InputAdapter
+                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #3
+                                      WholeStageCodegen (19)
+                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                          InputAdapter
+                                            Union
+                                              WholeStageCodegen (6)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
+                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                    InputAdapter
+                                                      WholeStageCodegen (4)
+                                                        Sort [cs_order_number,cs_item_sk]
                                                           InputAdapter
-                                                            CometFilter [cs_item_sk]
-                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #1
-                                                                  BroadcastExchange #5
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
+                                                            Exchange [cs_order_number,cs_item_sk] #4
+                                                              WholeStageCodegen (3)
+                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [cs_item_sk]
+                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #1
+                                                                                  BroadcastExchange #5
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                         InputAdapter
-                                                                          CometFilter [d_year,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                        InputAdapter
-                                                          BroadcastExchange #6
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
+                                                                          BroadcastExchange #6
+                                                                            WholeStageCodegen (1)
+                                                                              ColumnarToRow
+                                                                                InputAdapter
+                                                                                  CometProject [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                                    CometFilter [i_category,i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_brand_id,i_class_id,i_category_id,i_category,i_manufact_id]
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #5
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #5
-                                        CometSort [cr_order_number,cr_item_sk]
-                                          CometColumnarExchange [cr_order_number,cr_item_sk] #7
-                                            CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
-                                              CometFilter [cr_order_number,cr_item_sk]
-                                                CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
-                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                        CometSort [ss_ticket_number,ss_item_sk]
-                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #8
-                                            RowToColumnar
-                                              WholeStageCodegen (6)
-                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                      WholeStageCodegen (5)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ss_item_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [cr_order_number,cr_item_sk]
+                                                              CometExchange [cr_order_number,cr_item_sk] #7
+                                                                CometProject [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount]
+                                                                  CometFilter [cr_order_number,cr_item_sk]
+                                                                    CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_returned_date_sk]
+                                              WholeStageCodegen (12)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
+                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #5
-                                        CometSort [sr_ticket_number,sr_item_sk]
-                                          CometColumnarExchange [sr_ticket_number,sr_item_sk] #9
-                                            CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
-                                              CometFilter [sr_ticket_number,sr_item_sk]
-                                                CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
-                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                        CometSort [ws_order_number,ws_item_sk]
-                                          CometColumnarExchange [ws_order_number,ws_item_sk] #10
-                                            RowToColumnar
-                                              WholeStageCodegen (9)
-                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                      WholeStageCodegen (10)
+                                                        Sort [ss_ticket_number,ss_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ss_ticket_number,ss_item_sk] #8
+                                                              WholeStageCodegen (9)
+                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                    InputAdapter
+                                                      WholeStageCodegen (11)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ws_item_sk]
-                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #1
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [sr_ticket_number,sr_item_sk]
+                                                              CometExchange [sr_ticket_number,sr_item_sk] #9
+                                                                CometProject [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt]
+                                                                  CometFilter [sr_ticket_number,sr_item_sk]
+                                                                    CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_returned_date_sk]
+                                              WholeStageCodegen (18)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
+                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #5
-                                        CometSort [wr_order_number,wr_item_sk]
-                                          CometColumnarExchange [wr_order_number,wr_item_sk] #11
-                                            CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
-                                              CometFilter [wr_order_number,wr_item_sk]
-                                                CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
+                                                      WholeStageCodegen (16)
+                                                        Sort [ws_order_number,ws_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ws_order_number,ws_item_sk] #10
+                                                              WholeStageCodegen (15)
+                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ws_item_sk]
+                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #1
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #5
+                                                    InputAdapter
+                                                      WholeStageCodegen (17)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometSort [wr_order_number,wr_item_sk]
+                                                              CometExchange [wr_order_number,wr_item_sk] #11
+                                                                CometProject [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt]
+                                                                  CometFilter [wr_order_number,wr_item_sk]
+                                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_returned_date_sk]
         InputAdapter
-          WholeStageCodegen (20)
-            ColumnarToRow
+          WholeStageCodegen (44)
+            Sort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
               InputAdapter
-                CometSort [i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                  CometColumnarExchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
-                    CometFilter [sales_cnt]
-                      CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum]
-                        CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
-                          CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                            CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                              CometColumnarExchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
-                                CometHashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                  CometUnion
-                                    CometProject [cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
-                                        CometSort [cs_order_number,cs_item_sk]
-                                          CometColumnarExchange [cs_order_number,cs_item_sk] #15
-                                            RowToColumnar
-                                              WholeStageCodegen (13)
-                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
-                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
-                                                        ColumnarToRow
+                Exchange [i_brand_id,i_class_id,i_category_id,i_manufact_id] #12
+                  WholeStageCodegen (43)
+                    Filter [sales_cnt]
+                      HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sum,sum] [sum(sales_cnt),sum(UnscaledValue(sales_amt)),sales_cnt,sales_amt,sum,sum]
+                        InputAdapter
+                          Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id] #13
+                            WholeStageCodegen (42)
+                              HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] [sum,sum,sum,sum]
+                                HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                  InputAdapter
+                                    Exchange [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt] #14
+                                      WholeStageCodegen (41)
+                                        HashAggregate [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
+                                          InputAdapter
+                                            Union
+                                              WholeStageCodegen (28)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,cs_quantity,cr_return_quantity,cs_ext_sales_price,cr_return_amount]
+                                                  SortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
+                                                    InputAdapter
+                                                      WholeStageCodegen (26)
+                                                        Sort [cs_order_number,cs_item_sk]
                                                           InputAdapter
-                                                            CometFilter [cs_item_sk]
-                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
-                                                                SubqueryBroadcast [d_date_sk] #2
-                                                                  BroadcastExchange #16
-                                                                    WholeStageCodegen (1)
-                                                                      ColumnarToRow
+                                                            Exchange [cs_order_number,cs_item_sk] #15
+                                                              WholeStageCodegen (25)
+                                                                Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
+                                                                    Project [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [cs_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [cs_item_sk]
+                                                                              CometScan parquet spark_catalog.default.catalog_sales [cs_item_sk,cs_order_number,cs_quantity,cs_ext_sales_price,cs_sold_date_sk]
+                                                                                SubqueryBroadcast [d_date_sk] #2
+                                                                                  BroadcastExchange #16
+                                                                                    WholeStageCodegen (1)
+                                                                                      ColumnarToRow
+                                                                                        InputAdapter
+                                                                                          CometFilter [d_year,d_date_sk]
+                                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
                                                                         InputAdapter
-                                                                          CometFilter [d_year,d_date_sk]
-                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #16
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #16
-                                        CometSort [cr_order_number,cr_item_sk]
-                                          ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
-                                    CometProject [ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                        CometSort [ss_ticket_number,ss_item_sk]
-                                          CometColumnarExchange [ss_ticket_number,ss_item_sk] #17
-                                            RowToColumnar
-                                              WholeStageCodegen (16)
-                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                      WholeStageCodegen (27)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ss_item_sk]
-                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #2
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [cr_order_number,cr_item_sk]
+                                                              ReusedExchange [cr_item_sk,cr_order_number,cr_return_quantity,cr_return_amount] #7
+                                              WholeStageCodegen (34)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ss_quantity,sr_return_quantity,ss_ext_sales_price,sr_return_amt]
+                                                  SortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                                    InputAdapter
+                                                      WholeStageCodegen (32)
+                                                        Sort [ss_ticket_number,ss_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ss_ticket_number,ss_item_sk] #17
+                                                              WholeStageCodegen (31)
+                                                                Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                                                    Project [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ss_item_sk]
+                                                                              CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ticket_number,ss_quantity,ss_ext_sales_price,ss_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #2
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #16
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #16
-                                        CometSort [sr_ticket_number,sr_item_sk]
-                                          ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
-                                    CometProject [ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt] [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,sales_cnt,sales_amt]
-                                      CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                        CometSort [ws_order_number,ws_item_sk]
-                                          CometColumnarExchange [ws_order_number,ws_item_sk] #18
-                                            RowToColumnar
-                                              WholeStageCodegen (19)
-                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
-                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
-                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                      WholeStageCodegen (33)
                                                         ColumnarToRow
                                                           InputAdapter
-                                                            CometFilter [ws_item_sk]
-                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
-                                                                ReusedSubquery [d_date_sk] #2
-                                                        InputAdapter
-                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                            CometSort [sr_ticket_number,sr_item_sk]
+                                                              ReusedExchange [sr_item_sk,sr_ticket_number,sr_return_quantity,sr_return_amt] #9
+                                              WholeStageCodegen (40)
+                                                Project [d_year,i_brand_id,i_class_id,i_category_id,i_manufact_id,ws_quantity,wr_return_quantity,ws_ext_sales_price,wr_return_amt]
+                                                  SortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
                                                     InputAdapter
-                                                      ReusedExchange [d_date_sk,d_year] #16
-                                        CometSort [wr_order_number,wr_item_sk]
-                                          ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
+                                                      WholeStageCodegen (38)
+                                                        Sort [ws_order_number,ws_item_sk]
+                                                          InputAdapter
+                                                            Exchange [ws_order_number,ws_item_sk] #18
+                                                              WholeStageCodegen (37)
+                                                                Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,i_brand_id,i_class_id,i_category_id,i_manufact_id,d_year]
+                                                                  BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                                    Project [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id]
+                                                                      BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                                        ColumnarToRow
+                                                                          InputAdapter
+                                                                            CometFilter [ws_item_sk]
+                                                                              CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_order_number,ws_quantity,ws_ext_sales_price,ws_sold_date_sk]
+                                                                                ReusedSubquery [d_date_sk] #2
+                                                                        InputAdapter
+                                                                          ReusedExchange [i_item_sk,i_brand_id,i_class_id,i_category_id,i_manufact_id] #6
+                                                                    InputAdapter
+                                                                      ReusedExchange [d_date_sk,d_year] #16
+                                                    InputAdapter
+                                                      WholeStageCodegen (39)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometSort [wr_order_number,wr_item_sk]
+                                                              ReusedExchange [wr_item_sk,wr_order_number,wr_return_quantity,wr_return_amt] #11
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt
index 688a02fb0e..82c7d9b244 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/explain.txt
@@ -1,116 +1,102 @@
 == Physical Plan ==
-* ColumnarToRow (112)
-+- CometTakeOrderedAndProject (111)
-   +- CometHashAggregate (110)
-      +- CometColumnarExchange (109)
-         +- CometHashAggregate (108)
-            +- CometUnion (107)
-               :- CometHashAggregate (96)
-               :  +- CometColumnarExchange (95)
-               :     +- RowToColumnar (94)
-               :        +- * HashAggregate (93)
-               :           +- Union (92)
-               :              :- * Project (34)
-               :              :  +- * BroadcastHashJoin LeftOuter BuildRight (33)
-               :              :     :- * ColumnarToRow (17)
-               :              :     :  +- CometHashAggregate (16)
-               :              :     :     +- CometColumnarExchange (15)
-               :              :     :        +- RowToColumnar (14)
-               :              :     :           +- * HashAggregate (13)
-               :              :     :              +- * Project (12)
-               :              :     :                 +- * BroadcastHashJoin Inner BuildRight (11)
-               :              :     :                    :- * Project (6)
-               :              :     :                    :  +- * BroadcastHashJoin Inner BuildRight (5)
-               :              :     :                    :     :- * ColumnarToRow (3)
-               :              :     :                    :     :  +- CometFilter (2)
-               :              :     :                    :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-               :              :     :                    :     +- ReusedExchange (4)
-               :              :     :                    +- BroadcastExchange (10)
-               :              :     :                       +- * ColumnarToRow (9)
-               :              :     :                          +- CometFilter (8)
-               :              :     :                             +- CometScan parquet spark_catalog.default.store (7)
-               :              :     +- BroadcastExchange (32)
-               :              :        +- * ColumnarToRow (31)
-               :              :           +- CometHashAggregate (30)
-               :              :              +- CometColumnarExchange (29)
-               :              :                 +- RowToColumnar (28)
-               :              :                    +- * HashAggregate (27)
-               :              :                       +- * Project (26)
-               :              :                          +- * BroadcastHashJoin Inner BuildRight (25)
-               :              :                             :- * Project (23)
-               :              :                             :  +- * BroadcastHashJoin Inner BuildRight (22)
-               :              :                             :     :- * ColumnarToRow (20)
-               :              :                             :     :  +- CometFilter (19)
-               :              :                             :     :     +- CometScan parquet spark_catalog.default.store_returns (18)
-               :              :                             :     +- ReusedExchange (21)
-               :              :                             +- ReusedExchange (24)
-               :              :- * Project (57)
-               :              :  +- * BroadcastNestedLoopJoin Inner BuildLeft (56)
-               :              :     :- BroadcastExchange (45)
-               :              :     :  +- * ColumnarToRow (44)
-               :              :     :     +- CometHashAggregate (43)
-               :              :     :        +- CometColumnarExchange (42)
-               :              :     :           +- RowToColumnar (41)
-               :              :     :              +- * HashAggregate (40)
-               :              :     :                 +- * Project (39)
-               :              :     :                    +- * BroadcastHashJoin Inner BuildRight (38)
-               :              :     :                       :- * ColumnarToRow (36)
-               :              :     :                       :  +- CometScan parquet spark_catalog.default.catalog_sales (35)
-               :              :     :                       +- ReusedExchange (37)
-               :              :     +- * ColumnarToRow (55)
-               :              :        +- CometHashAggregate (54)
-               :              :           +- CometColumnarExchange (53)
-               :              :              +- RowToColumnar (52)
-               :              :                 +- * HashAggregate (51)
-               :              :                    +- * Project (50)
-               :              :                       +- * BroadcastHashJoin Inner BuildRight (49)
-               :              :                          :- * ColumnarToRow (47)
-               :              :                          :  +- CometScan parquet spark_catalog.default.catalog_returns (46)
-               :              :                          +- ReusedExchange (48)
-               :              +- * Project (91)
-               :                 +- * BroadcastHashJoin LeftOuter BuildRight (90)
-               :                    :- * ColumnarToRow (74)
-               :                    :  +- CometHashAggregate (73)
-               :                    :     +- CometColumnarExchange (72)
-               :                    :        +- RowToColumnar (71)
-               :                    :           +- * HashAggregate (70)
-               :                    :              +- * Project (69)
-               :                    :                 +- * BroadcastHashJoin Inner BuildRight (68)
-               :                    :                    :- * Project (63)
-               :                    :                    :  +- * BroadcastHashJoin Inner BuildRight (62)
-               :                    :                    :     :- * ColumnarToRow (60)
-               :                    :                    :     :  +- CometFilter (59)
-               :                    :                    :     :     +- CometScan parquet spark_catalog.default.web_sales (58)
-               :                    :                    :     +- ReusedExchange (61)
-               :                    :                    +- BroadcastExchange (67)
-               :                    :                       +- * ColumnarToRow (66)
-               :                    :                          +- CometFilter (65)
-               :                    :                             +- CometScan parquet spark_catalog.default.web_page (64)
-               :                    +- BroadcastExchange (89)
-               :                       +- * ColumnarToRow (88)
-               :                          +- CometHashAggregate (87)
-               :                             +- CometColumnarExchange (86)
-               :                                +- RowToColumnar (85)
-               :                                   +- * HashAggregate (84)
-               :                                      +- * Project (83)
-               :                                         +- * BroadcastHashJoin Inner BuildRight (82)
-               :                                            :- * Project (80)
-               :                                            :  +- * BroadcastHashJoin Inner BuildRight (79)
-               :                                            :     :- * ColumnarToRow (77)
-               :                                            :     :  +- CometFilter (76)
-               :                                            :     :     +- CometScan parquet spark_catalog.default.web_returns (75)
-               :                                            :     +- ReusedExchange (78)
-               :                                            +- ReusedExchange (81)
-               :- CometHashAggregate (101)
-               :  +- CometColumnarExchange (100)
-               :     +- CometHashAggregate (99)
-               :        +- CometHashAggregate (98)
-               :           +- ReusedExchange (97)
-               +- CometHashAggregate (106)
-                  +- CometColumnarExchange (105)
-                     +- CometHashAggregate (104)
-                        +- CometHashAggregate (103)
-                           +- ReusedExchange (102)
+TakeOrderedAndProject (98)
++- * HashAggregate (97)
+   +- Exchange (96)
+      +- * HashAggregate (95)
+         +- Union (94)
+            :- * HashAggregate (83)
+            :  +- Exchange (82)
+            :     +- * HashAggregate (81)
+            :        +- Union (80)
+            :           :- * Project (30)
+            :           :  +- * BroadcastHashJoin LeftOuter BuildRight (29)
+            :           :     :- * HashAggregate (15)
+            :           :     :  +- Exchange (14)
+            :           :     :     +- * HashAggregate (13)
+            :           :     :        +- * Project (12)
+            :           :     :           +- * BroadcastHashJoin Inner BuildRight (11)
+            :           :     :              :- * Project (6)
+            :           :     :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+            :           :     :              :     :- * ColumnarToRow (3)
+            :           :     :              :     :  +- CometFilter (2)
+            :           :     :              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+            :           :     :              :     +- ReusedExchange (4)
+            :           :     :              +- BroadcastExchange (10)
+            :           :     :                 +- * ColumnarToRow (9)
+            :           :     :                    +- CometFilter (8)
+            :           :     :                       +- CometScan parquet spark_catalog.default.store (7)
+            :           :     +- BroadcastExchange (28)
+            :           :        +- * HashAggregate (27)
+            :           :           +- Exchange (26)
+            :           :              +- * HashAggregate (25)
+            :           :                 +- * Project (24)
+            :           :                    +- * BroadcastHashJoin Inner BuildRight (23)
+            :           :                       :- * Project (21)
+            :           :                       :  +- * BroadcastHashJoin Inner BuildRight (20)
+            :           :                       :     :- * ColumnarToRow (18)
+            :           :                       :     :  +- CometFilter (17)
+            :           :                       :     :     +- CometScan parquet spark_catalog.default.store_returns (16)
+            :           :                       :     +- ReusedExchange (19)
+            :           :                       +- ReusedExchange (22)
+            :           :- * Project (49)
+            :           :  +- * BroadcastNestedLoopJoin Inner BuildLeft (48)
+            :           :     :- BroadcastExchange (39)
+            :           :     :  +- * HashAggregate (38)
+            :           :     :     +- Exchange (37)
+            :           :     :        +- * HashAggregate (36)
+            :           :     :           +- * Project (35)
+            :           :     :              +- * BroadcastHashJoin Inner BuildRight (34)
+            :           :     :                 :- * ColumnarToRow (32)
+            :           :     :                 :  +- CometScan parquet spark_catalog.default.catalog_sales (31)
+            :           :     :                 +- ReusedExchange (33)
+            :           :     +- * HashAggregate (47)
+            :           :        +- Exchange (46)
+            :           :           +- * HashAggregate (45)
+            :           :              +- * Project (44)
+            :           :                 +- * BroadcastHashJoin Inner BuildRight (43)
+            :           :                    :- * ColumnarToRow (41)
+            :           :                    :  +- CometScan parquet spark_catalog.default.catalog_returns (40)
+            :           :                    +- ReusedExchange (42)
+            :           +- * Project (79)
+            :              +- * BroadcastHashJoin LeftOuter BuildRight (78)
+            :                 :- * HashAggregate (64)
+            :                 :  +- Exchange (63)
+            :                 :     +- * HashAggregate (62)
+            :                 :        +- * Project (61)
+            :                 :           +- * BroadcastHashJoin Inner BuildRight (60)
+            :                 :              :- * Project (55)
+            :                 :              :  +- * BroadcastHashJoin Inner BuildRight (54)
+            :                 :              :     :- * ColumnarToRow (52)
+            :                 :              :     :  +- CometFilter (51)
+            :                 :              :     :     +- CometScan parquet spark_catalog.default.web_sales (50)
+            :                 :              :     +- ReusedExchange (53)
+            :                 :              +- BroadcastExchange (59)
+            :                 :                 +- * ColumnarToRow (58)
+            :                 :                    +- CometFilter (57)
+            :                 :                       +- CometScan parquet spark_catalog.default.web_page (56)
+            :                 +- BroadcastExchange (77)
+            :                    +- * HashAggregate (76)
+            :                       +- Exchange (75)
+            :                          +- * HashAggregate (74)
+            :                             +- * Project (73)
+            :                                +- * BroadcastHashJoin Inner BuildRight (72)
+            :                                   :- * Project (70)
+            :                                   :  +- * BroadcastHashJoin Inner BuildRight (69)
+            :                                   :     :- * ColumnarToRow (67)
+            :                                   :     :  +- CometFilter (66)
+            :                                   :     :     +- CometScan parquet spark_catalog.default.web_returns (65)
+            :                                   :     +- ReusedExchange (68)
+            :                                   +- ReusedExchange (71)
+            :- * HashAggregate (88)
+            :  +- Exchange (87)
+            :     +- * HashAggregate (86)
+            :        +- * HashAggregate (85)
+            :           +- ReusedExchange (84)
+            +- * HashAggregate (93)
+               +- Exchange (92)
+                  +- * HashAggregate (91)
+                     +- * HashAggregate (90)
+                        +- ReusedExchange (89)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -128,7 +114,7 @@ Condition : isnotnull(ss_store_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [4]: [ss_store_sk#1, ss_ext_sales_price#2, ss_net_profit#3, ss_sold_date_sk#4]
 
-(4) ReusedExchange [Reuses operator id: 117]
+(4) ReusedExchange [Reuses operator id: 103]
 Output [1]: [d_date_sk#6]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -176,486 +162,471 @@ Functions [2]: [partial_sum(UnscaledValue(ss_ext_sales_price#2)), partial_sum(Un
 Aggregate Attributes [2]: [sum#8, sum#9]
 Results [3]: [s_store_sk#7, sum#10, sum#11]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [s_store_sk#7, sum#10, sum#11]
+Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [s_store_sk#7, sum#10, sum#11]
-Arguments: hashpartitioning(s_store_sk#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 8]
 Input [3]: [s_store_sk#7, sum#10, sum#11]
 Keys [1]: [s_store_sk#7]
 Functions [2]: [sum(UnscaledValue(ss_ext_sales_price#2)), sum(UnscaledValue(ss_net_profit#3))]
-
-(17) ColumnarToRow [codegen id : 8]
-Input [3]: [s_store_sk#7, sales#12, profit#13]
+Aggregate Attributes [2]: [sum(UnscaledValue(ss_ext_sales_price#2))#12, sum(UnscaledValue(ss_net_profit#3))#13]
+Results [3]: [s_store_sk#7, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#12,17,2) AS sales#14, MakeDecimal(sum(UnscaledValue(ss_net_profit#3))#13,17,2) AS profit#15]
 
 (unknown) Scan parquet spark_catalog.default.store_returns
-Output [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
+Output [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(sr_returned_date_sk#17), dynamicpruningexpression(sr_returned_date_sk#17 IN dynamicpruning#18)]
+PartitionFilters: [isnotnull(sr_returned_date_sk#19), dynamicpruningexpression(sr_returned_date_sk#19 IN dynamicpruning#20)]
 PushedFilters: [IsNotNull(sr_store_sk)]
 ReadSchema: struct<sr_store_sk:int,sr_return_amt:decimal(7,2),sr_net_loss:decimal(7,2)>
 
-(19) CometFilter
-Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
-Condition : isnotnull(sr_store_sk#14)
+(17) CometFilter
+Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
+Condition : isnotnull(sr_store_sk#16)
 
-(20) ColumnarToRow [codegen id : 6]
-Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17]
+(18) ColumnarToRow [codegen id : 6]
+Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19]
 
-(21) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#19]
+(19) ReusedExchange [Reuses operator id: 103]
+Output [1]: [d_date_sk#21]
 
-(22) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_returned_date_sk#17]
-Right keys [1]: [d_date_sk#19]
+(20) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_returned_date_sk#19]
+Right keys [1]: [d_date_sk#21]
 Join type: Inner
 Join condition: None
 
-(23) Project [codegen id : 6]
-Output [3]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16]
-Input [5]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, sr_returned_date_sk#17, d_date_sk#19]
+(21) Project [codegen id : 6]
+Output [3]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18]
+Input [5]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, sr_returned_date_sk#19, d_date_sk#21]
 
-(24) ReusedExchange [Reuses operator id: 10]
-Output [1]: [s_store_sk#20]
+(22) ReusedExchange [Reuses operator id: 10]
+Output [1]: [s_store_sk#22]
 
-(25) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [sr_store_sk#14]
-Right keys [1]: [s_store_sk#20]
+(23) BroadcastHashJoin [codegen id : 6]
+Left keys [1]: [sr_store_sk#16]
+Right keys [1]: [s_store_sk#22]
 Join type: Inner
 Join condition: None
 
-(26) Project [codegen id : 6]
-Output [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
-Input [4]: [sr_store_sk#14, sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
-
-(27) HashAggregate [codegen id : 6]
-Input [3]: [sr_return_amt#15, sr_net_loss#16, s_store_sk#20]
-Keys [1]: [s_store_sk#20]
-Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#15)), partial_sum(UnscaledValue(sr_net_loss#16))]
-Aggregate Attributes [2]: [sum#21, sum#22]
-Results [3]: [s_store_sk#20, sum#23, sum#24]
-
-(28) RowToColumnar
-Input [3]: [s_store_sk#20, sum#23, sum#24]
-
-(29) CometColumnarExchange
-Input [3]: [s_store_sk#20, sum#23, sum#24]
-Arguments: hashpartitioning(s_store_sk#20, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(30) CometHashAggregate
-Input [3]: [s_store_sk#20, sum#23, sum#24]
-Keys [1]: [s_store_sk#20]
-Functions [2]: [sum(UnscaledValue(sr_return_amt#15)), sum(UnscaledValue(sr_net_loss#16))]
-
-(31) ColumnarToRow [codegen id : 7]
-Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
-
-(32) BroadcastExchange
-Input [3]: [s_store_sk#20, returns#25, profit_loss#26]
+(24) Project [codegen id : 6]
+Output [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
+Input [4]: [sr_store_sk#16, sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
+
+(25) HashAggregate [codegen id : 6]
+Input [3]: [sr_return_amt#17, sr_net_loss#18, s_store_sk#22]
+Keys [1]: [s_store_sk#22]
+Functions [2]: [partial_sum(UnscaledValue(sr_return_amt#17)), partial_sum(UnscaledValue(sr_net_loss#18))]
+Aggregate Attributes [2]: [sum#23, sum#24]
+Results [3]: [s_store_sk#22, sum#25, sum#26]
+
+(26) Exchange
+Input [3]: [s_store_sk#22, sum#25, sum#26]
+Arguments: hashpartitioning(s_store_sk#22, 5), ENSURE_REQUIREMENTS, [plan_id=3]
+
+(27) HashAggregate [codegen id : 7]
+Input [3]: [s_store_sk#22, sum#25, sum#26]
+Keys [1]: [s_store_sk#22]
+Functions [2]: [sum(UnscaledValue(sr_return_amt#17)), sum(UnscaledValue(sr_net_loss#18))]
+Aggregate Attributes [2]: [sum(UnscaledValue(sr_return_amt#17))#27, sum(UnscaledValue(sr_net_loss#18))#28]
+Results [3]: [s_store_sk#22, MakeDecimal(sum(UnscaledValue(sr_return_amt#17))#27,17,2) AS returns#29, MakeDecimal(sum(UnscaledValue(sr_net_loss#18))#28,17,2) AS profit_loss#30]
+
+(28) BroadcastExchange
+Input [3]: [s_store_sk#22, returns#29, profit_loss#30]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=4]
 
-(33) BroadcastHashJoin [codegen id : 8]
+(29) BroadcastHashJoin [codegen id : 8]
 Left keys [1]: [s_store_sk#7]
-Right keys [1]: [s_store_sk#20]
+Right keys [1]: [s_store_sk#22]
 Join type: LeftOuter
 Join condition: None
 
-(34) Project [codegen id : 8]
-Output [5]: [store channel AS channel#27, s_store_sk#7 AS id#28, sales#12, coalesce(returns#25, 0.00) AS returns#29, (profit#13 - coalesce(profit_loss#26, 0.00)) AS profit#30]
-Input [6]: [s_store_sk#7, sales#12, profit#13, s_store_sk#20, returns#25, profit_loss#26]
+(30) Project [codegen id : 8]
+Output [5]: [store channel AS channel#31, s_store_sk#7 AS id#32, sales#14, coalesce(returns#29, 0.00) AS returns#33, (profit#15 - coalesce(profit_loss#30, 0.00)) AS profit#34]
+Input [6]: [s_store_sk#7, sales#14, profit#15, s_store_sk#22, returns#29, profit_loss#30]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
+Output [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#34), dynamicpruningexpression(cs_sold_date_sk#34 IN dynamicpruning#35)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#38), dynamicpruningexpression(cs_sold_date_sk#38 IN dynamicpruning#39)]
 ReadSchema: struct<cs_call_center_sk:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(36) ColumnarToRow [codegen id : 10]
-Input [4]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34]
+(32) ColumnarToRow [codegen id : 10]
+Input [4]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38]
 
-(37) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#36]
+(33) ReusedExchange [Reuses operator id: 103]
+Output [1]: [d_date_sk#40]
 
-(38) BroadcastHashJoin [codegen id : 10]
-Left keys [1]: [cs_sold_date_sk#34]
-Right keys [1]: [d_date_sk#36]
+(34) BroadcastHashJoin [codegen id : 10]
+Left keys [1]: [cs_sold_date_sk#38]
+Right keys [1]: [d_date_sk#40]
 Join type: Inner
 Join condition: None
 
-(39) Project [codegen id : 10]
-Output [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
-Input [5]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33, cs_sold_date_sk#34, d_date_sk#36]
-
-(40) HashAggregate [codegen id : 10]
-Input [3]: [cs_call_center_sk#31, cs_ext_sales_price#32, cs_net_profit#33]
-Keys [1]: [cs_call_center_sk#31]
-Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#32)), partial_sum(UnscaledValue(cs_net_profit#33))]
-Aggregate Attributes [2]: [sum#37, sum#38]
-Results [3]: [cs_call_center_sk#31, sum#39, sum#40]
-
-(41) RowToColumnar
-Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
-
-(42) CometColumnarExchange
-Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
-Arguments: hashpartitioning(cs_call_center_sk#31, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
-
-(43) CometHashAggregate
-Input [3]: [cs_call_center_sk#31, sum#39, sum#40]
-Keys [1]: [cs_call_center_sk#31]
-Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#32)), sum(UnscaledValue(cs_net_profit#33))]
-
-(44) ColumnarToRow [codegen id : 11]
-Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
-
-(45) BroadcastExchange
-Input [3]: [cs_call_center_sk#31, sales#41, profit#42]
+(35) Project [codegen id : 10]
+Output [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
+Input [5]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37, cs_sold_date_sk#38, d_date_sk#40]
+
+(36) HashAggregate [codegen id : 10]
+Input [3]: [cs_call_center_sk#35, cs_ext_sales_price#36, cs_net_profit#37]
+Keys [1]: [cs_call_center_sk#35]
+Functions [2]: [partial_sum(UnscaledValue(cs_ext_sales_price#36)), partial_sum(UnscaledValue(cs_net_profit#37))]
+Aggregate Attributes [2]: [sum#41, sum#42]
+Results [3]: [cs_call_center_sk#35, sum#43, sum#44]
+
+(37) Exchange
+Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
+Arguments: hashpartitioning(cs_call_center_sk#35, 5), ENSURE_REQUIREMENTS, [plan_id=5]
+
+(38) HashAggregate [codegen id : 11]
+Input [3]: [cs_call_center_sk#35, sum#43, sum#44]
+Keys [1]: [cs_call_center_sk#35]
+Functions [2]: [sum(UnscaledValue(cs_ext_sales_price#36)), sum(UnscaledValue(cs_net_profit#37))]
+Aggregate Attributes [2]: [sum(UnscaledValue(cs_ext_sales_price#36))#45, sum(UnscaledValue(cs_net_profit#37))#46]
+Results [3]: [cs_call_center_sk#35, MakeDecimal(sum(UnscaledValue(cs_ext_sales_price#36))#45,17,2) AS sales#47, MakeDecimal(sum(UnscaledValue(cs_net_profit#37))#46,17,2) AS profit#48]
+
+(39) BroadcastExchange
+Input [3]: [cs_call_center_sk#35, sales#47, profit#48]
 Arguments: IdentityBroadcastMode, [plan_id=6]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
+Output [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cr_returned_date_sk#45), dynamicpruningexpression(cr_returned_date_sk#45 IN dynamicpruning#46)]
+PartitionFilters: [isnotnull(cr_returned_date_sk#51), dynamicpruningexpression(cr_returned_date_sk#51 IN dynamicpruning#52)]
 ReadSchema: struct<cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(47) ColumnarToRow [codegen id : 13]
-Input [3]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45]
+(41) ColumnarToRow [codegen id : 13]
+Input [3]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 
-(48) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#47]
+(42) ReusedExchange [Reuses operator id: 103]
+Output [1]: [d_date_sk#53]
 
-(49) BroadcastHashJoin [codegen id : 13]
-Left keys [1]: [cr_returned_date_sk#45]
-Right keys [1]: [d_date_sk#47]
+(43) BroadcastHashJoin [codegen id : 13]
+Left keys [1]: [cr_returned_date_sk#51]
+Right keys [1]: [d_date_sk#53]
 Join type: Inner
 Join condition: None
 
-(50) Project [codegen id : 13]
-Output [2]: [cr_return_amount#43, cr_net_loss#44]
-Input [4]: [cr_return_amount#43, cr_net_loss#44, cr_returned_date_sk#45, d_date_sk#47]
+(44) Project [codegen id : 13]
+Output [2]: [cr_return_amount#49, cr_net_loss#50]
+Input [4]: [cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51, d_date_sk#53]
 
-(51) HashAggregate [codegen id : 13]
-Input [2]: [cr_return_amount#43, cr_net_loss#44]
+(45) HashAggregate [codegen id : 13]
+Input [2]: [cr_return_amount#49, cr_net_loss#50]
 Keys: []
-Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#43)), partial_sum(UnscaledValue(cr_net_loss#44))]
-Aggregate Attributes [2]: [sum#48, sum#49]
-Results [2]: [sum#50, sum#51]
+Functions [2]: [partial_sum(UnscaledValue(cr_return_amount#49)), partial_sum(UnscaledValue(cr_net_loss#50))]
+Aggregate Attributes [2]: [sum#54, sum#55]
+Results [2]: [sum#56, sum#57]
 
-(52) RowToColumnar
-Input [2]: [sum#50, sum#51]
+(46) Exchange
+Input [2]: [sum#56, sum#57]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=7]
 
-(53) CometColumnarExchange
-Input [2]: [sum#50, sum#51]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
-
-(54) CometHashAggregate
-Input [2]: [sum#50, sum#51]
+(47) HashAggregate
+Input [2]: [sum#56, sum#57]
 Keys: []
-Functions [2]: [sum(UnscaledValue(cr_return_amount#43)), sum(UnscaledValue(cr_net_loss#44))]
-
-(55) ColumnarToRow
-Input [2]: [returns#52, profit_loss#53]
+Functions [2]: [sum(UnscaledValue(cr_return_amount#49)), sum(UnscaledValue(cr_net_loss#50))]
+Aggregate Attributes [2]: [sum(UnscaledValue(cr_return_amount#49))#58, sum(UnscaledValue(cr_net_loss#50))#59]
+Results [2]: [MakeDecimal(sum(UnscaledValue(cr_return_amount#49))#58,17,2) AS returns#60, MakeDecimal(sum(UnscaledValue(cr_net_loss#50))#59,17,2) AS profit_loss#61]
 
-(56) BroadcastNestedLoopJoin [codegen id : 14]
+(48) BroadcastNestedLoopJoin [codegen id : 14]
 Join type: Inner
 Join condition: None
 
-(57) Project [codegen id : 14]
-Output [5]: [catalog channel AS channel#54, cs_call_center_sk#31 AS id#55, sales#41, returns#52, (profit#42 - profit_loss#53) AS profit#56]
-Input [5]: [cs_call_center_sk#31, sales#41, profit#42, returns#52, profit_loss#53]
+(49) Project [codegen id : 14]
+Output [5]: [catalog channel AS channel#62, cs_call_center_sk#35 AS id#63, sales#47, returns#60, (profit#48 - profit_loss#61) AS profit#64]
+Input [5]: [cs_call_center_sk#35, sales#47, profit#48, returns#60, profit_loss#61]
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
+Output [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#60), dynamicpruningexpression(ws_sold_date_sk#60 IN dynamicpruning#61)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#68), dynamicpruningexpression(ws_sold_date_sk#68 IN dynamicpruning#69)]
 PushedFilters: [IsNotNull(ws_web_page_sk)]
 ReadSchema: struct<ws_web_page_sk:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(59) CometFilter
-Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
-Condition : isnotnull(ws_web_page_sk#57)
+(51) CometFilter
+Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
+Condition : isnotnull(ws_web_page_sk#65)
 
-(60) ColumnarToRow [codegen id : 17]
-Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60]
+(52) ColumnarToRow [codegen id : 17]
+Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68]
 
-(61) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#62]
+(53) ReusedExchange [Reuses operator id: 103]
+Output [1]: [d_date_sk#70]
 
-(62) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_sold_date_sk#60]
-Right keys [1]: [d_date_sk#62]
+(54) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_sold_date_sk#68]
+Right keys [1]: [d_date_sk#70]
 Join type: Inner
 Join condition: None
 
-(63) Project [codegen id : 17]
-Output [3]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59]
-Input [5]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, ws_sold_date_sk#60, d_date_sk#62]
+(55) Project [codegen id : 17]
+Output [3]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67]
+Input [5]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, ws_sold_date_sk#68, d_date_sk#70]
 
 (unknown) Scan parquet spark_catalog.default.web_page
-Output [1]: [wp_web_page_sk#63]
+Output [1]: [wp_web_page_sk#71]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_page]
 PushedFilters: [IsNotNull(wp_web_page_sk)]
 ReadSchema: struct<wp_web_page_sk:int>
 
-(65) CometFilter
-Input [1]: [wp_web_page_sk#63]
-Condition : isnotnull(wp_web_page_sk#63)
+(57) CometFilter
+Input [1]: [wp_web_page_sk#71]
+Condition : isnotnull(wp_web_page_sk#71)
 
-(66) ColumnarToRow [codegen id : 16]
-Input [1]: [wp_web_page_sk#63]
+(58) ColumnarToRow [codegen id : 16]
+Input [1]: [wp_web_page_sk#71]
 
-(67) BroadcastExchange
-Input [1]: [wp_web_page_sk#63]
+(59) BroadcastExchange
+Input [1]: [wp_web_page_sk#71]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=8]
 
-(68) BroadcastHashJoin [codegen id : 17]
-Left keys [1]: [ws_web_page_sk#57]
-Right keys [1]: [wp_web_page_sk#63]
+(60) BroadcastHashJoin [codegen id : 17]
+Left keys [1]: [ws_web_page_sk#65]
+Right keys [1]: [wp_web_page_sk#71]
 Join type: Inner
 Join condition: None
 
-(69) Project [codegen id : 17]
-Output [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
-Input [4]: [ws_web_page_sk#57, ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
-
-(70) HashAggregate [codegen id : 17]
-Input [3]: [ws_ext_sales_price#58, ws_net_profit#59, wp_web_page_sk#63]
-Keys [1]: [wp_web_page_sk#63]
-Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#58)), partial_sum(UnscaledValue(ws_net_profit#59))]
-Aggregate Attributes [2]: [sum#64, sum#65]
-Results [3]: [wp_web_page_sk#63, sum#66, sum#67]
+(61) Project [codegen id : 17]
+Output [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
+Input [4]: [ws_web_page_sk#65, ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
 
-(71) RowToColumnar
-Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
+(62) HashAggregate [codegen id : 17]
+Input [3]: [ws_ext_sales_price#66, ws_net_profit#67, wp_web_page_sk#71]
+Keys [1]: [wp_web_page_sk#71]
+Functions [2]: [partial_sum(UnscaledValue(ws_ext_sales_price#66)), partial_sum(UnscaledValue(ws_net_profit#67))]
+Aggregate Attributes [2]: [sum#72, sum#73]
+Results [3]: [wp_web_page_sk#71, sum#74, sum#75]
 
-(72) CometColumnarExchange
-Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
-Arguments: hashpartitioning(wp_web_page_sk#63, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
+(63) Exchange
+Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
+Arguments: hashpartitioning(wp_web_page_sk#71, 5), ENSURE_REQUIREMENTS, [plan_id=9]
 
-(73) CometHashAggregate
-Input [3]: [wp_web_page_sk#63, sum#66, sum#67]
-Keys [1]: [wp_web_page_sk#63]
-Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#58)), sum(UnscaledValue(ws_net_profit#59))]
-
-(74) ColumnarToRow [codegen id : 22]
-Input [3]: [wp_web_page_sk#63, sales#68, profit#69]
+(64) HashAggregate [codegen id : 22]
+Input [3]: [wp_web_page_sk#71, sum#74, sum#75]
+Keys [1]: [wp_web_page_sk#71]
+Functions [2]: [sum(UnscaledValue(ws_ext_sales_price#66)), sum(UnscaledValue(ws_net_profit#67))]
+Aggregate Attributes [2]: [sum(UnscaledValue(ws_ext_sales_price#66))#76, sum(UnscaledValue(ws_net_profit#67))#77]
+Results [3]: [wp_web_page_sk#71, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#66))#76,17,2) AS sales#78, MakeDecimal(sum(UnscaledValue(ws_net_profit#67))#77,17,2) AS profit#79]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
+Output [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(wr_returned_date_sk#73), dynamicpruningexpression(wr_returned_date_sk#73 IN dynamicpruning#74)]
+PartitionFilters: [isnotnull(wr_returned_date_sk#83), dynamicpruningexpression(wr_returned_date_sk#83 IN dynamicpruning#84)]
 PushedFilters: [IsNotNull(wr_web_page_sk)]
 ReadSchema: struct<wr_web_page_sk:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(76) CometFilter
-Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
-Condition : isnotnull(wr_web_page_sk#70)
+(66) CometFilter
+Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
+Condition : isnotnull(wr_web_page_sk#80)
 
-(77) ColumnarToRow [codegen id : 20]
-Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73]
+(67) ColumnarToRow [codegen id : 20]
+Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83]
 
-(78) ReusedExchange [Reuses operator id: 117]
-Output [1]: [d_date_sk#75]
+(68) ReusedExchange [Reuses operator id: 103]
+Output [1]: [d_date_sk#85]
 
-(79) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_returned_date_sk#73]
-Right keys [1]: [d_date_sk#75]
+(69) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_returned_date_sk#83]
+Right keys [1]: [d_date_sk#85]
 Join type: Inner
 Join condition: None
 
-(80) Project [codegen id : 20]
-Output [3]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72]
-Input [5]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wr_returned_date_sk#73, d_date_sk#75]
+(70) Project [codegen id : 20]
+Output [3]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82]
+Input [5]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wr_returned_date_sk#83, d_date_sk#85]
 
-(81) ReusedExchange [Reuses operator id: 67]
-Output [1]: [wp_web_page_sk#76]
+(71) ReusedExchange [Reuses operator id: 59]
+Output [1]: [wp_web_page_sk#86]
 
-(82) BroadcastHashJoin [codegen id : 20]
-Left keys [1]: [wr_web_page_sk#70]
-Right keys [1]: [wp_web_page_sk#76]
+(72) BroadcastHashJoin [codegen id : 20]
+Left keys [1]: [wr_web_page_sk#80]
+Right keys [1]: [wp_web_page_sk#86]
 Join type: Inner
 Join condition: None
 
-(83) Project [codegen id : 20]
-Output [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
-Input [4]: [wr_web_page_sk#70, wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
-
-(84) HashAggregate [codegen id : 20]
-Input [3]: [wr_return_amt#71, wr_net_loss#72, wp_web_page_sk#76]
-Keys [1]: [wp_web_page_sk#76]
-Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#71)), partial_sum(UnscaledValue(wr_net_loss#72))]
-Aggregate Attributes [2]: [sum#77, sum#78]
-Results [3]: [wp_web_page_sk#76, sum#79, sum#80]
-
-(85) RowToColumnar
-Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
-
-(86) CometColumnarExchange
-Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
-Arguments: hashpartitioning(wp_web_page_sk#76, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(87) CometHashAggregate
-Input [3]: [wp_web_page_sk#76, sum#79, sum#80]
-Keys [1]: [wp_web_page_sk#76]
-Functions [2]: [sum(UnscaledValue(wr_return_amt#71)), sum(UnscaledValue(wr_net_loss#72))]
-
-(88) ColumnarToRow [codegen id : 21]
-Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
-
-(89) BroadcastExchange
-Input [3]: [wp_web_page_sk#76, returns#81, profit_loss#82]
+(73) Project [codegen id : 20]
+Output [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
+Input [4]: [wr_web_page_sk#80, wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
+
+(74) HashAggregate [codegen id : 20]
+Input [3]: [wr_return_amt#81, wr_net_loss#82, wp_web_page_sk#86]
+Keys [1]: [wp_web_page_sk#86]
+Functions [2]: [partial_sum(UnscaledValue(wr_return_amt#81)), partial_sum(UnscaledValue(wr_net_loss#82))]
+Aggregate Attributes [2]: [sum#87, sum#88]
+Results [3]: [wp_web_page_sk#86, sum#89, sum#90]
+
+(75) Exchange
+Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
+Arguments: hashpartitioning(wp_web_page_sk#86, 5), ENSURE_REQUIREMENTS, [plan_id=10]
+
+(76) HashAggregate [codegen id : 21]
+Input [3]: [wp_web_page_sk#86, sum#89, sum#90]
+Keys [1]: [wp_web_page_sk#86]
+Functions [2]: [sum(UnscaledValue(wr_return_amt#81)), sum(UnscaledValue(wr_net_loss#82))]
+Aggregate Attributes [2]: [sum(UnscaledValue(wr_return_amt#81))#91, sum(UnscaledValue(wr_net_loss#82))#92]
+Results [3]: [wp_web_page_sk#86, MakeDecimal(sum(UnscaledValue(wr_return_amt#81))#91,17,2) AS returns#93, MakeDecimal(sum(UnscaledValue(wr_net_loss#82))#92,17,2) AS profit_loss#94]
+
+(77) BroadcastExchange
+Input [3]: [wp_web_page_sk#86, returns#93, profit_loss#94]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=11]
 
-(90) BroadcastHashJoin [codegen id : 22]
-Left keys [1]: [wp_web_page_sk#63]
-Right keys [1]: [wp_web_page_sk#76]
+(78) BroadcastHashJoin [codegen id : 22]
+Left keys [1]: [wp_web_page_sk#71]
+Right keys [1]: [wp_web_page_sk#86]
 Join type: LeftOuter
 Join condition: None
 
-(91) Project [codegen id : 22]
-Output [5]: [web channel AS channel#83, wp_web_page_sk#63 AS id#84, sales#68, coalesce(returns#81, 0.00) AS returns#85, (profit#69 - coalesce(profit_loss#82, 0.00)) AS profit#86]
-Input [6]: [wp_web_page_sk#63, sales#68, profit#69, wp_web_page_sk#76, returns#81, profit_loss#82]
-
-(92) Union
-
-(93) HashAggregate [codegen id : 23]
-Input [5]: [channel#27, id#28, sales#12, returns#29, profit#30]
-Keys [2]: [channel#27, id#28]
-Functions [3]: [partial_sum(sales#12), partial_sum(returns#29), partial_sum(profit#30)]
-Aggregate Attributes [6]: [sum#87, isEmpty#88, sum#89, isEmpty#90, sum#91, isEmpty#92]
-Results [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-
-(94) RowToColumnar
-Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-
-(95) CometColumnarExchange
-Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-Arguments: hashpartitioning(channel#27, id#28, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
-
-(96) CometHashAggregate
-Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-Keys [2]: [channel#27, id#28]
-Functions [3]: [sum(sales#12), sum(returns#29), sum(profit#30)]
-
-(97) ReusedExchange [Reuses operator id: 95]
-Output [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-
-(98) CometHashAggregate
-Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-Keys [2]: [channel#27, id#28]
-Functions [3]: [sum(sales#12), sum(returns#29), sum(profit#30)]
-
-(99) CometHashAggregate
-Input [4]: [channel#27, sales#99, returns#100, profit#101]
-Keys [1]: [channel#27]
-Functions [3]: [partial_sum(sales#99), partial_sum(returns#100), partial_sum(profit#101)]
-
-(100) CometColumnarExchange
-Input [7]: [channel#27, sum#102, isEmpty#103, sum#104, isEmpty#105, sum#106, isEmpty#107]
-Arguments: hashpartitioning(channel#27, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=13]
-
-(101) CometHashAggregate
-Input [7]: [channel#27, sum#102, isEmpty#103, sum#104, isEmpty#105, sum#106, isEmpty#107]
-Keys [1]: [channel#27]
-Functions [3]: [sum(sales#99), sum(returns#100), sum(profit#101)]
-
-(102) ReusedExchange [Reuses operator id: 95]
-Output [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-
-(103) CometHashAggregate
-Input [8]: [channel#27, id#28, sum#93, isEmpty#94, sum#95, isEmpty#96, sum#97, isEmpty#98]
-Keys [2]: [channel#27, id#28]
-Functions [3]: [sum(sales#12), sum(returns#29), sum(profit#30)]
-
-(104) CometHashAggregate
-Input [3]: [sales#99, returns#100, profit#101]
+(79) Project [codegen id : 22]
+Output [5]: [web channel AS channel#95, wp_web_page_sk#71 AS id#96, sales#78, coalesce(returns#93, 0.00) AS returns#97, (profit#79 - coalesce(profit_loss#94, 0.00)) AS profit#98]
+Input [6]: [wp_web_page_sk#71, sales#78, profit#79, wp_web_page_sk#86, returns#93, profit_loss#94]
+
+(80) Union
+
+(81) HashAggregate [codegen id : 23]
+Input [5]: [channel#31, id#32, sales#14, returns#33, profit#34]
+Keys [2]: [channel#31, id#32]
+Functions [3]: [partial_sum(sales#14), partial_sum(returns#33), partial_sum(profit#34)]
+Aggregate Attributes [6]: [sum#99, isEmpty#100, sum#101, isEmpty#102, sum#103, isEmpty#104]
+Results [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+
+(82) Exchange
+Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+Arguments: hashpartitioning(channel#31, id#32, 5), ENSURE_REQUIREMENTS, [plan_id=12]
+
+(83) HashAggregate [codegen id : 24]
+Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+Keys [2]: [channel#31, id#32]
+Functions [3]: [sum(sales#14), sum(returns#33), sum(profit#34)]
+Aggregate Attributes [3]: [sum(sales#14)#111, sum(returns#33)#112, sum(profit#34)#113]
+Results [5]: [channel#31, id#32, cast(sum(sales#14)#111 as decimal(37,2)) AS sales#114, cast(sum(returns#33)#112 as decimal(37,2)) AS returns#115, cast(sum(profit#34)#113 as decimal(38,2)) AS profit#116]
+
+(84) ReusedExchange [Reuses operator id: 82]
+Output [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+
+(85) HashAggregate [codegen id : 48]
+Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+Keys [2]: [channel#31, id#32]
+Functions [3]: [sum(sales#14), sum(returns#33), sum(profit#34)]
+Aggregate Attributes [3]: [sum(sales#14)#111, sum(returns#33)#112, sum(profit#34)#113]
+Results [4]: [channel#31, sum(sales#14)#111 AS sales#117, sum(returns#33)#112 AS returns#118, sum(profit#34)#113 AS profit#119]
+
+(86) HashAggregate [codegen id : 48]
+Input [4]: [channel#31, sales#117, returns#118, profit#119]
+Keys [1]: [channel#31]
+Functions [3]: [partial_sum(sales#117), partial_sum(returns#118), partial_sum(profit#119)]
+Aggregate Attributes [6]: [sum#120, isEmpty#121, sum#122, isEmpty#123, sum#124, isEmpty#125]
+Results [7]: [channel#31, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
+
+(87) Exchange
+Input [7]: [channel#31, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
+Arguments: hashpartitioning(channel#31, 5), ENSURE_REQUIREMENTS, [plan_id=13]
+
+(88) HashAggregate [codegen id : 49]
+Input [7]: [channel#31, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
+Keys [1]: [channel#31]
+Functions [3]: [sum(sales#117), sum(returns#118), sum(profit#119)]
+Aggregate Attributes [3]: [sum(sales#117)#132, sum(returns#118)#133, sum(profit#119)#134]
+Results [5]: [channel#31, null AS id#135, sum(sales#117)#132 AS sales#136, sum(returns#118)#133 AS returns#137, sum(profit#119)#134 AS profit#138]
+
+(89) ReusedExchange [Reuses operator id: 82]
+Output [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+
+(90) HashAggregate [codegen id : 73]
+Input [8]: [channel#31, id#32, sum#105, isEmpty#106, sum#107, isEmpty#108, sum#109, isEmpty#110]
+Keys [2]: [channel#31, id#32]
+Functions [3]: [sum(sales#14), sum(returns#33), sum(profit#34)]
+Aggregate Attributes [3]: [sum(sales#14)#111, sum(returns#33)#112, sum(profit#34)#113]
+Results [3]: [sum(sales#14)#111 AS sales#117, sum(returns#33)#112 AS returns#118, sum(profit#34)#113 AS profit#119]
+
+(91) HashAggregate [codegen id : 73]
+Input [3]: [sales#117, returns#118, profit#119]
 Keys: []
-Functions [3]: [partial_sum(sales#99), partial_sum(returns#100), partial_sum(profit#101)]
+Functions [3]: [partial_sum(sales#117), partial_sum(returns#118), partial_sum(profit#119)]
+Aggregate Attributes [6]: [sum#139, isEmpty#140, sum#141, isEmpty#142, sum#143, isEmpty#144]
+Results [6]: [sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150]
 
-(105) CometColumnarExchange
-Input [6]: [sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
+(92) Exchange
+Input [6]: [sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=14]
 
-(106) CometHashAggregate
-Input [6]: [sum#108, isEmpty#109, sum#110, isEmpty#111, sum#112, isEmpty#113]
+(93) HashAggregate [codegen id : 74]
+Input [6]: [sum#145, isEmpty#146, sum#147, isEmpty#148, sum#149, isEmpty#150]
 Keys: []
-Functions [3]: [sum(sales#99), sum(returns#100), sum(profit#101)]
+Functions [3]: [sum(sales#117), sum(returns#118), sum(profit#119)]
+Aggregate Attributes [3]: [sum(sales#117)#151, sum(returns#118)#152, sum(profit#119)#153]
+Results [5]: [null AS channel#154, null AS id#155, sum(sales#117)#151 AS sales#156, sum(returns#118)#152 AS returns#157, sum(profit#119)#153 AS profit#158]
 
-(107) CometUnion
-Child 0 Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
-Child 1 Input [5]: [channel#27, id#117, sales#118, returns#119, profit#120]
-Child 2 Input [5]: [channel#121, id#122, sales#123, returns#124, profit#125]
+(94) Union
 
-(108) CometHashAggregate
-Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
-Keys [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+(95) HashAggregate [codegen id : 75]
+Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
+Keys [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
 
-(109) CometColumnarExchange
-Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
-Arguments: hashpartitioning(channel#27, id#28, sales#114, returns#115, profit#116, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+(96) Exchange
+Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
+Arguments: hashpartitioning(channel#31, id#32, sales#114, returns#115, profit#116, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(110) CometHashAggregate
-Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
-Keys [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+(97) HashAggregate [codegen id : 76]
+Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
+Keys [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
 
-(111) CometTakeOrderedAndProject
-Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#27 ASC NULLS FIRST,id#28 ASC NULLS FIRST], output=[channel#27,id#28,sales#114,returns#115,profit#116]), 100, [channel#27 ASC NULLS FIRST, id#28 ASC NULLS FIRST], [channel#27, id#28, sales#114, returns#115, profit#116]
-
-(112) ColumnarToRow [codegen id : 70]
-Input [5]: [channel#27, id#28, sales#114, returns#115, profit#116]
+(98) TakeOrderedAndProject
+Input [5]: [channel#31, id#32, sales#114, returns#115, profit#116]
+Arguments: 100, [channel#31 ASC NULLS FIRST, id#32 ASC NULLS FIRST], [channel#31, id#32, sales#114, returns#115, profit#116]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#4 IN dynamicpruning#5
-BroadcastExchange (117)
-+- * ColumnarToRow (116)
-   +- CometProject (115)
-      +- CometFilter (114)
-         +- CometScan parquet spark_catalog.default.date_dim (113)
+BroadcastExchange (103)
++- * ColumnarToRow (102)
+   +- CometProject (101)
+      +- CometFilter (100)
+         +- CometScan parquet spark_catalog.default.date_dim (99)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#6, d_date#126]
+Output [2]: [d_date_sk#6, d_date#159]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-09-03), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(114) CometFilter
-Input [2]: [d_date_sk#6, d_date#126]
-Condition : (((isnotnull(d_date#126) AND (d_date#126 >= 1998-08-04)) AND (d_date#126 <= 1998-09-03)) AND isnotnull(d_date_sk#6))
+(100) CometFilter
+Input [2]: [d_date_sk#6, d_date#159]
+Condition : (((isnotnull(d_date#159) AND (d_date#159 >= 1998-08-04)) AND (d_date#159 <= 1998-09-03)) AND isnotnull(d_date_sk#6))
 
-(115) CometProject
-Input [2]: [d_date_sk#6, d_date#126]
+(101) CometProject
+Input [2]: [d_date_sk#6, d_date#159]
 Arguments: [d_date_sk#6], [d_date_sk#6]
 
-(116) ColumnarToRow [codegen id : 1]
+(102) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#6]
 
-(117) BroadcastExchange
+(103) BroadcastExchange
 Input [1]: [d_date_sk#6]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=16]
 
-Subquery:2 Hosting operator id = 18 Hosting Expression = sr_returned_date_sk#17 IN dynamicpruning#5
+Subquery:2 Hosting operator id = 16 Hosting Expression = sr_returned_date_sk#19 IN dynamicpruning#5
 
-Subquery:3 Hosting operator id = 35 Hosting Expression = cs_sold_date_sk#34 IN dynamicpruning#5
+Subquery:3 Hosting operator id = 31 Hosting Expression = cs_sold_date_sk#38 IN dynamicpruning#5
 
-Subquery:4 Hosting operator id = 46 Hosting Expression = cr_returned_date_sk#45 IN dynamicpruning#5
+Subquery:4 Hosting operator id = 40 Hosting Expression = cr_returned_date_sk#51 IN dynamicpruning#5
 
-Subquery:5 Hosting operator id = 58 Hosting Expression = ws_sold_date_sk#60 IN dynamicpruning#5
+Subquery:5 Hosting operator id = 50 Hosting Expression = ws_sold_date_sk#68 IN dynamicpruning#5
 
-Subquery:6 Hosting operator id = 75 Hosting Expression = wr_returned_date_sk#73 IN dynamicpruning#5
+Subquery:6 Hosting operator id = 65 Hosting Expression = wr_returned_date_sk#83 IN dynamicpruning#5
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt
index 1fc58ce481..670a7e6c3e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q77a/simplified.txt
@@ -1,26 +1,26 @@
-WholeStageCodegen (70)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
-        CometHashAggregate [channel,id,sales,returns,profit]
-          CometColumnarExchange [channel,id,sales,returns,profit] #1
-            CometHashAggregate [channel,id,sales,returns,profit]
-              CometUnion
-                CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [channel,id] #2
-                    RowToColumnar
-                      WholeStageCodegen (23)
-                        HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                          InputAdapter
-                            Union
-                              WholeStageCodegen (8)
-                                Project [s_store_sk,sales,returns,profit,profit_loss]
-                                  BroadcastHashJoin [s_store_sk,s_store_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [s_store_sk,sum,sum]
-                                          CometColumnarExchange [s_store_sk] #3
-                                            RowToColumnar
+TakeOrderedAndProject [channel,id,sales,returns,profit]
+  WholeStageCodegen (76)
+    HashAggregate [channel,id,sales,returns,profit]
+      InputAdapter
+        Exchange [channel,id,sales,returns,profit] #1
+          WholeStageCodegen (75)
+            HashAggregate [channel,id,sales,returns,profit]
+              InputAdapter
+                Union
+                  WholeStageCodegen (24)
+                    HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [channel,id] #2
+                          WholeStageCodegen (23)
+                            HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (8)
+                                    Project [s_store_sk,sales,returns,profit,profit_loss]
+                                      BroadcastHashJoin [s_store_sk,s_store_sk]
+                                        HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(ss_ext_sales_price)),sum(UnscaledValue(ss_net_profit)),sales,profit,sum,sum]
+                                          InputAdapter
+                                            Exchange [s_store_sk] #3
                                               WholeStageCodegen (3)
                                                 HashAggregate [s_store_sk,ss_ext_sales_price,ss_net_profit] [sum,sum,sum,sum]
                                                   Project [ss_ext_sales_price,ss_net_profit,s_store_sk]
@@ -48,14 +48,12 @@ WholeStageCodegen (70)
                                                               InputAdapter
                                                                 CometFilter [s_store_sk]
                                                                   CometScan parquet spark_catalog.default.store [s_store_sk]
-                                    InputAdapter
-                                      BroadcastExchange #6
-                                        WholeStageCodegen (7)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometHashAggregate [s_store_sk,sum,sum]
-                                                CometColumnarExchange [s_store_sk] #7
-                                                  RowToColumnar
+                                        InputAdapter
+                                          BroadcastExchange #6
+                                            WholeStageCodegen (7)
+                                              HashAggregate [s_store_sk,sum,sum] [sum(UnscaledValue(sr_return_amt)),sum(UnscaledValue(sr_net_loss)),returns,profit_loss,sum,sum]
+                                                InputAdapter
+                                                  Exchange [s_store_sk] #7
                                                     WholeStageCodegen (6)
                                                       HashAggregate [s_store_sk,sr_return_amt,sr_net_loss] [sum,sum,sum,sum]
                                                         Project [sr_return_amt,sr_net_loss,s_store_sk]
@@ -71,17 +69,15 @@ WholeStageCodegen (70)
                                                                   ReusedExchange [d_date_sk] #4
                                                             InputAdapter
                                                               ReusedExchange [s_store_sk] #5
-                              WholeStageCodegen (14)
-                                Project [cs_call_center_sk,sales,returns,profit,profit_loss]
-                                  BroadcastNestedLoopJoin
-                                    InputAdapter
-                                      BroadcastExchange #8
-                                        WholeStageCodegen (11)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometHashAggregate [cs_call_center_sk,sum,sum]
-                                                CometColumnarExchange [cs_call_center_sk] #9
-                                                  RowToColumnar
+                                  WholeStageCodegen (14)
+                                    Project [cs_call_center_sk,sales,returns,profit,profit_loss]
+                                      BroadcastNestedLoopJoin
+                                        InputAdapter
+                                          BroadcastExchange #8
+                                            WholeStageCodegen (11)
+                                              HashAggregate [cs_call_center_sk,sum,sum] [sum(UnscaledValue(cs_ext_sales_price)),sum(UnscaledValue(cs_net_profit)),sales,profit,sum,sum]
+                                                InputAdapter
+                                                  Exchange [cs_call_center_sk] #9
                                                     WholeStageCodegen (10)
                                                       HashAggregate [cs_call_center_sk,cs_ext_sales_price,cs_net_profit] [sum,sum,sum,sum]
                                                         Project [cs_call_center_sk,cs_ext_sales_price,cs_net_profit]
@@ -92,11 +88,9 @@ WholeStageCodegen (70)
                                                                   ReusedSubquery [d_date_sk] #1
                                                             InputAdapter
                                                               ReusedExchange [d_date_sk] #4
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [sum,sum]
-                                          CometColumnarExchange #10
-                                            RowToColumnar
+                                        HashAggregate [sum,sum] [sum(UnscaledValue(cr_return_amount)),sum(UnscaledValue(cr_net_loss)),returns,profit_loss,sum,sum]
+                                          InputAdapter
+                                            Exchange #10
                                               WholeStageCodegen (13)
                                                 HashAggregate [cr_return_amount,cr_net_loss] [sum,sum,sum,sum]
                                                   Project [cr_return_amount,cr_net_loss]
@@ -107,14 +101,12 @@ WholeStageCodegen (70)
                                                             ReusedSubquery [d_date_sk] #1
                                                       InputAdapter
                                                         ReusedExchange [d_date_sk] #4
-                              WholeStageCodegen (22)
-                                Project [wp_web_page_sk,sales,returns,profit,profit_loss]
-                                  BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
-                                    ColumnarToRow
-                                      InputAdapter
-                                        CometHashAggregate [wp_web_page_sk,sum,sum]
-                                          CometColumnarExchange [wp_web_page_sk] #11
-                                            RowToColumnar
+                                  WholeStageCodegen (22)
+                                    Project [wp_web_page_sk,sales,returns,profit,profit_loss]
+                                      BroadcastHashJoin [wp_web_page_sk,wp_web_page_sk]
+                                        HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(ws_ext_sales_price)),sum(UnscaledValue(ws_net_profit)),sales,profit,sum,sum]
+                                          InputAdapter
+                                            Exchange [wp_web_page_sk] #11
                                               WholeStageCodegen (17)
                                                 HashAggregate [wp_web_page_sk,ws_ext_sales_price,ws_net_profit] [sum,sum,sum,sum]
                                                   Project [ws_ext_sales_price,ws_net_profit,wp_web_page_sk]
@@ -135,14 +127,12 @@ WholeStageCodegen (70)
                                                               InputAdapter
                                                                 CometFilter [wp_web_page_sk]
                                                                   CometScan parquet spark_catalog.default.web_page [wp_web_page_sk]
-                                    InputAdapter
-                                      BroadcastExchange #13
-                                        WholeStageCodegen (21)
-                                          ColumnarToRow
-                                            InputAdapter
-                                              CometHashAggregate [wp_web_page_sk,sum,sum]
-                                                CometColumnarExchange [wp_web_page_sk] #14
-                                                  RowToColumnar
+                                        InputAdapter
+                                          BroadcastExchange #13
+                                            WholeStageCodegen (21)
+                                              HashAggregate [wp_web_page_sk,sum,sum] [sum(UnscaledValue(wr_return_amt)),sum(UnscaledValue(wr_net_loss)),returns,profit_loss,sum,sum]
+                                                InputAdapter
+                                                  Exchange [wp_web_page_sk] #14
                                                     WholeStageCodegen (20)
                                                       HashAggregate [wp_web_page_sk,wr_return_amt,wr_net_loss] [sum,sum,sum,sum]
                                                         Project [wr_return_amt,wr_net_loss,wp_web_page_sk]
@@ -158,13 +148,21 @@ WholeStageCodegen (70)
                                                                   ReusedExchange [d_date_sk] #4
                                                             InputAdapter
                                                               ReusedExchange [wp_web_page_sk] #12
-                CometHashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [channel] #15
-                    CometHashAggregate [channel,sales,returns,profit]
-                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
-                CometHashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange #16
-                    CometHashAggregate [sales,returns,profit]
-                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                  WholeStageCodegen (49)
+                    HashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [channel] #15
+                          WholeStageCodegen (48)
+                            HashAggregate [channel,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                InputAdapter
+                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                  WholeStageCodegen (74)
+                    HashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),channel,id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange #16
+                          WholeStageCodegen (73)
+                            HashAggregate [sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                InputAdapter
+                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt
index f411b80b79..cfb9ed7d0e 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/explain.txt
@@ -1,75 +1,71 @@
 == Physical Plan ==
-TakeOrderedAndProject (71)
-+- * Project (70)
-   +- * ColumnarToRow (69)
-      +- CometSortMergeJoin (68)
-         :- CometProject (45)
-         :  +- CometSortMergeJoin (44)
-         :     :- CometSort (21)
-         :     :  +- CometHashAggregate (20)
-         :     :     +- CometColumnarExchange (19)
-         :     :        +- RowToColumnar (18)
-         :     :           +- * HashAggregate (17)
-         :     :              +- * Project (16)
-         :     :                 +- * BroadcastHashJoin Inner BuildRight (15)
-         :     :                    :- * ColumnarToRow (13)
-         :     :                    :  +- CometProject (12)
-         :     :                    :     +- CometFilter (11)
-         :     :                    :        +- CometSortMergeJoin (10)
-         :     :                    :           :- CometSort (4)
-         :     :                    :           :  +- CometColumnarExchange (3)
-         :     :                    :           :     +- CometFilter (2)
-         :     :                    :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
-         :     :                    :           +- CometSort (9)
-         :     :                    :              +- CometColumnarExchange (8)
-         :     :                    :                 +- CometProject (7)
-         :     :                    :                    +- CometFilter (6)
-         :     :                    :                       +- CometScan parquet spark_catalog.default.store_returns (5)
-         :     :                    +- ReusedExchange (14)
-         :     +- CometSort (43)
-         :        +- CometFilter (42)
-         :           +- CometHashAggregate (41)
-         :              +- CometColumnarExchange (40)
-         :                 +- RowToColumnar (39)
-         :                    +- * HashAggregate (38)
-         :                       +- * Project (37)
-         :                          +- * BroadcastHashJoin Inner BuildRight (36)
-         :                             :- * ColumnarToRow (34)
-         :                             :  +- CometProject (33)
-         :                             :     +- CometFilter (32)
-         :                             :        +- CometSortMergeJoin (31)
-         :                             :           :- CometSort (25)
-         :                             :           :  +- CometColumnarExchange (24)
-         :                             :           :     +- CometFilter (23)
-         :                             :           :        +- CometScan parquet spark_catalog.default.web_sales (22)
-         :                             :           +- CometSort (30)
-         :                             :              +- CometColumnarExchange (29)
-         :                             :                 +- CometProject (28)
-         :                             :                    +- CometFilter (27)
-         :                             :                       +- CometScan parquet spark_catalog.default.web_returns (26)
-         :                             +- ReusedExchange (35)
-         +- CometSort (67)
-            +- CometFilter (66)
-               +- CometHashAggregate (65)
-                  +- CometColumnarExchange (64)
-                     +- RowToColumnar (63)
-                        +- * HashAggregate (62)
-                           +- * Project (61)
-                              +- * BroadcastHashJoin Inner BuildRight (60)
-                                 :- * ColumnarToRow (58)
-                                 :  +- CometProject (57)
-                                 :     +- CometFilter (56)
-                                 :        +- CometSortMergeJoin (55)
-                                 :           :- CometSort (49)
-                                 :           :  +- CometColumnarExchange (48)
-                                 :           :     +- CometFilter (47)
-                                 :           :        +- CometScan parquet spark_catalog.default.catalog_sales (46)
-                                 :           +- CometSort (54)
-                                 :              +- CometColumnarExchange (53)
-                                 :                 +- CometProject (52)
-                                 :                    +- CometFilter (51)
-                                 :                       +- CometScan parquet spark_catalog.default.catalog_returns (50)
-                                 +- ReusedExchange (59)
+TakeOrderedAndProject (67)
++- * Project (66)
+   +- * SortMergeJoin Inner (65)
+      :- * Project (43)
+      :  +- * SortMergeJoin Inner (42)
+      :     :- * Sort (20)
+      :     :  +- * HashAggregate (19)
+      :     :     +- Exchange (18)
+      :     :        +- * HashAggregate (17)
+      :     :           +- * Project (16)
+      :     :              +- * BroadcastHashJoin Inner BuildRight (15)
+      :     :                 :- * ColumnarToRow (13)
+      :     :                 :  +- CometProject (12)
+      :     :                 :     +- CometFilter (11)
+      :     :                 :        +- CometSortMergeJoin (10)
+      :     :                 :           :- CometSort (4)
+      :     :                 :           :  +- CometExchange (3)
+      :     :                 :           :     +- CometFilter (2)
+      :     :                 :           :        +- CometScan parquet spark_catalog.default.store_sales (1)
+      :     :                 :           +- CometSort (9)
+      :     :                 :              +- CometExchange (8)
+      :     :                 :                 +- CometProject (7)
+      :     :                 :                    +- CometFilter (6)
+      :     :                 :                       +- CometScan parquet spark_catalog.default.store_returns (5)
+      :     :                 +- ReusedExchange (14)
+      :     +- * Sort (41)
+      :        +- * Filter (40)
+      :           +- * HashAggregate (39)
+      :              +- Exchange (38)
+      :                 +- * HashAggregate (37)
+      :                    +- * Project (36)
+      :                       +- * BroadcastHashJoin Inner BuildRight (35)
+      :                          :- * ColumnarToRow (33)
+      :                          :  +- CometProject (32)
+      :                          :     +- CometFilter (31)
+      :                          :        +- CometSortMergeJoin (30)
+      :                          :           :- CometSort (24)
+      :                          :           :  +- CometExchange (23)
+      :                          :           :     +- CometFilter (22)
+      :                          :           :        +- CometScan parquet spark_catalog.default.web_sales (21)
+      :                          :           +- CometSort (29)
+      :                          :              +- CometExchange (28)
+      :                          :                 +- CometProject (27)
+      :                          :                    +- CometFilter (26)
+      :                          :                       +- CometScan parquet spark_catalog.default.web_returns (25)
+      :                          +- ReusedExchange (34)
+      +- * Sort (64)
+         +- * Filter (63)
+            +- * HashAggregate (62)
+               +- Exchange (61)
+                  +- * HashAggregate (60)
+                     +- * Project (59)
+                        +- * BroadcastHashJoin Inner BuildRight (58)
+                           :- * ColumnarToRow (56)
+                           :  +- CometProject (55)
+                           :     +- CometFilter (54)
+                           :        +- CometSortMergeJoin (53)
+                           :           :- CometSort (47)
+                           :           :  +- CometExchange (46)
+                           :           :     +- CometFilter (45)
+                           :           :        +- CometScan parquet spark_catalog.default.catalog_sales (44)
+                           :           +- CometSort (52)
+                           :              +- CometExchange (51)
+                           :                 +- CometProject (50)
+                           :                    +- CometFilter (49)
+                           :                       +- CometScan parquet spark_catalog.default.catalog_returns (48)
+                           +- ReusedExchange (57)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -84,9 +80,9 @@ ReadSchema: struct<ss_item_sk:int,ss_customer_sk:int,ss_ticket_number:int,ss_qua
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 Condition : (isnotnull(ss_item_sk#1) AND isnotnull(ss_customer_sk#2))
 
-(3) CometColumnarExchange
+(3) CometExchange
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_ticket_number#3, ss_item_sk#1, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_customer_sk#2, ss_ticket_number#3, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
@@ -107,9 +103,9 @@ Condition : (isnotnull(sr_ticket_number#10) AND isnotnull(sr_item_sk#9))
 Input [3]: [sr_item_sk#9, sr_ticket_number#10, sr_returned_date_sk#11]
 Arguments: [sr_item_sk#9, sr_ticket_number#10], [sr_item_sk#9, sr_ticket_number#10]
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
-Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_ticket_number#10, sr_item_sk#9, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [2]: [sr_item_sk#9, sr_ticket_number#10]
@@ -131,7 +127,7 @@ Arguments: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5,
 (13) ColumnarToRow [codegen id : 2]
 Input [6]: [ss_item_sk#1, ss_customer_sk#2, ss_quantity#4, ss_wholesale_cost#5, ss_sales_price#6, ss_sold_date_sk#7]
 
-(14) ReusedExchange [Reuses operator id: 75]
+(14) ReusedExchange [Reuses operator id: 71]
 Output [2]: [d_date_sk#12, d_year#13]
 
 (15) BroadcastHashJoin [codegen id : 2]
@@ -151,252 +147,248 @@ Functions [3]: [partial_sum(ss_quantity#4), partial_sum(UnscaledValue(ss_wholesa
 Aggregate Attributes [3]: [sum#14, sum#15, sum#16]
 Results [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 
-(18) RowToColumnar
+(18) Exchange
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
+Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(19) CometColumnarExchange
-Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
-Arguments: hashpartitioning(d_year#13, ss_item_sk#1, ss_customer_sk#2, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(20) CometHashAggregate
+(19) HashAggregate [codegen id : 3]
 Input [6]: [d_year#13, ss_item_sk#1, ss_customer_sk#2, sum#17, sum#18, sum#19]
 Keys [3]: [d_year#13, ss_item_sk#1, ss_customer_sk#2]
 Functions [3]: [sum(ss_quantity#4), sum(UnscaledValue(ss_wholesale_cost#5)), sum(UnscaledValue(ss_sales_price#6))]
+Aggregate Attributes [3]: [sum(ss_quantity#4)#20, sum(UnscaledValue(ss_wholesale_cost#5))#21, sum(UnscaledValue(ss_sales_price#6))#22]
+Results [6]: [d_year#13 AS ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, sum(ss_quantity#4)#20 AS ss_qty#24, MakeDecimal(sum(UnscaledValue(ss_wholesale_cost#5))#21,17,2) AS ss_wc#25, MakeDecimal(sum(UnscaledValue(ss_sales_price#6))#22,17,2) AS ss_sp#26]
 
-(21) CometSort
-Input [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23], [ss_sold_year#20 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST]
+(20) Sort [codegen id : 3]
+Input [6]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
+Arguments: [ss_sold_year#23 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST], false, 0
 
 (unknown) Scan parquet spark_catalog.default.web_sales
-Output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+Output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(ws_sold_date_sk#30), dynamicpruningexpression(ws_sold_date_sk#30 IN dynamicpruning#31)]
+PartitionFilters: [isnotnull(ws_sold_date_sk#33), dynamicpruningexpression(ws_sold_date_sk#33 IN dynamicpruning#34)]
 PushedFilters: [IsNotNull(ws_item_sk), IsNotNull(ws_bill_customer_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_bill_customer_sk:int,ws_order_number:int,ws_quantity:int,ws_wholesale_cost:decimal(7,2),ws_sales_price:decimal(7,2)>
 
-(23) CometFilter
-Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Condition : (isnotnull(ws_item_sk#24) AND isnotnull(ws_bill_customer_sk#25))
+(22) CometFilter
+Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Condition : (isnotnull(ws_item_sk#27) AND isnotnull(ws_bill_customer_sk#28))
 
-(24) CometColumnarExchange
-Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Arguments: hashpartitioning(ws_order_number#26, ws_item_sk#24, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(23) CometExchange
+Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Arguments: hashpartitioning(ws_order_number#29, ws_item_sk#27, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=4]
 
-(25) CometSort
-Input [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_order_number#26 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST]
+(24) CometSort
+Input [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_order_number#29 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.web_returns
-Output [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
+Output [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_order_number), IsNotNull(wr_item_sk)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int>
 
-(27) CometFilter
-Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
-Condition : (isnotnull(wr_order_number#33) AND isnotnull(wr_item_sk#32))
+(26) CometFilter
+Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
+Condition : (isnotnull(wr_order_number#36) AND isnotnull(wr_item_sk#35))
 
-(28) CometProject
-Input [3]: [wr_item_sk#32, wr_order_number#33, wr_returned_date_sk#34]
-Arguments: [wr_item_sk#32, wr_order_number#33], [wr_item_sk#32, wr_order_number#33]
+(27) CometProject
+Input [3]: [wr_item_sk#35, wr_order_number#36, wr_returned_date_sk#37]
+Arguments: [wr_item_sk#35, wr_order_number#36], [wr_item_sk#35, wr_order_number#36]
 
-(29) CometColumnarExchange
-Input [2]: [wr_item_sk#32, wr_order_number#33]
-Arguments: hashpartitioning(wr_order_number#33, wr_item_sk#32, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(28) CometExchange
+Input [2]: [wr_item_sk#35, wr_order_number#36]
+Arguments: hashpartitioning(wr_order_number#36, wr_item_sk#35, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=5]
 
-(30) CometSort
-Input [2]: [wr_item_sk#32, wr_order_number#33]
-Arguments: [wr_item_sk#32, wr_order_number#33], [wr_order_number#33 ASC NULLS FIRST, wr_item_sk#32 ASC NULLS FIRST]
+(29) CometSort
+Input [2]: [wr_item_sk#35, wr_order_number#36]
+Arguments: [wr_item_sk#35, wr_order_number#36], [wr_order_number#36 ASC NULLS FIRST, wr_item_sk#35 ASC NULLS FIRST]
 
-(31) CometSortMergeJoin
-Left output [7]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
-Right output [2]: [wr_item_sk#32, wr_order_number#33]
-Arguments: [ws_order_number#26, ws_item_sk#24], [wr_order_number#33, wr_item_sk#32], LeftOuter
+(30) CometSortMergeJoin
+Left output [7]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
+Right output [2]: [wr_item_sk#35, wr_order_number#36]
+Arguments: [ws_order_number#29, ws_item_sk#27], [wr_order_number#36, wr_item_sk#35], LeftOuter
 
-(32) CometFilter
-Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
-Condition : isnull(wr_order_number#33)
+(31) CometFilter
+Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
+Condition : isnull(wr_order_number#36)
 
-(33) CometProject
-Input [9]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_order_number#26, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, wr_item_sk#32, wr_order_number#33]
-Arguments: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30], [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+(32) CometProject
+Input [9]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_order_number#29, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, wr_item_sk#35, wr_order_number#36]
+Arguments: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33], [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
 
-(34) ColumnarToRow [codegen id : 4]
-Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30]
+(33) ColumnarToRow [codegen id : 5]
+Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33]
 
-(35) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#35, d_year#36]
+(34) ReusedExchange [Reuses operator id: 71]
+Output [2]: [d_date_sk#38, d_year#39]
 
-(36) BroadcastHashJoin [codegen id : 4]
-Left keys [1]: [ws_sold_date_sk#30]
-Right keys [1]: [d_date_sk#35]
+(35) BroadcastHashJoin [codegen id : 5]
+Left keys [1]: [ws_sold_date_sk#33]
+Right keys [1]: [d_date_sk#38]
 Join type: Inner
 Join condition: None
 
-(37) Project [codegen id : 4]
-Output [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
-Input [8]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, ws_sold_date_sk#30, d_date_sk#35, d_year#36]
-
-(38) HashAggregate [codegen id : 4]
-Input [6]: [ws_item_sk#24, ws_bill_customer_sk#25, ws_quantity#27, ws_wholesale_cost#28, ws_sales_price#29, d_year#36]
-Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
-Functions [3]: [partial_sum(ws_quantity#27), partial_sum(UnscaledValue(ws_wholesale_cost#28)), partial_sum(UnscaledValue(ws_sales_price#29))]
-Aggregate Attributes [3]: [sum#37, sum#38, sum#39]
-Results [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-
-(39) RowToColumnar
-Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-
-(40) CometColumnarExchange
-Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-Arguments: hashpartitioning(d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(41) CometHashAggregate
-Input [6]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25, sum#40, sum#41, sum#42]
-Keys [3]: [d_year#36, ws_item_sk#24, ws_bill_customer_sk#25]
-Functions [3]: [sum(ws_quantity#27), sum(UnscaledValue(ws_wholesale_cost#28)), sum(UnscaledValue(ws_sales_price#29))]
-
-(42) CometFilter
-Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Condition : (coalesce(ws_qty#45, 0) > 0)
-
-(43) CometSort
-Input [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Arguments: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47], [ws_sold_year#43 ASC NULLS FIRST, ws_item_sk#24 ASC NULLS FIRST, ws_customer_sk#44 ASC NULLS FIRST]
-
-(44) CometSortMergeJoin
-Left output [6]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
-Right output [6]: [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44], Inner
+(36) Project [codegen id : 5]
+Output [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
+Input [8]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, ws_sold_date_sk#33, d_date_sk#38, d_year#39]
+
+(37) HashAggregate [codegen id : 5]
+Input [6]: [ws_item_sk#27, ws_bill_customer_sk#28, ws_quantity#30, ws_wholesale_cost#31, ws_sales_price#32, d_year#39]
+Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
+Functions [3]: [partial_sum(ws_quantity#30), partial_sum(UnscaledValue(ws_wholesale_cost#31)), partial_sum(UnscaledValue(ws_sales_price#32))]
+Aggregate Attributes [3]: [sum#40, sum#41, sum#42]
+Results [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
+
+(38) Exchange
+Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
+Arguments: hashpartitioning(d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, 5), ENSURE_REQUIREMENTS, [plan_id=6]
+
+(39) HashAggregate [codegen id : 6]
+Input [6]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28, sum#43, sum#44, sum#45]
+Keys [3]: [d_year#39, ws_item_sk#27, ws_bill_customer_sk#28]
+Functions [3]: [sum(ws_quantity#30), sum(UnscaledValue(ws_wholesale_cost#31)), sum(UnscaledValue(ws_sales_price#32))]
+Aggregate Attributes [3]: [sum(ws_quantity#30)#46, sum(UnscaledValue(ws_wholesale_cost#31))#47, sum(UnscaledValue(ws_sales_price#32))#48]
+Results [6]: [d_year#39 AS ws_sold_year#49, ws_item_sk#27, ws_bill_customer_sk#28 AS ws_customer_sk#50, sum(ws_quantity#30)#46 AS ws_qty#51, MakeDecimal(sum(UnscaledValue(ws_wholesale_cost#31))#47,17,2) AS ws_wc#52, MakeDecimal(sum(UnscaledValue(ws_sales_price#32))#48,17,2) AS ws_sp#53]
+
+(40) Filter [codegen id : 6]
+Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
+Condition : (coalesce(ws_qty#51, 0) > 0)
+
+(41) Sort [codegen id : 6]
+Input [6]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
+Arguments: [ws_sold_year#49 ASC NULLS FIRST, ws_item_sk#27 ASC NULLS FIRST, ws_customer_sk#50 ASC NULLS FIRST], false, 0
+
+(42) SortMergeJoin [codegen id : 7]
+Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
+Right keys [3]: [ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50]
+Join type: Inner
+Join condition: None
 
-(45) CometProject
-Input [12]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_sold_year#43, ws_item_sk#24, ws_customer_sk#44, ws_qty#45, ws_wc#46, ws_sp#47]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47], [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
+(43) Project [codegen id : 7]
+Output [9]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53]
+Input [12]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_sold_year#49, ws_item_sk#27, ws_customer_sk#50, ws_qty#51, ws_wc#52, ws_sp#53]
 
 (unknown) Scan parquet spark_catalog.default.catalog_sales
-Output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+Output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
 Batched: true
 Location: InMemoryFileIndex []
-PartitionFilters: [isnotnull(cs_sold_date_sk#54), dynamicpruningexpression(cs_sold_date_sk#54 IN dynamicpruning#55)]
+PartitionFilters: [isnotnull(cs_sold_date_sk#60), dynamicpruningexpression(cs_sold_date_sk#60 IN dynamicpruning#61)]
 PushedFilters: [IsNotNull(cs_item_sk), IsNotNull(cs_bill_customer_sk)]
 ReadSchema: struct<cs_bill_customer_sk:int,cs_item_sk:int,cs_order_number:int,cs_quantity:int,cs_wholesale_cost:decimal(7,2),cs_sales_price:decimal(7,2)>
 
-(47) CometFilter
-Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Condition : (isnotnull(cs_item_sk#49) AND isnotnull(cs_bill_customer_sk#48))
+(45) CometFilter
+Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Condition : (isnotnull(cs_item_sk#55) AND isnotnull(cs_bill_customer_sk#54))
 
-(48) CometColumnarExchange
-Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Arguments: hashpartitioning(cs_order_number#50, cs_item_sk#49, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+(46) CometExchange
+Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Arguments: hashpartitioning(cs_order_number#56, cs_item_sk#55, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(49) CometSort
-Input [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_order_number#50 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST]
+(47) CometSort
+Input [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_order_number#56 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST]
 
 (unknown) Scan parquet spark_catalog.default.catalog_returns
-Output [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
+Output [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_order_number), IsNotNull(cr_item_sk)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int>
 
-(51) CometFilter
-Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
-Condition : (isnotnull(cr_order_number#57) AND isnotnull(cr_item_sk#56))
+(49) CometFilter
+Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
+Condition : (isnotnull(cr_order_number#63) AND isnotnull(cr_item_sk#62))
 
-(52) CometProject
-Input [3]: [cr_item_sk#56, cr_order_number#57, cr_returned_date_sk#58]
-Arguments: [cr_item_sk#56, cr_order_number#57], [cr_item_sk#56, cr_order_number#57]
+(50) CometProject
+Input [3]: [cr_item_sk#62, cr_order_number#63, cr_returned_date_sk#64]
+Arguments: [cr_item_sk#62, cr_order_number#63], [cr_item_sk#62, cr_order_number#63]
 
-(53) CometColumnarExchange
-Input [2]: [cr_item_sk#56, cr_order_number#57]
-Arguments: hashpartitioning(cr_order_number#57, cr_item_sk#56, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+(51) CometExchange
+Input [2]: [cr_item_sk#62, cr_order_number#63]
+Arguments: hashpartitioning(cr_order_number#63, cr_item_sk#62, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
 
-(54) CometSort
-Input [2]: [cr_item_sk#56, cr_order_number#57]
-Arguments: [cr_item_sk#56, cr_order_number#57], [cr_order_number#57 ASC NULLS FIRST, cr_item_sk#56 ASC NULLS FIRST]
+(52) CometSort
+Input [2]: [cr_item_sk#62, cr_order_number#63]
+Arguments: [cr_item_sk#62, cr_order_number#63], [cr_order_number#63 ASC NULLS FIRST, cr_item_sk#62 ASC NULLS FIRST]
 
-(55) CometSortMergeJoin
-Left output [7]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
-Right output [2]: [cr_item_sk#56, cr_order_number#57]
-Arguments: [cs_order_number#50, cs_item_sk#49], [cr_order_number#57, cr_item_sk#56], LeftOuter
+(53) CometSortMergeJoin
+Left output [7]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
+Right output [2]: [cr_item_sk#62, cr_order_number#63]
+Arguments: [cs_order_number#56, cs_item_sk#55], [cr_order_number#63, cr_item_sk#62], LeftOuter
 
-(56) CometFilter
-Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
-Condition : isnull(cr_order_number#57)
+(54) CometFilter
+Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
+Condition : isnull(cr_order_number#63)
 
-(57) CometProject
-Input [9]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_order_number#50, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, cr_item_sk#56, cr_order_number#57]
-Arguments: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54], [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+(55) CometProject
+Input [9]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_order_number#56, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, cr_item_sk#62, cr_order_number#63]
+Arguments: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60], [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
 
-(58) ColumnarToRow [codegen id : 6]
-Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54]
+(56) ColumnarToRow [codegen id : 9]
+Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60]
 
-(59) ReusedExchange [Reuses operator id: 75]
-Output [2]: [d_date_sk#59, d_year#60]
+(57) ReusedExchange [Reuses operator id: 71]
+Output [2]: [d_date_sk#65, d_year#66]
 
-(60) BroadcastHashJoin [codegen id : 6]
-Left keys [1]: [cs_sold_date_sk#54]
-Right keys [1]: [d_date_sk#59]
+(58) BroadcastHashJoin [codegen id : 9]
+Left keys [1]: [cs_sold_date_sk#60]
+Right keys [1]: [d_date_sk#65]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 6]
-Output [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
-Input [8]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, cs_sold_date_sk#54, d_date_sk#59, d_year#60]
-
-(62) HashAggregate [codegen id : 6]
-Input [6]: [cs_bill_customer_sk#48, cs_item_sk#49, cs_quantity#51, cs_wholesale_cost#52, cs_sales_price#53, d_year#60]
-Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
-Functions [3]: [partial_sum(cs_quantity#51), partial_sum(UnscaledValue(cs_wholesale_cost#52)), partial_sum(UnscaledValue(cs_sales_price#53))]
-Aggregate Attributes [3]: [sum#61, sum#62, sum#63]
-Results [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-
-(63) RowToColumnar
-Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-
-(64) CometColumnarExchange
-Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-Arguments: hashpartitioning(d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=9]
-
-(65) CometHashAggregate
-Input [6]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48, sum#64, sum#65, sum#66]
-Keys [3]: [d_year#60, cs_item_sk#49, cs_bill_customer_sk#48]
-Functions [3]: [sum(cs_quantity#51), sum(UnscaledValue(cs_wholesale_cost#52)), sum(UnscaledValue(cs_sales_price#53))]
-
-(66) CometFilter
-Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
-Condition : (coalesce(cs_qty#69, 0) > 0)
-
-(67) CometSort
-Input [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
-Arguments: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71], [cs_sold_year#67 ASC NULLS FIRST, cs_item_sk#49 ASC NULLS FIRST, cs_customer_sk#68 ASC NULLS FIRST]
-
-(68) CometSortMergeJoin
-Left output [9]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47]
-Right output [6]: [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
-Arguments: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2], [cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68], Inner
-
-(69) ColumnarToRow [codegen id : 7]
-Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+(59) Project [codegen id : 9]
+Output [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
+Input [8]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, cs_sold_date_sk#60, d_date_sk#65, d_year#66]
+
+(60) HashAggregate [codegen id : 9]
+Input [6]: [cs_bill_customer_sk#54, cs_item_sk#55, cs_quantity#57, cs_wholesale_cost#58, cs_sales_price#59, d_year#66]
+Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
+Functions [3]: [partial_sum(cs_quantity#57), partial_sum(UnscaledValue(cs_wholesale_cost#58)), partial_sum(UnscaledValue(cs_sales_price#59))]
+Aggregate Attributes [3]: [sum#67, sum#68, sum#69]
+Results [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
+
+(61) Exchange
+Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
+Arguments: hashpartitioning(d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, 5), ENSURE_REQUIREMENTS, [plan_id=9]
+
+(62) HashAggregate [codegen id : 10]
+Input [6]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54, sum#70, sum#71, sum#72]
+Keys [3]: [d_year#66, cs_item_sk#55, cs_bill_customer_sk#54]
+Functions [3]: [sum(cs_quantity#57), sum(UnscaledValue(cs_wholesale_cost#58)), sum(UnscaledValue(cs_sales_price#59))]
+Aggregate Attributes [3]: [sum(cs_quantity#57)#73, sum(UnscaledValue(cs_wholesale_cost#58))#74, sum(UnscaledValue(cs_sales_price#59))#75]
+Results [6]: [d_year#66 AS cs_sold_year#76, cs_item_sk#55, cs_bill_customer_sk#54 AS cs_customer_sk#77, sum(cs_quantity#57)#73 AS cs_qty#78, MakeDecimal(sum(UnscaledValue(cs_wholesale_cost#58))#74,17,2) AS cs_wc#79, MakeDecimal(sum(UnscaledValue(cs_sales_price#59))#75,17,2) AS cs_sp#80]
+
+(63) Filter [codegen id : 10]
+Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
+Condition : (coalesce(cs_qty#78, 0) > 0)
+
+(64) Sort [codegen id : 10]
+Input [6]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
+Arguments: [cs_sold_year#76 ASC NULLS FIRST, cs_item_sk#55 ASC NULLS FIRST, cs_customer_sk#77 ASC NULLS FIRST], false, 0
+
+(65) SortMergeJoin [codegen id : 11]
+Left keys [3]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2]
+Right keys [3]: [cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77]
+Join type: Inner
+Join condition: None
 
-(70) Project [codegen id : 7]
-Output [13]: [round((cast(ss_qty#21 as double) / cast(coalesce((ws_qty#45 + cs_qty#69), 1) as double)), 2) AS ratio#72, ss_qty#21 AS store_qty#73, ss_wc#22 AS store_wholesale_cost#74, ss_sp#23 AS store_sales_price#75, (coalesce(ws_qty#45, 0) + coalesce(cs_qty#69, 0)) AS other_chan_qty#76, (coalesce(ws_wc#46, 0.00) + coalesce(cs_wc#70, 0.00)) AS other_chan_wholesale_cost#77, (coalesce(ws_sp#47, 0.00) + coalesce(cs_sp#71, 0.00)) AS other_chan_sales_price#78, ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
-Input [15]: [ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23, ws_qty#45, ws_wc#46, ws_sp#47, cs_sold_year#67, cs_item_sk#49, cs_customer_sk#68, cs_qty#69, cs_wc#70, cs_sp#71]
+(66) Project [codegen id : 11]
+Output [13]: [round((cast(ss_qty#24 as double) / cast(coalesce((ws_qty#51 + cs_qty#78), 1) as double)), 2) AS ratio#81, ss_qty#24 AS store_qty#82, ss_wc#25 AS store_wholesale_cost#83, ss_sp#26 AS store_sales_price#84, (coalesce(ws_qty#51, 0) + coalesce(cs_qty#78, 0)) AS other_chan_qty#85, (coalesce(ws_wc#52, 0.00) + coalesce(cs_wc#79, 0.00)) AS other_chan_wholesale_cost#86, (coalesce(ws_sp#53, 0.00) + coalesce(cs_sp#80, 0.00)) AS other_chan_sales_price#87, ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
+Input [15]: [ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26, ws_qty#51, ws_wc#52, ws_sp#53, cs_sold_year#76, cs_item_sk#55, cs_customer_sk#77, cs_qty#78, cs_wc#79, cs_sp#80]
 
-(71) TakeOrderedAndProject
-Input [13]: [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78, ss_sold_year#20, ss_item_sk#1, ss_customer_sk#2, ss_qty#21, ss_wc#22, ss_sp#23]
-Arguments: 100, [ss_sold_year#20 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST, ss_qty#21 DESC NULLS LAST, ss_wc#22 DESC NULLS LAST, ss_sp#23 DESC NULLS LAST, other_chan_qty#76 ASC NULLS FIRST, other_chan_wholesale_cost#77 ASC NULLS FIRST, other_chan_sales_price#78 ASC NULLS FIRST, ratio#72 ASC NULLS FIRST], [ratio#72, store_qty#73, store_wholesale_cost#74, store_sales_price#75, other_chan_qty#76, other_chan_wholesale_cost#77, other_chan_sales_price#78]
+(67) TakeOrderedAndProject
+Input [13]: [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87, ss_sold_year#23, ss_item_sk#1, ss_customer_sk#2, ss_qty#24, ss_wc#25, ss_sp#26]
+Arguments: 100, [ss_sold_year#23 ASC NULLS FIRST, ss_item_sk#1 ASC NULLS FIRST, ss_customer_sk#2 ASC NULLS FIRST, ss_qty#24 DESC NULLS LAST, ss_wc#25 DESC NULLS LAST, ss_sp#26 DESC NULLS LAST, other_chan_qty#85 ASC NULLS FIRST, other_chan_wholesale_cost#86 ASC NULLS FIRST, other_chan_sales_price#87 ASC NULLS FIRST, ratio#81 ASC NULLS FIRST], [ratio#81, store_qty#82, store_wholesale_cost#83, store_sales_price#84, other_chan_qty#85, other_chan_wholesale_cost#86, other_chan_sales_price#87]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (75)
-+- * ColumnarToRow (74)
-   +- CometFilter (73)
-      +- CometScan parquet spark_catalog.default.date_dim (72)
+BroadcastExchange (71)
++- * ColumnarToRow (70)
+   +- CometFilter (69)
+      +- CometScan parquet spark_catalog.default.date_dim (68)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
@@ -406,19 +398,19 @@ Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_year), EqualTo(d_year,2000), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_year:int>
 
-(73) CometFilter
+(69) CometFilter
 Input [2]: [d_date_sk#12, d_year#13]
 Condition : ((isnotnull(d_year#13) AND (d_year#13 = 2000)) AND isnotnull(d_date_sk#12))
 
-(74) ColumnarToRow [codegen id : 1]
+(70) ColumnarToRow [codegen id : 1]
 Input [2]: [d_date_sk#12, d_year#13]
 
-(75) BroadcastExchange
+(71) BroadcastExchange
 Input [2]: [d_date_sk#12, d_year#13]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=10]
 
-Subquery:2 Hosting operator id = 22 Hosting Expression = ws_sold_date_sk#30 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 21 Hosting Expression = ws_sold_date_sk#33 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 46 Hosting Expression = cs_sold_date_sk#54 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 44 Hosting Expression = cs_sold_date_sk#60 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt
index 1b83b3157b..ea1de2fd73 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q78/simplified.txt
@@ -1,74 +1,80 @@
 TakeOrderedAndProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,other_chan_qty,other_chan_wholesale_cost,other_chan_sales_price,ratio,store_qty,store_wholesale_cost,store_sales_price]
-  WholeStageCodegen (7)
+  WholeStageCodegen (11)
     Project [ss_qty,ws_qty,cs_qty,ss_wc,ss_sp,ws_wc,cs_wc,ws_sp,cs_sp,ss_sold_year,ss_item_sk,ss_customer_sk]
-      ColumnarToRow
+      SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
         InputAdapter
-          CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,cs_sold_year,cs_item_sk,cs_customer_sk]
-            CometProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
-              CometSortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
-                CometSort [ss_sold_year,ss_item_sk,ss_customer_sk]
-                  CometHashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum]
-                    CometColumnarExchange [d_year,ss_item_sk,ss_customer_sk] #1
-                      RowToColumnar
-                        WholeStageCodegen (2)
-                          HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
-                            Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
-                              BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                ColumnarToRow
-                                  InputAdapter
-                                    CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                      CometFilter [sr_ticket_number]
-                                        CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
-                                          CometSort [ss_ticket_number,ss_item_sk]
-                                            CometColumnarExchange [ss_ticket_number,ss_item_sk] #2
-                                              CometFilter [ss_item_sk,ss_customer_sk]
-                                                CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
-                                                  SubqueryBroadcast [d_date_sk] #1
-                                                    BroadcastExchange #3
-                                                      WholeStageCodegen (1)
-                                                        ColumnarToRow
-                                                          InputAdapter
-                                                            CometFilter [d_year,d_date_sk]
-                                                              CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
-                                          CometSort [sr_ticket_number,sr_item_sk]
-                                            CometColumnarExchange [sr_ticket_number,sr_item_sk] #4
-                                              CometProject [sr_item_sk,sr_ticket_number]
-                                                CometFilter [sr_ticket_number,sr_item_sk]
-                                                  CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
-                                InputAdapter
-                                  ReusedExchange [d_date_sk,d_year] #3
-                CometSort [ws_sold_year,ws_item_sk,ws_customer_sk]
-                  CometFilter [ws_qty]
-                    CometHashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum]
-                      CometColumnarExchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
-                        RowToColumnar
-                          WholeStageCodegen (4)
-                            HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
-                              Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
-                                BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                  ColumnarToRow
+          WholeStageCodegen (7)
+            Project [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp,ws_qty,ws_wc,ws_sp]
+              SortMergeJoin [ss_sold_year,ss_item_sk,ss_customer_sk,ws_sold_year,ws_item_sk,ws_customer_sk]
+                InputAdapter
+                  WholeStageCodegen (3)
+                    Sort [ss_sold_year,ss_item_sk,ss_customer_sk]
+                      HashAggregate [d_year,ss_item_sk,ss_customer_sk,sum,sum,sum] [sum(ss_quantity),sum(UnscaledValue(ss_wholesale_cost)),sum(UnscaledValue(ss_sales_price)),ss_sold_year,ss_qty,ss_wc,ss_sp,sum,sum,sum]
+                        InputAdapter
+                          Exchange [d_year,ss_item_sk,ss_customer_sk] #1
+                            WholeStageCodegen (2)
+                              HashAggregate [d_year,ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price] [sum,sum,sum,sum,sum,sum]
+                                Project [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,d_year]
+                                  BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                    ColumnarToRow
+                                      InputAdapter
+                                        CometProject [ss_item_sk,ss_customer_sk,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                          CometFilter [sr_ticket_number]
+                                            CometSortMergeJoin [ss_ticket_number,ss_item_sk,sr_ticket_number,sr_item_sk]
+                                              CometSort [ss_ticket_number,ss_item_sk]
+                                                CometExchange [ss_ticket_number,ss_item_sk] #2
+                                                  CometFilter [ss_item_sk,ss_customer_sk]
+                                                    CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_customer_sk,ss_ticket_number,ss_quantity,ss_wholesale_cost,ss_sales_price,ss_sold_date_sk]
+                                                      SubqueryBroadcast [d_date_sk] #1
+                                                        BroadcastExchange #3
+                                                          WholeStageCodegen (1)
+                                                            ColumnarToRow
+                                                              InputAdapter
+                                                                CometFilter [d_year,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_year]
+                                              CometSort [sr_ticket_number,sr_item_sk]
+                                                CometExchange [sr_ticket_number,sr_item_sk] #4
+                                                  CometProject [sr_item_sk,sr_ticket_number]
+                                                    CometFilter [sr_ticket_number,sr_item_sk]
+                                                      CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_returned_date_sk]
                                     InputAdapter
-                                      CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                        CometFilter [wr_order_number]
-                                          CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
-                                            CometSort [ws_order_number,ws_item_sk]
-                                              CometColumnarExchange [ws_order_number,ws_item_sk] #6
-                                                CometFilter [ws_item_sk,ws_bill_customer_sk]
-                                                  CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
-                                                    ReusedSubquery [d_date_sk] #1
-                                            CometSort [wr_order_number,wr_item_sk]
-                                              CometColumnarExchange [wr_order_number,wr_item_sk] #7
-                                                CometProject [wr_item_sk,wr_order_number]
-                                                  CometFilter [wr_order_number,wr_item_sk]
-                                                    CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
-                                  InputAdapter
-                                    ReusedExchange [d_date_sk,d_year] #3
-            CometSort [cs_sold_year,cs_item_sk,cs_customer_sk]
-              CometFilter [cs_qty]
-                CometHashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum]
-                  CometColumnarExchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
-                    RowToColumnar
-                      WholeStageCodegen (6)
+                                      ReusedExchange [d_date_sk,d_year] #3
+                InputAdapter
+                  WholeStageCodegen (6)
+                    Sort [ws_sold_year,ws_item_sk,ws_customer_sk]
+                      Filter [ws_qty]
+                        HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,sum,sum,sum] [sum(ws_quantity),sum(UnscaledValue(ws_wholesale_cost)),sum(UnscaledValue(ws_sales_price)),ws_sold_year,ws_customer_sk,ws_qty,ws_wc,ws_sp,sum,sum,sum]
+                          InputAdapter
+                            Exchange [d_year,ws_item_sk,ws_bill_customer_sk] #5
+                              WholeStageCodegen (5)
+                                HashAggregate [d_year,ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price] [sum,sum,sum,sum,sum,sum]
+                                  Project [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,d_year]
+                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                      ColumnarToRow
+                                        InputAdapter
+                                          CometProject [ws_item_sk,ws_bill_customer_sk,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                            CometFilter [wr_order_number]
+                                              CometSortMergeJoin [ws_order_number,ws_item_sk,wr_order_number,wr_item_sk]
+                                                CometSort [ws_order_number,ws_item_sk]
+                                                  CometExchange [ws_order_number,ws_item_sk] #6
+                                                    CometFilter [ws_item_sk,ws_bill_customer_sk]
+                                                      CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_bill_customer_sk,ws_order_number,ws_quantity,ws_wholesale_cost,ws_sales_price,ws_sold_date_sk]
+                                                        ReusedSubquery [d_date_sk] #1
+                                                CometSort [wr_order_number,wr_item_sk]
+                                                  CometExchange [wr_order_number,wr_item_sk] #7
+                                                    CometProject [wr_item_sk,wr_order_number]
+                                                      CometFilter [wr_order_number,wr_item_sk]
+                                                        CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_returned_date_sk]
+                                      InputAdapter
+                                        ReusedExchange [d_date_sk,d_year] #3
+        InputAdapter
+          WholeStageCodegen (10)
+            Sort [cs_sold_year,cs_item_sk,cs_customer_sk]
+              Filter [cs_qty]
+                HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,sum,sum,sum] [sum(cs_quantity),sum(UnscaledValue(cs_wholesale_cost)),sum(UnscaledValue(cs_sales_price)),cs_sold_year,cs_customer_sk,cs_qty,cs_wc,cs_sp,sum,sum,sum]
+                  InputAdapter
+                    Exchange [d_year,cs_item_sk,cs_bill_customer_sk] #8
+                      WholeStageCodegen (9)
                         HashAggregate [d_year,cs_item_sk,cs_bill_customer_sk,cs_quantity,cs_wholesale_cost,cs_sales_price] [sum,sum,sum,sum,sum,sum]
                           Project [cs_bill_customer_sk,cs_item_sk,cs_quantity,cs_wholesale_cost,cs_sales_price,d_year]
                             BroadcastHashJoin [cs_sold_date_sk,d_date_sk]
@@ -78,12 +84,12 @@ TakeOrderedAndProject [ss_sold_year,ss_item_sk,ss_customer_sk,ss_qty,ss_wc,ss_sp
                                     CometFilter [cr_order_number]
                                       CometSortMergeJoin [cs_order_number,cs_item_sk,cr_order_number,cr_item_sk]
                                         CometSort [cs_order_number,cs_item_sk]
-                                          CometColumnarExchange [cs_order_number,cs_item_sk] #9
+                                          CometExchange [cs_order_number,cs_item_sk] #9
                                             CometFilter [cs_item_sk,cs_bill_customer_sk]
                                               CometScan parquet spark_catalog.default.catalog_sales [cs_bill_customer_sk,cs_item_sk,cs_order_number,cs_quantity,cs_wholesale_cost,cs_sales_price,cs_sold_date_sk]
                                                 ReusedSubquery [d_date_sk] #1
                                         CometSort [cr_order_number,cr_item_sk]
-                                          CometColumnarExchange [cr_order_number,cr_item_sk] #10
+                                          CometExchange [cr_order_number,cr_item_sk] #10
                                             CometProject [cr_item_sk,cr_order_number]
                                               CometFilter [cr_order_number,cr_item_sk]
                                                 CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_returned_date_sk]
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt
index 71122484d8..dfd081b442 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/explain.txt
@@ -1,129 +1,121 @@
 == Physical Plan ==
-* ColumnarToRow (125)
-+- CometTakeOrderedAndProject (124)
-   +- CometHashAggregate (123)
-      +- CometColumnarExchange (122)
-         +- CometHashAggregate (121)
-            +- CometUnion (120)
-               :- CometHashAggregate (109)
-               :  +- CometColumnarExchange (108)
-               :     +- RowToColumnar (107)
-               :        +- * HashAggregate (106)
-               :           +- Union (105)
-               :              :- * HashAggregate (40)
-               :              :  +- * ColumnarToRow (39)
-               :              :     +- CometColumnarExchange (38)
-               :              :        +- RowToColumnar (37)
-               :              :           +- * HashAggregate (36)
-               :              :              +- * Project (35)
-               :              :                 +- * BroadcastHashJoin Inner BuildRight (34)
-               :              :                    :- * Project (28)
-               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (27)
-               :              :                    :     :- * Project (21)
-               :              :                    :     :  +- * BroadcastHashJoin Inner BuildRight (20)
-               :              :                    :     :     :- * Project (15)
-               :              :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
-               :              :                    :     :     :     :- * ColumnarToRow (12)
-               :              :                    :     :     :     :  +- CometProject (11)
-               :              :                    :     :     :     :     +- CometSortMergeJoin (10)
-               :              :                    :     :     :     :        :- CometSort (4)
-               :              :                    :     :     :     :        :  +- CometColumnarExchange (3)
-               :              :                    :     :     :     :        :     +- CometFilter (2)
-               :              :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
-               :              :                    :     :     :     :        +- CometSort (9)
-               :              :                    :     :     :     :           +- CometColumnarExchange (8)
-               :              :                    :     :     :     :              +- CometProject (7)
-               :              :                    :     :     :     :                 +- CometFilter (6)
-               :              :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
-               :              :                    :     :     :     +- ReusedExchange (13)
-               :              :                    :     :     +- BroadcastExchange (19)
-               :              :                    :     :        +- * ColumnarToRow (18)
-               :              :                    :     :           +- CometFilter (17)
-               :              :                    :     :              +- CometScan parquet spark_catalog.default.store (16)
-               :              :                    :     +- BroadcastExchange (26)
-               :              :                    :        +- * ColumnarToRow (25)
-               :              :                    :           +- CometProject (24)
-               :              :                    :              +- CometFilter (23)
-               :              :                    :                 +- CometScan parquet spark_catalog.default.item (22)
-               :              :                    +- BroadcastExchange (33)
-               :              :                       +- * ColumnarToRow (32)
-               :              :                          +- CometProject (31)
-               :              :                             +- CometFilter (30)
-               :              :                                +- CometScan parquet spark_catalog.default.promotion (29)
-               :              :- * HashAggregate (72)
-               :              :  +- * ColumnarToRow (71)
-               :              :     +- CometColumnarExchange (70)
-               :              :        +- RowToColumnar (69)
-               :              :           +- * HashAggregate (68)
-               :              :              +- * Project (67)
-               :              :                 +- * BroadcastHashJoin Inner BuildRight (66)
-               :              :                    :- * Project (64)
-               :              :                    :  +- * BroadcastHashJoin Inner BuildRight (63)
-               :              :                    :     :- * Project (61)
-               :              :                    :     :  +- * BroadcastHashJoin Inner BuildRight (60)
-               :              :                    :     :     :- * Project (55)
-               :              :                    :     :     :  +- * BroadcastHashJoin Inner BuildRight (54)
-               :              :                    :     :     :     :- * ColumnarToRow (52)
-               :              :                    :     :     :     :  +- CometProject (51)
-               :              :                    :     :     :     :     +- CometSortMergeJoin (50)
-               :              :                    :     :     :     :        :- CometSort (44)
-               :              :                    :     :     :     :        :  +- CometColumnarExchange (43)
-               :              :                    :     :     :     :        :     +- CometFilter (42)
-               :              :                    :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (41)
-               :              :                    :     :     :     :        +- CometSort (49)
-               :              :                    :     :     :     :           +- CometColumnarExchange (48)
-               :              :                    :     :     :     :              +- CometProject (47)
-               :              :                    :     :     :     :                 +- CometFilter (46)
-               :              :                    :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (45)
-               :              :                    :     :     :     +- ReusedExchange (53)
-               :              :                    :     :     +- BroadcastExchange (59)
-               :              :                    :     :        +- * ColumnarToRow (58)
-               :              :                    :     :           +- CometFilter (57)
-               :              :                    :     :              +- CometScan parquet spark_catalog.default.catalog_page (56)
-               :              :                    :     +- ReusedExchange (62)
-               :              :                    +- ReusedExchange (65)
-               :              +- * HashAggregate (104)
-               :                 +- * ColumnarToRow (103)
-               :                    +- CometColumnarExchange (102)
-               :                       +- RowToColumnar (101)
-               :                          +- * HashAggregate (100)
-               :                             +- * Project (99)
-               :                                +- * BroadcastHashJoin Inner BuildRight (98)
-               :                                   :- * Project (96)
-               :                                   :  +- * BroadcastHashJoin Inner BuildRight (95)
-               :                                   :     :- * Project (93)
-               :                                   :     :  +- * BroadcastHashJoin Inner BuildRight (92)
-               :                                   :     :     :- * Project (87)
-               :                                   :     :     :  +- * BroadcastHashJoin Inner BuildRight (86)
-               :                                   :     :     :     :- * ColumnarToRow (84)
-               :                                   :     :     :     :  +- CometProject (83)
-               :                                   :     :     :     :     +- CometSortMergeJoin (82)
-               :                                   :     :     :     :        :- CometSort (76)
-               :                                   :     :     :     :        :  +- CometColumnarExchange (75)
-               :                                   :     :     :     :        :     +- CometFilter (74)
-               :                                   :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (73)
-               :                                   :     :     :     :        +- CometSort (81)
-               :                                   :     :     :     :           +- CometColumnarExchange (80)
-               :                                   :     :     :     :              +- CometProject (79)
-               :                                   :     :     :     :                 +- CometFilter (78)
-               :                                   :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (77)
-               :                                   :     :     :     +- ReusedExchange (85)
-               :                                   :     :     +- BroadcastExchange (91)
-               :                                   :     :        +- * ColumnarToRow (90)
-               :                                   :     :           +- CometFilter (89)
-               :                                   :     :              +- CometScan parquet spark_catalog.default.web_site (88)
-               :                                   :     +- ReusedExchange (94)
-               :                                   +- ReusedExchange (97)
-               :- CometHashAggregate (114)
-               :  +- CometColumnarExchange (113)
-               :     +- CometHashAggregate (112)
-               :        +- CometHashAggregate (111)
-               :           +- ReusedExchange (110)
-               +- CometHashAggregate (119)
-                  +- CometColumnarExchange (118)
-                     +- CometHashAggregate (117)
-                        +- CometHashAggregate (116)
-                           +- ReusedExchange (115)
+TakeOrderedAndProject (117)
++- * HashAggregate (116)
+   +- Exchange (115)
+      +- * HashAggregate (114)
+         +- Union (113)
+            :- * HashAggregate (102)
+            :  +- Exchange (101)
+            :     +- * HashAggregate (100)
+            :        +- Union (99)
+            :           :- * HashAggregate (38)
+            :           :  +- Exchange (37)
+            :           :     +- * HashAggregate (36)
+            :           :        +- * Project (35)
+            :           :           +- * BroadcastHashJoin Inner BuildRight (34)
+            :           :              :- * Project (28)
+            :           :              :  +- * BroadcastHashJoin Inner BuildRight (27)
+            :           :              :     :- * Project (21)
+            :           :              :     :  +- * BroadcastHashJoin Inner BuildRight (20)
+            :           :              :     :     :- * Project (15)
+            :           :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (14)
+            :           :              :     :     :     :- * ColumnarToRow (12)
+            :           :              :     :     :     :  +- CometProject (11)
+            :           :              :     :     :     :     +- CometSortMergeJoin (10)
+            :           :              :     :     :     :        :- CometSort (4)
+            :           :              :     :     :     :        :  +- CometExchange (3)
+            :           :              :     :     :     :        :     +- CometFilter (2)
+            :           :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.store_sales (1)
+            :           :              :     :     :     :        +- CometSort (9)
+            :           :              :     :     :     :           +- CometExchange (8)
+            :           :              :     :     :     :              +- CometProject (7)
+            :           :              :     :     :     :                 +- CometFilter (6)
+            :           :              :     :     :     :                    +- CometScan parquet spark_catalog.default.store_returns (5)
+            :           :              :     :     :     +- ReusedExchange (13)
+            :           :              :     :     +- BroadcastExchange (19)
+            :           :              :     :        +- * ColumnarToRow (18)
+            :           :              :     :           +- CometFilter (17)
+            :           :              :     :              +- CometScan parquet spark_catalog.default.store (16)
+            :           :              :     +- BroadcastExchange (26)
+            :           :              :        +- * ColumnarToRow (25)
+            :           :              :           +- CometProject (24)
+            :           :              :              +- CometFilter (23)
+            :           :              :                 +- CometScan parquet spark_catalog.default.item (22)
+            :           :              +- BroadcastExchange (33)
+            :           :                 +- * ColumnarToRow (32)
+            :           :                    +- CometProject (31)
+            :           :                       +- CometFilter (30)
+            :           :                          +- CometScan parquet spark_catalog.default.promotion (29)
+            :           :- * HashAggregate (68)
+            :           :  +- Exchange (67)
+            :           :     +- * HashAggregate (66)
+            :           :        +- * Project (65)
+            :           :           +- * BroadcastHashJoin Inner BuildRight (64)
+            :           :              :- * Project (62)
+            :           :              :  +- * BroadcastHashJoin Inner BuildRight (61)
+            :           :              :     :- * Project (59)
+            :           :              :     :  +- * BroadcastHashJoin Inner BuildRight (58)
+            :           :              :     :     :- * Project (53)
+            :           :              :     :     :  +- * BroadcastHashJoin Inner BuildRight (52)
+            :           :              :     :     :     :- * ColumnarToRow (50)
+            :           :              :     :     :     :  +- CometProject (49)
+            :           :              :     :     :     :     +- CometSortMergeJoin (48)
+            :           :              :     :     :     :        :- CometSort (42)
+            :           :              :     :     :     :        :  +- CometExchange (41)
+            :           :              :     :     :     :        :     +- CometFilter (40)
+            :           :              :     :     :     :        :        +- CometScan parquet spark_catalog.default.catalog_sales (39)
+            :           :              :     :     :     :        +- CometSort (47)
+            :           :              :     :     :     :           +- CometExchange (46)
+            :           :              :     :     :     :              +- CometProject (45)
+            :           :              :     :     :     :                 +- CometFilter (44)
+            :           :              :     :     :     :                    +- CometScan parquet spark_catalog.default.catalog_returns (43)
+            :           :              :     :     :     +- ReusedExchange (51)
+            :           :              :     :     +- BroadcastExchange (57)
+            :           :              :     :        +- * ColumnarToRow (56)
+            :           :              :     :           +- CometFilter (55)
+            :           :              :     :              +- CometScan parquet spark_catalog.default.catalog_page (54)
+            :           :              :     +- ReusedExchange (60)
+            :           :              +- ReusedExchange (63)
+            :           +- * HashAggregate (98)
+            :              +- Exchange (97)
+            :                 +- * HashAggregate (96)
+            :                    +- * Project (95)
+            :                       +- * BroadcastHashJoin Inner BuildRight (94)
+            :                          :- * Project (92)
+            :                          :  +- * BroadcastHashJoin Inner BuildRight (91)
+            :                          :     :- * Project (89)
+            :                          :     :  +- * BroadcastHashJoin Inner BuildRight (88)
+            :                          :     :     :- * Project (83)
+            :                          :     :     :  +- * BroadcastHashJoin Inner BuildRight (82)
+            :                          :     :     :     :- * ColumnarToRow (80)
+            :                          :     :     :     :  +- CometProject (79)
+            :                          :     :     :     :     +- CometSortMergeJoin (78)
+            :                          :     :     :     :        :- CometSort (72)
+            :                          :     :     :     :        :  +- CometExchange (71)
+            :                          :     :     :     :        :     +- CometFilter (70)
+            :                          :     :     :     :        :        +- CometScan parquet spark_catalog.default.web_sales (69)
+            :                          :     :     :     :        +- CometSort (77)
+            :                          :     :     :     :           +- CometExchange (76)
+            :                          :     :     :     :              +- CometProject (75)
+            :                          :     :     :     :                 +- CometFilter (74)
+            :                          :     :     :     :                    +- CometScan parquet spark_catalog.default.web_returns (73)
+            :                          :     :     :     +- ReusedExchange (81)
+            :                          :     :     +- BroadcastExchange (87)
+            :                          :     :        +- * ColumnarToRow (86)
+            :                          :     :           +- CometFilter (85)
+            :                          :     :              +- CometScan parquet spark_catalog.default.web_site (84)
+            :                          :     +- ReusedExchange (90)
+            :                          +- ReusedExchange (93)
+            :- * HashAggregate (107)
+            :  +- Exchange (106)
+            :     +- * HashAggregate (105)
+            :        +- * HashAggregate (104)
+            :           +- ReusedExchange (103)
+            +- * HashAggregate (112)
+               +- Exchange (111)
+                  +- * HashAggregate (110)
+                     +- * HashAggregate (109)
+                        +- ReusedExchange (108)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -138,9 +130,9 @@ ReadSchema: struct<ss_item_sk:int,ss_store_sk:int,ss_promo_sk:int,ss_ticket_numb
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
 Condition : ((isnotnull(ss_store_sk#2) AND isnotnull(ss_item_sk#1)) AND isnotnull(ss_promo_sk#3))
 
-(3) CometColumnarExchange
+(3) CometExchange
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
-Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=1]
+Arguments: hashpartitioning(ss_item_sk#1, ss_ticket_number#4, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=1]
 
 (4) CometSort
 Input [7]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ticket_number#4, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7]
@@ -161,9 +153,9 @@ Condition : (isnotnull(sr_item_sk#9) AND isnotnull(sr_ticket_number#10))
 Input [5]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12, sr_returned_date_sk#13]
 Arguments: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12], [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
 
-(8) CometColumnarExchange
+(8) CometExchange
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
-Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
+Arguments: hashpartitioning(sr_item_sk#9, sr_ticket_number#10, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=2]
 
 (9) CometSort
 Input [4]: [sr_item_sk#9, sr_ticket_number#10, sr_return_amt#11, sr_net_loss#12]
@@ -181,7 +173,7 @@ Arguments: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss
 (12) ColumnarToRow [codegen id : 5]
 Input [8]: [ss_item_sk#1, ss_store_sk#2, ss_promo_sk#3, ss_ext_sales_price#5, ss_net_profit#6, ss_sold_date_sk#7, sr_return_amt#11, sr_net_loss#12]
 
-(13) ReusedExchange [Reuses operator id: 130]
+(13) ReusedExchange [Reuses operator id: 122]
 Output [1]: [d_date_sk#14]
 
 (14) BroadcastHashJoin [codegen id : 5]
@@ -293,17 +285,11 @@ Functions [3]: [partial_sum(UnscaledValue(ss_ext_sales_price#5)), partial_sum(co
 Aggregate Attributes [5]: [sum#21, sum#22, isEmpty#23, sum#24, isEmpty#25]
 Results [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 
-(37) RowToColumnar
+(37) Exchange
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
+Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(38) CometColumnarExchange
-Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
-Arguments: hashpartitioning(s_store_id#16, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(39) ColumnarToRow [codegen id : 6]
-Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
-
-(40) HashAggregate [codegen id : 6]
+(38) HashAggregate [codegen id : 6]
 Input [6]: [s_store_id#16, sum#26, sum#27, isEmpty#28, sum#29, isEmpty#30]
 Keys [1]: [s_store_id#16]
 Functions [3]: [sum(UnscaledValue(ss_ext_sales_price#5)), sum(coalesce(cast(sr_return_amt#11 as decimal(12,2)), 0.00)), sum((ss_net_profit#6 - coalesce(cast(sr_net_loss#12 as decimal(12,2)), 0.00)))]
@@ -318,15 +304,15 @@ PartitionFilters: [isnotnull(cs_sold_date_sk#45), dynamicpruningexpression(cs_so
 PushedFilters: [IsNotNull(cs_catalog_page_sk), IsNotNull(cs_item_sk), IsNotNull(cs_promo_sk)]
 ReadSchema: struct<cs_catalog_page_sk:int,cs_item_sk:int,cs_promo_sk:int,cs_order_number:int,cs_ext_sales_price:decimal(7,2),cs_net_profit:decimal(7,2)>
 
-(42) CometFilter
+(40) CometFilter
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Condition : ((isnotnull(cs_catalog_page_sk#39) AND isnotnull(cs_item_sk#40)) AND isnotnull(cs_promo_sk#41))
 
-(43) CometColumnarExchange
+(41) CometExchange
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
-Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=7]
+Arguments: hashpartitioning(cs_item_sk#40, cs_order_number#42, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=7]
 
-(44) CometSort
+(42) CometSort
 Input [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45], [cs_item_sk#40 ASC NULLS FIRST, cs_order_number#42 ASC NULLS FIRST]
 
@@ -337,44 +323,44 @@ Location [not included in comparison]/{warehouse_dir}/catalog_returns]
 PushedFilters: [IsNotNull(cr_item_sk), IsNotNull(cr_order_number)]
 ReadSchema: struct<cr_item_sk:int,cr_order_number:int,cr_return_amount:decimal(7,2),cr_net_loss:decimal(7,2)>
 
-(46) CometFilter
+(44) CometFilter
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Condition : (isnotnull(cr_item_sk#47) AND isnotnull(cr_order_number#48))
 
-(47) CometProject
+(45) CometProject
 Input [5]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50, cr_returned_date_sk#51]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 
-(48) CometColumnarExchange
+(46) CometExchange
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
-Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=8]
+Arguments: hashpartitioning(cr_item_sk#47, cr_order_number#48, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=8]
 
-(49) CometSort
+(47) CometSort
 Input [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50], [cr_item_sk#47 ASC NULLS FIRST, cr_order_number#48 ASC NULLS FIRST]
 
-(50) CometSortMergeJoin
+(48) CometSortMergeJoin
 Left output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45]
 Right output [4]: [cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_item_sk#40, cs_order_number#42], [cr_item_sk#47, cr_order_number#48], LeftOuter
 
-(51) CometProject
+(49) CometProject
 Input [11]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_order_number#42, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_item_sk#47, cr_order_number#48, cr_return_amount#49, cr_net_loss#50]
 Arguments: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50], [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(52) ColumnarToRow [codegen id : 11]
+(50) ColumnarToRow [codegen id : 11]
 Input [8]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50]
 
-(53) ReusedExchange [Reuses operator id: 130]
+(51) ReusedExchange [Reuses operator id: 122]
 Output [1]: [d_date_sk#52]
 
-(54) BroadcastHashJoin [codegen id : 11]
+(52) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_sold_date_sk#45]
 Right keys [1]: [d_date_sk#52]
 Join type: Inner
 Join condition: None
 
-(55) Project [codegen id : 11]
+(53) Project [codegen id : 11]
 Output [7]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cs_sold_date_sk#45, cr_return_amount#49, cr_net_loss#50, d_date_sk#52]
 
@@ -385,71 +371,65 @@ Location [not included in comparison]/{warehouse_dir}/catalog_page]
 PushedFilters: [IsNotNull(cp_catalog_page_sk)]
 ReadSchema: struct<cp_catalog_page_sk:int,cp_catalog_page_id:string>
 
-(57) CometFilter
+(55) CometFilter
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Condition : isnotnull(cp_catalog_page_sk#53)
 
-(58) ColumnarToRow [codegen id : 8]
+(56) ColumnarToRow [codegen id : 8]
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(59) BroadcastExchange
+(57) BroadcastExchange
 Input [2]: [cp_catalog_page_sk#53, cp_catalog_page_id#54]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=9]
 
-(60) BroadcastHashJoin [codegen id : 11]
+(58) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_catalog_page_sk#39]
 Right keys [1]: [cp_catalog_page_sk#53]
 Join type: Inner
 Join condition: None
 
-(61) Project [codegen id : 11]
+(59) Project [codegen id : 11]
 Output [7]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [9]: [cs_catalog_page_sk#39, cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_sk#53, cp_catalog_page_id#54]
 
-(62) ReusedExchange [Reuses operator id: 26]
+(60) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#55]
 
-(63) BroadcastHashJoin [codegen id : 11]
+(61) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_item_sk#40]
 Right keys [1]: [i_item_sk#55]
 Join type: Inner
 Join condition: None
 
-(64) Project [codegen id : 11]
+(62) Project [codegen id : 11]
 Output [6]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [8]: [cs_item_sk#40, cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, i_item_sk#55]
 
-(65) ReusedExchange [Reuses operator id: 33]
+(63) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#56]
 
-(66) BroadcastHashJoin [codegen id : 11]
+(64) BroadcastHashJoin [codegen id : 11]
 Left keys [1]: [cs_promo_sk#41]
 Right keys [1]: [p_promo_sk#56]
 Join type: Inner
 Join condition: None
 
-(67) Project [codegen id : 11]
+(65) Project [codegen id : 11]
 Output [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Input [7]: [cs_promo_sk#41, cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54, p_promo_sk#56]
 
-(68) HashAggregate [codegen id : 11]
+(66) HashAggregate [codegen id : 11]
 Input [5]: [cs_ext_sales_price#43, cs_net_profit#44, cr_return_amount#49, cr_net_loss#50, cp_catalog_page_id#54]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [partial_sum(UnscaledValue(cs_ext_sales_price#43)), partial_sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), partial_sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#57, sum#58, isEmpty#59, sum#60, isEmpty#61]
 Results [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 
-(69) RowToColumnar
-Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
-
-(70) CometColumnarExchange
-Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
-Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=10]
-
-(71) ColumnarToRow [codegen id : 12]
+(67) Exchange
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
+Arguments: hashpartitioning(cp_catalog_page_id#54, 5), ENSURE_REQUIREMENTS, [plan_id=10]
 
-(72) HashAggregate [codegen id : 12]
+(68) HashAggregate [codegen id : 12]
 Input [6]: [cp_catalog_page_id#54, sum#62, sum#63, isEmpty#64, sum#65, isEmpty#66]
 Keys [1]: [cp_catalog_page_id#54]
 Functions [3]: [sum(UnscaledValue(cs_ext_sales_price#43)), sum(coalesce(cast(cr_return_amount#49 as decimal(12,2)), 0.00)), sum((cs_net_profit#44 - coalesce(cast(cr_net_loss#50 as decimal(12,2)), 0.00)))]
@@ -464,15 +444,15 @@ PartitionFilters: [isnotnull(ws_sold_date_sk#81), dynamicpruningexpression(ws_so
 PushedFilters: [IsNotNull(ws_web_site_sk), IsNotNull(ws_item_sk), IsNotNull(ws_promo_sk)]
 ReadSchema: struct<ws_item_sk:int,ws_web_site_sk:int,ws_promo_sk:int,ws_order_number:int,ws_ext_sales_price:decimal(7,2),ws_net_profit:decimal(7,2)>
 
-(74) CometFilter
+(70) CometFilter
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Condition : ((isnotnull(ws_web_site_sk#76) AND isnotnull(ws_item_sk#75)) AND isnotnull(ws_promo_sk#77))
 
-(75) CometColumnarExchange
+(71) CometExchange
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
-Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=11]
+Arguments: hashpartitioning(ws_item_sk#75, ws_order_number#78, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=11]
 
-(76) CometSort
+(72) CometSort
 Input [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81], [ws_item_sk#75 ASC NULLS FIRST, ws_order_number#78 ASC NULLS FIRST]
 
@@ -483,44 +463,44 @@ Location [not included in comparison]/{warehouse_dir}/web_returns]
 PushedFilters: [IsNotNull(wr_item_sk), IsNotNull(wr_order_number)]
 ReadSchema: struct<wr_item_sk:int,wr_order_number:int,wr_return_amt:decimal(7,2),wr_net_loss:decimal(7,2)>
 
-(78) CometFilter
+(74) CometFilter
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Condition : (isnotnull(wr_item_sk#83) AND isnotnull(wr_order_number#84))
 
-(79) CometProject
+(75) CometProject
 Input [5]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86, wr_returned_date_sk#87]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 
-(80) CometColumnarExchange
+(76) CometExchange
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
-Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=12]
+Arguments: hashpartitioning(wr_item_sk#83, wr_order_number#84, 5), ENSURE_REQUIREMENTS, CometNativeShuffle, [plan_id=12]
 
-(81) CometSort
+(77) CometSort
 Input [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86], [wr_item_sk#83 ASC NULLS FIRST, wr_order_number#84 ASC NULLS FIRST]
 
-(82) CometSortMergeJoin
+(78) CometSortMergeJoin
 Left output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81]
 Right output [4]: [wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_order_number#78], [wr_item_sk#83, wr_order_number#84], LeftOuter
 
-(83) CometProject
+(79) CometProject
 Input [11]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_order_number#78, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_item_sk#83, wr_order_number#84, wr_return_amt#85, wr_net_loss#86]
 Arguments: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86], [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(84) ColumnarToRow [codegen id : 17]
+(80) ColumnarToRow [codegen id : 17]
 Input [8]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86]
 
-(85) ReusedExchange [Reuses operator id: 130]
+(81) ReusedExchange [Reuses operator id: 122]
 Output [1]: [d_date_sk#88]
 
-(86) BroadcastHashJoin [codegen id : 17]
+(82) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_sold_date_sk#81]
 Right keys [1]: [d_date_sk#88]
 Join type: Inner
 Join condition: None
 
-(87) Project [codegen id : 17]
+(83) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, ws_sold_date_sk#81, wr_return_amt#85, wr_net_loss#86, d_date_sk#88]
 
@@ -531,202 +511,205 @@ Location [not included in comparison]/{warehouse_dir}/web_site]
 PushedFilters: [IsNotNull(web_site_sk)]
 ReadSchema: struct<web_site_sk:int,web_site_id:string>
 
-(89) CometFilter
+(85) CometFilter
 Input [2]: [web_site_sk#89, web_site_id#90]
 Condition : isnotnull(web_site_sk#89)
 
-(90) ColumnarToRow [codegen id : 14]
+(86) ColumnarToRow [codegen id : 14]
 Input [2]: [web_site_sk#89, web_site_id#90]
 
-(91) BroadcastExchange
+(87) BroadcastExchange
 Input [2]: [web_site_sk#89, web_site_id#90]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, false] as bigint)),false), [plan_id=13]
 
-(92) BroadcastHashJoin [codegen id : 17]
+(88) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_web_site_sk#76]
 Right keys [1]: [web_site_sk#89]
 Join type: Inner
 Join condition: None
 
-(93) Project [codegen id : 17]
+(89) Project [codegen id : 17]
 Output [7]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [9]: [ws_item_sk#75, ws_web_site_sk#76, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_sk#89, web_site_id#90]
 
-(94) ReusedExchange [Reuses operator id: 26]
+(90) ReusedExchange [Reuses operator id: 26]
 Output [1]: [i_item_sk#91]
 
-(95) BroadcastHashJoin [codegen id : 17]
+(91) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_item_sk#75]
 Right keys [1]: [i_item_sk#91]
 Join type: Inner
 Join condition: None
 
-(96) Project [codegen id : 17]
+(92) Project [codegen id : 17]
 Output [6]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [8]: [ws_item_sk#75, ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, i_item_sk#91]
 
-(97) ReusedExchange [Reuses operator id: 33]
+(93) ReusedExchange [Reuses operator id: 33]
 Output [1]: [p_promo_sk#92]
 
-(98) BroadcastHashJoin [codegen id : 17]
+(94) BroadcastHashJoin [codegen id : 17]
 Left keys [1]: [ws_promo_sk#77]
 Right keys [1]: [p_promo_sk#92]
 Join type: Inner
 Join condition: None
 
-(99) Project [codegen id : 17]
+(95) Project [codegen id : 17]
 Output [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Input [7]: [ws_promo_sk#77, ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90, p_promo_sk#92]
 
-(100) HashAggregate [codegen id : 17]
+(96) HashAggregate [codegen id : 17]
 Input [5]: [ws_ext_sales_price#79, ws_net_profit#80, wr_return_amt#85, wr_net_loss#86, web_site_id#90]
 Keys [1]: [web_site_id#90]
 Functions [3]: [partial_sum(UnscaledValue(ws_ext_sales_price#79)), partial_sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), partial_sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [5]: [sum#93, sum#94, isEmpty#95, sum#96, isEmpty#97]
 Results [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 
-(101) RowToColumnar
+(97) Exchange
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
+Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, [plan_id=14]
 
-(102) CometColumnarExchange
-Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
-Arguments: hashpartitioning(web_site_id#90, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=14]
-
-(103) ColumnarToRow [codegen id : 18]
-Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
-
-(104) HashAggregate [codegen id : 18]
+(98) HashAggregate [codegen id : 18]
 Input [6]: [web_site_id#90, sum#98, sum#99, isEmpty#100, sum#101, isEmpty#102]
 Keys [1]: [web_site_id#90]
 Functions [3]: [sum(UnscaledValue(ws_ext_sales_price#79)), sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00)), sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))]
 Aggregate Attributes [3]: [sum(UnscaledValue(ws_ext_sales_price#79))#103, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105]
 Results [5]: [web channel AS channel#106, concat(web_site, web_site_id#90) AS id#107, MakeDecimal(sum(UnscaledValue(ws_ext_sales_price#79))#103,17,2) AS sales#108, sum(coalesce(cast(wr_return_amt#85 as decimal(12,2)), 0.00))#104 AS returns#109, sum((ws_net_profit#80 - coalesce(cast(wr_net_loss#86 as decimal(12,2)), 0.00)))#105 AS profit#110]
 
-(105) Union
+(99) Union
 
-(106) HashAggregate [codegen id : 19]
+(100) HashAggregate [codegen id : 19]
 Input [5]: [channel#34, id#35, sales#36, returns#37, profit#38]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [partial_sum(sales#36), partial_sum(returns#37), partial_sum(profit#38)]
 Aggregate Attributes [6]: [sum#111, isEmpty#112, sum#113, isEmpty#114, sum#115, isEmpty#116]
 Results [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 
-(107) RowToColumnar
-Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
-
-(108) CometColumnarExchange
+(101) Exchange
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
-Arguments: hashpartitioning(channel#34, id#35, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=15]
+Arguments: hashpartitioning(channel#34, id#35, 5), ENSURE_REQUIREMENTS, [plan_id=15]
 
-(109) CometHashAggregate
+(102) HashAggregate [codegen id : 20]
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [sum(sales#36), sum(returns#37), sum(profit#38)]
+Aggregate Attributes [3]: [sum(sales#36)#123, sum(returns#37)#124, sum(profit#38)#125]
+Results [5]: [channel#34, id#35, cast(sum(sales#36)#123 as decimal(37,2)) AS sales#126, cast(sum(returns#37)#124 as decimal(38,2)) AS returns#127, cast(sum(profit#38)#125 as decimal(38,2)) AS profit#128]
 
-(110) ReusedExchange [Reuses operator id: 108]
+(103) ReusedExchange [Reuses operator id: 101]
 Output [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 
-(111) CometHashAggregate
+(104) HashAggregate [codegen id : 40]
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [sum(sales#36), sum(returns#37), sum(profit#38)]
+Aggregate Attributes [3]: [sum(sales#36)#123, sum(returns#37)#124, sum(profit#38)#125]
+Results [4]: [channel#34, sum(sales#36)#123 AS sales#129, sum(returns#37)#124 AS returns#130, sum(profit#38)#125 AS profit#131]
 
-(112) CometHashAggregate
-Input [4]: [channel#34, sales#123, returns#124, profit#125]
+(105) HashAggregate [codegen id : 40]
+Input [4]: [channel#34, sales#129, returns#130, profit#131]
 Keys [1]: [channel#34]
-Functions [3]: [partial_sum(sales#123), partial_sum(returns#124), partial_sum(profit#125)]
+Functions [3]: [partial_sum(sales#129), partial_sum(returns#130), partial_sum(profit#131)]
+Aggregate Attributes [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
+Results [7]: [channel#34, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
 
-(113) CometColumnarExchange
-Input [7]: [channel#34, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
-Arguments: hashpartitioning(channel#34, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=16]
+(106) Exchange
+Input [7]: [channel#34, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
+Arguments: hashpartitioning(channel#34, 5), ENSURE_REQUIREMENTS, [plan_id=16]
 
-(114) CometHashAggregate
-Input [7]: [channel#34, sum#126, isEmpty#127, sum#128, isEmpty#129, sum#130, isEmpty#131]
+(107) HashAggregate [codegen id : 41]
+Input [7]: [channel#34, sum#138, isEmpty#139, sum#140, isEmpty#141, sum#142, isEmpty#143]
 Keys [1]: [channel#34]
-Functions [3]: [sum(sales#123), sum(returns#124), sum(profit#125)]
+Functions [3]: [sum(sales#129), sum(returns#130), sum(profit#131)]
+Aggregate Attributes [3]: [sum(sales#129)#144, sum(returns#130)#145, sum(profit#131)#146]
+Results [5]: [channel#34, null AS id#147, sum(sales#129)#144 AS sales#148, sum(returns#130)#145 AS returns#149, sum(profit#131)#146 AS profit#150]
 
-(115) ReusedExchange [Reuses operator id: 108]
+(108) ReusedExchange [Reuses operator id: 101]
 Output [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 
-(116) CometHashAggregate
+(109) HashAggregate [codegen id : 61]
 Input [8]: [channel#34, id#35, sum#117, isEmpty#118, sum#119, isEmpty#120, sum#121, isEmpty#122]
 Keys [2]: [channel#34, id#35]
 Functions [3]: [sum(sales#36), sum(returns#37), sum(profit#38)]
+Aggregate Attributes [3]: [sum(sales#36)#123, sum(returns#37)#124, sum(profit#38)#125]
+Results [3]: [sum(sales#36)#123 AS sales#129, sum(returns#37)#124 AS returns#130, sum(profit#38)#125 AS profit#131]
 
-(117) CometHashAggregate
-Input [3]: [sales#123, returns#124, profit#125]
+(110) HashAggregate [codegen id : 61]
+Input [3]: [sales#129, returns#130, profit#131]
 Keys: []
-Functions [3]: [partial_sum(sales#123), partial_sum(returns#124), partial_sum(profit#125)]
+Functions [3]: [partial_sum(sales#129), partial_sum(returns#130), partial_sum(profit#131)]
+Aggregate Attributes [6]: [sum#151, isEmpty#152, sum#153, isEmpty#154, sum#155, isEmpty#156]
+Results [6]: [sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162]
 
-(118) CometColumnarExchange
-Input [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=17]
+(111) Exchange
+Input [6]: [sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=17]
 
-(119) CometHashAggregate
-Input [6]: [sum#132, isEmpty#133, sum#134, isEmpty#135, sum#136, isEmpty#137]
+(112) HashAggregate [codegen id : 62]
+Input [6]: [sum#157, isEmpty#158, sum#159, isEmpty#160, sum#161, isEmpty#162]
 Keys: []
-Functions [3]: [sum(sales#123), sum(returns#124), sum(profit#125)]
+Functions [3]: [sum(sales#129), sum(returns#130), sum(profit#131)]
+Aggregate Attributes [3]: [sum(sales#129)#163, sum(returns#130)#164, sum(profit#131)#165]
+Results [5]: [null AS channel#166, null AS id#167, sum(sales#129)#163 AS sales#168, sum(returns#130)#164 AS returns#169, sum(profit#131)#165 AS profit#170]
 
-(120) CometUnion
-Child 0 Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
-Child 1 Input [5]: [channel#34, id#141, sales#142, returns#143, profit#144]
-Child 2 Input [5]: [channel#145, id#146, sales#147, returns#148, profit#149]
+(113) Union
 
-(121) CometHashAggregate
-Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
-Keys [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+(114) HashAggregate [codegen id : 63]
+Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
+Keys [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
 
-(122) CometColumnarExchange
-Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
-Arguments: hashpartitioning(channel#34, id#35, sales#138, returns#139, profit#140, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=18]
+(115) Exchange
+Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
+Arguments: hashpartitioning(channel#34, id#35, sales#126, returns#127, profit#128, 5), ENSURE_REQUIREMENTS, [plan_id=18]
 
-(123) CometHashAggregate
-Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
-Keys [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+(116) HashAggregate [codegen id : 64]
+Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
+Keys [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
 
-(124) CometTakeOrderedAndProject
-Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
-Arguments: TakeOrderedAndProject(limit=100, orderBy=[channel#34 ASC NULLS FIRST,id#35 ASC NULLS FIRST], output=[channel#34,id#35,sales#138,returns#139,profit#140]), 100, [channel#34 ASC NULLS FIRST, id#35 ASC NULLS FIRST], [channel#34, id#35, sales#138, returns#139, profit#140]
-
-(125) ColumnarToRow [codegen id : 58]
-Input [5]: [channel#34, id#35, sales#138, returns#139, profit#140]
+(117) TakeOrderedAndProject
+Input [5]: [channel#34, id#35, sales#126, returns#127, profit#128]
+Arguments: 100, [channel#34 ASC NULLS FIRST, id#35 ASC NULLS FIRST], [channel#34, id#35, sales#126, returns#127, profit#128]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#7 IN dynamicpruning#8
-BroadcastExchange (130)
-+- * ColumnarToRow (129)
-   +- CometProject (128)
-      +- CometFilter (127)
-         +- CometScan parquet spark_catalog.default.date_dim (126)
+BroadcastExchange (122)
++- * ColumnarToRow (121)
+   +- CometProject (120)
+      +- CometFilter (119)
+         +- CometScan parquet spark_catalog.default.date_dim (118)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#14, d_date#150]
+Output [2]: [d_date_sk#14, d_date#171]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1998-08-04), LessThanOrEqual(d_date,1998-09-03), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(127) CometFilter
-Input [2]: [d_date_sk#14, d_date#150]
-Condition : (((isnotnull(d_date#150) AND (d_date#150 >= 1998-08-04)) AND (d_date#150 <= 1998-09-03)) AND isnotnull(d_date_sk#14))
+(119) CometFilter
+Input [2]: [d_date_sk#14, d_date#171]
+Condition : (((isnotnull(d_date#171) AND (d_date#171 >= 1998-08-04)) AND (d_date#171 <= 1998-09-03)) AND isnotnull(d_date_sk#14))
 
-(128) CometProject
-Input [2]: [d_date_sk#14, d_date#150]
+(120) CometProject
+Input [2]: [d_date_sk#14, d_date#171]
 Arguments: [d_date_sk#14], [d_date_sk#14]
 
-(129) ColumnarToRow [codegen id : 1]
+(121) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#14]
 
-(130) BroadcastExchange
+(122) BroadcastExchange
 Input [1]: [d_date_sk#14]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=19]
 
-Subquery:2 Hosting operator id = 41 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
+Subquery:2 Hosting operator id = 39 Hosting Expression = cs_sold_date_sk#45 IN dynamicpruning#8
 
-Subquery:3 Hosting operator id = 73 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
+Subquery:3 Hosting operator id = 69 Hosting Expression = ws_sold_date_sk#81 IN dynamicpruning#8
 
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt
index f694eedfaf..f6a37c6372 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q80a/simplified.txt
@@ -1,24 +1,24 @@
-WholeStageCodegen (58)
-  ColumnarToRow
-    InputAdapter
-      CometTakeOrderedAndProject [channel,id,sales,returns,profit]
-        CometHashAggregate [channel,id,sales,returns,profit]
-          CometColumnarExchange [channel,id,sales,returns,profit] #1
-            CometHashAggregate [channel,id,sales,returns,profit]
-              CometUnion
-                CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [channel,id] #2
-                    RowToColumnar
-                      WholeStageCodegen (19)
-                        HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                          InputAdapter
-                            Union
-                              WholeStageCodegen (6)
-                                HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [s_store_id] #3
-                                        RowToColumnar
+TakeOrderedAndProject [channel,id,sales,returns,profit]
+  WholeStageCodegen (64)
+    HashAggregate [channel,id,sales,returns,profit]
+      InputAdapter
+        Exchange [channel,id,sales,returns,profit] #1
+          WholeStageCodegen (63)
+            HashAggregate [channel,id,sales,returns,profit]
+              InputAdapter
+                Union
+                  WholeStageCodegen (20)
+                    HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [channel,id] #2
+                          WholeStageCodegen (19)
+                            HashAggregate [channel,id,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (6)
+                                    HashAggregate [s_store_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ss_ext_sales_price)),sum(coalesce(cast(sr_return_amt as decimal(12,2)), 0.00)),sum((ss_net_profit - coalesce(cast(sr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [s_store_id] #3
                                           WholeStageCodegen (5)
                                             HashAggregate [s_store_id,ss_ext_sales_price,sr_return_amt,ss_net_profit,sr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
                                               Project [ss_ext_sales_price,ss_net_profit,sr_return_amt,sr_net_loss,s_store_id]
@@ -34,7 +34,7 @@ WholeStageCodegen (58)
                                                                   CometProject [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk,sr_return_amt,sr_net_loss]
                                                                     CometSortMergeJoin [ss_item_sk,ss_ticket_number,sr_item_sk,sr_ticket_number]
                                                                       CometSort [ss_item_sk,ss_ticket_number]
-                                                                        CometColumnarExchange [ss_item_sk,ss_ticket_number] #4
+                                                                        CometExchange [ss_item_sk,ss_ticket_number] #4
                                                                           CometFilter [ss_store_sk,ss_item_sk,ss_promo_sk]
                                                                             CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_store_sk,ss_promo_sk,ss_ticket_number,ss_ext_sales_price,ss_net_profit,ss_sold_date_sk]
                                                                               SubqueryBroadcast [d_date_sk] #1
@@ -46,7 +46,7 @@ WholeStageCodegen (58)
                                                                                           CometFilter [d_date,d_date_sk]
                                                                                             CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                                                       CometSort [sr_item_sk,sr_ticket_number]
-                                                                        CometColumnarExchange [sr_item_sk,sr_ticket_number] #6
+                                                                        CometExchange [sr_item_sk,sr_ticket_number] #6
                                                                           CometProject [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss]
                                                                             CometFilter [sr_item_sk,sr_ticket_number]
                                                                               CometScan parquet spark_catalog.default.store_returns [sr_item_sk,sr_ticket_number,sr_return_amt,sr_net_loss,sr_returned_date_sk]
@@ -75,12 +75,10 @@ WholeStageCodegen (58)
                                                             CometProject [p_promo_sk]
                                                               CometFilter [p_channel_tv,p_promo_sk]
                                                                 CometScan parquet spark_catalog.default.promotion [p_promo_sk,p_channel_tv]
-                              WholeStageCodegen (12)
-                                HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [cp_catalog_page_id] #10
-                                        RowToColumnar
+                                  WholeStageCodegen (12)
+                                    HashAggregate [cp_catalog_page_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(cs_ext_sales_price)),sum(coalesce(cast(cr_return_amount as decimal(12,2)), 0.00)),sum((cs_net_profit - coalesce(cast(cr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [cp_catalog_page_id] #10
                                           WholeStageCodegen (11)
                                             HashAggregate [cp_catalog_page_id,cs_ext_sales_price,cr_return_amount,cs_net_profit,cr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
                                               Project [cs_ext_sales_price,cs_net_profit,cr_return_amount,cr_net_loss,cp_catalog_page_id]
@@ -96,12 +94,12 @@ WholeStageCodegen (58)
                                                                   CometProject [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk,cr_return_amount,cr_net_loss]
                                                                     CometSortMergeJoin [cs_item_sk,cs_order_number,cr_item_sk,cr_order_number]
                                                                       CometSort [cs_item_sk,cs_order_number]
-                                                                        CometColumnarExchange [cs_item_sk,cs_order_number] #11
+                                                                        CometExchange [cs_item_sk,cs_order_number] #11
                                                                           CometFilter [cs_catalog_page_sk,cs_item_sk,cs_promo_sk]
                                                                             CometScan parquet spark_catalog.default.catalog_sales [cs_catalog_page_sk,cs_item_sk,cs_promo_sk,cs_order_number,cs_ext_sales_price,cs_net_profit,cs_sold_date_sk]
                                                                               ReusedSubquery [d_date_sk] #1
                                                                       CometSort [cr_item_sk,cr_order_number]
-                                                                        CometColumnarExchange [cr_item_sk,cr_order_number] #12
+                                                                        CometExchange [cr_item_sk,cr_order_number] #12
                                                                           CometProject [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss]
                                                                             CometFilter [cr_item_sk,cr_order_number]
                                                                               CometScan parquet spark_catalog.default.catalog_returns [cr_item_sk,cr_order_number,cr_return_amount,cr_net_loss,cr_returned_date_sk]
@@ -118,12 +116,10 @@ WholeStageCodegen (58)
                                                         ReusedExchange [i_item_sk] #8
                                                   InputAdapter
                                                     ReusedExchange [p_promo_sk] #9
-                              WholeStageCodegen (18)
-                                HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
-                                  ColumnarToRow
-                                    InputAdapter
-                                      CometColumnarExchange [web_site_id] #14
-                                        RowToColumnar
+                                  WholeStageCodegen (18)
+                                    HashAggregate [web_site_id,sum,sum,isEmpty,sum,isEmpty] [sum(UnscaledValue(ws_ext_sales_price)),sum(coalesce(cast(wr_return_amt as decimal(12,2)), 0.00)),sum((ws_net_profit - coalesce(cast(wr_net_loss as decimal(12,2)), 0.00))),channel,id,sales,returns,profit,sum,sum,isEmpty,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [web_site_id] #14
                                           WholeStageCodegen (17)
                                             HashAggregate [web_site_id,ws_ext_sales_price,wr_return_amt,ws_net_profit,wr_net_loss] [sum,sum,isEmpty,sum,isEmpty,sum,sum,isEmpty,sum,isEmpty]
                                               Project [ws_ext_sales_price,ws_net_profit,wr_return_amt,wr_net_loss,web_site_id]
@@ -139,12 +135,12 @@ WholeStageCodegen (58)
                                                                   CometProject [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk,wr_return_amt,wr_net_loss]
                                                                     CometSortMergeJoin [ws_item_sk,ws_order_number,wr_item_sk,wr_order_number]
                                                                       CometSort [ws_item_sk,ws_order_number]
-                                                                        CometColumnarExchange [ws_item_sk,ws_order_number] #15
+                                                                        CometExchange [ws_item_sk,ws_order_number] #15
                                                                           CometFilter [ws_web_site_sk,ws_item_sk,ws_promo_sk]
                                                                             CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_web_site_sk,ws_promo_sk,ws_order_number,ws_ext_sales_price,ws_net_profit,ws_sold_date_sk]
                                                                               ReusedSubquery [d_date_sk] #1
                                                                       CometSort [wr_item_sk,wr_order_number]
-                                                                        CometColumnarExchange [wr_item_sk,wr_order_number] #16
+                                                                        CometExchange [wr_item_sk,wr_order_number] #16
                                                                           CometProject [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss]
                                                                             CometFilter [wr_item_sk,wr_order_number]
                                                                               CometScan parquet spark_catalog.default.web_returns [wr_item_sk,wr_order_number,wr_return_amt,wr_net_loss,wr_returned_date_sk]
@@ -161,13 +157,21 @@ WholeStageCodegen (58)
                                                         ReusedExchange [i_item_sk] #8
                                                   InputAdapter
                                                     ReusedExchange [p_promo_sk] #9
-                CometHashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange [channel] #18
-                    CometHashAggregate [channel,sales,returns,profit]
-                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
-                CometHashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                  CometColumnarExchange #19
-                    CometHashAggregate [sales,returns,profit]
-                      CometHashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty]
-                        ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                  WholeStageCodegen (41)
+                    HashAggregate [channel,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange [channel] #18
+                          WholeStageCodegen (40)
+                            HashAggregate [channel,sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                InputAdapter
+                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
+                  WholeStageCodegen (62)
+                    HashAggregate [sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),channel,id,sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                      InputAdapter
+                        Exchange #19
+                          WholeStageCodegen (61)
+                            HashAggregate [sales,returns,profit] [sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                              HashAggregate [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] [sum(sales),sum(returns),sum(profit),sales,returns,profit,sum,isEmpty,sum,isEmpty,sum,isEmpty]
+                                InputAdapter
+                                  ReusedExchange [channel,id,sum,isEmpty,sum,isEmpty,sum,isEmpty] #2
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt
index 2c60857ef7..610ae89672 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/explain.txt
@@ -1,40 +1,38 @@
 == Physical Plan ==
-TakeOrderedAndProject (36)
-+- * Project (35)
-   +- Window (34)
-      +- * ColumnarToRow (33)
-         +- CometSort (32)
-            +- CometColumnarExchange (31)
-               +- CometHashAggregate (30)
-                  +- CometColumnarExchange (29)
-                     +- CometHashAggregate (28)
-                        +- CometUnion (27)
-                           :- CometHashAggregate (16)
-                           :  +- CometColumnarExchange (15)
-                           :     +- RowToColumnar (14)
-                           :        +- * HashAggregate (13)
-                           :           +- * Project (12)
-                           :              +- * BroadcastHashJoin Inner BuildRight (11)
-                           :                 :- * Project (6)
-                           :                 :  +- * BroadcastHashJoin Inner BuildRight (5)
-                           :                 :     :- * ColumnarToRow (3)
-                           :                 :     :  +- CometFilter (2)
-                           :                 :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
-                           :                 :     +- ReusedExchange (4)
-                           :                 +- BroadcastExchange (10)
-                           :                    +- * ColumnarToRow (9)
-                           :                       +- CometFilter (8)
-                           :                          +- CometScan parquet spark_catalog.default.item (7)
-                           :- CometHashAggregate (21)
-                           :  +- CometColumnarExchange (20)
-                           :     +- CometHashAggregate (19)
-                           :        +- CometHashAggregate (18)
-                           :           +- ReusedExchange (17)
-                           +- CometHashAggregate (26)
-                              +- CometColumnarExchange (25)
-                                 +- CometHashAggregate (24)
-                                    +- CometHashAggregate (23)
-                                       +- ReusedExchange (22)
+TakeOrderedAndProject (34)
++- * Project (33)
+   +- Window (32)
+      +- * Sort (31)
+         +- Exchange (30)
+            +- * HashAggregate (29)
+               +- Exchange (28)
+                  +- * HashAggregate (27)
+                     +- Union (26)
+                        :- * HashAggregate (15)
+                        :  +- Exchange (14)
+                        :     +- * HashAggregate (13)
+                        :        +- * Project (12)
+                        :           +- * BroadcastHashJoin Inner BuildRight (11)
+                        :              :- * Project (6)
+                        :              :  +- * BroadcastHashJoin Inner BuildRight (5)
+                        :              :     :- * ColumnarToRow (3)
+                        :              :     :  +- CometFilter (2)
+                        :              :     :     +- CometScan parquet spark_catalog.default.web_sales (1)
+                        :              :     +- ReusedExchange (4)
+                        :              +- BroadcastExchange (10)
+                        :                 +- * ColumnarToRow (9)
+                        :                    +- CometFilter (8)
+                        :                       +- CometScan parquet spark_catalog.default.item (7)
+                        :- * HashAggregate (20)
+                        :  +- Exchange (19)
+                        :     +- * HashAggregate (18)
+                        :        +- * HashAggregate (17)
+                        :           +- ReusedExchange (16)
+                        +- * HashAggregate (25)
+                           +- Exchange (24)
+                              +- * HashAggregate (23)
+                                 +- * HashAggregate (22)
+                                    +- ReusedExchange (21)
 
 
 (unknown) Scan parquet spark_catalog.default.web_sales
@@ -52,7 +50,7 @@ Condition : isnotnull(ws_item_sk#1)
 (3) ColumnarToRow [codegen id : 3]
 Input [3]: [ws_item_sk#1, ws_net_paid#2, ws_sold_date_sk#3]
 
-(4) ReusedExchange [Reuses operator id: 41]
+(4) ReusedExchange [Reuses operator id: 39]
 Output [1]: [d_date_sk#5]
 
 (5) BroadcastHashJoin [codegen id : 3]
@@ -100,133 +98,142 @@ Functions [1]: [partial_sum(UnscaledValue(ws_net_paid#2))]
 Aggregate Attributes [1]: [sum#9]
 Results [3]: [i_category#8, i_class#7, sum#10]
 
-(14) RowToColumnar
+(14) Exchange
 Input [3]: [i_category#8, i_class#7, sum#10]
+Arguments: hashpartitioning(i_category#8, i_class#7, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [3]: [i_category#8, i_class#7, sum#10]
-Arguments: hashpartitioning(i_category#8, i_class#7, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [3]: [i_category#8, i_class#7, sum#10]
 Keys [2]: [i_category#8, i_class#7]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#11]
+Results [6]: [cast(MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#11,17,2) as decimal(27,2)) AS total_sum#12, i_category#8, i_class#7, 0 AS g_category#13, 0 AS g_class#14, 0 AS lochierarchy#15]
 
-(17) ReusedExchange [Reuses operator id: 15]
-Output [3]: [i_category#8, i_class#7, sum#11]
+(16) ReusedExchange [Reuses operator id: 14]
+Output [3]: [i_category#8, i_class#7, sum#16]
 
-(18) CometHashAggregate
-Input [3]: [i_category#8, i_class#7, sum#11]
+(17) HashAggregate [codegen id : 8]
+Input [3]: [i_category#8, i_class#7, sum#16]
 Keys [2]: [i_category#8, i_class#7]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#11]
+Results [2]: [MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#11,17,2) AS total_sum#17, i_category#8]
 
-(19) CometHashAggregate
-Input [2]: [total_sum#12, i_category#8]
+(18) HashAggregate [codegen id : 8]
+Input [2]: [total_sum#17, i_category#8]
 Keys [1]: [i_category#8]
-Functions [1]: [partial_sum(total_sum#12)]
+Functions [1]: [partial_sum(total_sum#17)]
+Aggregate Attributes [2]: [sum#18, isEmpty#19]
+Results [3]: [i_category#8, sum#20, isEmpty#21]
 
-(20) CometColumnarExchange
-Input [3]: [i_category#8, sum#13, isEmpty#14]
-Arguments: hashpartitioning(i_category#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
+(19) Exchange
+Input [3]: [i_category#8, sum#20, isEmpty#21]
+Arguments: hashpartitioning(i_category#8, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) CometHashAggregate
-Input [3]: [i_category#8, sum#13, isEmpty#14]
+(20) HashAggregate [codegen id : 9]
+Input [3]: [i_category#8, sum#20, isEmpty#21]
 Keys [1]: [i_category#8]
-Functions [1]: [sum(total_sum#12)]
+Functions [1]: [sum(total_sum#17)]
+Aggregate Attributes [1]: [sum(total_sum#17)#22]
+Results [6]: [sum(total_sum#17)#22 AS total_sum#23, i_category#8, null AS i_class#24, 0 AS g_category#25, 1 AS g_class#26, 1 AS lochierarchy#27]
 
-(22) ReusedExchange [Reuses operator id: 15]
-Output [3]: [i_category#8, i_class#7, sum#15]
+(21) ReusedExchange [Reuses operator id: 14]
+Output [3]: [i_category#8, i_class#7, sum#28]
 
-(23) CometHashAggregate
-Input [3]: [i_category#8, i_class#7, sum#15]
+(22) HashAggregate [codegen id : 13]
+Input [3]: [i_category#8, i_class#7, sum#28]
 Keys [2]: [i_category#8, i_class#7]
 Functions [1]: [sum(UnscaledValue(ws_net_paid#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ws_net_paid#2))#11]
+Results [1]: [MakeDecimal(sum(UnscaledValue(ws_net_paid#2))#11,17,2) AS total_sum#17]
 
-(24) CometHashAggregate
-Input [1]: [total_sum#12]
+(23) HashAggregate [codegen id : 13]
+Input [1]: [total_sum#17]
 Keys: []
-Functions [1]: [partial_sum(total_sum#12)]
+Functions [1]: [partial_sum(total_sum#17)]
+Aggregate Attributes [2]: [sum#29, isEmpty#30]
+Results [2]: [sum#31, isEmpty#32]
 
-(25) CometColumnarExchange
-Input [2]: [sum#16, isEmpty#17]
-Arguments: SinglePartition, ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(24) Exchange
+Input [2]: [sum#31, isEmpty#32]
+Arguments: SinglePartition, ENSURE_REQUIREMENTS, [plan_id=4]
 
-(26) CometHashAggregate
-Input [2]: [sum#16, isEmpty#17]
+(25) HashAggregate [codegen id : 14]
+Input [2]: [sum#31, isEmpty#32]
 Keys: []
-Functions [1]: [sum(total_sum#12)]
+Functions [1]: [sum(total_sum#17)]
+Aggregate Attributes [1]: [sum(total_sum#17)#33]
+Results [6]: [sum(total_sum#17)#33 AS total_sum#34, null AS i_category#35, null AS i_class#36, 1 AS g_category#37, 1 AS g_class#38, 2 AS lochierarchy#39]
 
-(27) CometUnion
-Child 0 Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
-Child 1 Input [6]: [total_sum#22, i_category#8, i_class#23, g_category#24, g_class#25, lochierarchy#26]
-Child 2 Input [6]: [total_sum#27, i_category#28, i_class#29, g_category#30, g_class#31, lochierarchy#32]
+(26) Union
 
-(28) CometHashAggregate
-Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
-Keys [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
+(27) HashAggregate [codegen id : 15]
+Input [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
+Keys [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
 Functions: []
+Aggregate Attributes: []
+Results [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
 
-(29) CometColumnarExchange
-Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
-Arguments: hashpartitioning(total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=5]
+(28) Exchange
+Input [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
+Arguments: hashpartitioning(total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15, 5), ENSURE_REQUIREMENTS, [plan_id=5]
 
-(30) CometHashAggregate
-Input [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
-Keys [6]: [total_sum#18, i_category#8, i_class#7, g_category#19, g_class#20, lochierarchy#21]
+(29) HashAggregate [codegen id : 16]
+Input [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
+Keys [6]: [total_sum#12, i_category#8, i_class#7, g_category#13, g_class#14, lochierarchy#15]
 Functions: []
+Aggregate Attributes: []
+Results [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, CASE WHEN (g_class#14 = 0) THEN i_category#8 END AS _w0#40]
 
-(31) CometColumnarExchange
-Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
-Arguments: hashpartitioning(lochierarchy#21, _w0#33, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=6]
-
-(32) CometSort
-Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
-Arguments: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33], [lochierarchy#21 ASC NULLS FIRST, _w0#33 ASC NULLS FIRST, total_sum#18 DESC NULLS LAST]
+(30) Exchange
+Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40]
+Arguments: hashpartitioning(lochierarchy#15, _w0#40, 5), ENSURE_REQUIREMENTS, [plan_id=6]
 
-(33) ColumnarToRow [codegen id : 10]
-Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
+(31) Sort [codegen id : 17]
+Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40]
+Arguments: [lochierarchy#15 ASC NULLS FIRST, _w0#40 ASC NULLS FIRST, total_sum#12 DESC NULLS LAST], false, 0
 
-(34) Window
-Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33]
-Arguments: [rank(total_sum#18) windowspecdefinition(lochierarchy#21, _w0#33, total_sum#18 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#34], [lochierarchy#21, _w0#33], [total_sum#18 DESC NULLS LAST]
+(32) Window
+Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40]
+Arguments: [rank(total_sum#12) windowspecdefinition(lochierarchy#15, _w0#40, total_sum#12 DESC NULLS LAST, specifiedwindowframe(RowFrame, unboundedpreceding$(), currentrow$())) AS rank_within_parent#41], [lochierarchy#15, _w0#40], [total_sum#12 DESC NULLS LAST]
 
-(35) Project [codegen id : 11]
-Output [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, rank_within_parent#34]
-Input [6]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, _w0#33, rank_within_parent#34]
+(33) Project [codegen id : 18]
+Output [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, rank_within_parent#41]
+Input [6]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, _w0#40, rank_within_parent#41]
 
-(36) TakeOrderedAndProject
-Input [5]: [total_sum#18, i_category#8, i_class#7, lochierarchy#21, rank_within_parent#34]
-Arguments: 100, [lochierarchy#21 DESC NULLS LAST, CASE WHEN (lochierarchy#21 = 0) THEN i_category#8 END ASC NULLS FIRST, rank_within_parent#34 ASC NULLS FIRST], [total_sum#18, i_category#8, i_class#7, lochierarchy#21, rank_within_parent#34]
+(34) TakeOrderedAndProject
+Input [5]: [total_sum#12, i_category#8, i_class#7, lochierarchy#15, rank_within_parent#41]
+Arguments: 100, [lochierarchy#15 DESC NULLS LAST, CASE WHEN (lochierarchy#15 = 0) THEN i_category#8 END ASC NULLS FIRST, rank_within_parent#41 ASC NULLS FIRST], [total_sum#12, i_category#8, i_class#7, lochierarchy#15, rank_within_parent#41]
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ws_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (41)
-+- * ColumnarToRow (40)
-   +- CometProject (39)
-      +- CometFilter (38)
-         +- CometScan parquet spark_catalog.default.date_dim (37)
+BroadcastExchange (39)
++- * ColumnarToRow (38)
+   +- CometProject (37)
+      +- CometFilter (36)
+         +- CometScan parquet spark_catalog.default.date_dim (35)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#5, d_month_seq#35]
+Output [2]: [d_date_sk#5, d_month_seq#42]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_month_seq), GreaterThanOrEqual(d_month_seq,1212), LessThanOrEqual(d_month_seq,1223), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_month_seq:int>
 
-(38) CometFilter
-Input [2]: [d_date_sk#5, d_month_seq#35]
-Condition : (((isnotnull(d_month_seq#35) AND (d_month_seq#35 >= 1212)) AND (d_month_seq#35 <= 1223)) AND isnotnull(d_date_sk#5))
+(36) CometFilter
+Input [2]: [d_date_sk#5, d_month_seq#42]
+Condition : (((isnotnull(d_month_seq#42) AND (d_month_seq#42 >= 1212)) AND (d_month_seq#42 <= 1223)) AND isnotnull(d_date_sk#5))
 
-(39) CometProject
-Input [2]: [d_date_sk#5, d_month_seq#35]
+(37) CometProject
+Input [2]: [d_date_sk#5, d_month_seq#42]
 Arguments: [d_date_sk#5], [d_date_sk#5]
 
-(40) ColumnarToRow [codegen id : 1]
+(38) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#5]
 
-(41) BroadcastExchange
+(39) BroadcastExchange
 Input [1]: [d_date_sk#5]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=7]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt
index ef041fca19..5c5e088857 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q86a/simplified.txt
@@ -1,54 +1,66 @@
 TakeOrderedAndProject [lochierarchy,i_category,rank_within_parent,total_sum,i_class]
-  WholeStageCodegen (11)
+  WholeStageCodegen (18)
     Project [total_sum,i_category,i_class,lochierarchy,rank_within_parent]
       InputAdapter
         Window [total_sum,lochierarchy,_w0]
-          WholeStageCodegen (10)
-            ColumnarToRow
+          WholeStageCodegen (17)
+            Sort [lochierarchy,_w0,total_sum]
               InputAdapter
-                CometSort [lochierarchy,_w0,total_sum]
-                  CometColumnarExchange [lochierarchy,_w0] #1
-                    CometHashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy]
-                      CometColumnarExchange [total_sum,i_category,i_class,g_category,g_class,lochierarchy] #2
-                        CometHashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy]
-                          CometUnion
-                            CometHashAggregate [i_category,i_class,sum]
-                              CometColumnarExchange [i_category,i_class] #3
-                                RowToColumnar
-                                  WholeStageCodegen (3)
-                                    HashAggregate [i_category,i_class,ws_net_paid] [sum,sum]
-                                      Project [ws_net_paid,i_class,i_category]
-                                        BroadcastHashJoin [ws_item_sk,i_item_sk]
-                                          Project [ws_item_sk,ws_net_paid]
-                                            BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
-                                              ColumnarToRow
-                                                InputAdapter
-                                                  CometFilter [ws_item_sk]
-                                                    CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_net_paid,ws_sold_date_sk]
-                                                      SubqueryBroadcast [d_date_sk] #1
-                                                        BroadcastExchange #4
-                                                          WholeStageCodegen (1)
-                                                            ColumnarToRow
-                                                              InputAdapter
-                                                                CometProject [d_date_sk]
-                                                                  CometFilter [d_month_seq,d_date_sk]
-                                                                    CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
-                                              InputAdapter
-                                                ReusedExchange [d_date_sk] #4
-                                          InputAdapter
-                                            BroadcastExchange #5
-                                              WholeStageCodegen (2)
-                                                ColumnarToRow
+                Exchange [lochierarchy,_w0] #1
+                  WholeStageCodegen (16)
+                    HashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy] [_w0]
+                      InputAdapter
+                        Exchange [total_sum,i_category,i_class,g_category,g_class,lochierarchy] #2
+                          WholeStageCodegen (15)
+                            HashAggregate [total_sum,i_category,i_class,g_category,g_class,lochierarchy]
+                              InputAdapter
+                                Union
+                                  WholeStageCodegen (4)
+                                    HashAggregate [i_category,i_class,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,g_category,g_class,lochierarchy,sum]
+                                      InputAdapter
+                                        Exchange [i_category,i_class] #3
+                                          WholeStageCodegen (3)
+                                            HashAggregate [i_category,i_class,ws_net_paid] [sum,sum]
+                                              Project [ws_net_paid,i_class,i_category]
+                                                BroadcastHashJoin [ws_item_sk,i_item_sk]
+                                                  Project [ws_item_sk,ws_net_paid]
+                                                    BroadcastHashJoin [ws_sold_date_sk,d_date_sk]
+                                                      ColumnarToRow
+                                                        InputAdapter
+                                                          CometFilter [ws_item_sk]
+                                                            CometScan parquet spark_catalog.default.web_sales [ws_item_sk,ws_net_paid,ws_sold_date_sk]
+                                                              SubqueryBroadcast [d_date_sk] #1
+                                                                BroadcastExchange #4
+                                                                  WholeStageCodegen (1)
+                                                                    ColumnarToRow
+                                                                      InputAdapter
+                                                                        CometProject [d_date_sk]
+                                                                          CometFilter [d_month_seq,d_date_sk]
+                                                                            CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_month_seq]
+                                                      InputAdapter
+                                                        ReusedExchange [d_date_sk] #4
                                                   InputAdapter
-                                                    CometFilter [i_item_sk]
-                                                      CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
-                            CometHashAggregate [i_category,sum,isEmpty]
-                              CometColumnarExchange [i_category] #6
-                                CometHashAggregate [i_category,total_sum]
-                                  CometHashAggregate [i_category,i_class,sum]
-                                    ReusedExchange [i_category,i_class,sum] #3
-                            CometHashAggregate [sum,isEmpty]
-                              CometColumnarExchange #7
-                                CometHashAggregate [total_sum]
-                                  CometHashAggregate [i_category,i_class,sum]
-                                    ReusedExchange [i_category,i_class,sum] #3
+                                                    BroadcastExchange #5
+                                                      WholeStageCodegen (2)
+                                                        ColumnarToRow
+                                                          InputAdapter
+                                                            CometFilter [i_item_sk]
+                                                              CometScan parquet spark_catalog.default.item [i_item_sk,i_class,i_category]
+                                  WholeStageCodegen (9)
+                                    HashAggregate [i_category,sum,isEmpty] [sum(total_sum),total_sum,i_class,g_category,g_class,lochierarchy,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange [i_category] #6
+                                          WholeStageCodegen (8)
+                                            HashAggregate [i_category,total_sum] [sum,isEmpty,sum,isEmpty]
+                                              HashAggregate [i_category,i_class,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,sum]
+                                                InputAdapter
+                                                  ReusedExchange [i_category,i_class,sum] #3
+                                  WholeStageCodegen (14)
+                                    HashAggregate [sum,isEmpty] [sum(total_sum),total_sum,i_category,i_class,g_category,g_class,lochierarchy,sum,isEmpty]
+                                      InputAdapter
+                                        Exchange #7
+                                          WholeStageCodegen (13)
+                                            HashAggregate [total_sum] [sum,isEmpty,sum,isEmpty]
+                                              HashAggregate [i_category,i_class,sum] [sum(UnscaledValue(ws_net_paid)),total_sum,sum]
+                                                InputAdapter
+                                                  ReusedExchange [i_category,i_class,sum] #3
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt
index 080613d65b..7fa138d5e9 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/explain.txt
@@ -1,29 +1,25 @@
 == Physical Plan ==
-* ColumnarToRow (25)
-+- CometSort (24)
-   +- CometColumnarExchange (23)
-      +- RowToColumnar (22)
-         +- * Project (21)
-            +- Window (20)
-               +- * ColumnarToRow (19)
-                  +- CometSort (18)
-                     +- CometColumnarExchange (17)
-                        +- CometHashAggregate (16)
-                           +- CometColumnarExchange (15)
-                              +- RowToColumnar (14)
-                                 +- * HashAggregate (13)
-                                    +- * Project (12)
-                                       +- * BroadcastHashJoin Inner BuildRight (11)
-                                          :- * Project (9)
-                                          :  +- * BroadcastHashJoin Inner BuildRight (8)
-                                          :     :- * ColumnarToRow (3)
-                                          :     :  +- CometFilter (2)
-                                          :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
-                                          :     +- BroadcastExchange (7)
-                                          :        +- * ColumnarToRow (6)
-                                          :           +- CometFilter (5)
-                                          :              +- CometScan parquet spark_catalog.default.item (4)
-                                          +- ReusedExchange (10)
+* Sort (21)
++- Exchange (20)
+   +- * Project (19)
+      +- Window (18)
+         +- * Sort (17)
+            +- Exchange (16)
+               +- * HashAggregate (15)
+                  +- Exchange (14)
+                     +- * HashAggregate (13)
+                        +- * Project (12)
+                           +- * BroadcastHashJoin Inner BuildRight (11)
+                              :- * Project (9)
+                              :  +- * BroadcastHashJoin Inner BuildRight (8)
+                              :     :- * ColumnarToRow (3)
+                              :     :  +- CometFilter (2)
+                              :     :     +- CometScan parquet spark_catalog.default.store_sales (1)
+                              :     +- BroadcastExchange (7)
+                              :        +- * ColumnarToRow (6)
+                              :           +- CometFilter (5)
+                              :              +- CometScan parquet spark_catalog.default.item (4)
+                              +- ReusedExchange (10)
 
 
 (unknown) Scan parquet spark_catalog.default.store_sales
@@ -69,7 +65,7 @@ Join condition: None
 Output [7]: [ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 Input [9]: [ss_item_sk#1, ss_ext_sales_price#2, ss_sold_date_sk#3, i_item_sk#5, i_item_id#6, i_item_desc#7, i_current_price#8, i_class#9, i_category#10]
 
-(10) ReusedExchange [Reuses operator id: 30]
+(10) ReusedExchange [Reuses operator id: 26]
 Output [1]: [d_date_sk#11]
 
 (11) BroadcastHashJoin [codegen id : 3]
@@ -89,80 +85,70 @@ Functions [1]: [partial_sum(UnscaledValue(ss_ext_sales_price#2))]
 Aggregate Attributes [1]: [sum#12]
 Results [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 
-(14) RowToColumnar
+(14) Exchange
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
+Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, [plan_id=2]
 
-(15) CometColumnarExchange
-Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
-Arguments: hashpartitioning(i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=2]
-
-(16) CometHashAggregate
+(15) HashAggregate [codegen id : 4]
 Input [6]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, sum#13]
 Keys [5]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8]
 Functions [1]: [sum(UnscaledValue(ss_ext_sales_price#2))]
+Aggregate Attributes [1]: [sum(UnscaledValue(ss_ext_sales_price#2))#14]
+Results [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS itemrevenue#15, MakeDecimal(sum(UnscaledValue(ss_ext_sales_price#2))#14,17,2) AS _w0#16]
 
-(17) CometColumnarExchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=3]
-
-(18) CometSort
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15], [i_class#9 ASC NULLS FIRST]
-
-(19) ColumnarToRow [codegen id : 4]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-
-(20) Window
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15]
-Arguments: [sum(_w0#15) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#16], [i_class#9]
+(16) Exchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: hashpartitioning(i_class#9, 5), ENSURE_REQUIREMENTS, [plan_id=3]
 
-(21) Project [codegen id : 5]
-Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, ((_w0#15 * 100) / _we0#16) AS revenueratio#17]
-Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, _w0#15, _we0#16]
+(17) Sort [codegen id : 5]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: [i_class#9 ASC NULLS FIRST], false, 0
 
-(22) RowToColumnar
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(18) Window
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16]
+Arguments: [sum(_w0#16) windowspecdefinition(i_class#9, specifiedwindowframe(RowFrame, unboundedpreceding$(), unboundedfollowing$())) AS _we0#17], [i_class#9]
 
-(23) CometColumnarExchange
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
-Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, CometColumnarShuffle, [plan_id=4]
+(19) Project [codegen id : 6]
+Output [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, ((_w0#16 * 100) / _we0#17) AS revenueratio#18]
+Input [8]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, _w0#16, _we0#17]
 
-(24) CometSort
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
-Arguments: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17], [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#17 ASC NULLS FIRST]
+(20) Exchange
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+Arguments: rangepartitioning(i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST, 5), ENSURE_REQUIREMENTS, [plan_id=4]
 
-(25) ColumnarToRow [codegen id : 6]
-Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#14, revenueratio#17]
+(21) Sort [codegen id : 7]
+Input [7]: [i_item_id#6, i_item_desc#7, i_category#10, i_class#9, i_current_price#8, itemrevenue#15, revenueratio#18]
+Arguments: [i_category#10 ASC NULLS FIRST, i_class#9 ASC NULLS FIRST, i_item_id#6 ASC NULLS FIRST, i_item_desc#7 ASC NULLS FIRST, revenueratio#18 ASC NULLS FIRST], true, 0
 
 ===== Subqueries =====
 
 Subquery:1 Hosting operator id = 1 Hosting Expression = ss_sold_date_sk#3 IN dynamicpruning#4
-BroadcastExchange (30)
-+- * ColumnarToRow (29)
-   +- CometProject (28)
-      +- CometFilter (27)
-         +- CometScan parquet spark_catalog.default.date_dim (26)
+BroadcastExchange (26)
++- * ColumnarToRow (25)
+   +- CometProject (24)
+      +- CometFilter (23)
+         +- CometScan parquet spark_catalog.default.date_dim (22)
 
 
 (unknown) Scan parquet spark_catalog.default.date_dim
-Output [2]: [d_date_sk#11, d_date#18]
+Output [2]: [d_date_sk#11, d_date#19]
 Batched: true
 Location [not included in comparison]/{warehouse_dir}/date_dim]
 PushedFilters: [IsNotNull(d_date), GreaterThanOrEqual(d_date,1999-02-22), LessThanOrEqual(d_date,1999-03-24), IsNotNull(d_date_sk)]
 ReadSchema: struct<d_date_sk:int,d_date:date>
 
-(27) CometFilter
-Input [2]: [d_date_sk#11, d_date#18]
-Condition : (((isnotnull(d_date#18) AND (d_date#18 >= 1999-02-22)) AND (d_date#18 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
+(23) CometFilter
+Input [2]: [d_date_sk#11, d_date#19]
+Condition : (((isnotnull(d_date#19) AND (d_date#19 >= 1999-02-22)) AND (d_date#19 <= 1999-03-24)) AND isnotnull(d_date_sk#11))
 
-(28) CometProject
-Input [2]: [d_date_sk#11, d_date#18]
+(24) CometProject
+Input [2]: [d_date_sk#11, d_date#19]
 Arguments: [d_date_sk#11], [d_date_sk#11]
 
-(29) ColumnarToRow [codegen id : 1]
+(25) ColumnarToRow [codegen id : 1]
 Input [1]: [d_date_sk#11]
 
-(30) BroadcastExchange
+(26) BroadcastExchange
 Input [1]: [d_date_sk#11]
 Arguments: HashedRelationBroadcastMode(List(cast(input[0, int, true] as bigint)),false), [plan_id=5]
 
diff --git a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt
index b59521b6c2..b7489a0aff 100644
--- a/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt
+++ b/spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q98/simplified.txt
@@ -1,45 +1,43 @@
-WholeStageCodegen (6)
-  ColumnarToRow
+WholeStageCodegen (7)
+  Sort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
     InputAdapter
-      CometSort [i_category,i_class,i_item_id,i_item_desc,revenueratio]
-        CometColumnarExchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
-          RowToColumnar
-            WholeStageCodegen (5)
-              Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
-                InputAdapter
-                  Window [_w0,i_class]
-                    WholeStageCodegen (4)
-                      ColumnarToRow
-                        InputAdapter
-                          CometSort [i_class]
-                            CometColumnarExchange [i_class] #2
-                              CometHashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum]
-                                CometColumnarExchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
-                                  RowToColumnar
-                                    WholeStageCodegen (3)
-                                      HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
-                                        Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                          BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
-                                            Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
-                                              BroadcastHashJoin [ss_item_sk,i_item_sk]
-                                                ColumnarToRow
-                                                  InputAdapter
-                                                    CometFilter [ss_item_sk]
-                                                      CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
-                                                        SubqueryBroadcast [d_date_sk] #1
-                                                          BroadcastExchange #4
-                                                            WholeStageCodegen (1)
-                                                              ColumnarToRow
-                                                                InputAdapter
-                                                                  CometProject [d_date_sk]
-                                                                    CometFilter [d_date,d_date_sk]
-                                                                      CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
-                                                InputAdapter
-                                                  BroadcastExchange #5
-                                                    WholeStageCodegen (1)
-                                                      ColumnarToRow
-                                                        InputAdapter
-                                                          CometFilter [i_category,i_item_sk]
-                                                            CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+      Exchange [i_category,i_class,i_item_id,i_item_desc,revenueratio] #1
+        WholeStageCodegen (6)
+          Project [i_item_id,i_item_desc,i_category,i_class,i_current_price,itemrevenue,_w0,_we0]
+            InputAdapter
+              Window [_w0,i_class]
+                WholeStageCodegen (5)
+                  Sort [i_class]
+                    InputAdapter
+                      Exchange [i_class] #2
+                        WholeStageCodegen (4)
+                          HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,sum] [sum(UnscaledValue(ss_ext_sales_price)),itemrevenue,_w0,sum]
+                            InputAdapter
+                              Exchange [i_item_id,i_item_desc,i_category,i_class,i_current_price] #3
+                                WholeStageCodegen (3)
+                                  HashAggregate [i_item_id,i_item_desc,i_category,i_class,i_current_price,ss_ext_sales_price] [sum,sum]
+                                    Project [ss_ext_sales_price,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                      BroadcastHashJoin [ss_sold_date_sk,d_date_sk]
+                                        Project [ss_ext_sales_price,ss_sold_date_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                          BroadcastHashJoin [ss_item_sk,i_item_sk]
+                                            ColumnarToRow
+                                              InputAdapter
+                                                CometFilter [ss_item_sk]
+                                                  CometScan parquet spark_catalog.default.store_sales [ss_item_sk,ss_ext_sales_price,ss_sold_date_sk]
+                                                    SubqueryBroadcast [d_date_sk] #1
+                                                      BroadcastExchange #4
+                                                        WholeStageCodegen (1)
+                                                          ColumnarToRow
+                                                            InputAdapter
+                                                              CometProject [d_date_sk]
+                                                                CometFilter [d_date,d_date_sk]
+                                                                  CometScan parquet spark_catalog.default.date_dim [d_date_sk,d_date]
                                             InputAdapter
-                                              ReusedExchange [d_date_sk] #4
+                                              BroadcastExchange #5
+                                                WholeStageCodegen (1)
+                                                  ColumnarToRow
+                                                    InputAdapter
+                                                      CometFilter [i_category,i_item_sk]
+                                                        CometScan parquet spark_catalog.default.item [i_item_sk,i_item_id,i_item_desc,i_current_price,i_class,i_category]
+                                        InputAdapter
+                                          ReusedExchange [d_date_sk] #4